diff --git a/.github/actions/asana-create-action-item/action.yml b/.github/actions/asana-create-action-item/action.yml
index 7f4ee3f3c2..b83f2dd1ad 100644
--- a/.github/actions/asana-create-action-item/action.yml
+++ b/.github/actions/asana-create-action-item/action.yml
@@ -45,7 +45,7 @@ runs:
 
     - id: get-asana-user-id
       if: github.event_name != 'schedule'
-      uses: duckduckgo/apple-infra/actions/asana-get-user-id-for-github-handle@main
+      uses: duckduckgo/apple-toolbox/actions/asana-get-user-id-for-github-handle@main
       with:
         access-token: ${{ inputs.access-token }}
         github-handle: ${{ github.actor }}
diff --git a/.github/actions/asana-get-build-variants-list/action.yml b/.github/actions/asana-get-build-variants-list/action.yml
new file mode 100644
index 0000000000..38543f750a
--- /dev/null
+++ b/.github/actions/asana-get-build-variants-list/action.yml
@@ -0,0 +1,36 @@
+name: Get The List of Build Variants From Asana
+description: |
+  Fetch the lists of build variants to measure retention (ATB) and attribution (Origin) from different Asana projects and combine them in a list.
+inputs:
+  access-token:
+    description: "Asana access token"
+    required: true
+    type: string
+  github-token:
+    description: "GitHub Token"
+    required: false
+    type: string
+  atb-asana-task-id:
+    description: "Asana Task id for the ATB list."
+    required: true
+    type: string
+  origin-asana-section-id:
+    description: "Asana Section id for the Origins list"
+    required: true
+    type: string
+outputs:
+  build-variants:
+    description: "The list of build variants to create"
+    value: ${{ steps.get-build-variants-task.outputs.build-variants }}
+runs:
+  using: "composite"
+  steps:
+    - id: get-build-variants-task
+      shell: bash
+      env:
+        ASANA_ACCESS_TOKEN: ${{ inputs.access-token }}
+        GITHUB_TOKEN: ${{ inputs.github-token || github.token }}
+        ORIGIN_ASANA_SECTION_ID: ${{ inputs.origin-asana-section-id }}
+        ATB_ASANA_TASK_ID: ${{ inputs.atb-asana-task-id }}
+      run: |
+        ${{ github.action_path }}/get_build_variants_list.sh
diff --git a/.github/actions/asana-get-build-variants-list/get_build_variants_list.sh b/.github/actions/asana-get-build-variants-list/get_build_variants_list.sh
new file mode 100755
index 0000000000..a42d54ac58
--- /dev/null
+++ b/.github/actions/asana-get-build-variants-list/get_build_variants_list.sh
@@ -0,0 +1,110 @@
+#!/bin/bash
+#
+# This scripts fetches Asana tasks from the Origins section defined in the Asana project https://app.asana.com/0/1206716555947156/1206716715679835.
+# 
+
+set -e -o pipefail
+
+asana_api_url="https://app.asana.com/api/1.0"
+
+# Create a JSON string with the `origin-variant` pairs from the list of .
+_create_origins_and_variants() {
+	local response="$1"
+	local origin_field="Origin"
+	local atb_field="ATB"
+
+	# for each element in the data array.
+	# filter out element with null `origin`.
+	# select `origin` and `variant` from the custom_fields response and make a key:value pair structure like {origin: <origin_value>, variant: <variant_value>}.
+	# if variant is not null we need to create two entries. One only with `origin` and one with `origin` and `variant` 
+	# replace the new line with a comma
+	# remove the trailing comma at the end of the line.
+	jq -c '.data[]
+		| select(.custom_fields[] | select(.name == "'"${origin_field}"'").text_value != null)
+		| {origin: (.custom_fields[] | select(.name == "'"${origin_field}"'") | .text_value), variant: (.custom_fields[] | select(.name == "'"${atb_field}"'") | .text_value)}
+		| if .variant != null then {origin}, {origin, variant} else {origin} end' <<< "$response" \
+		| tr '\n' ',' \
+		| sed 's/,$//'
+}
+
+# Fetch all the Asana tasks in the section specified by ORIGIN_ASANA_SECTION_ID for a project.
+# This function fetches only uncompleted tasks.
+# If there are more than 100 items the function takes care of pagination.
+# Returns a JSON string consisting of a list of `origin-variant` pairs concatenated by a comma. Eg. `{"origin":"app","variant":"ab"},{"origin":"app.search","variant":null}`.  
+_fetch_origin_tasks() {
+	# Fetches only tasks that have not been completed yet, includes in the response section name, name of the task and its custom fields. 
+	local query="completed_since=now&opt_fields=name,custom_fields.id_prefix,custom_fields.name,custom_fields.text_value&opt_expand=custom_fields&opt_fields=memberships.section.name&limit=100"
+
+	local url="${asana_api_url}/sections/${ORIGIN_ASANA_SECTION_ID}/tasks?${query}"
+	local response
+	local origin_variants=()
+
+	# go through all tasks in the section (there may be multiple requests in case there are more than 100 tasks in the section)
+	# repeat until no more pages (next_page.uri is null)
+	while true; do
+		response="$(curl -fLSs "$url" -H "Authorization: Bearer ${ASANA_ACCESS_TOKEN}")"
+		
+		# extract the object in the data array and append to result
+		origin_variants+=("$(_create_origins_and_variants "$response")")
+
+		# set new URL to next page URL
+		url="$(jq -r .next_page.uri <<< "$response")"
+
+		# break on last page
+		if [[ "$url" == "null" ]]; then
+			break
+		fi
+	done
+
+	echo "${origin_variants}"
+}
+
+# Create a JSON string from the list of ATB items passed.
+_create_atb_variant_pairs() {
+	local response="$1"
+
+	# read the response raw and format in a compact JSON mode
+	# map each element to the structure {variant:<element>}
+	# remove the array
+	# replace the new line with a comma
+	# remove the trailing comma at the end of the line.
+	jq -R -c 'split(",") 
+		| map({variant: .}) 
+		| .[]' <<< "$response" \
+		| tr '\n' ',' \
+		| sed 's/,$//'
+}
+
+# Fetches all the ATB variants defined in the ATB_ASANA_TASK_ID at the Variants list (comma separated) section.
+_fetch_atb_variants() { 
+	local url="${asana_api_url}/tasks/${ATB_ASANA_TASK_ID}?opt_fields=notes"
+	local atb_variants
+
+	# fetches the items
+	# read the response raw
+	# select only Variants list section
+	# output last line of the input to get all the list of variants.
+	atb_variants="$(curl -fSsL ${url} \
+		-H "Authorization: Bearer ${ASANA_ACCESS_TOKEN}" \
+		| jq -r .data.notes \
+		| grep -A1 '^Variants list' \
+		| tail -1)"
+
+	variants_list=("$(_create_atb_variant_pairs "$atb_variants")")
+
+	echo "${variants_list}"
+}
+
+main() {
+	# fetch ATB variants
+	local atb_variants=$(_fetch_atb_variants)
+	# fetch Origin variants
+	local origin_variants=$(_fetch_origin_tasks)
+	# merges the two list together. Use `include` keyword for later usage in matrix. 
+	# for more info see https://docs.github.com/en/actions/using-jobs/using-a-matrix-for-your-jobs#example-adding-configurations.
+	local merged_variants="{\"include\": [${atb_variants},${origin_variants}]}"
+	# write in GitHub output
+	echo "build-variants=${merged_variants}" >> "$GITHUB_OUTPUT"
+}
+
+main 
diff --git a/.github/actions/asana-log-message/action.yml b/.github/actions/asana-log-message/action.yml
index 288fd832ba..e00cbd2a6d 100644
--- a/.github/actions/asana-log-message/action.yml
+++ b/.github/actions/asana-log-message/action.yml
@@ -31,7 +31,7 @@ runs:
 
     - id: get-asana-user-id
       if: github.event_name != 'schedule'
-      uses: duckduckgo/apple-infra/actions/asana-get-user-id-for-github-handle@main
+      uses: duckduckgo/apple-toolbox/actions/asana-get-user-id-for-github-handle@main
       with:
         access-token: ${{ inputs.access-token }}
         github-handle: ${{ github.actor }}
diff --git a/.github/workflows/bump_internal_release.yml b/.github/workflows/bump_internal_release.yml
index 4d0d9f440a..13280743b5 100644
--- a/.github/workflows/bump_internal_release.yml
+++ b/.github/workflows/bump_internal_release.yml
@@ -118,10 +118,10 @@ jobs:
           curl -fLSs "https://app.asana.com/api/1.0/tasks/${TASK_ID}?opt_fields=notes" \
             -H "Authorization: Bearer ${ASANA_ACCESS_TOKEN}" \
             | jq -r .data.notes \
-            | ./scripts/extract_release_notes.sh > release_notes.txt
-          release_notes="$(<release_notes.txt)"
-          if [[ ${#release_notes} == 0 || "$release_notes" == "<-- Add release notes here -->" ]]; then
-            echo "::error::Release notes are empty. Please add release notes to the Asana task and restart the workflow."
+            | ./scripts/extract_release_notes.sh -r > raw_release_notes.txt
+          raw_release_notes="$(<raw_release_notes.txt)"
+          if [[ ${#raw_release_notes} == 0 || "$raw_release_notes" == *"<-- Add release notes here -->"* ]]; then
+            echo "::error::Release notes are empty or contain a placeholder. Please add release notes to the Asana task and restart the workflow."
             exit 1
           fi
 
diff --git a/.github/workflows/code_freeze.yml b/.github/workflows/code_freeze.yml
index 2da53a932a..5b7bc475b5 100644
--- a/.github/workflows/code_freeze.yml
+++ b/.github/workflows/code_freeze.yml
@@ -47,7 +47,7 @@ jobs:
 
       - name: Get Asana user ID
         id: get-asana-user-id
-        uses: duckduckgo/apple-infra/actions/asana-get-user-id-for-github-handle@main
+        uses: duckduckgo/apple-toolbox/actions/asana-get-user-id-for-github-handle@main
         with:
           access-token: ${{ secrets.ASANA_ACCESS_TOKEN }}
           github-handle: ${{ github.actor }}
@@ -172,6 +172,7 @@ jobs:
     uses: ./.github/workflows/tag_release.yml
     with:
       asana-task-url: ${{ needs.create_release_branch.outputs.asana_task_url }}
+      base-branch: ${{ github.ref_name }}
       branch: ${{ needs.create_release_branch.outputs.release_branch_name }}
       prerelease: true
     secrets:
diff --git a/.github/workflows/create_variant.yml b/.github/workflows/create_variant.yml
new file mode 100644
index 0000000000..c51a9c0697
--- /dev/null
+++ b/.github/workflows/create_variant.yml
@@ -0,0 +1,215 @@
+on:
+  workflow_dispatch:
+    inputs:
+      atb-variant:
+        description: "ATB variant. Used for measuring attribution and retention."
+        required: false
+        type: string
+      origin-variant:
+        description: "Origin variant. Used for measuring attribution only."
+        required: false
+        type: string
+  workflow_call:
+    inputs:
+      atb-variant:
+        description: "ATB variant. Used for measuring attribution and retention. Passed by the caller workflow."
+        required: false
+        type: string
+      origin-variant:
+        description: "Origin variant. Used for measuring attribution only. Passed by the caller workflow."
+        required: false
+        type: string
+    secrets:
+      BUILD_CERTIFICATE_BASE64:
+        required: true
+      P12_PASSWORD:
+        required: true
+      KEYCHAIN_PASSWORD:
+        required: true
+      REVIEW_PROVISION_PROFILE_BASE64:
+        required: true
+      RELEASE_PROVISION_PROFILE_BASE64:
+        required: true
+      DBP_AGENT_RELEASE_PROVISION_PROFILE_BASE64:
+        required: true
+      DBP_AGENT_REVIEW_PROVISION_PROFILE_BASE64:
+        required: true
+      NETP_SYSEX_RELEASE_PROVISION_PROFILE_BASE64_V2:
+        required: true
+      NETP_SYSEX_REVIEW_PROVISION_PROFILE_BASE64_V2:
+        required: true
+      NETP_AGENT_RELEASE_PROVISION_PROFILE_BASE64_V2:
+        required: true
+      NETP_AGENT_REVIEW_PROVISION_PROFILE_BASE64_V2:
+        required: true
+      NETP_NOTIFICATIONS_RELEASE_PROVISION_PROFILE_BASE64:
+        required: true
+      NETP_NOTIFICATIONS_REVIEW_PROVISION_PROFILE_BASE64:
+        required: true
+      APPLE_API_KEY_BASE64:
+        required: true
+      APPLE_API_KEY_ID:
+        required: true
+      APPLE_API_KEY_ISSUER:
+        required: true
+      ASANA_ACCESS_TOKEN:
+        required: true
+      MM_HANDLES_BASE64:
+        required: true
+      MM_WEBHOOK_URL:
+        required: true
+      AWS_ACCESS_KEY_ID_RELEASE_S3:
+        required: true
+      AWS_SECRET_ACCESS_KEY_RELEASE_S3:
+        required: true
+
+jobs:
+
+  create-dmg-variant:
+    
+    name: Create DMG Variant
+
+    env:
+      ATB_VARIANT_NAME: ${{ inputs.atb-variant || github.event.inputs.atb-variant }}
+      ORIGIN_VARIANT_NAME: ${{ inputs.origin-variant || github.event.inputs.origin-variant }}
+
+    runs-on: macos-12
+    timeout-minutes: 15
+
+    steps:
+
+    - name: Check out the code
+      uses: actions/checkout@v4
+      with:
+        ref: main
+        sparse-checkout: |
+          .github
+          scripts
+
+    - name: Download DMG artifact
+      id: download-dmg-artifact
+      continue-on-error: true
+      uses: actions/download-artifact@v4
+      with:
+        name: duckduckgo-dmg
+        path: ${{ github.workspace }}
+
+    - name: Download release app
+      # Download the release app only if download-dmg-artifact fails
+      if: ${{ steps.download-dmg-artifact.outcome == 'failure' }}
+      run: |
+        curl -fLSs "${{ vars.RELEASE_DMG_URL }}" --output duckduckgo.dmg
+
+    - name: Extract App from DMG
+      id: extract-app-from-dmg
+      run: |
+          hdiutil attach duckduckgo.dmg -mountpoint vanilla
+          mkdir -p dmg
+          cp -R vanilla/DuckDuckGo.app dmg/DuckDuckGo.app
+          hdiutil detach vanilla
+          rm -f duckduckgo.dmg
+
+    - name: Install create-dmg
+      run: brew install create-dmg
+
+    - name: Install Apple Developer ID Application certificate
+      uses: ./.github/actions/install-certs-and-profiles
+      with:
+        BUILD_CERTIFICATE_BASE64: ${{ secrets.BUILD_CERTIFICATE_BASE64 }}
+        P12_PASSWORD: ${{ secrets.P12_PASSWORD }}
+        KEYCHAIN_PASSWORD: ${{ secrets.KEYCHAIN_PASSWORD }}
+        REVIEW_PROVISION_PROFILE_BASE64: ${{ secrets.REVIEW_PROVISION_PROFILE_BASE64 }}
+        RELEASE_PROVISION_PROFILE_BASE64: ${{ secrets.RELEASE_PROVISION_PROFILE_BASE64 }}
+        DBP_AGENT_RELEASE_PROVISION_PROFILE_BASE64: ${{ secrets.DBP_AGENT_RELEASE_PROVISION_PROFILE_BASE64 }}
+        DBP_AGENT_REVIEW_PROVISION_PROFILE_BASE64: ${{ secrets.DBP_AGENT_REVIEW_PROVISION_PROFILE_BASE64 }}
+        NETP_SYSEX_RELEASE_PROVISION_PROFILE_BASE64: ${{ secrets.NETP_SYSEX_RELEASE_PROVISION_PROFILE_BASE64_V2 }}
+        NETP_SYSEX_REVIEW_PROVISION_PROFILE_BASE64: ${{ secrets.NETP_SYSEX_REVIEW_PROVISION_PROFILE_BASE64_V2 }}
+        NETP_AGENT_RELEASE_PROVISION_PROFILE_BASE64: ${{ secrets.NETP_AGENT_RELEASE_PROVISION_PROFILE_BASE64_V2 }}
+        NETP_AGENT_REVIEW_PROVISION_PROFILE_BASE64: ${{ secrets.NETP_AGENT_REVIEW_PROVISION_PROFILE_BASE64_V2 }}
+        NETP_NOTIFICATIONS_RELEASE_PROVISION_PROFILE_BASE64: ${{ secrets.NETP_NOTIFICATIONS_RELEASE_PROVISION_PROFILE_BASE64 }}
+        NETP_NOTIFICATIONS_REVIEW_PROVISION_PROFILE_BASE64: ${{ secrets.NETP_NOTIFICATIONS_REVIEW_PROVISION_PROFILE_BASE64 }}
+
+    - name: Set up variant
+      working-directory: ${{ github.workspace }}/dmg
+      run: |
+        codesign -d --entitlements :- DuckDuckGo.app > entitlements.plist
+        echo "${{ env.ATB_VARIANT_NAME }}" > "DuckDuckGo.app/Contents/Resources/variant.txt"
+        echo "${{ env.ORIGIN_VARIANT_NAME }}" > "DuckDuckGo.app/Contents/Resources/Origin.txt"
+        sign_identity="$(security find-certificate -a -c "Developer ID Application" -Z | grep ^SHA-1 | cut -d " " -f3 | uniq)"
+
+        /usr/bin/codesign \
+          --force \
+          --sign ${sign_identity} \
+          --options runtime \
+          --entitlements entitlements.plist \
+          --generate-entitlement-der "DuckDuckGo.app"
+        rm -f entitlements.plist
+
+    - name: Notarize the app
+      env:
+        APPLE_API_KEY_BASE64: ${{ secrets.APPLE_API_KEY_BASE64 }}
+        APPLE_API_KEY_ID: ${{ secrets.APPLE_API_KEY_ID }}
+        APPLE_API_KEY_ISSUER: ${{ secrets.APPLE_API_KEY_ISSUER }}
+      working-directory: ${{ github.workspace }}/dmg
+      run: |
+        # import API Key from secrets
+        export APPLE_API_KEY_PATH="$RUNNER_TEMP/apple_api_key.pem"
+        echo -n "$APPLE_API_KEY_BASE64" | base64 --decode -o $APPLE_API_KEY_PATH
+
+        notarization_zip_path="DuckDuckGo-for-notarization.zip"
+
+        ditto -c -k --keepParent "DuckDuckGo.app" "${notarization_zip_path}"
+        xcrun notarytool submit \
+          --key "${APPLE_API_KEY_PATH}" \
+          --key-id "${{ env.APPLE_API_KEY_ID }}" \
+          --issuer "${{ env.APPLE_API_KEY_ISSUER }}" \
+          --wait \
+          "${notarization_zip_path}"
+        xcrun stapler staple "DuckDuckGo.app"
+        rm -rf "${notarization_zip_path}"
+
+    - name: Create variant DMG
+      env:
+        GH_TOKEN: ${{ github.token }}
+      run: |
+        retries=3
+
+        while [[ $retries -gt 0 ]]; do
+          if create-dmg --volname "DuckDuckGo" \
+            --icon "DuckDuckGo.app" 140 160 \
+            --background "scripts/assets/dmg-background.png" \
+            --window-size 600 400 \
+            --icon-size 120 \
+            --app-drop-link 430 160 "duckduckgo.dmg" \
+            "dmg"
+          then
+            break
+          fi
+          retries=$((retries-1))
+        done
+
+    - name: Set variant name
+      id: set-variant-name
+      run: |
+        if [ -z "$ORIGIN_VARIANT_NAME" ] && [ -n "$ATB_VARIANT_NAME" ]; then
+          name=$ATB_VARIANT_NAME
+        elif [ -n "$ORIGIN_VARIANT_NAME" ] && [ -z "$ATB_VARIANT_NAME" ]; then
+          name=$ORIGIN_VARIANT_NAME
+        elif [ -n "$ORIGIN_VARIANT_NAME" ] && [ -n "$ATB_VARIANT_NAME" ]; then
+          name="${ORIGIN_VARIANT_NAME}-${ATB_VARIANT_NAME}"
+        else
+          echo "Neither ATB_VARIANT_NAME nor ORIGIN_VARIANT_NAME is set"
+          exit 1
+        fi
+
+        echo "variant-name=${name}" >> "$GITHUB_OUTPUT"
+
+    - name: Upload variant DMG
+      env:
+        AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID_RELEASE_S3 }}
+        AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY_RELEASE_S3 }}
+        AWS_DEFAULT_REGION: ${{ vars.AWS_DEFAULT_REGION }}
+      run: |
+        aws s3 cp duckduckgo.dmg \
+          s3://${{ vars.RELEASE_BUCKET_NAME }}/${{ vars.RELEASE_BUCKET_PREFIX }}/${{ steps.set-variant-name.outputs.variant-name }}/duckduckgo.dmg \
+          --acl public-read
diff --git a/.github/workflows/create_variants.yml b/.github/workflows/create_variants.yml
index 734d71d8ff..eb3acf62ff 100644
--- a/.github/workflows/create_variants.yml
+++ b/.github/workflows/create_variants.yml
@@ -2,11 +2,7 @@ name: Create DMG Variants
 
 on:
   workflow_dispatch:
-    inputs:
-      atb-variants:
-        description: "ATB variants (comma-separated)"
-        required: true
-        type: string
+
   workflow_call:
     secrets:
       BUILD_CERTIFICATE_BASE64:
@@ -62,164 +58,84 @@ jobs:
     timeout-minutes: 15
 
     outputs:
-      atb-variants: ${{ steps.atb-variants.outputs.matrix }}
+      build-variants: ${{ steps.get-build-variants.outputs.build-variants }}
 
     steps:
+      - name: Check out repository
+        uses: actions/checkout@v4
+        
+      - name: Fetch Build Variants
+        id: get-build-variants
+        uses: ./.github/actions/asana-get-build-variants-list
+        with:
+          access-token: ${{ secrets.ASANA_ACCESS_TOKEN }}
+          atb-asana-task-id: ${{ vars.DMG_VARIANTS_LIST_TASK_ID }}
+          origin-asana-section-id: ${{ vars.DMG_VARIANTS_ORIGIN_SECTION_ID }}
+          
+  download-dmg-and-upload-artifact:
+
+    name: Download Release App and upload artifact
 
-      - name: Set up ATB variants
-        id: atb-variants
-        env:
-          ASANA_TASK_ID: ${{ vars.DMG_VARIANTS_LIST_TASK_ID }}
-          ASANA_ACCESS_TOKEN: ${{ secrets.ASANA_ACCESS_TOKEN }}
-        run: |
-          atb_variants="${{ github.event.inputs.atb-variants }}"
-          if [[ -z "${atb_variants}" ]]; then
-            atb_variants="$(curl -fSsL "https://app.asana.com/api/1.0/tasks/${ASANA_TASK_ID}?opt_fields=notes" \
-              -H "Authorization: Bearer ${ASANA_ACCESS_TOKEN}" \
-              | jq -r .data.notes \
-              | grep -A1 '^Variants list' \
-              | tail -1)"
-          fi
-          echo "atb-variants=${atb_variants}" >> $GITHUB_ENV
-          variant_matrix="$(sed 's/,/\",\"/g' <<< "${atb_variants}")"
-          echo "matrix={\"variant\": [\"${variant_matrix}\"]}" >> $GITHUB_OUTPUT
-
-  create-atb-variants:
-
-    name: Create ATB Variant
-    needs: set-up-variants
-
-    strategy:
-      fail-fast: false
-      matrix: ${{ fromJSON(needs.set-up-variants.outputs.atb-variants) }}
-
-    runs-on: macos-12
+    runs-on: macos-13
     timeout-minutes: 15
 
     steps:
+      - name: Download release app
+        run: |
+          curl -fLSs "${{ vars.RELEASE_DMG_URL }}" --output duckduckgo.dmg
 
-    - name: Download release app
-      run: |
-        curl -fLSs "${{ vars.RELEASE_DMG_URL }}" --output duckduckgo.dmg
-        hdiutil attach duckduckgo.dmg -mountpoint vanilla
-        mkdir -p dmg
-        cp -R vanilla/DuckDuckGo.app dmg/DuckDuckGo.app
-        hdiutil detach vanilla
-        rm -f duckduckgo.dmg
-
-    - name: Install create-dmg
-      run: brew install create-dmg
-
-    - name: Fetch install-certs-and-profiles action
-      env:
-        GH_TOKEN: ${{ github.token }}
-        DEST_DIR: ".github/actions/install-certs-and-profiles"
-      run: |
-        mkdir -p "${{ env.DEST_DIR }}"
-        curl -fLSs $(gh api https://api.github.com/repos/${{ github.repository }}/contents/${{ env.DEST_DIR }}/action.yml?ref=${{ github.ref }} --jq .download_url) \
-          --output ${{ env.DEST_DIR }}/action.yml
-
-    - name: Install Apple Developer ID Application certificate
-      uses: ./.github/actions/install-certs-and-profiles
-      with:
-        BUILD_CERTIFICATE_BASE64: ${{ secrets.BUILD_CERTIFICATE_BASE64 }}
-        P12_PASSWORD: ${{ secrets.P12_PASSWORD }}
-        KEYCHAIN_PASSWORD: ${{ secrets.KEYCHAIN_PASSWORD }}
-        REVIEW_PROVISION_PROFILE_BASE64: ${{ secrets.REVIEW_PROVISION_PROFILE_BASE64 }}
-        RELEASE_PROVISION_PROFILE_BASE64: ${{ secrets.RELEASE_PROVISION_PROFILE_BASE64 }}
-        DBP_AGENT_RELEASE_PROVISION_PROFILE_BASE64: ${{ secrets.DBP_AGENT_RELEASE_PROVISION_PROFILE_BASE64 }}
-        DBP_AGENT_REVIEW_PROVISION_PROFILE_BASE64: ${{ secrets.DBP_AGENT_REVIEW_PROVISION_PROFILE_BASE64 }}
-        NETP_SYSEX_RELEASE_PROVISION_PROFILE_BASE64: ${{ secrets.NETP_SYSEX_RELEASE_PROVISION_PROFILE_BASE64_V2 }}
-        NETP_SYSEX_REVIEW_PROVISION_PROFILE_BASE64: ${{ secrets.NETP_SYSEX_REVIEW_PROVISION_PROFILE_BASE64_V2 }}
-        NETP_AGENT_RELEASE_PROVISION_PROFILE_BASE64: ${{ secrets.NETP_AGENT_RELEASE_PROVISION_PROFILE_BASE64_V2 }}
-        NETP_AGENT_REVIEW_PROVISION_PROFILE_BASE64: ${{ secrets.NETP_AGENT_REVIEW_PROVISION_PROFILE_BASE64_V2 }}
-        NETP_NOTIFICATIONS_RELEASE_PROVISION_PROFILE_BASE64: ${{ secrets.NETP_NOTIFICATIONS_RELEASE_PROVISION_PROFILE_BASE64 }}
-        NETP_NOTIFICATIONS_REVIEW_PROVISION_PROFILE_BASE64: ${{ secrets.NETP_NOTIFICATIONS_REVIEW_PROVISION_PROFILE_BASE64 }}
-
-    - name: Set up variant
-      working-directory: ${{ github.workspace }}/dmg
-      run: |
-        codesign -d --entitlements :- DuckDuckGo.app > entitlements.plist
-        echo "${{ matrix.variant }}" > "DuckDuckGo.app/Contents/Resources/variant.txt"
-        sign_identity="$(security find-certificate -a -c "Developer ID Application" -Z | grep ^SHA-1 | cut -d " " -f3 | uniq)"
-
-        /usr/bin/codesign \
-          --force \
-          --sign ${sign_identity} \
-          --options runtime \
-          --entitlements entitlements.plist \
-          --generate-entitlement-der "DuckDuckGo.app"
-        rm -f entitlements.plist
-
-    - name: Notarize the app
-      env:
-        APPLE_API_KEY_BASE64: ${{ secrets.APPLE_API_KEY_BASE64 }}
-        APPLE_API_KEY_ID: ${{ secrets.APPLE_API_KEY_ID }}
-        APPLE_API_KEY_ISSUER: ${{ secrets.APPLE_API_KEY_ISSUER }}
-      working-directory: ${{ github.workspace }}/dmg
-      run: |
-        # import API Key from secrets
-        export APPLE_API_KEY_PATH="$RUNNER_TEMP/apple_api_key.pem"
-        echo -n "$APPLE_API_KEY_BASE64" | base64 --decode -o $APPLE_API_KEY_PATH
-
-        notarization_zip_path="DuckDuckGo-for-notarization.zip"
-
-        ditto -c -k --keepParent "DuckDuckGo.app" "${notarization_zip_path}"
-        xcrun notarytool submit \
-          --key "${APPLE_API_KEY_PATH}" \
-          --key-id "${{ env.APPLE_API_KEY_ID }}" \
-          --issuer "${{ env.APPLE_API_KEY_ISSUER }}" \
-          --wait \
-          "${notarization_zip_path}"
-        xcrun stapler staple "DuckDuckGo.app"
-        rm -rf "${notarization_zip_path}"
-
-    - name: Create variant DMG
-      env:
-        GH_TOKEN: ${{ github.token }}
-      run: |
-        curl -fLSs $(gh api https://api.github.com/repos/${{ github.repository }}/contents/scripts/assets/dmg-background.png?ref=${{ github.ref }} --jq .download_url) \
-          --output dmg-background.png
-
-        retries=3
-
-        while [[ $retries -gt 0 ]]; do
-          if create-dmg --volname "DuckDuckGo" \
-            --icon "DuckDuckGo.app" 140 160 \
-            --background "dmg-background.png" \
-            --window-size 600 400 \
-            --icon-size 120 \
-            --app-drop-link 430 160 "duckduckgo.dmg" \
-            "dmg"
-          then
-            break
-          fi
-          retries=$((retries-1))
-        done
+      - name: Upload DMG artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: duckduckgo-dmg
+          path: ${{ github.workspace }}/duckduckgo.dmg
+          retention-days: 1
 
+  create-variants:
 
-    - name: Upload variant DMG
-      env:
-        AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID_RELEASE_S3 }}
-        AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY_RELEASE_S3 }}
-        AWS_DEFAULT_REGION: ${{ vars.AWS_DEFAULT_REGION }}
-      run: |
-        aws s3 cp duckduckgo.dmg \
-          s3://${{ vars.RELEASE_BUCKET_NAME }}/${{ vars.RELEASE_BUCKET_PREFIX }}/${{ matrix.variant }}/duckduckgo.dmg \
-          --acl public-read
+    name: Create Variant
+    needs: [set-up-variants, download-dmg-and-upload-artifact]
 
+    strategy:
+      fail-fast: false
+      matrix: ${{ fromJSON(needs.set-up-variants.outputs.build-variants) }}
+    uses: ./.github/workflows/create_variant.yml
+    with:
+      atb-variant: ${{ matrix.variant }}
+      origin-variant: ${{ matrix.origin }}
+    secrets:
+      BUILD_CERTIFICATE_BASE64: ${{ secrets.BUILD_CERTIFICATE_BASE64 }}
+      P12_PASSWORD: ${{ secrets.P12_PASSWORD }}
+      KEYCHAIN_PASSWORD: ${{ secrets.KEYCHAIN_PASSWORD }}
+      REVIEW_PROVISION_PROFILE_BASE64: ${{ secrets.REVIEW_PROVISION_PROFILE_BASE64 }}
+      RELEASE_PROVISION_PROFILE_BASE64: ${{ secrets.RELEASE_PROVISION_PROFILE_BASE64 }}
+      DBP_AGENT_RELEASE_PROVISION_PROFILE_BASE64: ${{ secrets.DBP_AGENT_RELEASE_PROVISION_PROFILE_BASE64 }}
+      DBP_AGENT_REVIEW_PROVISION_PROFILE_BASE64: ${{ secrets.DBP_AGENT_REVIEW_PROVISION_PROFILE_BASE64 }}
+      NETP_SYSEX_RELEASE_PROVISION_PROFILE_BASE64_V2: ${{ secrets.NETP_SYSEX_RELEASE_PROVISION_PROFILE_BASE64_V2 }}
+      NETP_SYSEX_REVIEW_PROVISION_PROFILE_BASE64_V2: ${{ secrets.NETP_SYSEX_REVIEW_PROVISION_PROFILE_BASE64_V2 }}
+      NETP_AGENT_RELEASE_PROVISION_PROFILE_BASE64_V2: ${{ secrets.NETP_AGENT_RELEASE_PROVISION_PROFILE_BASE64_V2 }}
+      NETP_AGENT_REVIEW_PROVISION_PROFILE_BASE64_V2: ${{ secrets.NETP_AGENT_REVIEW_PROVISION_PROFILE_BASE64_V2 }}
+      NETP_NOTIFICATIONS_RELEASE_PROVISION_PROFILE_BASE64: ${{ secrets.NETP_NOTIFICATIONS_RELEASE_PROVISION_PROFILE_BASE64 }}
+      NETP_NOTIFICATIONS_REVIEW_PROVISION_PROFILE_BASE64: ${{ secrets.NETP_NOTIFICATIONS_REVIEW_PROVISION_PROFILE_BASE64 }}
+      APPLE_API_KEY_BASE64: ${{ secrets.APPLE_API_KEY_BASE64 }}
+      APPLE_API_KEY_ID: ${{ secrets.APPLE_API_KEY_ID }}
+      APPLE_API_KEY_ISSUER: ${{ secrets.APPLE_API_KEY_ISSUER }}
+      ASANA_ACCESS_TOKEN: ${{ secrets.ASANA_ACCESS_TOKEN }}
+      MM_HANDLES_BASE64: ${{ secrets.MM_HANDLES_BASE64 }}
+      MM_WEBHOOK_URL: ${{ secrets.MM_WEBHOOK_URL }}
+      AWS_ACCESS_KEY_ID_RELEASE_S3: ${{ secrets.AWS_ACCESS_KEY_ID_RELEASE_S3 }}
+      AWS_SECRET_ACCESS_KEY_RELEASE_S3: ${{ secrets.AWS_SECRET_ACCESS_KEY_RELEASE_S3 }}
+  
   mattermost:
-
+    
     name: Send Mattermost message
-
-    needs: create-atb-variants
-
+    needs: create-variants
     runs-on: ubuntu-latest
-
+    
     env:
-      success: ${{ needs.create-atb-variants.result == 'success' }}
-      failure: ${{ needs.create-atb-variants.result == 'failure' }}
-
+      success: ${{ needs.create-variants.result == 'success' }}
+      failure: ${{ needs.create-variants.result == 'failure' }}
+    
     steps:
       - name: Send Mattermost message
         if: ${{ env.success || env.failure }} # Don't execute when cancelled
@@ -227,15 +143,15 @@ jobs:
           GH_TOKEN: ${{ github.token }}
           WORKFLOW_URL: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}
         run: |
-          curl -fLSs $(gh api https://api.github.com/repos/${{ github.repository }}/contents/scripts/assets/variants-release-mm-template.json?ref=${{ github.ref }} --jq .download_url) \
+          curl -fLSs $(gh api https://api.github.com/repos/${{ github.repository }}/contents/scripts/assets/variants-release-mm-template.json --jq .download_url) \
               --output message-template.json
-
+    
           export MM_USER_HANDLE=$(base64 -d <<< ${{ secrets.MM_HANDLES_BASE64 }} | jq ".${{ github.actor }}" | tr -d '"')
-
+    
           if [[ -z "${MM_USER_HANDLE}" ]]; then
               echo "Mattermost user handle not known for ${{ github.actor }}, skipping sending message"
           else
-
+    
               if [[ "${{ env.success }}" == "true" ]]; then
                   status="success"
               else
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index c6e30341ad..fd2341e1b6 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -54,6 +54,36 @@ jobs:
       env:
         SHELLCHECK_OPTS: -x -P scripts -P scripts/helpers
 
+  bats:
+
+    name: Test Shell Scripts
+
+    runs-on: macos-13
+
+    steps:
+    - name: Check out the code
+      if: github.event_name == 'pull_request' || github.event_name == 'push'
+      uses: actions/checkout@v4
+
+    - name: Check out the code
+      if: github.event_name != 'pull_request' && github.event_name != 'push'
+      uses: actions/checkout@v4
+      with:
+        ref: ${{ inputs.branch || github.ref_name }}
+
+    - name: Install Bats
+      run: brew install bats-core
+
+    - name: Run Bats tests
+      run: bats --formatter junit scripts/tests/* > bats-tests.xml
+
+    - name: Publish unit tests report
+      uses: mikepenz/action-junit-report@v3
+      if: always() # always run even if the previous step fails
+      with:
+        check_name: "Test Report: Shell Scripts"
+        report_paths: 'bats-tests.xml'
+
   tests:
     name: Test
 
@@ -256,10 +286,6 @@ jobs:
     # workflow_call is used by bump_internal_release and is followed by a proper release job
     if: github.actor != 'dependabot[bot]' && (github.event_name == 'push' || github.event_name == 'pull_request')
 
-    strategy:
-      matrix:
-        scheme: [ "DuckDuckGo Privacy Browser", "DuckDuckGo Privacy Pro" ]
-
     runs-on: macos-13-xlarge
     timeout-minutes: 30
 
@@ -311,7 +337,7 @@ jobs:
       run: |
         export OS_ACTIVITY_MODE=debug
         set -o pipefail && xcodebuild \
-          -scheme "${{ matrix.scheme }}" \
+          -scheme "DuckDuckGo Privacy Browser" \
           -derivedDataPath "DerivedData" \
           -configuration "Release" \
           -skipPackagePluginValidation -skipMacroValidation \
@@ -347,7 +373,7 @@ jobs:
 
   create-asana-task:
     name: Create Asana Task
-    needs: [swiftlint, tests, release-build, verify-autoconsent-bundle, private-api]
+    needs: [swiftlint, bats, tests, release-build, verify-autoconsent-bundle, private-api]
 
     if: failure() && github.ref_name == 'main' && github.run_attempt == 1
 
@@ -364,7 +390,7 @@ jobs:
 
   close-asana-task:
     name: Close Asana Task
-    needs: [swiftlint, tests, release-build, verify-autoconsent-bundle, private-api]
+    needs: [swiftlint, bats, tests, release-build, verify-autoconsent-bundle, private-api]
 
     if: success() && github.ref_name == 'main' && github.run_attempt > 1
 
diff --git a/.github/workflows/pr_task_url.yml b/.github/workflows/pr_task_url.yml
index 820b61ba14..b5e247e02d 100644
--- a/.github/workflows/pr_task_url.yml
+++ b/.github/workflows/pr_task_url.yml
@@ -2,7 +2,7 @@ name: Asana PR Task URL
 
 on: 
   pull_request:
-    types: [opened, edited, closed, unlabeled, synchronize]
+    types: [opened, edited, closed, unlabeled, synchronize, review_requested]
 
 jobs:
 
@@ -112,6 +112,24 @@ jobs:
       if: ${{ needs.assert-project-membership.outputs.task_id }}
       run: exit ${{ needs.assert-project-membership.outputs.failure }}
 
+  # When reviewer is assigned create a subtask in Asana if not existing already
+  create-asana-pr-subtask-if-needed:
+
+    name: "Create the PR subtask in Asana"
+
+    runs-on: ubuntu-latest
+    if: github.event.action == 'review_requested'
+
+    needs: [assert-project-membership]
+
+    steps:
+    - name: Create or Update PR Subtask
+      uses: duckduckgo/apple-toolbox/actions/asana-create-pr-subtask@main
+      with:
+        access-token: ${{ secrets.ASANA_ACCESS_TOKEN }}
+        asana-task-id: ${{ needs.assert-project-membership.outputs.task_id }}
+        github-reviewer-user: ${{ github.event.requested_reviewer.login }}
+
   # When a PR is merged, move the task to the Waiting for Release section of the App Board.
   mark-waiting-for-release:
 
diff --git a/.github/workflows/publish_dmg_release.yml b/.github/workflows/publish_dmg_release.yml
index 8daecea7be..2dd82d53ed 100644
--- a/.github/workflows/publish_dmg_release.yml
+++ b/.github/workflows/publish_dmg_release.yml
@@ -145,14 +145,14 @@ jobs:
         run: |
           curl -fLSs "https://app.asana.com/api/1.0/tasks/${TASK_ID}?opt_fields=notes" \
             -H "Authorization: Bearer ${ASANA_ACCESS_TOKEN}" \
-            | jq -r .data.notes \
-            | ./scripts/extract_release_notes.sh > release_notes.txt
-          release_notes="$(<release_notes.txt)"
-          if [[ ${#release_notes} == 0 || "$release_notes" == "<-- Add release notes here -->" ]]; then
-            echo "::error::Release notes are empty. Please add release notes to the Asana task and restart the workflow."
+            | jq -r .data.notes > release_task_content.txt
+          raw_release_notes="$(./scripts/extract_release_notes.sh -r < release_task_content.txt)"
+          if [[ ${#raw_release_notes} == 0 || "$raw_release_notes" == *"<-- Add release notes here -->"* ]]; then
+            echo "::error::Release notes are empty or contain a placeholder. Please add release notes to the Asana task and restart the workflow."
             exit 1
           fi
-          echo "RELEASE_NOTES_FILE=release_notes.txt" >> $GITHUB_ENV
+          ./scripts/extract_release_notes.sh < release_task_content.txt > release_notes.html
+          echo "RELEASE_NOTES_FILE=release_notes.html" >> $GITHUB_ENV
 
       - name: Set up Sparkle tools
         env:
@@ -189,21 +189,21 @@ jobs:
               ./scripts/appcast_manager/appcastManager.swift \
                 --release-to-internal-channel \
                 --dmg ${DMG_PATH} \
-                --release-notes release_notes.txt \
+                --release-notes-html release_notes.html \
                 --key sparkle_private_key
               ;;
             "public")
               ./scripts/appcast_manager/appcastManager.swift \
                 --release-to-public-channel \
                 --version ${VERSION} \
-                --release-notes release_notes.txt \
+                --release-notes-html release_notes.html \
                 --key sparkle_private_key
               ;;
             "hotfix")
               ./scripts/appcast_manager/appcastManager.swift \
                 --release-hotfix-to-public-channel \
                 --dmg ${DMG_PATH} \
-                --release-notes release_notes.txt \
+                --release-notes-html release_notes.html \
                 --key sparkle_private_key
               ;;
             *)
diff --git a/.github/workflows/stale_pr.yml b/.github/workflows/stale_pr.yml
new file mode 100644
index 0000000000..a4a6e92c29
--- /dev/null
+++ b/.github/workflows/stale_pr.yml
@@ -0,0 +1,19 @@
+name: Close Stale Pull Requests
+
+on:
+  schedule:
+    - cron: '0 0 * * *'
+
+jobs:
+  close_stale_prs:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Close stale pull requests
+        uses: actions/stale@v9
+        with:
+          stale-pr-message: 'This PR has been inactive for more than 7 days and will be automatically closed 7 days from now.'
+          days-before-pr-stale: 7
+          close-pr-message: 'This PR has been closed after 14 days of inactivity. Feel free to reopen it if you plan to continue working on it or have further discussions.'
+          days-before-pr-close: 7
+          stale-pr-label: stale
+          exempt-draft-pr: true
\ No newline at end of file
diff --git a/.github/workflows/ui_tests.yml b/.github/workflows/ui_tests.yml
new file mode 100644
index 0000000000..44bbfa8410
--- /dev/null
+++ b/.github/workflows/ui_tests.yml
@@ -0,0 +1,103 @@
+name: UI Tests
+
+on:
+  workflow_dispatch:
+  schedule:
+     - cron: '0 3 * * 1-5' # 3AM UTC offsetted to legacy to avoid action-junit-report@v4 bug
+      
+jobs:
+  ui-tests:
+    name: UI tests
+    runs-on: ${{ matrix.runner }}
+    strategy:
+      fail-fast: false
+      matrix:
+        runner: [macos-13-xlarge, macos-14-xlarge]
+
+    timeout-minutes: 120
+
+    steps:
+    - name: Check out the code
+      uses: actions/checkout@v4
+      with:
+        submodules: recursive
+
+    - name: Set cache key hash
+      run: |
+        has_only_tags=$(jq '[ .pins[].state | has("version") ] | all' DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved)
+        if [[ "$has_only_tags" == "true" ]]; then
+          echo "cache_key_hash=${{ hashFiles('DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved') }}" >> $GITHUB_ENV
+        else
+          echo "Package.resolved contains dependencies specified by branch or commit, skipping cache."
+        fi
+
+    - name: Cache SPM
+      if: env.cache_key_hash
+      uses: actions/cache@v3
+      with:
+        path: DerivedData/SourcePackages
+        key: ${{ runner.os }}-spm-${{ env.cache_key_hash }}
+        restore-keys: |
+          ${{ runner.os }}-spm-
+
+    - name: Install Apple Developer ID Application certificate
+      uses: ./.github/actions/install-certs-and-profiles
+      with:
+        BUILD_CERTIFICATE_BASE64: ${{ secrets.BUILD_CERTIFICATE_BASE64 }}
+        P12_PASSWORD: ${{ secrets.P12_PASSWORD }}
+        KEYCHAIN_PASSWORD: ${{ secrets.KEYCHAIN_PASSWORD }}
+        REVIEW_PROVISION_PROFILE_BASE64: ${{ secrets.REVIEW_PROVISION_PROFILE_BASE64 }}
+        RELEASE_PROVISION_PROFILE_BASE64: ${{ secrets.RELEASE_PROVISION_PROFILE_BASE64 }}
+        DBP_AGENT_RELEASE_PROVISION_PROFILE_BASE64: ${{ secrets.DBP_AGENT_RELEASE_PROVISION_PROFILE_BASE64 }}
+        DBP_AGENT_REVIEW_PROVISION_PROFILE_BASE64: ${{ secrets.DBP_AGENT_REVIEW_PROVISION_PROFILE_BASE64 }}
+        NETP_SYSEX_RELEASE_PROVISION_PROFILE_BASE64: ${{ secrets.NETP_SYSEX_RELEASE_PROVISION_PROFILE_BASE64_V2 }}
+        NETP_SYSEX_REVIEW_PROVISION_PROFILE_BASE64: ${{ secrets.NETP_SYSEX_REVIEW_PROVISION_PROFILE_BASE64_V2 }}
+        NETP_AGENT_RELEASE_PROVISION_PROFILE_BASE64: ${{ secrets.NETP_AGENT_RELEASE_PROVISION_PROFILE_BASE64_V2 }}
+        NETP_AGENT_REVIEW_PROVISION_PROFILE_BASE64: ${{ secrets.NETP_AGENT_REVIEW_PROVISION_PROFILE_BASE64_V2 }}
+        NETP_NOTIFICATIONS_RELEASE_PROVISION_PROFILE_BASE64: ${{ secrets.NETP_NOTIFICATIONS_RELEASE_PROVISION_PROFILE_BASE64 }}
+        NETP_NOTIFICATIONS_REVIEW_PROVISION_PROFILE_BASE64: ${{ secrets.NETP_NOTIFICATIONS_REVIEW_PROVISION_PROFILE_BASE64 }}
+
+    - name: Select Xcode
+      run: sudo xcode-select -s /Applications/Xcode_$(<.xcode-version).app/Contents/Developer
+
+    - name: Build and run UI Testing
+      run: |
+        defaults write com.duckduckgo.macos.browser.review moveToApplicationsFolderAlertSuppress 1
+        defaults write com.duckduckgo.macos.browser.review onboarding.finished -bool true
+        set -o pipefail && xcodebuild test \
+          -scheme "UI Tests" \
+          -configuration Review \
+          -derivedDataPath DerivedData \
+          -skipPackagePluginValidation \
+          -skipMacroValidation \
+          -test-iterations 2 \
+          -retry-tests-on-failure \
+        | tee xcodebuild.log \
+        | xcbeautify --report junit --report-path . --junit-report-filename ui-tests.xml
+
+     #   - name: Create Asana task when workflow failed
+ #     if: ${{ failure() }} && github.ref == 'refs/heads/main'
+ #     run: |
+ #       curl -s "https://app.asana.com/api/1.0/tasks" \
+ #          --header "Accept: application/json" \
+ #          --header "Authorization: Bearer ${{ secrets.ASANA_ACCESS_TOKEN }}" \
+ #          --header "Content-Type: application/json" \
+ #          --data ' { "data": { "name": "GH Workflow Failure - UI Tests", "projects": [ "${{ vars.MACOS_APP_DEVELOPMENT_ASANA_PROJECT_ID }}" ], "notes" : "The end to end workflow has failed. See https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}" } }'
+
+    - name: Publish tests report
+      uses: mikepenz/action-junit-report@v4
+      if: always() 
+      with:
+        check_name: "Test Report ${{ matrix.runner }}"
+        report_paths: ui-tests.xml
+
+    - name: Upload logs when workflow failed
+      uses: actions/upload-artifact@v4
+      if: failure()
+      with:
+        name: "BuildLogs ${{ matrix.runner }}"
+        path: |
+          xcodebuild.log
+          DerivedData/Logs/Test/*.xcresult
+          ~/Library/Logs/DiagnosticReports/*
+        retention-days: 7
\ No newline at end of file
diff --git a/Configuration/App/DBP/DuckDuckGoDBPAgent.xcconfig b/Configuration/App/DBP/DuckDuckGoDBPAgent.xcconfig
index be90b0c9b3..edfa557220 100644
--- a/Configuration/App/DBP/DuckDuckGoDBPAgent.xcconfig
+++ b/Configuration/App/DBP/DuckDuckGoDBPAgent.xcconfig
@@ -47,7 +47,7 @@ PROVISIONING_PROFILE_SPECIFIER[sdk=macosx*] =
 PROVISIONING_PROFILE_SPECIFIER[config=Review][sdk=macosx*] = macOS DBP Agent - Review
 PROVISIONING_PROFILE_SPECIFIER[config=Release][sdk=macosx*] = macOS DBP Agent - Release
 
-FEATURE_FLAGS = FEEDBACK DBP NETWORK_PROTECTION
+FEATURE_FLAGS = FEEDBACK DBP
 
 GCC_PREPROCESSOR_DEFINITIONS[arch=*][sdk=*] = DBP=1 NETP_SYSTEM_EXTENSION=1
 GCC_PREPROCESSOR_DEFINITIONS[config=CI][arch=*][sdk=*] = DBP=1 NETP_SYSTEM_EXTENSION=1 DEBUG=1 CI=1 $(inherited)
diff --git a/Configuration/App/DBP/DuckDuckGoDBPAgentAppStore.xcconfig b/Configuration/App/DBP/DuckDuckGoDBPAgentAppStore.xcconfig
index 154bd9cf6b..e19a23209a 100644
--- a/Configuration/App/DBP/DuckDuckGoDBPAgentAppStore.xcconfig
+++ b/Configuration/App/DBP/DuckDuckGoDBPAgentAppStore.xcconfig
@@ -49,7 +49,7 @@ PROVISIONING_PROFILE_SPECIFIER[sdk=macosx*] =
 PROVISIONING_PROFILE_SPECIFIER[config=Review][sdk=macosx*] = match AppStore com.duckduckgo.mobile.ios.DBP.backgroundAgent.review macos
 PROVISIONING_PROFILE_SPECIFIER[config=Release][sdk=macosx*] = match AppStore com.duckduckgo.mobile.ios.DBP.backgroundAgent macos
 
-FEATURE_FLAGS = FEEDBACK DBP NETWORK_PROTECTION
+FEATURE_FLAGS = FEEDBACK DBP
 
 GCC_PREPROCESSOR_DEFINITIONS[arch=*][sdk=*] = DBP=1 NETP_SYSTEM_EXTENSION=1
 GCC_PREPROCESSOR_DEFINITIONS[config=CI][arch=*][sdk=*] = DBP=1 NETP_SYSTEM_EXTENSION=1 DEBUG=1 CI=1 $(inherited)
diff --git a/Configuration/App/DuckDuckGo.xcconfig b/Configuration/App/DuckDuckGo.xcconfig
index 710327265e..36ec797d04 100644
--- a/Configuration/App/DuckDuckGo.xcconfig
+++ b/Configuration/App/DuckDuckGo.xcconfig
@@ -26,7 +26,7 @@ CODE_SIGN_IDENTITY[sdk=macosx*] = Developer ID Application
 CODE_SIGN_IDENTITY[config=Debug][sdk=macosx*] = Apple Development
 CODE_SIGN_IDENTITY[config=CI][sdk=macosx*] =
 
-FEATURE_FLAGS = FEEDBACK NETWORK_PROTECTION SPARKLE DBP SUBSCRIPTION STRIPE
+FEATURE_FLAGS = FEEDBACK SPARKLE DBP STRIPE
 
 PRODUCT_NAME_PREFIX = DuckDuckGo
 
@@ -34,10 +34,10 @@ PROVISIONING_PROFILE_SPECIFIER[sdk=macosx*] =
 PROVISIONING_PROFILE_SPECIFIER[config=Release][sdk=macosx*] = MacOS Browser
 PROVISIONING_PROFILE_SPECIFIER[config=Review][sdk=macosx*] = MacOS Browser Product Review
 
-GCC_PREPROCESSOR_DEFINITIONS[arch=*][sdk=*] = NETP_SYSTEM_EXTENSION=1
-GCC_PREPROCESSOR_DEFINITIONS[config=CI][arch=*][sdk=*] = NETP_SYSTEM_EXTENSION=1 DEBUG=1 CI=1 $(inherited)
-GCC_PREPROCESSOR_DEFINITIONS[config=Debug][arch=*][sdk=*] = NETP_SYSTEM_EXTENSION=1 DEBUG=1 $(inherited)
-GCC_PREPROCESSOR_DEFINITIONS[config=Review][arch=*][sdk=*] = NETP_SYSTEM_EXTENSION=1 REVIEW=1 $(inherited)
+GCC_PREPROCESSOR_DEFINITIONS[arch=*][sdk=*] = NETP_SYSTEM_EXTENSION=1 SWIFT_OBJC_INTERFACE_HEADER_NAME=$(SWIFT_OBJC_INTERFACE_HEADER_NAME)
+GCC_PREPROCESSOR_DEFINITIONS[config=CI][arch=*][sdk=*] = NETP_SYSTEM_EXTENSION=1 DEBUG=1 CI=1 SWIFT_OBJC_INTERFACE_HEADER_NAME=$(SWIFT_OBJC_INTERFACE_HEADER_NAME) $(inherited)
+GCC_PREPROCESSOR_DEFINITIONS[config=Debug][arch=*][sdk=*] = NETP_SYSTEM_EXTENSION=1 DEBUG=1 SWIFT_OBJC_INTERFACE_HEADER_NAME=$(SWIFT_OBJC_INTERFACE_HEADER_NAME) $(inherited)
+GCC_PREPROCESSOR_DEFINITIONS[config=Review][arch=*][sdk=*] = NETP_SYSTEM_EXTENSION=1 REVIEW=1 SWIFT_OBJC_INTERFACE_HEADER_NAME=$(SWIFT_OBJC_INTERFACE_HEADER_NAME) $(inherited)
 
 SWIFT_ACTIVE_COMPILATION_CONDITIONS[arch=*][sdk=*] = NETP_SYSTEM_EXTENSION $(FEATURE_FLAGS)
 SWIFT_ACTIVE_COMPILATION_CONDITIONS[config=CI][arch=*][sdk=*] = NETP_SYSTEM_EXTENSION DEBUG CI $(FEATURE_FLAGS)
diff --git a/Configuration/App/NetworkProtection/DuckDuckGoVPN.xcconfig b/Configuration/App/NetworkProtection/DuckDuckGoVPN.xcconfig
index b3b7f7ef35..6280424f9c 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 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
+FEATURE_FLAGS[arch=*][sdk=*] = NETP_SYSTEM_EXTENSION
+FEATURE_FLAGS[config=CI][arch=*][sdk=*] = NETP_SYSTEM_EXTENSION
+FEATURE_FLAGS[config=Debug][arch=*][sdk=*] = NETP_SYSTEM_EXTENSION
+FEATURE_FLAGS[config=Review][arch=*][sdk=*] = NETP_SYSTEM_EXTENSION
 
 SWIFT_OBJC_BRIDGING_HEADER =
 SKIP_INSTALL = YES
diff --git a/Configuration/App/NetworkProtection/DuckDuckGoVPNAppStore.xcconfig b/Configuration/App/NetworkProtection/DuckDuckGoVPNAppStore.xcconfig
index cad39a4d7e..d3e404d3ac 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 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
+FEATURE_FLAGS[arch=*][sdk=*] =
+FEATURE_FLAGS[config=CI][arch=*][sdk=*] =
+FEATURE_FLAGS[config=Debug][arch=*][sdk=*] =
+FEATURE_FLAGS[config=Review][arch=*][sdk=*] =
 
 ENABLE_APP_SANDBOX = YES
 SWIFT_OBJC_BRIDGING_HEADER =
diff --git a/Configuration/AppStore.xcconfig b/Configuration/AppStore.xcconfig
index 1fbb567afd..30ec838615 100644
--- a/Configuration/AppStore.xcconfig
+++ b/Configuration/AppStore.xcconfig
@@ -23,10 +23,10 @@ MAIN_BUNDLE_IDENTIFIER[config=Debug][sdk=*] = $(MAIN_BUNDLE_IDENTIFIER_PREFIX).d
 MAIN_BUNDLE_IDENTIFIER[config=CI][sdk=*] = $(MAIN_BUNDLE_IDENTIFIER_PREFIX).debug
 MAIN_BUNDLE_IDENTIFIER[config=Review][sdk=*] = $(MAIN_BUNDLE_IDENTIFIER_PREFIX).review
 
-GCC_PREPROCESSOR_DEFINITIONS[arch=*][sdk=*] = APPSTORE=1
-GCC_PREPROCESSOR_DEFINITIONS[config=CI][arch=*][sdk=*] = APPSTORE=1 DEBUG=1 CI=1 $(inherited)
-GCC_PREPROCESSOR_DEFINITIONS[config=Debug][arch=*][sdk=*] = APPSTORE=1 DEBUG=1 $(inherited)
-GCC_PREPROCESSOR_DEFINITIONS[config=Review][arch=*][sdk=*] = APPSTORE=1 REVIEW=1 $(inherited)
+GCC_PREPROCESSOR_DEFINITIONS[arch=*][sdk=*] = APPSTORE=1 SWIFT_OBJC_INTERFACE_HEADER_NAME=$(SWIFT_OBJC_INTERFACE_HEADER_NAME)
+GCC_PREPROCESSOR_DEFINITIONS[config=CI][arch=*][sdk=*] = APPSTORE=1 DEBUG=1 CI=1 SWIFT_OBJC_INTERFACE_HEADER_NAME=$(SWIFT_OBJC_INTERFACE_HEADER_NAME) $(inherited)
+GCC_PREPROCESSOR_DEFINITIONS[config=Debug][arch=*][sdk=*] = APPSTORE=1 DEBUG=1 SWIFT_OBJC_INTERFACE_HEADER_NAME=$(SWIFT_OBJC_INTERFACE_HEADER_NAME) $(inherited)
+GCC_PREPROCESSOR_DEFINITIONS[config=Review][arch=*][sdk=*] = APPSTORE=1 REVIEW=1 SWIFT_OBJC_INTERFACE_HEADER_NAME=$(SWIFT_OBJC_INTERFACE_HEADER_NAME) $(inherited)
 
 MACOSX_DEPLOYMENT_TARGET = 12.3
 
diff --git a/Configuration/BuildNumber.xcconfig b/Configuration/BuildNumber.xcconfig
index a22b48d2cf..e5253b1076 100644
--- a/Configuration/BuildNumber.xcconfig
+++ b/Configuration/BuildNumber.xcconfig
@@ -1 +1 @@
-CURRENT_PROJECT_VERSION = 150
+CURRENT_PROJECT_VERSION = 183
diff --git a/Configuration/Common.xcconfig b/Configuration/Common.xcconfig
index 392d63d532..04c51ab42e 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 SUBSCRIPTION
+FEATURE_FLAGS = FEEDBACK DBP
 
 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/Extensions/NetworkProtection/NetworkProtectionAppExtension.xcconfig b/Configuration/Extensions/NetworkProtection/NetworkProtectionAppExtension.xcconfig
index 2fb095fc56..8b58584eab 100644
--- a/Configuration/Extensions/NetworkProtection/NetworkProtectionAppExtension.xcconfig
+++ b/Configuration/Extensions/NetworkProtection/NetworkProtectionAppExtension.xcconfig
@@ -30,10 +30,10 @@ GENERATE_INFOPLIST_FILE = YES
 INFOPLIST_FILE = NetworkProtectionAppExtension/Info.plist
 INFOPLIST_KEY_NSHumanReadableCopyright = Copyright © 2023 DuckDuckGo. All rights reserved.
 
-FEATURE_FLAGS[arch=*][sdk=*] = NETWORK_EXTENSION NETWORK_PROTECTION
-FEATURE_FLAGS[config=CI][arch=*][sdk=*] = NETWORK_EXTENSION NETWORK_PROTECTION
-FEATURE_FLAGS[config=Debug][arch=*][sdk=*] = NETWORK_EXTENSION NETWORK_PROTECTION
-FEATURE_FLAGS[config=Review][arch=*][sdk=*] = NETWORK_EXTENSION NETWORK_PROTECTION
+FEATURE_FLAGS[arch=*][sdk=*] = NETWORK_EXTENSION
+FEATURE_FLAGS[config=CI][arch=*][sdk=*] = NETWORK_EXTENSION
+FEATURE_FLAGS[config=Debug][arch=*][sdk=*] = NETWORK_EXTENSION
+FEATURE_FLAGS[config=Review][arch=*][sdk=*] = NETWORK_EXTENSION
 
 PRODUCT_BUNDLE_IDENTIFIER[sdk=*] =
 PRODUCT_BUNDLE_IDENTIFIER[config=CI][sdk=*] = $(TUNNEL_EXTENSION_BUNDLE_ID)
diff --git a/Configuration/Extensions/NetworkProtection/NetworkProtectionSystemExtension.xcconfig b/Configuration/Extensions/NetworkProtection/NetworkProtectionSystemExtension.xcconfig
index 325f9024b7..f815d7c7de 100644
--- a/Configuration/Extensions/NetworkProtection/NetworkProtectionSystemExtension.xcconfig
+++ b/Configuration/Extensions/NetworkProtection/NetworkProtectionSystemExtension.xcconfig
@@ -31,10 +31,10 @@ INFOPLIST_FILE = NetworkProtectionSystemExtension/Info.plist
 INFOPLIST_KEY_NSHumanReadableCopyright = Copyright © 2023 DuckDuckGo. All rights reserved.
 INFOPLIST_KEY_NSSystemExtensionUsageDescription = DuckDuckGo VPN
 
-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
+FEATURE_FLAGS[arch=*][sdk=*] = NETP_SYSTEM_EXTENSION NETWORK_EXTENSION
+FEATURE_FLAGS[config=CI][arch=*][sdk=*] = NETP_SYSTEM_EXTENSION NETWORK_EXTENSION
+FEATURE_FLAGS[config=Debug][arch=*][sdk=*] = NETP_SYSTEM_EXTENSION NETWORK_EXTENSION
+FEATURE_FLAGS[config=Review][arch=*][sdk=*] = NETP_SYSTEM_EXTENSION NETWORK_EXTENSION
 
 PRODUCT_BUNDLE_IDENTIFIER[sdk=*] = $(SYSEX_BUNDLE_ID)
 PRODUCT_BUNDLE_IDENTIFIER[config=CI][sdk=*] = $(SYSEX_BUNDLE_ID)
diff --git a/Configuration/Extensions/NetworkProtection/VPNProxyExtension.xcconfig b/Configuration/Extensions/NetworkProtection/VPNProxyExtension.xcconfig
index 5f70d87091..c2b25dbe47 100644
--- a/Configuration/Extensions/NetworkProtection/VPNProxyExtension.xcconfig
+++ b/Configuration/Extensions/NetworkProtection/VPNProxyExtension.xcconfig
@@ -30,10 +30,10 @@ GENERATE_INFOPLIST_FILE = YES
 INFOPLIST_FILE = VPNProxyExtension/Info.plist
 INFOPLIST_KEY_NSHumanReadableCopyright = Copyright © 2023 DuckDuckGo. All rights reserved.
 
-FEATURE_FLAGS[arch=*][sdk=*] = NETWORK_EXTENSION NETWORK_PROTECTION
-FEATURE_FLAGS[config=CI][arch=*][sdk=*] = NETWORK_EXTENSION NETWORK_PROTECTION
-FEATURE_FLAGS[config=Debug][arch=*][sdk=*] = NETWORK_EXTENSION NETWORK_PROTECTION
-FEATURE_FLAGS[config=Review][arch=*][sdk=*] = NETWORK_EXTENSION NETWORK_PROTECTION
+FEATURE_FLAGS[arch=*][sdk=*] = NETWORK_EXTENSION
+FEATURE_FLAGS[config=CI][arch=*][sdk=*] = NETWORK_EXTENSION
+FEATURE_FLAGS[config=Debug][arch=*][sdk=*] = NETWORK_EXTENSION
+FEATURE_FLAGS[config=Review][arch=*][sdk=*] = NETWORK_EXTENSION
 
 PRODUCT_BUNDLE_IDENTIFIER[sdk=*] =
 PRODUCT_BUNDLE_IDENTIFIER[config=CI][sdk=*] = $(PROXY_EXTENSION_BUNDLE_ID)
diff --git a/Configuration/Tests/IntegrationTests.xcconfig b/Configuration/Tests/IntegrationTests.xcconfig
index cee1523e37..7bbf931ba5 100644
--- a/Configuration/Tests/IntegrationTests.xcconfig
+++ b/Configuration/Tests/IntegrationTests.xcconfig
@@ -17,7 +17,7 @@
 
 MACOSX_DEPLOYMENT_TARGET = 11.4
 
-FEATURE_FLAGS = FEEDBACK NETWORK_PROTECTION DBP
+FEATURE_FLAGS = FEEDBACK DBP
 
 INFOPLIST_FILE = IntegrationTests/Info.plist
 PRODUCT_BUNDLE_IDENTIFIER = com.duckduckgo.Integration-Tests
diff --git a/Configuration/Tests/TestsServer.xcconfig b/Configuration/Tests/TestsServer.xcconfig
index b401906d9b..e8bc6f5e79 100644
--- a/Configuration/Tests/TestsServer.xcconfig
+++ b/Configuration/Tests/TestsServer.xcconfig
@@ -18,3 +18,5 @@
 #include "../Common.xcconfig"
 
 PRODUCT_NAME = $(TARGET_NAME);
+CODE_SIGNING_ALLOWED[config=Review][sdk=macosx*] = NO
+CODE_SIGNING_ALLOWED[config=CI][sdk=macosx*] = NO
\ No newline at end of file
diff --git a/Configuration/Tests/UnitTests.xcconfig b/Configuration/Tests/UnitTests.xcconfig
index b09dee6dc1..1f7cfbaeaf 100644
--- a/Configuration/Tests/UnitTests.xcconfig
+++ b/Configuration/Tests/UnitTests.xcconfig
@@ -17,7 +17,7 @@
 
 ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES
 
-FEATURE_FLAGS = FEEDBACK NETWORK_PROTECTION DBP SUBSCRIPTION
+FEATURE_FLAGS = FEEDBACK DBP
 
 INFOPLIST_FILE = UnitTests/Info.plist
 PRODUCT_BUNDLE_IDENTIFIER = com.duckduckgo.macos.browser.DuckDuckGoTests
diff --git a/Configuration/Tests/UnitTestsAppStore.xcconfig b/Configuration/Tests/UnitTestsAppStore.xcconfig
index b31177d987..e187624399 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 SUBSCRIPTION
+FEATURE_FLAGS = FEEDBACK DBP
 
 PRODUCT_BUNDLE_IDENTIFIER = com.duckduckgo.mobile.ios.DuckDuckGoTests
 
diff --git a/Configuration/Version.xcconfig b/Configuration/Version.xcconfig
index 4aebe00d0f..6b9d59ea7d 100644
--- a/Configuration/Version.xcconfig
+++ b/Configuration/Version.xcconfig
@@ -1 +1 @@
-MARKETING_VERSION = 1.82.0
+MARKETING_VERSION = 1.87.0
diff --git a/DuckDuckGo.xcodeproj/project.pbxproj b/DuckDuckGo.xcodeproj/project.pbxproj
index c23a180948..900c68ecc9 100644
--- a/DuckDuckGo.xcodeproj/project.pbxproj
+++ b/DuckDuckGo.xcodeproj/project.pbxproj
@@ -7,10 +7,15 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		021EA0802BD2A9D500772C9A /* TabsPreferences.swift in Sources */ = {isa = PBXBuildFile; fileRef = 021EA07F2BD2A9D500772C9A /* TabsPreferences.swift */; };
+		021EA0812BD2A9D500772C9A /* TabsPreferences.swift in Sources */ = {isa = PBXBuildFile; fileRef = 021EA07F2BD2A9D500772C9A /* TabsPreferences.swift */; };
+		021EA0842BD6E01A00772C9A /* TabsPreferencesTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 021EA0822BD6DF1B00772C9A /* TabsPreferencesTests.swift */; };
+		021EA0852BD6E0EB00772C9A /* TabsPreferencesTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 021EA0822BD6DF1B00772C9A /* TabsPreferencesTests.swift */; };
 		0230C0A3272080090018F728 /* KeyedCodingExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0230C0A2272080090018F728 /* KeyedCodingExtension.swift */; };
 		026ADE1426C3010C002518EE /* macos-config.json in Resources */ = {isa = PBXBuildFile; fileRef = 026ADE1326C3010C002518EE /* macos-config.json */; };
 		028904202A7B25380028369C /* AppConfigurationURLProviderTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0289041E2A7B23CE0028369C /* AppConfigurationURLProviderTests.swift */; };
 		028904212A7B25770028369C /* AppConfigurationURLProviderTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0289041E2A7B23CE0028369C /* AppConfigurationURLProviderTests.swift */; };
+		02C0737D2BE5B7E000BFE2F5 /* InfoPlist.xcstrings in Resources */ = {isa = PBXBuildFile; fileRef = 02C0737C2BE5B7E000BFE2F5 /* InfoPlist.xcstrings */; };
 		142879DA24CE1179005419BB /* SuggestionViewModelTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 142879D924CE1179005419BB /* SuggestionViewModelTests.swift */; };
 		142879DC24CE1185005419BB /* SuggestionContainerViewModelTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 142879DB24CE1185005419BB /* SuggestionContainerViewModelTests.swift */; };
 		1430DFF524D0580F00B8978C /* TabBarViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1430DFF424D0580F00B8978C /* TabBarViewController.swift */; };
@@ -19,13 +24,10 @@
 		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 */; };
@@ -37,16 +39,12 @@
 		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 */; };
 		1D26EBB02B74DB600002A93F /* TabSnapshotCleanupService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1D26EBAF2B74DB600002A93F /* TabSnapshotCleanupService.swift */; };
 		1D26EBB12B74DB600002A93F /* TabSnapshotCleanupService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1D26EBAF2B74DB600002A93F /* TabSnapshotCleanupService.swift */; };
-		1D26EBB22B74DB600002A93F /* TabSnapshotCleanupService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1D26EBAF2B74DB600002A93F /* TabSnapshotCleanupService.swift */; };
 		1D2DC00629016798008083A1 /* BWCredential.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1DDF075C28F815AD00EDFBE3 /* BWCredential.swift */; };
 		1D2DC0072901679C008083A1 /* BWError.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1DDF076028F815AD00EDFBE3 /* BWError.swift */; };
 		1D2DC0082901679E008083A1 /* BWResponse.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1DDF076128F815AD00EDFBE3 /* BWResponse.swift */; };
@@ -90,7 +88,6 @@
 		1D8C2FF12B70F751005E4BBD /* MockTabSnapshotStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1D8C2FEF2B70F751005E4BBD /* MockTabSnapshotStore.swift */; };
 		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 */; };
@@ -109,55 +106,43 @@
 		1DA6D1032A1FFA3B00540406 /* HTTPCookieTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1DA6D0FF2A1FF9DC00540406 /* HTTPCookieTests.swift */; };
 		1DB67F292B6FE4A6003DF243 /* WebViewSnapshotRenderer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1DB67F282B6FE4A6003DF243 /* WebViewSnapshotRenderer.swift */; };
 		1DB67F2A2B6FEB17003DF243 /* WebViewSnapshotRenderer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1DB67F282B6FE4A6003DF243 /* WebViewSnapshotRenderer.swift */; };
-		1DB67F2B2B6FEB19003DF243 /* WebViewSnapshotRenderer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1DB67F282B6FE4A6003DF243 /* WebViewSnapshotRenderer.swift */; };
 		1DB67F2D2B6FEFDB003DF243 /* ViewSnapshotRenderer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1DB67F2C2B6FEFDB003DF243 /* ViewSnapshotRenderer.swift */; };
 		1DB67F2E2B6FEFDB003DF243 /* ViewSnapshotRenderer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1DB67F2C2B6FEFDB003DF243 /* ViewSnapshotRenderer.swift */; };
-		1DB67F2F2B6FEFDB003DF243 /* ViewSnapshotRenderer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1DB67F2C2B6FEFDB003DF243 /* ViewSnapshotRenderer.swift */; };
 		1DB9617A29F1D06D00CF5568 /* InternalUserDeciderMock.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1DB9617929F1D06D00CF5568 /* InternalUserDeciderMock.swift */; };
 		1DB9617B29F1D06D00CF5568 /* InternalUserDeciderMock.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1DB9617929F1D06D00CF5568 /* InternalUserDeciderMock.swift */; };
 		1DB9618229F67F6100CF5568 /* FaviconNullStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1DB9617F29F67F3E00CF5568 /* FaviconNullStore.swift */; };
 		1DB9618329F67F6200CF5568 /* FaviconNullStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1DB9617F29F67F3E00CF5568 /* FaviconNullStore.swift */; };
 		1DC669702B6CF0D700AA0645 /* TabSnapshotStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1DC6696F2B6CF0D700AA0645 /* TabSnapshotStore.swift */; };
 		1DC669712B6CF0D700AA0645 /* TabSnapshotStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1DC6696F2B6CF0D700AA0645 /* TabSnapshotStore.swift */; };
-		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 */; };
+		1DEF3BAD2BD145A9004A2FBA /* AutoClearHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1DEF3BAC2BD145A9004A2FBA /* AutoClearHandler.swift */; };
+		1DEF3BAE2BD145A9004A2FBA /* AutoClearHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1DEF3BAC2BD145A9004A2FBA /* AutoClearHandler.swift */; };
 		1DFAB51D2A8982A600A0F7F6 /* SetExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1DFAB51C2A8982A600A0F7F6 /* SetExtension.swift */; };
 		1DFAB51E2A8982A600A0F7F6 /* SetExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1DFAB51C2A8982A600A0F7F6 /* SetExtension.swift */; };
 		1DFAB5222A8983DE00A0F7F6 /* SetExtensionTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1DFAB51F2A89830D00A0F7F6 /* SetExtensionTests.swift */; };
 		1DFAB5232A8983E100A0F7F6 /* SetExtensionTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1DFAB51F2A89830D00A0F7F6 /* SetExtensionTests.swift */; };
-		1E0068AD2B1673BB00BBF43B /* SubscriptionUI in Frameworks */ = {isa = PBXBuildFile; productRef = 1E0068AC2B1673BB00BBF43B /* SubscriptionUI */; };
 		1E0C72062ABC63BD00802009 /* SubscriptionPagesUserScript.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1E0C72052ABC63BD00802009 /* SubscriptionPagesUserScript.swift */; };
 		1E0C72072ABC63BD00802009 /* SubscriptionPagesUserScript.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1E0C72052ABC63BD00802009 /* SubscriptionPagesUserScript.swift */; };
-		1E21F8E32B73E48600FB272E /* Subscription in Frameworks */ = {isa = PBXBuildFile; productRef = 1E21F8E22B73E48600FB272E /* Subscription */; };
-		1E2AE4C72ACB215900684E0A /* NetworkProtectionRemoteMessaging.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BCF15D62ABB8A110083F6DF /* NetworkProtectionRemoteMessaging.swift */; };
-		1E2AE4C82ACB216B00684E0A /* HoverTrackingArea.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6B140872ABDBCC1004F8E85 /* HoverTrackingArea.swift */; };
-		1E2AE4CA2ACB21A000684E0A /* NetworkProtectionRemoteMessage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BCF15D82ABB8A7F0083F6DF /* NetworkProtectionRemoteMessage.swift */; };
-		1E2AE4CB2ACB21C800684E0A /* HardwareModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B9579202AC687170062CA31 /* HardwareModel.swift */; };
+		1E559BB12BBCA9F1002B4AF6 /* RedirectNavigationResponder.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1E559BB02BBCA9F1002B4AF6 /* RedirectNavigationResponder.swift */; };
+		1E559BB22BBCA9F1002B4AF6 /* RedirectNavigationResponder.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1E559BB02BBCA9F1002B4AF6 /* RedirectNavigationResponder.swift */; };
 		1E7E2E9029029A2A00C01B54 /* ContentBlockingRulesUpdateObserver.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1E7E2E8F29029A2A00C01B54 /* ContentBlockingRulesUpdateObserver.swift */; };
 		1E7E2E942902AC0E00C01B54 /* PrivacyDashboardPermissionHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1E7E2E932902AC0E00C01B54 /* PrivacyDashboardPermissionHandler.swift */; };
 		1E950E3F2912A10D0051A99B /* ContentBlocking in Frameworks */ = {isa = PBXBuildFile; productRef = 1E950E3E2912A10D0051A99B /* ContentBlocking */; };
@@ -167,37 +152,32 @@
 		1EA7B8D52B7E078C000330A4 /* Subscription in Frameworks */ = {isa = PBXBuildFile; productRef = 1EA7B8D42B7E078C000330A4 /* Subscription */; };
 		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 */; };
 		310E79BF294A19A8007C49E8 /* FireproofingReferenceTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 310E79BE294A19A8007C49E8 /* FireproofingReferenceTests.swift */; };
 		311B262728E73E0A00FD181A /* TabShadowConfig.swift in Sources */ = {isa = PBXBuildFile; fileRef = 311B262628E73E0A00FD181A /* TabShadowConfig.swift */; };
 		31267C692B640C4200FEF811 /* DataBrokerProtectionFeatureVisibility.swift in Sources */ = {isa = PBXBuildFile; fileRef = 31C5FFB82AF64D120008A79F /* DataBrokerProtectionFeatureVisibility.swift */; };
 		31267C6A2B640C4B00FEF811 /* DataBrokerProtectionFeatureDisabler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3199C6F82AF94F5B002A7BA1 /* DataBrokerProtectionFeatureDisabler.swift */; };
 		31267C6B2B640C5200FEF811 /* DataBrokerProtectionAppEvents.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3199C6FC2AF97367002A7BA1 /* DataBrokerProtectionAppEvents.swift */; };
 		3129788A2B64131200B67619 /* DataBrokerProtection in Frameworks */ = {isa = PBXBuildFile; productRef = 312978892B64131200B67619 /* DataBrokerProtection */; };
-		3143C8792B0D1F3D00382627 /* DataBrokerProtection in Frameworks */ = {isa = PBXBuildFile; productRef = 3143C8782B0D1F3D00382627 /* DataBrokerProtection */; };
 		3154FD1428E6011A00909769 /* TabShadowView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3154FD1328E6011A00909769 /* TabShadowView.swift */; };
-		3158B1472B0BF72E00AF130C /* DBPHomeViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3192EC872A4DCF21001E97A5 /* DBPHomeViewController.swift */; };
 		3158B1492B0BF73000AF130C /* DBPHomeViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3192EC872A4DCF21001E97A5 /* DBPHomeViewController.swift */; };
 		3158B14A2B0BF74300AF130C /* DataBrokerProtectionDebugMenu.swift in Sources */ = {isa = PBXBuildFile; fileRef = 316850712AF3AD58009A2828 /* DataBrokerProtectionDebugMenu.swift */; };
-		3158B14C2B0BF74500AF130C /* DataBrokerProtectionDebugMenu.swift in Sources */ = {isa = PBXBuildFile; fileRef = 316850712AF3AD58009A2828 /* DataBrokerProtectionDebugMenu.swift */; };
 		3158B14D2B0BF74D00AF130C /* DataBrokerProtectionManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3139A1512AA4B3C000969C7D /* DataBrokerProtectionManager.swift */; };
-		3158B14F2B0BF74F00AF130C /* DataBrokerProtectionManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3139A1512AA4B3C000969C7D /* DataBrokerProtectionManager.swift */; };
 		3158B1502B0BF75200AF130C /* DataBrokerProtectionLoginItemScheduler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B6D98662ADEB4B000CD35FE /* DataBrokerProtectionLoginItemScheduler.swift */; };
-		3158B1522B0BF75400AF130C /* DataBrokerProtectionLoginItemScheduler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B6D98662ADEB4B000CD35FE /* DataBrokerProtectionLoginItemScheduler.swift */; };
 		3158B1532B0BF75700AF130C /* LoginItem+DataBrokerProtection.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9D8FA00B2AC5BDCE005DD0D0 /* LoginItem+DataBrokerProtection.swift */; };
-		3158B1552B0BF75900AF130C /* LoginItem+DataBrokerProtection.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9D8FA00B2AC5BDCE005DD0D0 /* LoginItem+DataBrokerProtection.swift */; };
 		3158B1562B0BF75D00AF130C /* DataBrokerProtectionFeatureVisibility.swift in Sources */ = {isa = PBXBuildFile; fileRef = 31C5FFB82AF64D120008A79F /* DataBrokerProtectionFeatureVisibility.swift */; };
-		3158B1582B0BF76000AF130C /* DataBrokerProtectionFeatureVisibility.swift in Sources */ = {isa = PBXBuildFile; fileRef = 31C5FFB82AF64D120008A79F /* DataBrokerProtectionFeatureVisibility.swift */; };
 		3158B1592B0BF76400AF130C /* DataBrokerProtectionFeatureDisabler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3199C6F82AF94F5B002A7BA1 /* DataBrokerProtectionFeatureDisabler.swift */; };
-		3158B15B2B0BF76700AF130C /* DataBrokerProtectionFeatureDisabler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3199C6F82AF94F5B002A7BA1 /* DataBrokerProtectionFeatureDisabler.swift */; };
 		3158B15C2B0BF76D00AF130C /* DataBrokerProtectionAppEvents.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3199C6FC2AF97367002A7BA1 /* DataBrokerProtectionAppEvents.swift */; };
-		3158B15E2B0BF76F00AF130C /* DataBrokerProtectionAppEvents.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3199C6FC2AF97367002A7BA1 /* DataBrokerProtectionAppEvents.swift */; };
 		315A023D2B64216B00BFA577 /* IPCServiceManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7BD01C182AD8319C0088B32E /* IPCServiceManager.swift */; };
 		315A023F2B6421AE00BFA577 /* Networking in Frameworks */ = {isa = PBXBuildFile; productRef = 315A023E2B6421AE00BFA577 /* Networking */; };
 		315AA07028CA5CC800200030 /* YoutubePlayerNavigationHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 315AA06F28CA5CC800200030 /* YoutubePlayerNavigationHandler.swift */; };
 		3168506D2AF3AD1D009A2828 /* WaitlistViewControllerPresenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3168506C2AF3AD1C009A2828 /* WaitlistViewControllerPresenter.swift */; };
 		3168506E2AF3AD1D009A2828 /* WaitlistViewControllerPresenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3168506C2AF3AD1C009A2828 /* WaitlistViewControllerPresenter.swift */; };
-		316850702AF3AD1D009A2828 /* WaitlistViewControllerPresenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3168506C2AF3AD1C009A2828 /* WaitlistViewControllerPresenter.swift */; };
+		316913232BD2B6250051B46D /* DataBrokerProtectionPixelsHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 316913222BD2B6250051B46D /* DataBrokerProtectionPixelsHandler.swift */; };
+		316913242BD2B6250051B46D /* DataBrokerProtectionPixelsHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 316913222BD2B6250051B46D /* DataBrokerProtectionPixelsHandler.swift */; };
+		316913262BD2B76F0051B46D /* DataBrokerPrerequisitesStatusVerifier.swift in Sources */ = {isa = PBXBuildFile; fileRef = 316913252BD2B76F0051B46D /* DataBrokerPrerequisitesStatusVerifier.swift */; };
+		316913272BD2B76F0051B46D /* DataBrokerPrerequisitesStatusVerifier.swift in Sources */ = {isa = PBXBuildFile; fileRef = 316913252BD2B76F0051B46D /* DataBrokerPrerequisitesStatusVerifier.swift */; };
+		316913292BD2C7570051B46D /* DataBrokerProtectionErrorViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 316913282BD2C7570051B46D /* DataBrokerProtectionErrorViewController.swift */; };
+		3169132A2BD2C7570051B46D /* DataBrokerProtectionErrorViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 316913282BD2C7570051B46D /* DataBrokerProtectionErrorViewController.swift */; };
 		3171D6B82889849F0068632A /* CookieManagedNotificationView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3171D6B72889849F0068632A /* CookieManagedNotificationView.swift */; };
 		3171D6BA288984D00068632A /* BadgeAnimationView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3171D6B9288984D00068632A /* BadgeAnimationView.swift */; };
 		3171D6DB2889B64D0068632A /* CookieManagedNotificationContainerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3171D6DA2889B64D0068632A /* CookieManagedNotificationContainerView.swift */; };
@@ -210,16 +190,20 @@
 		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 */; };
+		31A83FB52BE28D7D00F74E67 /* UserText+DBP.swift in Sources */ = {isa = PBXBuildFile; fileRef = 31A83FB42BE28D7D00F74E67 /* UserText+DBP.swift */; };
+		31A83FB62BE28D7D00F74E67 /* UserText+DBP.swift in Sources */ = {isa = PBXBuildFile; fileRef = 31A83FB42BE28D7D00F74E67 /* UserText+DBP.swift */; };
+		31A83FB72BE28D8A00F74E67 /* UserText+DBP.swift in Sources */ = {isa = PBXBuildFile; fileRef = 31A83FB42BE28D7D00F74E67 /* UserText+DBP.swift */; };
+		31A83FB82BE28D8A00F74E67 /* UserText+DBP.swift in Sources */ = {isa = PBXBuildFile; fileRef = 31A83FB42BE28D7D00F74E67 /* UserText+DBP.swift */; };
 		31AA6B972B960B870025014E /* DataBrokerProtectionLoginItemPixels.swift in Sources */ = {isa = PBXBuildFile; fileRef = 31AA6B962B960B870025014E /* DataBrokerProtectionLoginItemPixels.swift */; };
 		31AA6B982B960BA50025014E /* DataBrokerProtectionLoginItemPixels.swift in Sources */ = {isa = PBXBuildFile; fileRef = 31AA6B962B960B870025014E /* DataBrokerProtectionLoginItemPixels.swift */; };
-		31AA6B992B960BA60025014E /* DataBrokerProtectionLoginItemPixels.swift in Sources */ = {isa = PBXBuildFile; fileRef = 31AA6B962B960B870025014E /* DataBrokerProtectionLoginItemPixels.swift */; };
 		31B4AF532901A4F20013585E /* NSEventExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 31B4AF522901A4F20013585E /* NSEventExtension.swift */; };
 		31C3CE0228EDC1E70002C24A /* CustomRoundedCornersShape.swift in Sources */ = {isa = PBXBuildFile; fileRef = 31C3CE0128EDC1E70002C24A /* CustomRoundedCornersShape.swift */; };
 		31C9ADE52AF0564500CEF57D /* WaitlistFeatureSetupHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 31C9ADE42AF0564500CEF57D /* WaitlistFeatureSetupHandler.swift */; };
 		31C9ADE62AF0564500CEF57D /* WaitlistFeatureSetupHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 31C9ADE42AF0564500CEF57D /* WaitlistFeatureSetupHandler.swift */; };
-		31C9ADE82AF0564500CEF57D /* WaitlistFeatureSetupHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 31C9ADE42AF0564500CEF57D /* WaitlistFeatureSetupHandler.swift */; };
 		31CF3432288B0B1B0087244B /* NavigationBarBadgeAnimator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 31CF3431288B0B1B0087244B /* NavigationBarBadgeAnimator.swift */; };
 		31D5375C291D944100407A95 /* PasswordManagementBitwardenItemView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 31D5375B291D944100407A95 /* PasswordManagementBitwardenItemView.swift */; };
+		31DC2F222BD6DE6C001354EF /* DataBrokerPrerequisitesStatusVerifierTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 31DC2F202BD6DE65001354EF /* DataBrokerPrerequisitesStatusVerifierTests.swift */; };
+		31DC2F232BD6E028001354EF /* DataBrokerPrerequisitesStatusVerifierTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 31DC2F202BD6DE65001354EF /* DataBrokerPrerequisitesStatusVerifierTests.swift */; };
 		31E163BA293A56F400963C10 /* BrokenSiteReportingReferenceTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 31E163B9293A56F400963C10 /* BrokenSiteReportingReferenceTests.swift */; };
 		31E163BD293A579E00963C10 /* PrivacyReferenceTestHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 31E163BC293A579E00963C10 /* PrivacyReferenceTestHelper.swift */; };
 		31E163C0293A581900963C10 /* privacy-reference-tests in Resources */ = {isa = PBXBuildFile; fileRef = 31E163BF293A581900963C10 /* privacy-reference-tests */; };
@@ -233,7 +217,6 @@
 		31F28C5328C8EECA00119F70 /* DuckURLSchemeHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 31F28C5228C8EECA00119F70 /* DuckURLSchemeHandler.swift */; };
 		31F2D1FF2AF026D800BF0144 /* WaitlistTermsAndConditionsActionHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 31F2D1FE2AF026D800BF0144 /* WaitlistTermsAndConditionsActionHandler.swift */; };
 		31F2D2002AF026D800BF0144 /* WaitlistTermsAndConditionsActionHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 31F2D1FE2AF026D800BF0144 /* WaitlistTermsAndConditionsActionHandler.swift */; };
-		31F2D2022AF026D800BF0144 /* WaitlistTermsAndConditionsActionHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 31F2D1FE2AF026D800BF0144 /* WaitlistTermsAndConditionsActionHandler.swift */; };
 		31F7F2A6288AD2CA001C0D64 /* NavigationBarBadgeAnimationView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 31F7F2A5288AD2CA001C0D64 /* NavigationBarBadgeAnimationView.swift */; };
 		3701C9CE29BD040C00305B15 /* FirefoxBerkeleyDatabaseReader.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3701C9CD29BD040900305B15 /* FirefoxBerkeleyDatabaseReader.swift */; };
 		3701C9CF29BD040C00305B15 /* FirefoxBerkeleyDatabaseReader.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3701C9CD29BD040900305B15 /* FirefoxBerkeleyDatabaseReader.swift */; };
@@ -285,7 +268,6 @@
 		3706FAB2293F65D500E42796 /* TabInstrumentation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BB88B4F25B7BA2B006F6B06 /* TabInstrumentation.swift */; };
 		3706FAB5293F65D500E42796 /* ConfigurationManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 85D33F1125C82EB3002B91A6 /* ConfigurationManager.swift */; };
 		3706FAB6293F65D500E42796 /* YoutubePlayerUserScript.swift in Sources */ = {isa = PBXBuildFile; fileRef = 31F28C4C28C8EEC500119F70 /* YoutubePlayerUserScript.swift */; };
-		3706FAB7293F65D500E42796 /* PixelParameters.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6A9E48326146AAB0067D1B9 /* PixelParameters.swift */; };
 		3706FAB8293F65D500E42796 /* FaviconImageCache.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA5FA696275F90C400DCE9C9 /* FaviconImageCache.swift */; };
 		3706FAB9293F65D500E42796 /* TabBarViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1430DFF424D0580F00B8978C /* TabBarViewController.swift */; };
 		3706FABA293F65D500E42796 /* BookmarkOutlineViewDataSource.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B92929126670D2A00AD2C21 /* BookmarkOutlineViewDataSource.swift */; };
@@ -423,7 +405,6 @@
 		3706FB60293F65D500E42796 /* PasswordManagementIdentityItemView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BE6546E271FCD40008D1D63 /* PasswordManagementIdentityItemView.swift */; };
 		3706FB61293F65D500E42796 /* ProgressExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6F41030264D2B23003DA42C /* ProgressExtension.swift */; };
 		3706FB62293F65D500E42796 /* CSVParser.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B723DF626B0002B00E14D75 /* CSVParser.swift */; };
-		3706FB64293F65D500E42796 /* PixelDataModel.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = B6DA44062616B30600DD1EC2 /* PixelDataModel.xcdatamodeld */; };
 		3706FB65293F65D500E42796 /* PrivacyDashboardWebView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B63BDF7D27FDAA640072D75B /* PrivacyDashboardWebView.swift */; };
 		3706FB66293F65D500E42796 /* AppearancePreferences.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37CD54C727F2FDD100F1F7B9 /* AppearancePreferences.swift */; };
 		3706FB67293F65D500E42796 /* DownloadListCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6B1E87A26D381710062C350 /* DownloadListCoordinator.swift */; };
@@ -505,7 +486,6 @@
 		3706FBC7293F65D500E42796 /* EncryptedHistoryStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = AAE7527B263B056C00B973F8 /* EncryptedHistoryStore.swift */; };
 		3706FBC8293F65D500E42796 /* FirePopoverCollectionViewItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = AAE246F12709EF3B00BEEAEE /* FirePopoverCollectionViewItem.swift */; };
 		3706FBC9293F65D500E42796 /* ArrayExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA61C0D12727F59B00E6B681 /* ArrayExtension.swift */; };
-		3706FBCA293F65D500E42796 /* CrashReportSender.swift in Sources */ = {isa = PBXBuildFile; fileRef = AAC30A2B268F1ECD00D2D9CD /* CrashReportSender.swift */; };
 		3706FBCB293F65D500E42796 /* BookmarkHTMLImporter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 373A1AAF2842C4EA00586521 /* BookmarkHTMLImporter.swift */; };
 		3706FBCC293F65D500E42796 /* CustomRoundedCornersShape.swift in Sources */ = {isa = PBXBuildFile; fileRef = 31C3CE0128EDC1E70002C24A /* CustomRoundedCornersShape.swift */; };
 		3706FBCD293F65D500E42796 /* LocaleExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B8D9061276D1D880078DB17 /* LocaleExtension.swift */; };
@@ -542,9 +522,6 @@
 		3706FBF0293F65D500E42796 /* PasswordManagementItemModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 85CC1D7C26A05F250062F04E /* PasswordManagementItemModel.swift */; };
 		3706FBF2293F65D500E42796 /* FindInPageModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 85A0118125AF60E700FA6A0C /* FindInPageModel.swift */; };
 		3706FBF3293F65D500E42796 /* PseudoFolder.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B92929826670D2A00AD2C21 /* PseudoFolder.swift */; };
-		3706FBF5293F65D500E42796 /* PixelDataStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6DA44012616B28300DD1EC2 /* PixelDataStore.swift */; };
-		3706FBF6293F65D500E42796 /* Pixel.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6A9E45226142B070067D1B9 /* Pixel.swift */; };
-		3706FBF7293F65D500E42796 /* PixelEvent.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6A9E47626146A570067D1B9 /* PixelEvent.swift */; };
 		3706FBF8293F65D500E42796 /* TabBarFooter.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA2CB1342587C29500AA6FBE /* TabBarFooter.swift */; };
 		3706FBF9293F65D500E42796 /* BookmarksBarCollectionViewItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BE5336A286912D40019DBFD /* BookmarksBarCollectionViewItem.swift */; };
 		3706FBFA293F65D500E42796 /* FileDownloadError.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6C0B23826E742610031CB7F /* FileDownloadError.swift */; };
@@ -610,7 +587,6 @@
 		3706FC3F293F65D500E42796 /* ApplicationDockMenu.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA97BF4525135DD30014931A /* ApplicationDockMenu.swift */; };
 		3706FC40293F65D500E42796 /* SaveIdentityViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B8A4DFE27C83B29005F40E8 /* SaveIdentityViewController.swift */; };
 		3706FC41293F65D500E42796 /* FileStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BA1A69A258B076900F6F690 /* FileStore.swift */; };
-		3706FC42293F65D500E42796 /* PixelArguments.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6A9E47E26146A800067D1B9 /* PixelArguments.swift */; };
 		3706FC43293F65D500E42796 /* PinnedTabsViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37BF3F1E286F0A7A00BD9014 /* PinnedTabsViewModel.swift */; };
 		3706FC44293F65D500E42796 /* BookmarkList.swift in Sources */ = {isa = PBXBuildFile; fileRef = AAC5E4CF25D6A709007F5990 /* BookmarkList.swift */; };
 		3706FC45293F65D500E42796 /* BookmarkTableRowView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B9292C92667123700AD2C21 /* BookmarkTableRowView.swift */; };
@@ -652,9 +628,8 @@
 		3706FC6F293F65D500E42796 /* FirePopoverViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA13DCB3271480B0006D48D3 /* FirePopoverViewModel.swift */; };
 		3706FC71293F65D500E42796 /* NSColorExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = F41D174025CB131900472416 /* NSColorExtension.swift */; };
 		3706FC73293F65D500E42796 /* AddressBarButtonsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = AAC5E4F525D6BF2C007F5990 /* AddressBarButtonsViewController.swift */; };
-		3706FC76293F65D500E42796 /* PixelDataRecord.swift in Sources */ = {isa = PBXBuildFile; fileRef = B68C92C32750EF76002AC6B0 /* PixelDataRecord.swift */; };
 		3706FC77293F65D500E42796 /* PageObserverUserScript.swift in Sources */ = {isa = PBXBuildFile; fileRef = 853014D525E671A000FB8205 /* PageObserverUserScript.swift */; };
-		3706FC78293F65D500E42796 /* SecureVaultErrorReporter.swift in Sources */ = {isa = PBXBuildFile; fileRef = B642738127B65BAC0005DFD1 /* SecureVaultErrorReporter.swift */; };
+		3706FC78293F65D500E42796 /* SecureVaultReporter.swift in Sources */ = {isa = PBXBuildFile; fileRef = B642738127B65BAC0005DFD1 /* SecureVaultReporter.swift */; };
 		3706FC79293F65D500E42796 /* NSImageExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B139AFC26B60BD800894F82 /* NSImageExtensions.swift */; };
 		3706FC7B293F65D500E42796 /* PasswordManagementViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 85625995269C953C00EE44BC /* PasswordManagementViewController.swift */; };
 		3706FC7C293F65D500E42796 /* ImportedBookmarks.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BB99CFA26FE191E001E4761 /* ImportedBookmarks.swift */; };
@@ -673,7 +648,6 @@
 		3706FC8C293F65D500E42796 /* FirefoxDataImporter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B5FF67726B602B100D42879 /* FirefoxDataImporter.swift */; };
 		3706FC8D293F65D500E42796 /* PreferencesGeneralView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37AFCE8A27DB69BC00471A10 /* PreferencesGeneralView.swift */; };
 		3706FC8E293F65D500E42796 /* PinnedTabsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37BF3F1F286F0A7A00BD9014 /* PinnedTabsView.swift */; };
-		3706FC92293F65D500E42796 /* NSStoryboardExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BE0DF0426781961006337B7 /* NSStoryboardExtension.swift */; };
 		3706FC93293F65D500E42796 /* PreferencesViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37AFCE8027DA2CA600471A10 /* PreferencesViewController.swift */; };
 		3706FC94293F65D500E42796 /* FireproofDomains.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B02198125E05FAC00ED7DEA /* FireproofDomains.swift */; };
 		3706FC95293F65D500E42796 /* Database.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B677440255DBEEA00025BD8 /* Database.swift */; };
@@ -703,7 +677,6 @@
 		3706FCB8293F65D500E42796 /* Onboarding.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 85B7184927677C2D00B4277F /* Onboarding.storyboard */; };
 		3706FCB9293F65D500E42796 /* FireproofDomains.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 4B0511AD262CAA5A00F6079C /* FireproofDomains.storyboard */; };
 		3706FCBA293F65D500E42796 /* clickToLoadConfig.json in Resources */ = {isa = PBXBuildFile; fileRef = EA47767F272A21B700419EDA /* clickToLoadConfig.json */; };
-		3706FCBB293F65D500E42796 /* Downloads.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = B6B1E88126D5DAC30062C350 /* Downloads.storyboard */; };
 		3706FCBC293F65D500E42796 /* dark-shield.json in Resources */ = {isa = PBXBuildFile; fileRef = AA34396F2754D4E900B241FA /* dark-shield.json */; };
 		3706FCBD293F65D500E42796 /* dark-shield-mouse-over.json in Resources */ = {isa = PBXBuildFile; fileRef = AA7EB6EA27E880AE00036718 /* dark-shield-mouse-over.json */; };
 		3706FCBE293F65D500E42796 /* autoconsent-bundle.js in Resources */ = {isa = PBXBuildFile; fileRef = B31055C327A1BA1D001AC618 /* autoconsent-bundle.js */; };
@@ -756,7 +729,6 @@
 		3706FDDF293F661700E42796 /* BookmarkSidebarTreeControllerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B9292B22667103000AD2C21 /* BookmarkSidebarTreeControllerTests.swift */; };
 		3706FDE0293F661700E42796 /* TabIndexTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37D2377B287EBDA300BCE03B /* TabIndexTests.swift */; };
 		3706FDE1293F661700E42796 /* AdjacentItemEnumeratorTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37534CA42811987D002621E7 /* AdjacentItemEnumeratorTests.swift */; };
-		3706FDE2293F661700E42796 /* PixelArgumentsTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6DA44222616CABC00DD1EC2 /* PixelArgumentsTests.swift */; };
 		3706FDE4293F661700E42796 /* TabLazyLoaderTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37534C9D28104D9B002621E7 /* TabLazyLoaderTests.swift */; };
 		3706FDE5293F661700E42796 /* URLEventHandlerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 85F1B0C825EF9759004792B6 /* URLEventHandlerTests.swift */; };
 		3706FDE6293F661700E42796 /* BookmarkOutlineViewDataSourceTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B9292B32667103000AD2C21 /* BookmarkOutlineViewDataSourceTests.swift */; };
@@ -802,14 +774,12 @@
 		3706FE10293F661700E42796 /* TestNavigationDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6DA06E02913AEDB00225DE2 /* TestNavigationDelegate.swift */; };
 		3706FE11293F661700E42796 /* URLSuggestedFilenameTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8553FF51257523760029327F /* URLSuggestedFilenameTests.swift */; };
 		3706FE13293F661700E42796 /* ConfigurationStorageTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 85AC3B4825DAC9BD00C7D2AA /* ConfigurationStorageTests.swift */; };
-		3706FE14293F661700E42796 /* DownloadListStoreMock.swift in Sources */ = {isa = PBXBuildFile; fileRef = B693956026F1C1BC0015B914 /* DownloadListStoreMock.swift */; };
 		3706FE15293F661700E42796 /* PrivacyIconViewModelTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA91F83827076F1900771A0D /* PrivacyIconViewModelTests.swift */; };
 		3706FE16293F661700E42796 /* CSVImporterTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B723E0126B0003E00E14D75 /* CSVImporterTests.swift */; };
 		3706FE19293F661700E42796 /* DeviceAuthenticatorTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BBC16A427C488C900E00A38 /* DeviceAuthenticatorTests.swift */; };
 		3706FE1A293F661700E42796 /* BrowserProfileTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B3F641D27A8D3BD00E0C118 /* BrowserProfileTests.swift */; };
 		3706FE1B293F661700E42796 /* PermissionManagerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6106B9F26A7BE0B0013B453 /* PermissionManagerTests.swift */; };
 		3706FE1C293F661700E42796 /* ConnectBitwardenViewModelTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B59CC8B290083240058F2F6 /* ConnectBitwardenViewModelTests.swift */; };
-		3706FE1D293F661700E42796 /* PixelStoreTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = B662D3D82755D7AD0035D4D6 /* PixelStoreTests.swift */; };
 		3706FE1E293F661700E42796 /* GeolocationProviderTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6106BB426A809E60013B453 /* GeolocationProviderTests.swift */; };
 		3706FE1F293F661700E42796 /* AppStateChangePublisherTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6A5A29F25B96E8300AA7ADA /* AppStateChangePublisherTests.swift */; };
 		3706FE20293F661700E42796 /* CLLocationManagerMock.swift in Sources */ = {isa = PBXBuildFile; fileRef = B63ED0E226B3E7FA00A9DAD1 /* CLLocationManagerMock.swift */; };
@@ -851,7 +821,6 @@
 		3706FE45293F661700E42796 /* ProgressEstimationTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6AE74332609AFCE005B9B1A /* ProgressEstimationTests.swift */; };
 		3706FE46293F661700E42796 /* EncryptedValueTransformerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BA1A6FD258C5C1300F6F690 /* EncryptedValueTransformerTests.swift */; };
 		3706FE47293F661700E42796 /* URLExtensionTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 85F69B3B25EDE81F00978E59 /* URLExtensionTests.swift */; };
-		3706FE48293F661700E42796 /* PixelTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6DA44102616C0FC00DD1EC2 /* PixelTests.swift */; };
 		3706FE49293F661700E42796 /* BookmarkNodePathTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B9292B02667103000AD2C21 /* BookmarkNodePathTests.swift */; };
 		3706FE4A293F661700E42796 /* BookmarkManagedObjectTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B9292B62667103000AD2C21 /* BookmarkManagedObjectTests.swift */; };
 		3706FE4B293F661700E42796 /* BookmarksHTMLImporterTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 373A1AB128451ED400586521 /* BookmarksHTMLImporterTests.swift */; };
@@ -978,16 +947,13 @@
 		371D00E129D8509400EC8598 /* OpenSSL in Frameworks */ = {isa = PBXBuildFile; productRef = 371D00E029D8509400EC8598 /* OpenSSL */; };
 		372217802B3337FE00B8E9C2 /* TestUtils in Frameworks */ = {isa = PBXBuildFile; productRef = 3722177F2B3337FE00B8E9C2 /* TestUtils */; };
 		372217822B33380700B8E9C2 /* TestUtils in Frameworks */ = {isa = PBXBuildFile; productRef = 372217812B33380700B8E9C2 /* TestUtils */; };
-		372217842B33380E00B8E9C2 /* TestUtils in Frameworks */ = {isa = PBXBuildFile; productRef = 372217832B33380E00B8E9C2 /* TestUtils */; };
 		37269EFB2B332F9E005E8E46 /* Common in Frameworks */ = {isa = PBXBuildFile; productRef = 37269EFA2B332F9E005E8E46 /* Common */; };
 		37269EFD2B332FAC005E8E46 /* Common in Frameworks */ = {isa = PBXBuildFile; productRef = 37269EFC2B332FAC005E8E46 /* Common */; };
 		37269EFF2B332FBB005E8E46 /* Common in Frameworks */ = {isa = PBXBuildFile; productRef = 37269EFE2B332FBB005E8E46 /* Common */; };
 		37269F012B332FC8005E8E46 /* Common in Frameworks */ = {isa = PBXBuildFile; productRef = 37269F002B332FC8005E8E46 /* Common */; };
-		37269F032B332FD8005E8E46 /* Common in Frameworks */ = {isa = PBXBuildFile; productRef = 37269F022B332FD8005E8E46 /* Common */; };
 		37269F052B3332C2005E8E46 /* Common in Frameworks */ = {isa = PBXBuildFile; productRef = 37269F042B3332C2005E8E46 /* Common */; };
 		372A0FEC2B2379310033BF7F /* SyncMetricsEventsHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 372A0FEB2B2379310033BF7F /* SyncMetricsEventsHandler.swift */; };
 		372A0FED2B2379310033BF7F /* SyncMetricsEventsHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 372A0FEB2B2379310033BF7F /* SyncMetricsEventsHandler.swift */; };
-		372A0FEE2B2379310033BF7F /* SyncMetricsEventsHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 372A0FEB2B2379310033BF7F /* SyncMetricsEventsHandler.swift */; };
 		372BC2A12A4AFA47001D8FD5 /* SyncCredentialsAdapter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 372BC2A02A4AFA47001D8FD5 /* SyncCredentialsAdapter.swift */; };
 		372BC2A22A4AFA47001D8FD5 /* SyncCredentialsAdapter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 372BC2A02A4AFA47001D8FD5 /* SyncCredentialsAdapter.swift */; };
 		3739326529AE4B39009346AE /* DDGSync in Frameworks */ = {isa = PBXBuildFile; productRef = 3739326429AE4B39009346AE /* DDGSync */; };
@@ -998,9 +964,7 @@
 		373A1AB228451ED400586521 /* BookmarksHTMLImporterTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 373A1AB128451ED400586521 /* BookmarksHTMLImporterTests.swift */; };
 		373D9B4829EEAC1B00381FDD /* SyncMetadataDatabase.swift in Sources */ = {isa = PBXBuildFile; fileRef = 373D9B4729EEAC1B00381FDD /* SyncMetadataDatabase.swift */; };
 		373D9B4929EEAC1B00381FDD /* SyncMetadataDatabase.swift in Sources */ = {isa = PBXBuildFile; fileRef = 373D9B4729EEAC1B00381FDD /* SyncMetadataDatabase.swift */; };
-		373FB4B12B4D6C42004C88D6 /* PreferencesViews in Frameworks */ = {isa = PBXBuildFile; productRef = 373FB4B02B4D6C42004C88D6 /* PreferencesViews */; };
 		373FB4B32B4D6C4B004C88D6 /* PreferencesViews in Frameworks */ = {isa = PBXBuildFile; productRef = 373FB4B22B4D6C4B004C88D6 /* PreferencesViews */; };
-		373FB4B52B4D6C57004C88D6 /* PreferencesViews in Frameworks */ = {isa = PBXBuildFile; productRef = 373FB4B42B4D6C57004C88D6 /* PreferencesViews */; };
 		37445F992A1566420029F789 /* SyncDataProviders.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37445F982A1566420029F789 /* SyncDataProviders.swift */; };
 		37445F9A2A1566420029F789 /* SyncDataProviders.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37445F982A1566420029F789 /* SyncDataProviders.swift */; };
 		37445F9C2A1569F00029F789 /* SyncBookmarksAdapter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37445F9B2A1569F00029F789 /* SyncBookmarksAdapter.swift */; };
@@ -1021,7 +985,6 @@
 		376E2D2629428353001CD31B /* PrivacyReferenceTestHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 31E163BC293A579E00963C10 /* PrivacyReferenceTestHelper.swift */; };
 		376E2D2729428353001CD31B /* BrokenSiteReportingReferenceTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 31E163B9293A56F400963C10 /* BrokenSiteReportingReferenceTests.swift */; };
 		376E2D282942843D001CD31B /* privacy-reference-tests in Resources */ = {isa = PBXBuildFile; fileRef = 31E163BF293A581900963C10 /* privacy-reference-tests */; };
-		376E2D29294286B8001CD31B /* PixelEventTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BC2621C293996410087A482 /* PixelEventTests.swift */; };
 		37716D8029707E5D00A9FC6D /* FireproofingReferenceTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 310E79BE294A19A8007C49E8 /* FireproofingReferenceTests.swift */; };
 		3775912D29AAC72700E26367 /* SyncPreferences.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3775912C29AAC72700E26367 /* SyncPreferences.swift */; };
 		3775912E29AAC72700E26367 /* SyncPreferences.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3775912C29AAC72700E26367 /* SyncPreferences.swift */; };
@@ -1030,7 +993,6 @@
 		3776582D27F71652009A6B35 /* WebsiteBreakageReportTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3776582C27F71652009A6B35 /* WebsiteBreakageReportTests.swift */; };
 		3776582F27F82E62009A6B35 /* AutofillPreferences.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3776582E27F82E62009A6B35 /* AutofillPreferences.swift */; };
 		3776583127F8325B009A6B35 /* AutofillPreferencesTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3776583027F8325B009A6B35 /* AutofillPreferencesTests.swift */; };
-		3778183D2AD6F86D00533759 /* FavoritesDisplayModeSyncHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 377D801B2AB47FBB002AF251 /* FavoritesDisplayModeSyncHandler.swift */; };
 		377D801C2AB47FBB002AF251 /* FavoritesDisplayModeSyncHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 377D801B2AB47FBB002AF251 /* FavoritesDisplayModeSyncHandler.swift */; };
 		377D801F2AB48191002AF251 /* FavoritesDisplayModeSyncHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 377D801B2AB47FBB002AF251 /* FavoritesDisplayModeSyncHandler.swift */; };
 		378205F62837CBA800D1D4AA /* SavedStateMock.swift in Sources */ = {isa = PBXBuildFile; fileRef = 378205F52837CBA800D1D4AA /* SavedStateMock.swift */; };
@@ -1049,10 +1011,8 @@
 		37A5E2F0298AA1B20047046B /* Persistence in Frameworks */ = {isa = PBXBuildFile; productRef = 37A5E2EF298AA1B20047046B /* Persistence */; };
 		37A6A8F12AFCC988008580A3 /* FaviconsFetcherOnboarding.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37A6A8F02AFCC988008580A3 /* FaviconsFetcherOnboarding.swift */; };
 		37A6A8F22AFCC988008580A3 /* FaviconsFetcherOnboarding.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37A6A8F02AFCC988008580A3 /* FaviconsFetcherOnboarding.swift */; };
-		37A6A8F42AFCC988008580A3 /* FaviconsFetcherOnboarding.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37A6A8F02AFCC988008580A3 /* FaviconsFetcherOnboarding.swift */; };
 		37A6A8F62AFCCA59008580A3 /* FaviconsFetcherOnboardingViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37A6A8F52AFCCA59008580A3 /* FaviconsFetcherOnboardingViewController.swift */; };
 		37A6A8F72AFCCA59008580A3 /* FaviconsFetcherOnboardingViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37A6A8F52AFCCA59008580A3 /* FaviconsFetcherOnboardingViewController.swift */; };
-		37A6A8F92AFCCA59008580A3 /* FaviconsFetcherOnboardingViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37A6A8F52AFCCA59008580A3 /* FaviconsFetcherOnboardingViewController.swift */; };
 		37A803DB27FD69D300052F4C /* DataImportResources in Resources */ = {isa = PBXBuildFile; fileRef = 37A803DA27FD69D300052F4C /* DataImportResources */; };
 		37AFCE8127DA2CA600471A10 /* PreferencesViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37AFCE8027DA2CA600471A10 /* PreferencesViewController.swift */; };
 		37AFCE8527DA2D3900471A10 /* PreferencesSidebar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37AFCE8427DA2D3900471A10 /* PreferencesSidebar.swift */; };
@@ -1109,11 +1069,8 @@
 		4B0511E1262CAA8600F6079C /* NSOpenPanelExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B0511DF262CAA8600F6079C /* NSOpenPanelExtensions.swift */; };
 		4B0511E2262CAA8600F6079C /* NSViewControllerExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B0511E0262CAA8600F6079C /* NSViewControllerExtension.swift */; };
 		4B05265E2B1AE5C70054955A /* VPNMetadataCollector.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B05265D2B1AE5C70054955A /* VPNMetadataCollector.swift */; };
-		4B05265F2B1AEFDB0054955A /* VPNMetadataCollector.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B05265D2B1AE5C70054955A /* VPNMetadataCollector.swift */; };
 		4B0526612B1D55320054955A /* VPNFeedbackSender.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B0526602B1D55320054955A /* VPNFeedbackSender.swift */; };
-		4B0526622B1D55320054955A /* VPNFeedbackSender.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B0526602B1D55320054955A /* VPNFeedbackSender.swift */; };
 		4B0526642B1D55D80054955A /* VPNFeedbackCategory.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B0526632B1D55D80054955A /* VPNFeedbackCategory.swift */; };
-		4B0526652B1D55D80054955A /* VPNFeedbackCategory.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B0526632B1D55D80054955A /* VPNFeedbackCategory.swift */; };
 		4B0A63E8289DB58E00378EF7 /* FirefoxFaviconsReader.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B0A63E7289DB58E00378EF7 /* FirefoxFaviconsReader.swift */; };
 		4B0AACAC28BC63ED001038AC /* ChromiumFaviconsReader.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B0AACAB28BC63ED001038AC /* ChromiumFaviconsReader.swift */; };
 		4B0AACAE28BC6FD0001038AC /* SafariFaviconsReader.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B0AACAD28BC6FD0001038AC /* SafariFaviconsReader.swift */; };
@@ -1122,7 +1079,6 @@
 		4B0DB5E528BD9D08007DD239 /* PinningManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B0DB5E428BD9D08007DD239 /* PinningManager.swift */; };
 		4B0EF7262B578095009D6481 /* AppVersionExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BA71ED92B4B81E80002EBCE /* AppVersionExtension.swift */; };
 		4B0EF7272B578096009D6481 /* AppVersionExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BA71ED92B4B81E80002EBCE /* AppVersionExtension.swift */; };
-		4B0EF7282B5780AB009D6481 /* AppVersionExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BA71ED92B4B81E80002EBCE /* AppVersionExtension.swift */; };
 		4B0EF7292B5780EB009D6481 /* VPNAppEventsHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B8DB3192B504D7500EC16DA /* VPNAppEventsHandler.swift */; };
 		4B11060525903E570039B979 /* CoreDataEncryptionTesting.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = 4B11060325903E570039B979 /* CoreDataEncryptionTesting.xcdatamodeld */; };
 		4B11060A25903EAC0039B979 /* CoreDataEncryptionTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B11060925903EAC0039B979 /* CoreDataEncryptionTests.swift */; };
@@ -1136,16 +1092,20 @@
 		4B1E6EEE27AB5E5100F51793 /* PasswordManagementListSection.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B1E6EEC27AB5E5100F51793 /* PasswordManagementListSection.swift */; };
 		4B1E6EF127AB5E5D00F51793 /* NSPopUpButtonView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B1E6EEF27AB5E5D00F51793 /* NSPopUpButtonView.swift */; };
 		4B1E6EF227AB5E5D00F51793 /* PasswordManagementItemList.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B1E6EF027AB5E5D00F51793 /* PasswordManagementItemList.swift */; };
+		4B1EFF1C2BD71EEF007CC84F /* PixelKit in Frameworks */ = {isa = PBXBuildFile; productRef = 4B1EFF1B2BD71EEF007CC84F /* PixelKit */; };
+		4B1EFF1D2BD71FCA007CC84F /* UserDefaultsWrapper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 85C6A29525CC1FFD00EEB5F1 /* UserDefaultsWrapper.swift */; };
+		4B1EFF1E2BD72034007CC84F /* BundleExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6106B9D26A565DA0013B453 /* BundleExtension.swift */; };
+		4B1EFF1F2BD72170007CC84F /* OptionalExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = B637273C26CCF0C200C8CB02 /* OptionalExtension.swift */; };
+		4B1EFF212BD72189007CC84F /* Networking in Frameworks */ = {isa = PBXBuildFile; productRef = 4B1EFF202BD72189007CC84F /* Networking */; };
+		4B1EFF222BD7223D007CC84F /* NetworkProtectionPixelEvent.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BF0E5042AD2551A00FFEC9E /* NetworkProtectionPixelEvent.swift */; };
 		4B25375B2A11BE7300610219 /* NetworkExtension.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4B4D603E2A0B290200BCD287 /* NetworkExtension.framework */; };
 		4B2537722A11BF8B00610219 /* main.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B25376F2A11BF8B00610219 /* main.swift */; };
-		4B2537772A11BFE100610219 /* PixelKit in Frameworks */ = {isa = PBXBuildFile; productRef = 4B2537762A11BFE100610219 /* PixelKit */; };
 		4B25377A2A11C01700610219 /* UserText+NetworkProtectionExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B4D607C2A0B29FA00BCD287 /* UserText+NetworkProtectionExtensions.swift */; };
 		4B29759728281F0900187C4E /* FirefoxEncryptionKeyReader.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B29759628281F0900187C4E /* FirefoxEncryptionKeyReader.swift */; };
 		4B2975992828285900187C4E /* FirefoxKeyReaderTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B2975982828285900187C4E /* FirefoxKeyReaderTests.swift */; };
 		4B2D06292A11C0C900DE1F49 /* Bundle+VPN.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B4D605E2A0B29FA00BCD287 /* Bundle+VPN.swift */; };
 		4B2D062A2A11C0C900DE1F49 /* NetworkProtectionOptionKeyExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B4D605F2A0B29FA00BCD287 /* NetworkProtectionOptionKeyExtension.swift */; };
 		4B2D062C2A11C0E100DE1F49 /* Networking in Frameworks */ = {isa = PBXBuildFile; productRef = 4B2D062B2A11C0E100DE1F49 /* Networking */; };
-		4B2D062D2A11C12300DE1F49 /* Logging.swift in Sources */ = {isa = PBXBuildFile; fileRef = 85799C1725DEBB3F0007EC87 /* Logging.swift */; };
 		4B2D06322A11C1D300DE1F49 /* NSApplicationExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA5C8F622591021700748EB7 /* NSApplicationExtension.swift */; };
 		4B2D06332A11C1E300DE1F49 /* OptionalExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = B637273C26CCF0C200C8CB02 /* OptionalExtension.swift */; };
 		4B2D065B2A11D1FF00DE1F49 /* Logging.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B4BEC322A11B509001D9AC5 /* Logging.swift */; };
@@ -1155,7 +1115,6 @@
 		4B2D067F2A1334D700DE1F49 /* NetworkProtectionUI in Frameworks */ = {isa = PBXBuildFile; productRef = 4B2D067E2A1334D700DE1F49 /* NetworkProtectionUI */; };
 		4B2E7D6326FF9D6500D2DB17 /* PrintingUserScript.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B2E7D6226FF9D6500D2DB17 /* PrintingUserScript.swift */; };
 		4B2F565C2B38F93E001214C0 /* NetworkProtectionSubscriptionEventHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B2F565B2B38F93E001214C0 /* NetworkProtectionSubscriptionEventHandler.swift */; };
-		4B2F565D2B38F93E001214C0 /* NetworkProtectionSubscriptionEventHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B2F565B2B38F93E001214C0 /* NetworkProtectionSubscriptionEventHandler.swift */; };
 		4B379C1527BD91E3008A968E /* QuartzIdleStateProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B379C1427BD91E3008A968E /* QuartzIdleStateProvider.swift */; };
 		4B379C1E27BDB7FF008A968E /* DeviceAuthenticator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B379C1D27BDB7FF008A968E /* DeviceAuthenticator.swift */; };
 		4B379C2227BDBA29008A968E /* LocalAuthenticationService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B379C2127BDBA29008A968E /* LocalAuthenticationService.swift */; };
@@ -1171,11 +1130,6 @@
 		4B37EE762B4CFF3300A89A61 /* DataBrokerProtectionRemoteMessaging.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B37EE672B4CFC9500A89A61 /* DataBrokerProtectionRemoteMessaging.swift */; };
 		4B37EE772B4CFF3900A89A61 /* DataBrokerProtectionRemoteMessage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B37EE662B4CFC9500A89A61 /* DataBrokerProtectionRemoteMessage.swift */; };
 		4B37EE782B4CFF3900A89A61 /* DataBrokerProtectionRemoteMessage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B37EE662B4CFC9500A89A61 /* DataBrokerProtectionRemoteMessage.swift */; };
-		4B37EE792B4CFF6F00A89A61 /* DataBrokerProtectionRemoteMessage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B37EE662B4CFC9500A89A61 /* DataBrokerProtectionRemoteMessage.swift */; };
-		4B37EE7A2B4CFF7200A89A61 /* DataBrokerProtectionRemoteMessaging.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B37EE672B4CFC9500A89A61 /* DataBrokerProtectionRemoteMessaging.swift */; };
-		4B37EE7B2B4CFF7C00A89A61 /* HomePageRemoteMessagingStorage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B37EE5C2B4CFC3C00A89A61 /* HomePageRemoteMessagingStorage.swift */; };
-		4B37EE7C2B4CFF8000A89A61 /* HomePageRemoteMessagingRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B37EE5E2B4CFC3C00A89A61 /* HomePageRemoteMessagingRequest.swift */; };
-		4B37EE7D2B4CFF8300A89A61 /* SurveyURLBuilder.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B37EE5D2B4CFC3C00A89A61 /* SurveyURLBuilder.swift */; };
 		4B39AAF627D9B2C700A73FD5 /* NSStackViewExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B39AAF527D9B2C700A73FD5 /* NSStackViewExtension.swift */; };
 		4B3B8490297A0E1000A384BD /* EmailManagerExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B3B848F297A0E1000A384BD /* EmailManagerExtension.swift */; };
 		4B3F641E27A8D3BD00E0C118 /* BrowserProfileTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B3F641D27A8D3BD00E0C118 /* BrowserProfileTests.swift */; };
@@ -1185,10 +1139,8 @@
 		4B41EDA12B15437A001EEDF4 /* NetworkProtectionNotificationsPresenterFactory.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B41ED9F2B15437A001EEDF4 /* NetworkProtectionNotificationsPresenterFactory.swift */; };
 		4B41EDA32B1543B9001EEDF4 /* VPNPreferencesModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B41EDA22B1543B9001EEDF4 /* VPNPreferencesModel.swift */; };
 		4B41EDA42B1543B9001EEDF4 /* VPNPreferencesModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B41EDA22B1543B9001EEDF4 /* VPNPreferencesModel.swift */; };
-		4B41EDA52B1543B9001EEDF4 /* VPNPreferencesModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B41EDA22B1543B9001EEDF4 /* VPNPreferencesModel.swift */; };
 		4B41EDA72B1543C9001EEDF4 /* PreferencesVPNView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B41EDA62B1543C9001EEDF4 /* PreferencesVPNView.swift */; };
 		4B41EDA82B1543C9001EEDF4 /* PreferencesVPNView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B41EDA62B1543C9001EEDF4 /* PreferencesVPNView.swift */; };
-		4B41EDA92B1543C9001EEDF4 /* PreferencesVPNView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B41EDA62B1543C9001EEDF4 /* PreferencesVPNView.swift */; };
 		4B41EDAB2B1544B2001EEDF4 /* LoginItems in Frameworks */ = {isa = PBXBuildFile; productRef = 4B41EDAA2B1544B2001EEDF4 /* LoginItems */; };
 		4B41EDAE2B168AFF001EEDF4 /* VPNFeedbackFormViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B41EDAD2B168AFF001EEDF4 /* VPNFeedbackFormViewController.swift */; };
 		4B41EDAF2B168AFF001EEDF4 /* VPNFeedbackFormViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B41EDAD2B168AFF001EEDF4 /* VPNFeedbackFormViewController.swift */; };
@@ -1196,14 +1148,10 @@
 		4B41EDB22B168B1E001EEDF4 /* VPNFeedbackFormView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B41EDB02B168B1E001EEDF4 /* VPNFeedbackFormView.swift */; };
 		4B41EDB42B168C55001EEDF4 /* VPNFeedbackFormViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B41EDB32B168C55001EEDF4 /* VPNFeedbackFormViewModel.swift */; };
 		4B41EDB52B168C55001EEDF4 /* VPNFeedbackFormViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B41EDB32B168C55001EEDF4 /* VPNFeedbackFormViewModel.swift */; };
-		4B41EDB62B169883001EEDF4 /* VPNFeedbackFormViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B41EDAD2B168AFF001EEDF4 /* VPNFeedbackFormViewController.swift */; };
-		4B41EDB72B169887001EEDF4 /* VPNFeedbackFormView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B41EDB02B168B1E001EEDF4 /* VPNFeedbackFormView.swift */; };
-		4B41EDB82B169889001EEDF4 /* VPNFeedbackFormViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B41EDB32B168C55001EEDF4 /* VPNFeedbackFormViewModel.swift */; };
 		4B434690285ED7A100177407 /* BookmarksBarViewModelTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B43468F285ED7A100177407 /* BookmarksBarViewModelTests.swift */; };
 		4B43469528655D1400177407 /* FirefoxDataImporterTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B43469428655D1400177407 /* FirefoxDataImporterTests.swift */; };
 		4B44FEF32B1FEF5A000619D8 /* FocusableTextEditor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B44FEF22B1FEF5A000619D8 /* FocusableTextEditor.swift */; };
 		4B44FEF42B1FEF5A000619D8 /* FocusableTextEditor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B44FEF22B1FEF5A000619D8 /* FocusableTextEditor.swift */; };
-		4B44FEF52B1FEF5A000619D8 /* FocusableTextEditor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B44FEF22B1FEF5A000619D8 /* FocusableTextEditor.swift */; };
 		4B4BEC3D2A11B56B001D9AC5 /* DuckDuckGoNotificationsAppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B4BEC382A11B509001D9AC5 /* DuckDuckGoNotificationsAppDelegate.swift */; };
 		4B4BEC3E2A11B56E001D9AC5 /* Logging.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B4BEC322A11B509001D9AC5 /* Logging.swift */; };
 		4B4BEC412A11B5BD001D9AC5 /* NetworkProtectionUNNotificationsPresenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B4D60762A0B29FA00BCD287 /* NetworkProtectionUNNotificationsPresenter.swift */; };
@@ -1213,7 +1161,6 @@
 		4B4BEC482A11B61F001D9AC5 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 4B4BEC342A11B509001D9AC5 /* Assets.xcassets */; };
 		4B4D603F2A0B290200BCD287 /* NetworkExtension.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4B4D603E2A0B290200BCD287 /* NetworkExtension.framework */; };
 		4B4D60892A0B2A1C00BCD287 /* NetworkProtectionUNNotificationsPresenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B4D60762A0B29FA00BCD287 /* NetworkProtectionUNNotificationsPresenter.swift */; };
-		4B4D60982A0B2A5C00BCD287 /* PixelKit in Frameworks */ = {isa = PBXBuildFile; productRef = 4B4D60972A0B2A5C00BCD287 /* PixelKit */; };
 		4B4D609F2A0B2C7300BCD287 /* Logging.swift in Sources */ = {isa = PBXBuildFile; fileRef = 85799C1725DEBB3F0007EC87 /* Logging.swift */; };
 		4B4D60A02A0B2D5B00BCD287 /* Bundle+VPN.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B4D605E2A0B29FA00BCD287 /* Bundle+VPN.swift */; };
 		4B4D60A12A0B2D6100BCD287 /* NetworkProtectionOptionKeyExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B4D605F2A0B29FA00BCD287 /* NetworkProtectionOptionKeyExtension.swift */; };
@@ -1230,11 +1177,6 @@
 		4B4D60C12A0C848E00BCD287 /* NetworkProtectionControllerErrorStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B4D606A2A0B29FA00BCD287 /* NetworkProtectionControllerErrorStore.swift */; };
 		4B4D60C22A0C849000BCD287 /* EventMapping+NetworkProtectionError.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B4D60722A0B29FA00BCD287 /* EventMapping+NetworkProtectionError.swift */; };
 		4B4D60C32A0C849100BCD287 /* EventMapping+NetworkProtectionError.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B4D60722A0B29FA00BCD287 /* EventMapping+NetworkProtectionError.swift */; };
-		4B4D60C42A0C849600BCD287 /* NetworkProtectionInvitePresenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B4D606F2A0B29FA00BCD287 /* NetworkProtectionInvitePresenter.swift */; };
-		4B4D60C62A0C849600BCD287 /* NetworkProtectionInviteCodeViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B4D60702A0B29FA00BCD287 /* NetworkProtectionInviteCodeViewModel.swift */; };
-		4B4D60CA2A0C849600BCD287 /* NetworkProtectionInvitePresenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B4D606F2A0B29FA00BCD287 /* NetworkProtectionInvitePresenter.swift */; };
-		4B4D60CC2A0C849600BCD287 /* NetworkProtectionInviteCodeViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B4D60702A0B29FA00BCD287 /* NetworkProtectionInviteCodeViewModel.swift */; };
-		4B4D60CF2A0C849600BCD287 /* NetworkProtectionInviteDialog.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B4D606C2A0B29FA00BCD287 /* NetworkProtectionInviteDialog.swift */; };
 		4B4D60D32A0C84F700BCD287 /* UserText+NetworkProtection.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B4D60D22A0C84F700BCD287 /* UserText+NetworkProtection.swift */; };
 		4B4D60D42A0C84F700BCD287 /* UserText+NetworkProtection.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B4D60D22A0C84F700BCD287 /* UserText+NetworkProtection.swift */; };
 		4B4D60DD2A0C875E00BCD287 /* NetworkProtectionOptionKeyExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B4D605F2A0B29FA00BCD287 /* NetworkProtectionOptionKeyExtension.swift */; };
@@ -1245,7 +1187,6 @@
 		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 */; };
@@ -1258,16 +1199,12 @@
 		4B677433255DBEB800025BD8 /* httpsMobileV2Bloom.bin in Resources */ = {isa = PBXBuildFile; fileRef = 4B677428255DBEB800025BD8 /* httpsMobileV2Bloom.bin */; };
 		4B677435255DBEB800025BD8 /* httpsMobileV2FalsePositives.json in Resources */ = {isa = PBXBuildFile; fileRef = 4B67742A255DBEB800025BD8 /* httpsMobileV2FalsePositives.json */; };
 		4B677442255DBEEA00025BD8 /* Database.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B677440255DBEEA00025BD8 /* Database.swift */; };
-		4B67853F2AA7C726008A5004 /* DailyPixel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B67853E2AA7C726008A5004 /* DailyPixel.swift */; };
-		4B6785402AA7C726008A5004 /* DailyPixel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B67853E2AA7C726008A5004 /* DailyPixel.swift */; };
 		4B6785472AA8DE68008A5004 /* NetworkProtectionFeatureDisabler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B6785432AA8DE1F008A5004 /* NetworkProtectionFeatureDisabler.swift */; };
 		4B6785482AA8DE69008A5004 /* NetworkProtectionFeatureDisabler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B6785432AA8DE1F008A5004 /* NetworkProtectionFeatureDisabler.swift */; };
 		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 */; };
@@ -1282,11 +1219,8 @@
 		4B723E1226B0006E00E14D75 /* DataImport.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B723DEB26B0002B00E14D75 /* DataImport.swift */; };
 		4B723E1326B0007A00E14D75 /* CSVLoginExporter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B723DFD26B0002B00E14D75 /* CSVLoginExporter.swift */; };
 		4B723E1926B000DC00E14D75 /* TemporaryFileCreator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B723E1726B000DC00E14D75 /* TemporaryFileCreator.swift */; };
-		4B7534CC2A1FD7EA00158A99 /* NetworkProtectionInviteDialog.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B4D606C2A0B29FA00BCD287 /* NetworkProtectionInviteDialog.swift */; };
 		4B7A57CF279A4EF300B1C70E /* ChromiumPreferences.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B7A57CE279A4EF300B1C70E /* ChromiumPreferences.swift */; };
 		4B7A60A1273E0BE400BBDFEB /* WKWebsiteDataStoreExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B7A60A0273E0BE400BBDFEB /* WKWebsiteDataStoreExtension.swift */; };
-		4B81AD352B29512B00706C96 /* PixelKitTestingUtilities in Frameworks */ = {isa = PBXBuildFile; productRef = 4B81AD342B29512B00706C96 /* PixelKitTestingUtilities */; };
-		4B81AD372B29513100706C96 /* PixelKitTestingUtilities in Frameworks */ = {isa = PBXBuildFile; productRef = 4B81AD362B29513100706C96 /* PixelKitTestingUtilities */; };
 		4B85A48028821CC500FC4C39 /* NSPasteboardItemExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B85A47F28821CC500FC4C39 /* NSPasteboardItemExtension.swift */; };
 		4B8A4DFF27C83B29005F40E8 /* SaveIdentityViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B8A4DFE27C83B29005F40E8 /* SaveIdentityViewController.swift */; };
 		4B8A4E0127C8447E005F40E8 /* SaveIdentityPopover.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B8A4E0027C8447E005F40E8 /* SaveIdentityPopover.swift */; };
@@ -1331,692 +1265,6 @@
 		4B9292DB2667125D00AD2C21 /* ContextualMenu.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B9292DA2667125D00AD2C21 /* ContextualMenu.swift */; };
 		4B9579212AC687170062CA31 /* HardwareModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B9579202AC687170062CA31 /* HardwareModel.swift */; };
 		4B9579222AC687170062CA31 /* HardwareModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B9579202AC687170062CA31 /* HardwareModel.swift */; };
-		4B9579462AC7AE700062CA31 /* FaviconUserScript.swift in Sources */ = {isa = PBXBuildFile; fileRef = AAA0CC562539EBC90079BC96 /* FaviconUserScript.swift */; };
-		4B9579472AC7AE700062CA31 /* BWResponse.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1DDF076128F815AD00EDFBE3 /* BWResponse.swift */; };
-		4B9579482AC7AE700062CA31 /* LottieAnimationCache.swift in Sources */ = {isa = PBXBuildFile; fileRef = AADCBF3926F7C2CE00EF67A8 /* LottieAnimationCache.swift */; };
-		4B9579492AC7AE700062CA31 /* WaitlistDialogView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B9DB0182A983B24000927DB /* WaitlistDialogView.swift */; };
-		4B95794A2AC7AE700062CA31 /* TabIndex.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37D23779287EB8CA00BCE03B /* TabIndex.swift */; };
-		4B95794B2AC7AE700062CA31 /* SavePanelAccessoryView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B60C6F8C29B200AB007BFAA8 /* SavePanelAccessoryView.swift */; };
-		4B95794C2AC7AE700062CA31 /* TabLazyLoaderDataSource.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37534CA2281132CB002621E7 /* TabLazyLoaderDataSource.swift */; };
-		4B95794D2AC7AE700062CA31 /* LoginImport.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B723DF426B0002B00E14D75 /* LoginImport.swift */; };
-		4B95794E2AC7AE700062CA31 /* JoinWaitlistView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B9DB0172A983B24000927DB /* JoinWaitlistView.swift */; };
-		4B95794F2AC7AE700062CA31 /* LazyLoadable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37534C9F28113101002621E7 /* LazyLoadable.swift */; };
-		4B9579502AC7AE700062CA31 /* ClickToLoadModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = EAE427FF275D47FA00DAC26B /* ClickToLoadModel.swift */; };
-		4B9579512AC7AE700062CA31 /* KeyedCodingExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0230C0A2272080090018F728 /* KeyedCodingExtension.swift */; };
-		4B9579522AC7AE700062CA31 /* PrivacyDashboardTabExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6BF5D842946FFDA006742B1 /* PrivacyDashboardTabExtension.swift */; };
-		4B9579542AC7AE700062CA31 /* DownloadListStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6C0B22F26E61D630031CB7F /* DownloadListStore.swift */; };
-		4B9579552AC7AE700062CA31 /* Logging.swift in Sources */ = {isa = PBXBuildFile; fileRef = 85799C1725DEBB3F0007EC87 /* Logging.swift */; };
-		4B9579562AC7AE700062CA31 /* CrashReportPromptPresenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = AAC30A2D268F1EE300D2D9CD /* CrashReportPromptPresenter.swift */; };
-		4B9579572AC7AE700062CA31 /* BWCredential.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1DDF075C28F815AD00EDFBE3 /* BWCredential.swift */; };
-		4B9579582AC7AE700062CA31 /* PreferencesRootView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37AFCE8627DA334800471A10 /* PreferencesRootView.swift */; };
-		4B9579592AC7AE700062CA31 /* AppStateChangedPublisher.swift in Sources */ = {isa = PBXBuildFile; fileRef = B684590725C9027900DC17B6 /* AppStateChangedPublisher.swift */; };
-		4B95795A2AC7AE700062CA31 /* BookmarkTableCellView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B92928926670D1700AD2C21 /* BookmarkTableCellView.swift */; };
-		4B95795B2AC7AE700062CA31 /* BookmarkManagementSidebarViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B9292C72667123700AD2C21 /* BookmarkManagementSidebarViewController.swift */; };
-		4B95795C2AC7AE700062CA31 /* NSStackViewExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B39AAF527D9B2C700A73FD5 /* NSStackViewExtension.swift */; };
-		4B95795D2AC7AE700062CA31 /* OptionalExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = B637273C26CCF0C200C8CB02 /* OptionalExtension.swift */; };
-		4B95795E2AC7AE700062CA31 /* PasswordManagementLoginItemView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BE65471271FCD40008D1D63 /* PasswordManagementLoginItemView.swift */; };
-		4B95795F2AC7AE700062CA31 /* UserText.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA80EC53256BE3BC007083E7 /* UserText.swift */; };
-		4B9579602AC7AE700062CA31 /* WKWebView+Download.swift in Sources */ = {isa = PBXBuildFile; fileRef = B61EF3EB266F91E700B4D78F /* WKWebView+Download.swift */; };
-		4B9579612AC7AE700062CA31 /* TabShadowConfig.swift in Sources */ = {isa = PBXBuildFile; fileRef = 311B262628E73E0A00FD181A /* TabShadowConfig.swift */; };
-		4B9579622AC7AE700062CA31 /* URLSessionExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6DB3AEE278D5C370024C5C4 /* URLSessionExtension.swift */; };
-		4B9579632AC7AE700062CA31 /* WKWebsiteDataStoreExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B7A60A0273E0BE400BBDFEB /* WKWebsiteDataStoreExtension.swift */; };
-		4B9579642AC7AE700062CA31 /* WindowDraggingView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B693954526F04BEA0015B914 /* WindowDraggingView.swift */; };
-		4B9579652AC7AE700062CA31 /* SecureVaultSorting.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B1E6EEB27AB5E5100F51793 /* SecureVaultSorting.swift */; };
-		4B9579662AC7AE700062CA31 /* PreferencesSidebarModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37CD54C627F2FDD100F1F7B9 /* PreferencesSidebarModel.swift */; };
-		4B9579672AC7AE700062CA31 /* DuckPlayerURLExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3767190128E724B2003A2A15 /* DuckPlayerURLExtension.swift */; };
-		4B9579682AC7AE700062CA31 /* BWEncryptionOutput.m in Sources */ = {isa = PBXBuildFile; fileRef = 1D43EB31292788C70065E5D6 /* BWEncryptionOutput.m */; };
-		4B9579692AC7AE700062CA31 /* PermissionState.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6106BAC26A7BF390013B453 /* PermissionState.swift */; };
-		4B95796A2AC7AE700062CA31 /* FeedbackPresenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 371C0A2827E33EDC0070591F /* FeedbackPresenter.swift */; };
-		4B95796B2AC7AE700062CA31 /* NavigationProtectionTabExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = B66260DC29AC5D4300E9E3EE /* NavigationProtectionTabExtension.swift */; };
-		4B95796C2AC7AE700062CA31 /* BurnerMode.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1D1A33482A6FEB170080ACED /* BurnerMode.swift */; };
-		4B95796D2AC7AE700062CA31 /* UserAgent.swift in Sources */ = {isa = PBXBuildFile; fileRef = 14505A07256084EF00272CC6 /* UserAgent.swift */; };
-		4B95796E2AC7AE700062CA31 /* LegacyBookmarkStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = 987799EF2999993C005D8EB6 /* LegacyBookmarkStore.swift */; };
-		4B95796F2AC7AE700062CA31 /* NSAlert+DataImport.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B8AC93426B3B2FD00879451 /* NSAlert+DataImport.swift */; };
-		4B9579702AC7AE700062CA31 /* MainWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA7412BC24D2BEEE00D22FE0 /* MainWindow.swift */; };
-		4B9579712AC7AE700062CA31 /* CrashReportPromptViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = AAD6D8862696DF6D002393B3 /* CrashReportPromptViewController.swift */; };
-		4B9579722AC7AE700062CA31 /* BookmarksCleanupErrorHandling.swift in Sources */ = {isa = PBXBuildFile; fileRef = 379E877529E98729001C8BB0 /* BookmarksCleanupErrorHandling.swift */; };
-		4B9579732AC7AE700062CA31 /* ContextMenuManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6DA06E32913ECEE00225DE2 /* ContextMenuManager.swift */; };
-		4B9579742AC7AE700062CA31 /* GradientView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B693954326F04BE90015B914 /* GradientView.swift */; };
-		4B9579752AC7AE700062CA31 /* PreferencesSidebar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37AFCE8427DA2D3900471A10 /* PreferencesSidebar.swift */; };
-		4B9579762AC7AE700062CA31 /* HoveredLinkTabExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6C00ED4292FB21E009C73A6 /* HoveredLinkTabExtension.swift */; };
-		4B9579772AC7AE700062CA31 /* NSPointExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA5C8F5D2590EEE800748EB7 /* NSPointExtension.swift */; };
-		4B9579782AC7AE700062CA31 /* WindowsManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA6EF9AC25066F42004754E6 /* WindowsManager.swift */; };
-		4B9579792AC7AE700062CA31 /* BWRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1D43EB39292B63B00065E5D6 /* BWRequest.swift */; };
-		4B95797A2AC7AE700062CA31 /* WKWebViewConfigurationExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = B68458CC25C7EB9000DC17B6 /* WKWebViewConfigurationExtensions.swift */; };
-		4B95797B2AC7AE700062CA31 /* HomePageDefaultBrowserModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 85AC7ADC27BEB6EE00FFB69B /* HomePageDefaultBrowserModel.swift */; };
-		4B95797C2AC7AE700062CA31 /* CrashReporter.swift in Sources */ = {isa = PBXBuildFile; fileRef = AAC30A25268DFEE200D2D9CD /* CrashReporter.swift */; };
-		4B95797D2AC7AE700062CA31 /* AddressBarTextSelectionNavigation.swift in Sources */ = {isa = PBXBuildFile; fileRef = B60D64482AAF1B7C00B26F50 /* AddressBarTextSelectionNavigation.swift */; };
-		4B95797E2AC7AE700062CA31 /* BadgeNotificationAnimationModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3184AC6C288F29D800C35E4B /* BadgeNotificationAnimationModel.swift */; };
-		4B95797F2AC7AE700062CA31 /* HyperLink.swift in Sources */ = {isa = PBXBuildFile; fileRef = 857FFEBF27D239DC00415E7A /* HyperLink.swift */; };
-		4B9579802AC7AE700062CA31 /* SyncDataProviders.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37445F982A1566420029F789 /* SyncDataProviders.swift */; };
-		4B9579812AC7AE700062CA31 /* PasteboardWriting.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B92929A26670D2A00AD2C21 /* PasteboardWriting.swift */; };
-		4B9579822AC7AE700062CA31 /* BookmarkOutlineCellView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B92928726670D1600AD2C21 /* BookmarkOutlineCellView.swift */; };
-		4B9579832AC7AE700062CA31 /* UnprotectedDomains.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = B604085A274B8CA300680351 /* UnprotectedDomains.xcdatamodeld */; };
-		4B9579842AC7AE700062CA31 /* TabInstrumentation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BB88B4F25B7BA2B006F6B06 /* TabInstrumentation.swift */; };
-		4B9579872AC7AE700062CA31 /* ConfigurationManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 85D33F1125C82EB3002B91A6 /* ConfigurationManager.swift */; };
-		4B9579882AC7AE700062CA31 /* YoutubePlayerUserScript.swift in Sources */ = {isa = PBXBuildFile; fileRef = 31F28C4C28C8EEC500119F70 /* YoutubePlayerUserScript.swift */; };
-		4B9579892AC7AE700062CA31 /* PixelParameters.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6A9E48326146AAB0067D1B9 /* PixelParameters.swift */; };
-		4B95798B2AC7AE700062CA31 /* FaviconImageCache.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA5FA696275F90C400DCE9C9 /* FaviconImageCache.swift */; };
-		4B95798C2AC7AE700062CA31 /* TabBarViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1430DFF424D0580F00B8978C /* TabBarViewController.swift */; };
-		4B95798D2AC7AE700062CA31 /* BookmarkOutlineViewDataSource.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B92929126670D2A00AD2C21 /* BookmarkOutlineViewDataSource.swift */; };
-		4B95798E2AC7AE700062CA31 /* DataImportStatusProviding.swift in Sources */ = {isa = PBXBuildFile; fileRef = 56D145EA29E6C99B00E3488A /* DataImportStatusProviding.swift */; };
-		4B95798F2AC7AE700062CA31 /* PasswordManagementBitwardenItemView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 31D5375B291D944100407A95 /* PasswordManagementBitwardenItemView.swift */; };
-		4B9579912AC7AE700062CA31 /* NSNotificationName+PasswordManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 85D885AF26A590A90077C374 /* NSNotificationName+PasswordManager.swift */; };
-		4B9579922AC7AE700062CA31 /* RulesCompilationMonitor.swift in Sources */ = {isa = PBXBuildFile; fileRef = B610F2BA27A145C500FCEBE9 /* RulesCompilationMonitor.swift */; };
-		4B9579932AC7AE700062CA31 /* FBProtectionTabExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6D574B329472253008ED1B6 /* FBProtectionTabExtension.swift */; };
-		4B9579942AC7AE700062CA31 /* CrashReportReader.swift in Sources */ = {isa = PBXBuildFile; fileRef = AAC30A27268E045400D2D9CD /* CrashReportReader.swift */; };
-		4B9579952AC7AE700062CA31 /* DataTaskProviding.swift in Sources */ = {isa = PBXBuildFile; fileRef = 85AC3B3425DA82A600C7D2AA /* DataTaskProviding.swift */; };
-		4B9579962AC7AE700062CA31 /* FeatureFlag.swift in Sources */ = {isa = PBXBuildFile; fileRef = EECE10E429DD77E60044D027 /* FeatureFlag.swift */; };
-		4B9579972AC7AE700062CA31 /* FeedbackViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA3D531627A1EEED00074EC1 /* FeedbackViewController.swift */; };
-		4B9579982AC7AE700062CA31 /* FaviconSelector.swift in Sources */ = {isa = PBXBuildFile; fileRef = AAEF6BC7276A081C0024DCF4 /* FaviconSelector.swift */; };
-		4B95799A2AC7AE700062CA31 /* PrintingUserScript.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B2E7D6226FF9D6500D2DB17 /* PrintingUserScript.swift */; };
-		4B95799B2AC7AE700062CA31 /* ConnectBitwardenViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BBDEE9028FC14760092FAA6 /* ConnectBitwardenViewController.swift */; };
-		4B95799C2AC7AE700062CA31 /* BWManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1DDF075E28F815AD00EDFBE3 /* BWManager.swift */; };
-		4B95799D2AC7AE700062CA31 /* AppTrackerDataSetProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9833912E27AAA3CE00DAF119 /* AppTrackerDataSetProvider.swift */; };
-		4B95799E2AC7AE700062CA31 /* EncryptionKeyGeneration.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BA1A6B2258B080A00F6F690 /* EncryptionKeyGeneration.swift */; };
-		4B95799F2AC7AE700062CA31 /* TabLazyLoader.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37B11B3828095E6600CBB621 /* TabLazyLoader.swift */; };
-		4B9579A02AC7AE700062CA31 /* InvitedToWaitlistView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B9DB0162A983B24000927DB /* InvitedToWaitlistView.swift */; };
-		4B9579A22AC7AE700062CA31 /* SaveCredentialsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8589063B267BCDC000D23B0D /* SaveCredentialsViewController.swift */; };
-		4B9579A32AC7AE700062CA31 /* PopUpButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BBE0AA627B9B027003B37A8 /* PopUpButton.swift */; };
-		4B9579A42AC7AE700062CA31 /* NetworkProtectionInviteDialog.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B4D606C2A0B29FA00BCD287 /* NetworkProtectionInviteDialog.swift */; };
-		4B9579A52AC7AE700062CA31 /* SuggestionViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = AABEE6A424AA0A7F0043105B /* SuggestionViewController.swift */; };
-		4B9579A82AC7AE700062CA31 /* BWKeyStorage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1D6216B129069BBF00386B2C /* BWKeyStorage.swift */; };
-		4B9579A92AC7AE700062CA31 /* VisitViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA7E919E287872EA00AB6B62 /* VisitViewModel.swift */; };
-		4B9579AA2AC7AE700062CA31 /* AddressBarTextEditor.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6676BE02AA986A700525A21 /* AddressBarTextEditor.swift */; };
-		4B9579AB2AC7AE700062CA31 /* Atb.swift in Sources */ = {isa = PBXBuildFile; fileRef = B69B50352726A11F00758A2B /* Atb.swift */; };
-		4B9579AC2AC7AE700062CA31 /* BrowserTabView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6C0BB6929AF1C7000AE8E3C /* BrowserTabView.swift */; };
-		4B9579AD2AC7AE700062CA31 /* DownloadsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6B1E87F26D5DA9B0062C350 /* DownloadsViewController.swift */; };
-		4B9579AE2AC7AE700062CA31 /* DataExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 85AC3AF625D5DBFD00C7D2AA /* DataExtension.swift */; };
-		4B9579AF2AC7AE700062CA31 /* ConfigurationStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = 85480FCE25D1AA22009424E3 /* ConfigurationStore.swift */; };
-		4B9579B02AC7AE700062CA31 /* Feedback.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA3D531A27A2F57E00074EC1 /* Feedback.swift */; };
-		4B9579B22AC7AE700062CA31 /* FirefoxFaviconsReader.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B0A63E7289DB58E00378EF7 /* FirefoxFaviconsReader.swift */; };
-		4B9579B32AC7AE700062CA31 /* CopyHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 858A798226A8B75F00A75A42 /* CopyHandler.swift */; };
-		4B9579B42AC7AE700062CA31 /* ContentBlockingRulesUpdateObserver.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1E7E2E8F29029A2A00C01B54 /* ContentBlockingRulesUpdateObserver.swift */; };
-		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 */; };
-		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 */; };
-		4B9579BC2AC7AE700062CA31 /* WKBackForwardListExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = B602E7CE2A93A5FF00F12201 /* WKBackForwardListExtension.swift */; };
-		4B9579BD2AC7AE700062CA31 /* ChromiumDataImporter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B59023B26B35F3600489384 /* ChromiumDataImporter.swift */; };
-		4B9579BE2AC7AE700062CA31 /* BackForwardListItemViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = AAA0CC3B25337FAB0079BC96 /* BackForwardListItemViewModel.swift */; };
-		4B9579BF2AC7AE700062CA31 /* BWNotRespondingAlert.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1D43EB3329297D760065E5D6 /* BWNotRespondingAlert.swift */; };
-		4B9579C02AC7AE700062CA31 /* DebugUserScript.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BB88B4425B7B55C006F6B06 /* DebugUserScript.swift */; };
-		4B9579C12AC7AE700062CA31 /* RecentlyClosedTab.swift in Sources */ = {isa = PBXBuildFile; fileRef = AAC6881828626BF800D54247 /* RecentlyClosedTab.swift */; };
-		4B9579C22AC7AE700062CA31 /* PDFSearchTextMenuItemHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = B688B4DE27420D290087BEAF /* PDFSearchTextMenuItemHandler.swift */; };
-		4B9579C42AC7AE700062CA31 /* HistoryMenu.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA7E919628746BCC00AB6B62 /* HistoryMenu.swift */; };
-		4B9579C52AC7AE700062CA31 /* ContentScopeFeatureFlagging.swift in Sources */ = {isa = PBXBuildFile; fileRef = F4A6198B283CFFBB007F2080 /* ContentScopeFeatureFlagging.swift */; };
-		4B9579C62AC7AE700062CA31 /* OnboardingButtonStyles.swift in Sources */ = {isa = PBXBuildFile; fileRef = 85707F23276A332A00DC0649 /* OnboardingButtonStyles.swift */; };
-		4B9579C72AC7AE700062CA31 /* SaveIdentityPopover.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B8A4E0027C8447E005F40E8 /* SaveIdentityPopover.swift */; };
-		4B9579C82AC7AE700062CA31 /* AuthenticationAlert.swift in Sources */ = {isa = PBXBuildFile; fileRef = B637273A26CBC8AF00C8CB02 /* AuthenticationAlert.swift */; };
-		4B9579C92AC7AE700062CA31 /* SetExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1DFAB51C2A8982A600A0F7F6 /* SetExtension.swift */; };
-		4B9579CA2AC7AE700062CA31 /* YoutubePlayerNavigationHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 315AA06F28CA5CC800200030 /* YoutubePlayerNavigationHandler.swift */; };
-		4B9579CB2AC7AE700062CA31 /* PreferencesAboutView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37AFCE9127DB8CAD00471A10 /* PreferencesAboutView.swift */; };
-		4B9579CC2AC7AE700062CA31 /* ContentBlocking.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9826B09F2747DF3D0092F683 /* ContentBlocking.swift */; };
-		4B9579CD2AC7AE700062CA31 /* LocalAuthenticationService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B379C2127BDBA29008A968E /* LocalAuthenticationService.swift */; };
-		4B9579CE2AC7AE700062CA31 /* CredentialsCleanupErrorHandling.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37CEFCA82A6737A2001EF741 /* CredentialsCleanupErrorHandling.swift */; };
-		4B9579CF2AC7AE700062CA31 /* SafariBookmarksReader.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BB99CFC26FE191E001E4761 /* SafariBookmarksReader.swift */; };
-		4B9579D02AC7AE700062CA31 /* HTTPCookie.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1DA6D0FC2A1FF9A100540406 /* HTTPCookie.swift */; };
-		4B9579D12AC7AE700062CA31 /* SafariVersionReader.swift in Sources */ = {isa = PBXBuildFile; fileRef = AACF6FD526BC366D00CF09F9 /* SafariVersionReader.swift */; };
-		4B9579D22AC7AE700062CA31 /* LoginFaviconView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BE65484271FCD7B008D1D63 /* LoginFaviconView.swift */; };
-		4B9579D32AC7AE700062CA31 /* FireproofDomainsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B0511B4262CAA5A00F6079C /* FireproofDomainsViewController.swift */; };
-		4B9579D42AC7AE700062CA31 /* URLEventHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA4D700625545EF800C3411E /* URLEventHandler.swift */; };
-		4B9579D52AC7AE700062CA31 /* SupportedOsChecker.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1D8057C72A83CAEE00F4FED6 /* SupportedOsChecker.swift */; };
-		4B9579D62AC7AE700062CA31 /* WKWebViewExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA92127625ADA07900600CD4 /* WKWebViewExtension.swift */; };
-		4B9579D72AC7AE700062CA31 /* CleanThisHistoryMenuItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = AAAB9113288EB1D600A057A9 /* CleanThisHistoryMenuItem.swift */; };
-		4B9579D92AC7AE700062CA31 /* DownloadListItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6C0B23526E732000031CB7F /* DownloadListItem.swift */; };
-		4B9579DA2AC7AE700062CA31 /* WaitlistRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B9DB00A2A983B24000927DB /* WaitlistRequest.swift */; };
-		4B9579DB2AC7AE700062CA31 /* DownloadsPopover.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6B1E87D26D5DA0E0062C350 /* DownloadsPopover.swift */; };
-		4B9579DC2AC7AE700062CA31 /* BookmarksBarMenuFactory.swift in Sources */ = {isa = PBXBuildFile; fileRef = 85774AFE2A713D3B00DE0561 /* BookmarksBarMenuFactory.swift */; };
-		4B9579DD2AC7AE700062CA31 /* SpacerNode.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B92929626670D2A00AD2C21 /* SpacerNode.swift */; };
-		4B9579DF2AC7AE700062CA31 /* SyncManagementDialogViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3775913529AB9A1C00E26367 /* SyncManagementDialogViewController.swift */; };
-		4B9579E02AC7AE700062CA31 /* BookmarkExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6C0BB6629AEFF8100AE8E3C /* BookmarkExtension.swift */; };
-		4B9579E12AC7AE700062CA31 /* PasswordManagementCreditCardModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BE6547B271FCD4D008D1D63 /* PasswordManagementCreditCardModel.swift */; };
-		4B9579E22AC7AE700062CA31 /* NSEventExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 31B4AF522901A4F20013585E /* NSEventExtension.swift */; };
-		4B9579E32AC7AE700062CA31 /* Onboarding.swift in Sources */ = {isa = PBXBuildFile; fileRef = 85707F25276A335700DC0649 /* Onboarding.swift */; };
-		4B9579E42AC7AE700062CA31 /* PopUpWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = B68C92C0274E3EF4002AC6B0 /* PopUpWindow.swift */; };
-		4B9579E52AC7AE700062CA31 /* Favicons.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = AA5FA69E275F948900DCE9C9 /* Favicons.xcdatamodeld */; };
-		4B9579E62AC7AE700062CA31 /* Publisher.asVoid.swift in Sources */ = {isa = PBXBuildFile; fileRef = B684592125C93BE000DC17B6 /* Publisher.asVoid.swift */; };
-		4B9579E72AC7AE700062CA31 /* Waitlist.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B9DB0072A983B23000927DB /* Waitlist.swift */; };
-		4B9579E82AC7AE700062CA31 /* NavigationButtonMenuDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = AAA0CC32252F181A0079BC96 /* NavigationButtonMenuDelegate.swift */; };
-		4B9579E92AC7AE700062CA31 /* CrashReport.swift in Sources */ = {isa = PBXBuildFile; fileRef = AAC30A29268E239100D2D9CD /* CrashReport.swift */; };
-		4B9579EA2AC7AE700062CA31 /* NSPopoverExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1D6A491F29CF7A490011DF74 /* NSPopoverExtension.swift */; };
-		4B9579EB2AC7AE700062CA31 /* NSPathControlView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37CC53F327E8D4620028713D /* NSPathControlView.swift */; };
-		4B9579EC2AC7AE700062CA31 /* HTTPSUpgradeTabExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6BF5D8829470BC4006742B1 /* HTTPSUpgradeTabExtension.swift */; };
-		4B9579ED2AC7AE700062CA31 /* AppIconChanger.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1D36E65A298ACD2900AA485D /* AppIconChanger.swift */; };
-		4B9579EE2AC7AE700062CA31 /* AppMain.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B4D60E12A0C883A00BCD287 /* AppMain.swift */; };
-		4B9579EF2AC7AE700062CA31 /* ProductWaitlistRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B9DB0092A983B23000927DB /* ProductWaitlistRequest.swift */; };
-		4B9579F02AC7AE700062CA31 /* Bookmark.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = 987799FC29999B64005D8EB6 /* Bookmark.xcdatamodeld */; };
-		4B9579F12AC7AE700062CA31 /* DefaultBrowserPromptView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 85589E9D27BFE4500038AD11 /* DefaultBrowserPromptView.swift */; };
-		4B9579F22AC7AE700062CA31 /* WaitlistActivationDateStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B4032832AAAC24400CCA602 /* WaitlistActivationDateStore.swift */; };
-		4B9579F42AC7AE700062CA31 /* FaviconManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA512D1324D99D9800230283 /* FaviconManager.swift */; };
-		4B9579F52AC7AE700062CA31 /* PFMoveApplication.m in Sources */ = {isa = PBXBuildFile; fileRef = 7BB108582A43375D000AB95F /* PFMoveApplication.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
-		4B9579F62AC7AE700062CA31 /* ChromiumFaviconsReader.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B0AACAB28BC63ED001038AC /* ChromiumFaviconsReader.swift */; };
-		4B9579F72AC7AE700062CA31 /* SuggestionTableRowView.swift in Sources */ = {isa = PBXBuildFile; fileRef = AABEE6AA24ACA0F90043105B /* SuggestionTableRowView.swift */; };
-		4B9579F82AC7AE700062CA31 /* DownloadsPreferences.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37CD54C327F2FDD100F1F7B9 /* DownloadsPreferences.swift */; };
-		4B9579F92AC7AE700062CA31 /* PasswordManagementItemList.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B1E6EF027AB5E5D00F51793 /* PasswordManagementItemList.swift */; };
-		4B9579FA2AC7AE700062CA31 /* Bookmark.swift in Sources */ = {isa = PBXBuildFile; fileRef = AAC5E4CD25D6A709007F5990 /* Bookmark.swift */; };
-		4B9579FB2AC7AE700062CA31 /* ConnectBitwardenViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BBDEE8F28FC14760092FAA6 /* ConnectBitwardenViewModel.swift */; };
-		4B9579FC2AC7AE700062CA31 /* NSNotificationName+DataImport.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B5A4F4B27F3A5AA008FBD88 /* NSNotificationName+DataImport.swift */; };
-		4B9579FD2AC7AE700062CA31 /* StoredPermission.swift in Sources */ = {isa = PBXBuildFile; fileRef = B64C853726944B880048FEBE /* StoredPermission.swift */; };
-		4B9579FE2AC7AE700062CA31 /* FirePopoverCollectionViewHeader.swift in Sources */ = {isa = PBXBuildFile; fileRef = AAE246F7270A406200BEEAEE /* FirePopoverCollectionViewHeader.swift */; };
-		4B9579FF2AC7AE700062CA31 /* FireViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = AAB7320826DD0CD9002FACF9 /* FireViewController.swift */; };
-		4B957A002AC7AE700062CA31 /* OutlineSeparatorViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B92928626670D1600AD2C21 /* OutlineSeparatorViewCell.swift */; };
-		4B957A012AC7AE700062CA31 /* SafariDataImporter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BB99CFD26FE191E001E4761 /* SafariDataImporter.swift */; };
-		4B957A022AC7AE700062CA31 /* WaitlistViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B9DB00C2A983B24000927DB /* WaitlistViewModel.swift */; };
-		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 /* 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 */; };
-		4B957A0B2AC7AE700062CA31 /* NavigationBarBadgeAnimator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 31CF3431288B0B1B0087244B /* NavigationBarBadgeAnimator.swift */; };
-		4B957A0C2AC7AE700062CA31 /* NSTextViewExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 858A798426A8BB5D00A75A42 /* NSTextViewExtension.swift */; };
-		4B957A0D2AC7AE700062CA31 /* FutureExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = B634DBE6293C98C500C3C99E /* FutureExtension.swift */; };
-		4B957A0E2AC7AE700062CA31 /* UserDialogRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = B634DBE2293C8FFF00C3C99E /* UserDialogRequest.swift */; };
-		4B957A0F2AC7AE700062CA31 /* DownloadsCellView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6B1E88326D5EB570062C350 /* DownloadsCellView.swift */; };
-		4B957A112AC7AE700062CA31 /* PublishedAfter.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6AAAC2C260330580029438D /* PublishedAfter.swift */; };
-		4B957A122AC7AE700062CA31 /* FirefoxBerkeleyDatabaseReader.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3701C9CD29BD040900305B15 /* FirefoxBerkeleyDatabaseReader.swift */; };
-		4B957A132AC7AE700062CA31 /* WebViewSnapshotView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37054FCD2876472D00033B6F /* WebViewSnapshotView.swift */; };
-		4B957A142AC7AE700062CA31 /* DeviceAuthenticationService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BBC169F27C4859400E00A38 /* DeviceAuthenticationService.swift */; };
-		4B957A152AC7AE700062CA31 /* AppConfigurationURLProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = CB24F70B29A3D9CB006DCC58 /* AppConfigurationURLProvider.swift */; };
-		4B957A162AC7AE700062CA31 /* SyncSettingsAdapter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37CBCA992A8966E60050218F /* SyncSettingsAdapter.swift */; };
-		4B957A172AC7AE700062CA31 /* AutofillPreferences.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3776582E27F82E62009A6B35 /* AutofillPreferences.swift */; };
-		4B957A192AC7AE700062CA31 /* PasswordManagerCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1D074B262909A433006E4AC3 /* PasswordManagerCoordinator.swift */; };
-		4B957A1A2AC7AE700062CA31 /* PasswordManagementIdentityModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BE6547A271FCD4D008D1D63 /* PasswordManagementIdentityModel.swift */; };
-		4B957A1B2AC7AE700062CA31 /* UserDefaultsWrapper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 85C6A29525CC1FFD00EEB5F1 /* UserDefaultsWrapper.swift */; };
-		4B957A1C2AC7AE700062CA31 /* PasswordManagementPopover.swift in Sources */ = {isa = PBXBuildFile; fileRef = 85625997269C9C5F00EE44BC /* PasswordManagementPopover.swift */; };
-		4B957A1D2AC7AE700062CA31 /* BWCommunicator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1DDF075D28F815AD00EDFBE3 /* BWCommunicator.swift */; };
-		4B957A1E2AC7AE700062CA31 /* HomePageRecentlyVisitedModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 85589E9027BFB9810038AD11 /* HomePageRecentlyVisitedModel.swift */; };
-		4B957A1F2AC7AE700062CA31 /* NavigationBarPopovers.swift in Sources */ = {isa = PBXBuildFile; fileRef = 85012B0129133F9F003D0DCC /* NavigationBarPopovers.swift */; };
-		4B957A202AC7AE700062CA31 /* CancellableExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = B626A75F2992407C00053070 /* CancellableExtension.swift */; };
-		4B957A212AC7AE700062CA31 /* PinnedTabsHostingView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37D23783287F4D6A00BCE03B /* PinnedTabsHostingView.swift */; };
-		4B957A222AC7AE700062CA31 /* FirefoxBookmarksReader.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BB99CF526FE191E001E4761 /* FirefoxBookmarksReader.swift */; };
-		4B957A232AC7AE700062CA31 /* DeviceIdleStateDetector.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BBC16A127C485BC00E00A38 /* DeviceIdleStateDetector.swift */; };
-		4B957A242AC7AE700062CA31 /* FlatButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B379C2327BDE1B0008A968E /* FlatButton.swift */; };
-		4B957A252AC7AE700062CA31 /* PinnedTabView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37054FC82873301700033B6F /* PinnedTabView.swift */; };
-		4B957A262AC7AE700062CA31 /* DataEncryption.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BA1A69F258B079600F6F690 /* DataEncryption.swift */; };
-		4B957A272AC7AE700062CA31 /* PrivacyDashboardPopover.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6FA8940269C425400588ECD /* PrivacyDashboardPopover.swift */; };
-		4B957A282AC7AE700062CA31 /* TestsClosureNavigationResponder.swift in Sources */ = {isa = PBXBuildFile; fileRef = B626A76C29928B1600053070 /* TestsClosureNavigationResponder.swift */; };
-		4B957A292AC7AE700062CA31 /* RootView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 85B7184D27677CBB00B4277F /* RootView.swift */; };
-		4B957A2A2AC7AE700062CA31 /* AddressBarTextField.swift in Sources */ = {isa = PBXBuildFile; fileRef = AABEE6AE24AD22B90043105B /* AddressBarTextField.swift */; };
-		4B957A2B2AC7AE700062CA31 /* FocusRingView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B693953E26F04BE70015B914 /* FocusRingView.swift */; };
-		4B957A2C2AC7AE700062CA31 /* BookmarksBarViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BE41A5D28446EAD00760399 /* BookmarksBarViewModel.swift */; };
-		4B957A2D2AC7AE700062CA31 /* NSPopUpButtonView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B1E6EEF27AB5E5D00F51793 /* NSPopUpButtonView.swift */; };
-		4B957A2E2AC7AE700062CA31 /* BlockMenuItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 85774B022A71CDD000DE0561 /* BlockMenuItem.swift */; };
-		4B957A2F2AC7AE700062CA31 /* ContextualMenu.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B9292DA2667125D00AD2C21 /* ContextualMenu.swift */; };
-		4B957A302AC7AE700062CA31 /* NavigationBarViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA68C3D22490ED62001B8783 /* NavigationBarViewController.swift */; };
-		4B957A312AC7AE700062CA31 /* MainViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA585DAE2490E6E600E9A3E2 /* MainViewController.swift */; };
-		4B957A322AC7AE700062CA31 /* DuckPlayer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37F19A6928E2F2D000740DC6 /* DuckPlayer.swift */; };
-		4B957A332AC7AE700062CA31 /* Favicon.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA5FA699275F91C700DCE9C9 /* Favicon.swift */; };
-		4B957A342AC7AE700062CA31 /* SuggestionContainerViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = AABEE69924A902A90043105B /* SuggestionContainerViewModel.swift */; };
-		4B957A352AC7AE700062CA31 /* FirePopoverWrapperViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA840A9727319D1600E63CDD /* FirePopoverWrapperViewController.swift */; };
-		4B957A362AC7AE700062CA31 /* NSPasteboardItemExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B85A47F28821CC500FC4C39 /* NSPasteboardItemExtension.swift */; };
-		4B957A372AC7AE700062CA31 /* AutofillPreferencesModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37CD54C227F2FDD100F1F7B9 /* AutofillPreferencesModel.swift */; };
-		4B957A382AC7AE700062CA31 /* NetworkProtectionDebugUtilities.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7BBD45B02A691AB500C83CA9 /* NetworkProtectionDebugUtilities.swift */; };
-		4B957A392AC7AE700062CA31 /* NSException+Catch.swift in Sources */ = {isa = PBXBuildFile; fileRef = B657841E25FA497600D8DB33 /* NSException+Catch.swift */; };
-		4B957A3A2AC7AE700062CA31 /* PasswordManagementNoteModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BE6547D271FCD4D008D1D63 /* PasswordManagementNoteModel.swift */; };
-		4B957A3B2AC7AE700062CA31 /* CookieNotificationAnimationModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3184AC6E288F2A1100C35E4B /* CookieNotificationAnimationModel.swift */; };
-		4B957A3C2AC7AE700062CA31 /* JoinedWaitlistView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B9DB0152A983B24000927DB /* JoinedWaitlistView.swift */; };
-		4B957A3D2AC7AE700062CA31 /* SharingMenu.swift in Sources */ = {isa = PBXBuildFile; fileRef = B63ED0E426BB8FB900A9DAD1 /* SharingMenu.swift */; };
-		4B957A3E2AC7AE700062CA31 /* EnableWaitlistFeatureView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B9DB0132A983B24000927DB /* EnableWaitlistFeatureView.swift */; };
-		4B957A3F2AC7AE700062CA31 /* GrammarFeaturesManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA4FF40B2624751A004E2377 /* GrammarFeaturesManager.swift */; };
-		4B957A402AC7AE700062CA31 /* WaitlistModalViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B9DB0192A983B24000927DB /* WaitlistModalViewController.swift */; };
-		4B957A412AC7AE700062CA31 /* WKMenuItemIdentifier.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6DA06E7291401D700225DE2 /* WKMenuItemIdentifier.swift */; };
-		4B957A422AC7AE700062CA31 /* SafariFaviconsReader.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B0AACAD28BC6FD0001038AC /* SafariFaviconsReader.swift */; };
-		4B957A432AC7AE700062CA31 /* NSScreenExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6B3E0DC2657E9CF0040E0A2 /* NSScreenExtension.swift */; };
-		4B957A442AC7AE700062CA31 /* NSBezierPathExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = B65E6B9F26D9F10600095F96 /* NSBezierPathExtension.swift */; };
-		4B957A452AC7AE700062CA31 /* Bundle+VPN.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B4D605E2A0B29FA00BCD287 /* Bundle+VPN.swift */; };
-		4B957A462AC7AE700062CA31 /* WebsiteDataStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA6820E325502F19005ED0D5 /* WebsiteDataStore.swift */; };
-		4B957A472AC7AE700062CA31 /* NetworkProtectionFeatureVisibility.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7BD8679A2A9E9E000063B9F7 /* NetworkProtectionFeatureVisibility.swift */; };
-		4B957A482AC7AE700062CA31 /* PermissionContextMenu.swift in Sources */ = {isa = PBXBuildFile; fileRef = B64C852926942AC90048FEBE /* PermissionContextMenu.swift */; };
-		4B957A492AC7AE700062CA31 /* ContextMenuUserScript.swift in Sources */ = {isa = PBXBuildFile; fileRef = 85D438B5256E7C9E00F3BAF8 /* ContextMenuUserScript.swift */; };
-		4B957A4A2AC7AE700062CA31 /* NSSavePanelExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = B693954726F04BEA0015B914 /* NSSavePanelExtension.swift */; };
-		4B957A4B2AC7AE700062CA31 /* AppPrivacyConfigurationDataProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9826B0A12747DFEB0092F683 /* AppPrivacyConfigurationDataProvider.swift */; };
-		4B957A4C2AC7AE700062CA31 /* LinkButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6B1E88A26D774090062C350 /* LinkButton.swift */; };
-		4B957A4D2AC7AE700062CA31 /* TemporaryFileHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BBF0914282DD40100EE1418 /* TemporaryFileHandler.swift */; };
-		4B957A4E2AC7AE700062CA31 /* URL+NetworkProtection.swift in Sources */ = {isa = PBXBuildFile; fileRef = B602E8152A1E2570006D261F /* URL+NetworkProtection.swift */; };
-		4B957A4F2AC7AE700062CA31 /* PrivacyFeatures.swift in Sources */ = {isa = PBXBuildFile; fileRef = CB6BCDF827C6BEFF00CC76DC /* PrivacyFeatures.swift */; };
-		4B957A512AC7AE700062CA31 /* ViewExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 378F44EA29B4C73E00899924 /* ViewExtension.swift */; };
-		4B957A522AC7AE700062CA31 /* AVCaptureDevice+SwizzledAuthState.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6DB3CF826A00E2D00D459B7 /* AVCaptureDevice+SwizzledAuthState.swift */; };
-		4B957A532AC7AE700062CA31 /* SubscriptionPagesUserScript.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1E0C72052ABC63BD00802009 /* SubscriptionPagesUserScript.swift */; };
-		4B957A542AC7AE700062CA31 /* VisitMenuItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = AAAB9115288EB46B00A057A9 /* VisitMenuItem.swift */; };
-		4B957A552AC7AE700062CA31 /* EncryptionKeyStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BA1A6BC258B082300F6F690 /* EncryptionKeyStore.swift */; };
-		4B957A562AC7AE700062CA31 /* TabExtensionsBuilder.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6C00ED6292FB4B4009C73A6 /* TabExtensionsBuilder.swift */; };
-		4B957A582AC7AE700062CA31 /* PasswordManagementIdentityItemView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BE6546E271FCD40008D1D63 /* PasswordManagementIdentityItemView.swift */; };
-		4B957A592AC7AE700062CA31 /* ProgressExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6F41030264D2B23003DA42C /* ProgressExtension.swift */; };
-		4B957A5A2AC7AE700062CA31 /* CSVParser.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B723DF626B0002B00E14D75 /* CSVParser.swift */; };
-		4B957A5B2AC7AE700062CA31 /* PixelDataModel.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = B6DA44062616B30600DD1EC2 /* PixelDataModel.xcdatamodeld */; };
-		4B957A5C2AC7AE700062CA31 /* PrivacyDashboardWebView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B63BDF7D27FDAA640072D75B /* PrivacyDashboardWebView.swift */; };
-		4B957A5D2AC7AE700062CA31 /* AppearancePreferences.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37CD54C727F2FDD100F1F7B9 /* AppearancePreferences.swift */; };
-		4B957A5E2AC7AE700062CA31 /* DownloadListCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6B1E87A26D381710062C350 /* DownloadListCoordinator.swift */; };
-		4B957A5F2AC7AE700062CA31 /* AdClickAttributionTabExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = B647EFBA2922584B00BA628D /* AdClickAttributionTabExtension.swift */; };
-		4B957A602AC7AE700062CA31 /* NSNotificationName+Debug.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B980E202817604000282EE1 /* NSNotificationName+Debug.swift */; };
-		4B957A612AC7AE700062CA31 /* NavigationBarBadgeAnimationView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 31F7F2A5288AD2CA001C0D64 /* NavigationBarBadgeAnimationView.swift */; };
-		4B957A622AC7AE700062CA31 /* AddressBarButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = AAC5E4F025D6BF10007F5990 /* AddressBarButton.swift */; };
-		4B957A642AC7AE700062CA31 /* FaviconStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA5FA69C275F945C00DCE9C9 /* FaviconStore.swift */; };
-		4B957A652AC7AE700062CA31 /* WaitlistTermsAndConditionsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B9DB0142A983B24000927DB /* WaitlistTermsAndConditionsView.swift */; };
-		4B957A662AC7AE700062CA31 /* SuggestionListCharacteristics.swift in Sources */ = {isa = PBXBuildFile; fileRef = AAB8203B26B2DE0D00788AC3 /* SuggestionListCharacteristics.swift */; };
-		4B957A672AC7AE700062CA31 /* TimeIntervalExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = AAADFD05264AA282001555EA /* TimeIntervalExtension.swift */; };
-		4B957A682AC7AE700062CA31 /* NetworkProtectionFeatureDisabler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B6785432AA8DE1F008A5004 /* NetworkProtectionFeatureDisabler.swift */; };
-		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 */; };
-		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 */; };
-		4B957A702AC7AE700062CA31 /* RecentlyClosedCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA5C1DD4285C780C0089850C /* RecentlyClosedCoordinator.swift */; };
-		4B957A712AC7AE700062CA31 /* URLRequestExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA88D14A252A557100980B4E /* URLRequestExtension.swift */; };
-		4B957A722AC7AE700062CA31 /* FaviconHostReference.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA6197C5276B3168008396F0 /* FaviconHostReference.swift */; };
-		4B957A732AC7AE700062CA31 /* DownloadsTabExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6685E4129A61C460043D2EE /* DownloadsTabExtension.swift */; };
-		4B957A752AC7AE700062CA31 /* ASN1Parser.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B8AC93A26B48ADF00879451 /* ASN1Parser.swift */; };
-		4B957A762AC7AE700062CA31 /* FileDownloadManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 856C98DE257014BD00A22F1F /* FileDownloadManager.swift */; };
-		4B957A772AC7AE700062CA31 /* BookmarkImport.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BB99CF626FE191E001E4761 /* BookmarkImport.swift */; };
-		4B957A782AC7AE700062CA31 /* KeySetDictionary.swift in Sources */ = {isa = PBXBuildFile; fileRef = B68503A6279141CD00893A05 /* KeySetDictionary.swift */; };
-		4B957A792AC7AE700062CA31 /* HistoryTabExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = B66260DF29AC6EBD00E9E3EE /* HistoryTabExtension.swift */; };
-		4B957A7A2AC7AE700062CA31 /* FireCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = AAEEC6A827088ADB008445F7 /* FireCoordinator.swift */; };
-		4B957A7B2AC7AE700062CA31 /* GeolocationProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = B655369A268442EE00085A79 /* GeolocationProvider.swift */; };
-		4B957A7C2AC7AE700062CA31 /* NSAlert+ActiveDownloadsTermination.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6C0B23B26E87D900031CB7F /* NSAlert+ActiveDownloadsTermination.swift */; };
-		4B957A7D2AC7AE700062CA31 /* IndexPathExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = AAECA41F24EEA4AC00EFA63A /* IndexPathExtension.swift */; };
-		4B957A7E2AC7AE700062CA31 /* PasswordManagementNoteItemView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BE65472271FCD40008D1D63 /* PasswordManagementNoteItemView.swift */; };
-		4B957A7F2AC7AE700062CA31 /* NSApplicationExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA5C8F622591021700748EB7 /* NSApplicationExtension.swift */; };
-		4B957A802AC7AE700062CA31 /* NSWindowExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA9E9A5525A3AE8400D1959D /* NSWindowExtension.swift */; };
-		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 */; };
-		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 */; };
-		4B957A882AC7AE700062CA31 /* BadgeAnimationView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3171D6B9288984D00068632A /* BadgeAnimationView.swift */; };
-		4B957A892AC7AE700062CA31 /* BrowserTabSelectionDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B9292C62667123700AD2C21 /* BrowserTabSelectionDelegate.swift */; };
-		4B957A8A2AC7AE700062CA31 /* ContinueSetUpView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 56D6A3D529DB2BAB0055215A /* ContinueSetUpView.swift */; };
-		4B957A8B2AC7AE700062CA31 /* PasswordManagementListSection.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B1E6EEC27AB5E5100F51793 /* PasswordManagementListSection.swift */; };
-		4B957A8C2AC7AE700062CA31 /* FaviconReferenceCache.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA222CB82760F74E00321475 /* FaviconReferenceCache.swift */; };
-		4B957A8D2AC7AE700062CA31 /* BookmarkTreeController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B92929726670D2A00AD2C21 /* BookmarkTreeController.swift */; };
-		4B957A8E2AC7AE700062CA31 /* FirefoxEncryptionKeyReader.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B29759628281F0900187C4E /* FirefoxEncryptionKeyReader.swift */; };
-		4B957A8F2AC7AE700062CA31 /* EventMapping+NetworkProtectionError.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B4D60722A0B29FA00BCD287 /* EventMapping+NetworkProtectionError.swift */; };
-		4B957A902AC7AE700062CA31 /* BookmarkManagementSplitViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B9292C82667123700AD2C21 /* BookmarkManagementSplitViewController.swift */; };
-		4B957A912AC7AE700062CA31 /* CookieManagedNotificationContainerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3171D6DA2889B64D0068632A /* CookieManagedNotificationContainerView.swift */; };
-		4B957A922AC7AE700062CA31 /* FileManagerExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6E61EE2263AC0C8004E11AB /* FileManagerExtension.swift */; };
-		4B957A932AC7AE700062CA31 /* PermissionModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6DB3CFA26A17CB800D459B7 /* PermissionModel.swift */; };
-		4B957A942AC7AE700062CA31 /* PasteboardFolder.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B92929226670D2A00AD2C21 /* PasteboardFolder.swift */; };
-		4B957A952AC7AE700062CA31 /* CookieManagedNotificationView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3171D6B72889849F0068632A /* CookieManagedNotificationView.swift */; };
-		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 */; };
-		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 */; };
-		4B957A9E2AC7AE700062CA31 /* PrivacyDashboardPermissionHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1E7E2E932902AC0E00C01B54 /* PrivacyDashboardPermissionHandler.swift */; };
-		4B957A9F2AC7AE700062CA31 /* TabCollectionViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA9FF95E24A1FB680039E328 /* TabCollectionViewModel.swift */; };
-		4B957AA02AC7AE700062CA31 /* BookmarkManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = AAC5E4CE25D6A709007F5990 /* BookmarkManager.swift */; };
-		4B957AA12AC7AE700062CA31 /* AboutModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37CD54C527F2FDD100F1F7B9 /* AboutModel.swift */; };
-		4B957AA22AC7AE700062CA31 /* PasswordManagementCreditCardItemView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BE65470271FCD40008D1D63 /* PasswordManagementCreditCardItemView.swift */; };
-		4B957AA32AC7AE700062CA31 /* NSTextFieldExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA5C8F58258FE21F00748EB7 /* NSTextFieldExtension.swift */; };
-		4B957AA42AC7AE700062CA31 /* BWManagement.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3706FEC7293F6F7500E42796 /* BWManagement.swift */; };
-		4B957AA52AC7AE700062CA31 /* FireproofDomainsContainer.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6830960274CDE99004B46BB /* FireproofDomainsContainer.swift */; };
-		4B957AA62AC7AE700062CA31 /* ExternalAppSchemeHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = B687B7CB2947A1E9001DEA6F /* ExternalAppSchemeHandler.swift */; };
-		4B957AA72AC7AE700062CA31 /* GeolocationService.swift in Sources */ = {isa = PBXBuildFile; fileRef = B65536AD2685E17100085A79 /* GeolocationService.swift */; };
-		4B957AA82AC7AE700062CA31 /* FireproofingURLExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B02197F25E05FAC00ED7DEA /* FireproofingURLExtensions.swift */; };
-		4B957AA92AC7AE700062CA31 /* ContentOverlayPopover.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B1E819B27C8874900FF0E60 /* ContentOverlayPopover.swift */; };
-		4B957AAA2AC7AE700062CA31 /* TabShadowView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3154FD1328E6011A00909769 /* TabShadowView.swift */; };
-		4B957AAB2AC7AE700062CA31 /* BWMessageIdGenerator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1D43EB3B292B664A0065E5D6 /* BWMessageIdGenerator.swift */; };
-		4B957AAC2AC7AE700062CA31 /* EncryptedValueTransformer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BA1A6A4258B07DF00F6F690 /* EncryptedValueTransformer.swift */; };
-		4B957AAD2AC7AE700062CA31 /* Tab+Dialogs.swift in Sources */ = {isa = PBXBuildFile; fileRef = B634DBE0293C8FD500C3C99E /* Tab+Dialogs.swift */; };
-		4B957AAE2AC7AE700062CA31 /* PasteboardBookmark.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B92929526670D2A00AD2C21 /* PasteboardBookmark.swift */; };
-		4B957AAF2AC7AE700062CA31 /* PinnedTabsManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37BF3F13286D8A6500BD9014 /* PinnedTabsManager.swift */; };
-		4B957AB02AC7AE700062CA31 /* HoverUserScript.swift in Sources */ = {isa = PBXBuildFile; fileRef = 856CADEF271710F400E79BB0 /* HoverUserScript.swift */; };
-		4B957AB12AC7AE700062CA31 /* MainMenuActions.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA6EF9B425081B4C004754E6 /* MainMenuActions.swift */; };
-		4B957AB22AC7AE700062CA31 /* WKWebView+SessionState.swift in Sources */ = {isa = PBXBuildFile; fileRef = B63D466825BEB6C200874977 /* WKWebView+SessionState.swift */; };
-		4B957AB32AC7AE700062CA31 /* NetworkProtectionControllerErrorStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B4D606A2A0B29FA00BCD287 /* NetworkProtectionControllerErrorStore.swift */; };
-		4B957AB42AC7AE700062CA31 /* DataImport.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B723DEB26B0002B00E14D75 /* DataImport.swift */; };
-		4B957AB52AC7AE700062CA31 /* NetworkProtectionDebugMenu.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7BE146062A6A83C700C313B8 /* NetworkProtectionDebugMenu.swift */; };
-		4B957AB62AC7AE700062CA31 /* FireproofDomains.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = B6085D072743993C00A9C456 /* FireproofDomains.xcdatamodeld */; };
-		4B957AB82AC7AE700062CA31 /* HomePageView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 85589E7C27BBB8630038AD11 /* HomePageView.swift */; };
-		4B957AB92AC7AE700062CA31 /* SerpHeadersNavigationResponder.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6BF5D922947199A006742B1 /* SerpHeadersNavigationResponder.swift */; };
-		4B957ABA2AC7AE700062CA31 /* HomePageContinueSetUpModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 569277C029DDCBB500B633EF /* HomePageContinueSetUpModel.swift */; };
-		4B957ABB2AC7AE700062CA31 /* WebKitDownloadTask.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6A924D82664C72D001A28CA /* WebKitDownloadTask.swift */; };
-		4B957ABC2AC7AE700062CA31 /* ChromiumLoginReader.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B59023926B35F3600489384 /* ChromiumLoginReader.swift */; };
-		4B957ABD2AC7AE700062CA31 /* NSAlert+PasswordManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 85D885B226A5A9DE0077C374 /* NSAlert+PasswordManager.swift */; };
-		4B957ABE2AC7AE700062CA31 /* UserContentUpdating.swift in Sources */ = {isa = PBXBuildFile; fileRef = 983DFB2428B67036006B7E34 /* UserContentUpdating.swift */; };
-		4B957ABF2AC7AE700062CA31 /* ChromiumPreferences.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B7A57CE279A4EF300B1C70E /* ChromiumPreferences.swift */; };
-		4B957AC02AC7AE700062CA31 /* FirePopoverViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA6AD95A2704B6DB00159F8A /* FirePopoverViewController.swift */; };
-		4B957AC12AC7AE700062CA31 /* SavePaymentMethodPopover.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BE4005227CF3DC3007D3161 /* SavePaymentMethodPopover.swift */; };
-		4B957AC22AC7AE700062CA31 /* FindInPageViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 85A0116825AF1D8900FA6A0C /* FindInPageViewController.swift */; };
-		4B957AC32AC7AE700062CA31 /* Cryptography.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BB6CE5E26B77ED000EC5860 /* Cryptography.swift */; };
-		4B957AC42AC7AE700062CA31 /* BWVault.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1D69C552291302F200B75945 /* BWVault.swift */; };
-		4B957AC52AC7AE700062CA31 /* NSViewExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA6FFB4324DC33320028F4D0 /* NSViewExtension.swift */; };
-		4B957AC72AC7AE700062CA31 /* DownloadListViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6C0B23D26E8BF1F0031CB7F /* DownloadListViewModel.swift */; };
-		4B957AC82AC7AE700062CA31 /* BookmarkManagementDetailViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B9292CD2667123700AD2C21 /* BookmarkManagementDetailViewController.swift */; };
-		4B957AC92AC7AE700062CA31 /* CSVImporter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B723DF726B0002B00E14D75 /* CSVImporter.swift */; };
-		4B957ACA2AC7AE700062CA31 /* StartupPreferences.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37A4CEB9282E992F00D75B89 /* StartupPreferences.swift */; };
-		4B957ACB2AC7AE700062CA31 /* UserDefaults+NetworkProtectionWaitlist.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7BFE95532A9DF2930081ABE9 /* UserDefaults+NetworkProtectionWaitlist.swift */; };
-		4B957ACC2AC7AE700062CA31 /* MainMenu.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA4BBA3A25C58FA200C4FB0F /* MainMenu.swift */; };
-		4B957ACE2AC7AE700062CA31 /* BrowserTabViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA585D83248FD31100E9A3E2 /* BrowserTabViewController.swift */; };
-		4B957ACF2AC7AE700062CA31 /* CallToAction.swift in Sources */ = {isa = PBXBuildFile; fileRef = 85707F21276A32B600DC0649 /* CallToAction.swift */; };
-		4B957AD02AC7AE700062CA31 /* MouseOverView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B693953D26F04BE70015B914 /* MouseOverView.swift */; };
-		4B957AD12AC7AE700062CA31 /* EncryptedHistoryStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = AAE7527B263B056C00B973F8 /* EncryptedHistoryStore.swift */; };
-		4B957AD22AC7AE700062CA31 /* FirePopoverCollectionViewItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = AAE246F12709EF3B00BEEAEE /* FirePopoverCollectionViewItem.swift */; };
-		4B957AD32AC7AE700062CA31 /* ArrayExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA61C0D12727F59B00E6B681 /* ArrayExtension.swift */; };
-		4B957AD42AC7AE700062CA31 /* NetworkProtectionInviteCodeViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B4D60702A0B29FA00BCD287 /* NetworkProtectionInviteCodeViewModel.swift */; };
-		4B957AD52AC7AE700062CA31 /* CrashReportSender.swift in Sources */ = {isa = PBXBuildFile; fileRef = AAC30A2B268F1ECD00D2D9CD /* CrashReportSender.swift */; };
-		4B957AD62AC7AE700062CA31 /* BookmarkHTMLImporter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 373A1AAF2842C4EA00586521 /* BookmarkHTMLImporter.swift */; };
-		4B957AD72AC7AE700062CA31 /* CustomRoundedCornersShape.swift in Sources */ = {isa = PBXBuildFile; fileRef = 31C3CE0128EDC1E70002C24A /* CustomRoundedCornersShape.swift */; };
-		4B957AD82AC7AE700062CA31 /* LocaleExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B8D9061276D1D880078DB17 /* LocaleExtension.swift */; };
-		4B957AD92AC7AE700062CA31 /* SavePaymentMethodViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BE4005427CF3F19007D3161 /* SavePaymentMethodViewController.swift */; };
-		4B957ADA2AC7AE700062CA31 /* BWStatus.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1DDF075F28F815AD00EDFBE3 /* BWStatus.swift */; };
-		4B957ADB2AC7AE700062CA31 /* WebKitVersionProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = AAFE068226C7082D005434CC /* WebKitVersionProvider.swift */; };
-		4B957ADC2AC7AE700062CA31 /* NSCoderExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = B63D467925BFC3E100874977 /* NSCoderExtensions.swift */; };
-		4B957ADD2AC7AE700062CA31 /* RunningApplicationCheck.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1D77921C28FFF27C00BE0210 /* RunningApplicationCheck.swift */; };
-		4B957ADE2AC7AE700062CA31 /* StatePersistenceService.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6A5A27025B9377300AA7ADA /* StatePersistenceService.swift */; };
-		4B957ADF2AC7AE700062CA31 /* WindowManager+StateRestoration.swift in Sources */ = {isa = PBXBuildFile; fileRef = B68458AF25C7E76A00DC17B6 /* WindowManager+StateRestoration.swift */; };
-		4B957AE02AC7AE700062CA31 /* TabCollection+NSSecureCoding.swift in Sources */ = {isa = PBXBuildFile; fileRef = B68458C425C7EA0C00DC17B6 /* TabCollection+NSSecureCoding.swift */; };
-		4B957AE12AC7AE700062CA31 /* Instruments.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BB88B5A25B7BA50006F6B06 /* Instruments.swift */; };
-		4B957AE22AC7AE700062CA31 /* ContentBlockerRulesLists.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9812D894276CEDA5004B6181 /* ContentBlockerRulesLists.swift */; };
-		4B957AE32AC7AE700062CA31 /* NSViewControllerExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B0511E0262CAA8600F6079C /* NSViewControllerExtension.swift */; };
-		4B957AE42AC7AE700062CA31 /* NSAppearanceExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = F44C130125C2DA0400426E3E /* NSAppearanceExtension.swift */; };
-		4B957AE52AC7AE700062CA31 /* EmailManagerExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B3B848F297A0E1000A384BD /* EmailManagerExtension.swift */; };
-		4B957AE62AC7AE700062CA31 /* PermissionManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = B64C84F0269310120048FEBE /* PermissionManager.swift */; };
-		4B957AE72AC7AE700062CA31 /* DefaultBrowserPreferences.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37CD54C827F2FDD100F1F7B9 /* DefaultBrowserPreferences.swift */; };
-		4B957AE82AC7AE700062CA31 /* Permissions.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = B64C852E26943BC10048FEBE /* Permissions.xcdatamodeld */; };
-		4B957AE92AC7AE700062CA31 /* JSAlertController.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE339227291BDEFD009F62C1 /* JSAlertController.swift */; };
-		4B957AEA2AC7AE700062CA31 /* NotificationService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B9DB01C2A983B24000927DB /* NotificationService.swift */; };
-		4B957AEB2AC7AE700062CA31 /* SyncPreferences.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3775912C29AAC72700E26367 /* SyncPreferences.swift */; };
-		4B957AEC2AC7AE700062CA31 /* FaviconNullStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1DB9617F29F67F3E00CF5568 /* FaviconNullStore.swift */; };
-		4B957AED2AC7AE700062CA31 /* PaddedImageButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = B693954126F04BE80015B914 /* PaddedImageButton.swift */; };
-		4B957AEE2AC7AE700062CA31 /* EncryptionKeyStoring.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BA1A6B7258B081600F6F690 /* EncryptionKeyStoring.swift */; };
-		4B957AEF2AC7AE700062CA31 /* String+Punycode.swift in Sources */ = {isa = PBXBuildFile; fileRef = B65783E625F8AAFB00D8DB33 /* String+Punycode.swift */; };
-		4B957AF02AC7AE700062CA31 /* NSException+Catch.m in Sources */ = {isa = PBXBuildFile; fileRef = B657841925FA484B00D8DB33 /* NSException+Catch.m */; };
-		4B957AF12AC7AE700062CA31 /* AppStateRestorationManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = B684592E25C93FBF00DC17B6 /* AppStateRestorationManager.swift */; };
-		4B957AF22AC7AE700062CA31 /* DailyPixel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B67853E2AA7C726008A5004 /* DailyPixel.swift */; };
-		4B957AF32AC7AE700062CA31 /* NavigationHotkeyHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = B66260E529ACAE4B00E9E3EE /* NavigationHotkeyHandler.swift */; };
-		4B957AF42AC7AE700062CA31 /* ClickToLoadUserScript.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA0BA3A8272217E6002A0B6C /* ClickToLoadUserScript.swift */; };
-		4B957AF52AC7AE700062CA31 /* WindowControllersManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = AAA892E9250A4CEF005B37B2 /* WindowControllersManager.swift */; };
-		4B957AF62AC7AE700062CA31 /* FireAnimationView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 85C5991A27D10CF000E605B2 /* FireAnimationView.swift */; };
-		4B957AF72AC7AE700062CA31 /* FaviconUrlReference.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA6197C3276B314D008396F0 /* FaviconUrlReference.swift */; };
-		4B957AF92AC7AE700062CA31 /* PasswordManagementItemListModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 85CC1D7A26A05ECF0062F04E /* PasswordManagementItemListModel.swift */; };
-		4B957AFA2AC7AE700062CA31 /* SuggestionTableCellView.swift in Sources */ = {isa = PBXBuildFile; fileRef = AABEE6A824AB4B910043105B /* SuggestionTableCellView.swift */; };
-		4B957AFB2AC7AE700062CA31 /* FireViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA6820F025503DA9005ED0D5 /* FireViewModel.swift */; };
-		4B957AFC2AC7AE700062CA31 /* SyncCredentialsAdapter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 372BC2A02A4AFA47001D8FD5 /* SyncCredentialsAdapter.swift */; };
-		4B957AFD2AC7AE700062CA31 /* WKUserContentControllerExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = AAA0CC69253CC43C0079BC96 /* WKUserContentControllerExtension.swift */; };
-		4B957AFE2AC7AE700062CA31 /* EditableTextView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BE65473271FCD40008D1D63 /* EditableTextView.swift */; };
-		4B957AFF2AC7AE700062CA31 /* TabCollection.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA9FF95C24A1FA1C0039E328 /* TabCollection.swift */; };
-		4B957B002AC7AE700062CA31 /* MainView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B688B4D9273E6D3B0087BEAF /* MainView.swift */; };
-		4B957B012AC7AE700062CA31 /* Tab+Navigation.swift in Sources */ = {isa = PBXBuildFile; fileRef = B61E2CD4294346C000773D8A /* Tab+Navigation.swift */; };
-		4B957B022AC7AE700062CA31 /* EmailUrlExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B65143D263924B5005B46EB /* EmailUrlExtensions.swift */; };
-		4B957B032AC7AE700062CA31 /* PasswordManagementItemModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 85CC1D7C26A05F250062F04E /* PasswordManagementItemModel.swift */; };
-		4B957B042AC7AE700062CA31 /* UpdateController.swift in Sources */ = {isa = PBXBuildFile; fileRef = AAD86E51267A0DFF005C11BE /* UpdateController.swift */; };
-		4B957B052AC7AE700062CA31 /* FindInPageModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 85A0118125AF60E700FA6A0C /* FindInPageModel.swift */; };
-		4B957B062AC7AE700062CA31 /* PseudoFolder.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B92929826670D2A00AD2C21 /* PseudoFolder.swift */; };
-		4B957B082AC7AE700062CA31 /* PixelDataStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6DA44012616B28300DD1EC2 /* PixelDataStore.swift */; };
-		4B957B092AC7AE700062CA31 /* WaitlistStorage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B9DB00E2A983B24000927DB /* WaitlistStorage.swift */; };
-		4B957B0A2AC7AE700062CA31 /* Pixel.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6A9E45226142B070067D1B9 /* Pixel.swift */; };
-		4B957B0B2AC7AE700062CA31 /* PixelEvent.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6A9E47626146A570067D1B9 /* PixelEvent.swift */; };
-		4B957B0C2AC7AE700062CA31 /* TabBarFooter.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA2CB1342587C29500AA6FBE /* TabBarFooter.swift */; };
-		4B957B0D2AC7AE700062CA31 /* JSAlertViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = EEC111E5294D06290086524F /* JSAlertViewModel.swift */; };
-		4B957B0E2AC7AE700062CA31 /* BookmarksBarCollectionViewItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BE5336A286912D40019DBFD /* BookmarksBarCollectionViewItem.swift */; };
-		4B957B0F2AC7AE700062CA31 /* FileDownloadError.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6C0B23826E742610031CB7F /* FileDownloadError.swift */; };
-		4B957B102AC7AE700062CA31 /* MoreOrLessView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 85589E9F27BFE60E0038AD11 /* MoreOrLessView.swift */; };
-		4B957B122AC7AE700062CA31 /* History.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = AAE75278263B046100B973F8 /* History.xcdatamodeld */; };
-		4B957B132AC7AE700062CA31 /* PermissionStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = B64C853C26944B940048FEBE /* PermissionStore.swift */; };
-		4B957B142AC7AE700062CA31 /* PrivacyIconViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA75A0AD26F3500C0086B667 /* PrivacyIconViewModel.swift */; };
-		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 /* 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 */; };
-		4B957B1C2AC7AE700062CA31 /* CoreDataBookmarkImporter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BB99CF726FE191E001E4761 /* CoreDataBookmarkImporter.swift */; };
-		4B957B1D2AC7AE700062CA31 /* SuggestionViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA3F895224C18AD500628DDE /* SuggestionViewModel.swift */; };
-		4B957B1E2AC7AE700062CA31 /* BookmarkManagedObject.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B92929926670D2A00AD2C21 /* BookmarkManagedObject.swift */; };
-		4B957B1F2AC7AE700062CA31 /* CSVLoginExporter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B723DFD26B0002B00E14D75 /* CSVLoginExporter.swift */; };
-		4B957B202AC7AE700062CA31 /* NSAttributedStringExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 85C48CCB278D808F00D3263E /* NSAttributedStringExtension.swift */; };
-		4B957B212AC7AE700062CA31 /* AnimationView.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA7EB6E427E7D6DC00036718 /* AnimationView.swift */; };
-		4B957B222AC7AE700062CA31 /* NSRectExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 85625999269CA0A600EE44BC /* NSRectExtension.swift */; };
-		4B957B232AC7AE700062CA31 /* WaitlistRootView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B9DB01A2A983B24000927DB /* WaitlistRootView.swift */; };
-		4B957B242AC7AE700062CA31 /* YoutubeOverlayUserScript.swift in Sources */ = {isa = PBXBuildFile; fileRef = 31F28C4E28C8EEC500119F70 /* YoutubeOverlayUserScript.swift */; };
-		4B957B252AC7AE700062CA31 /* DictionaryExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6040855274B830F00680351 /* DictionaryExtension.swift */; };
-		4B957B262AC7AE700062CA31 /* Publishers.NestedObjectChanges.swift in Sources */ = {isa = PBXBuildFile; fileRef = B684592625C93C0500DC17B6 /* Publishers.NestedObjectChanges.swift */; };
-		4B957B272AC7AE700062CA31 /* MenuItemSelectors.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6DA06E52913F39400225DE2 /* MenuItemSelectors.swift */; };
-		4B957B282AC7AE700062CA31 /* FaviconView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 85589E9927BFE3C30038AD11 /* FaviconView.swift */; };
-		4B957B292AC7AE700062CA31 /* OnboardingFlow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 85707F2B276A364E00DC0649 /* OnboardingFlow.swift */; };
-		4B957B2A2AC7AE700062CA31 /* PasswordManagementLoginModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BE6547C271FCD4D008D1D63 /* PasswordManagementLoginModel.swift */; };
-		4B957B2B2AC7AE700062CA31 /* TabViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA9FF95A24A1EFC20039E328 /* TabViewModel.swift */; };
-		4B957B2C2AC7AE700062CA31 /* TabDragAndDropManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA9E9A5D25A4867200D1959D /* TabDragAndDropManager.swift */; };
-		4B957B2D2AC7AE700062CA31 /* NSNotificationName+Favicons.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BBD3BFF285ACE090047A89D /* NSNotificationName+Favicons.swift */; };
-		4B957B2E2AC7AE700062CA31 /* PinningManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B0DB5E428BD9D08007DD239 /* PinningManager.swift */; };
-		4B957B2F2AC7AE700062CA31 /* SyncMetadataDatabase.swift in Sources */ = {isa = PBXBuildFile; fileRef = 373D9B4729EEAC1B00381FDD /* SyncMetadataDatabase.swift */; };
-		4B957B302AC7AE700062CA31 /* TabCollectionViewModel+NSSecureCoding.swift in Sources */ = {isa = PBXBuildFile; fileRef = B68458BF25C7E9E000DC17B6 /* TabCollectionViewModel+NSSecureCoding.swift */; };
-		4B957B312AC7AE700062CA31 /* StringExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA8EDF2624923EC70071C2E8 /* StringExtension.swift */; };
-		4B957B322AC7AE700062CA31 /* EmailManagerRequestDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 85378DA1274E7F25007C5CBF /* EmailManagerRequestDelegate.swift */; };
-		4B957B332AC7AE700062CA31 /* ApplicationVersionReader.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1D43EB35292ACE690065E5D6 /* ApplicationVersionReader.swift */; };
-		4B957B342AC7AE700062CA31 /* BookmarksBarViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BD18EFF283F0BC500058124 /* BookmarksBarViewController.swift */; };
-		4B957B352AC7AE700062CA31 /* PreferencesAutofillView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 379DE4BC27EA31AC002CC3DE /* PreferencesAutofillView.swift */; };
-		4B957B362AC7AE700062CA31 /* BurnerHomePageView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1DCFBC8929ADF32B00313531 /* BurnerHomePageView.swift */; };
-		4B957B372AC7AE700062CA31 /* UserText+PasswordManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 858A797E26A79EAA00A75A42 /* UserText+PasswordManager.swift */; };
-		4B957B382AC7AE700062CA31 /* LoadingProgressView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B693954026F04BE80015B914 /* LoadingProgressView.swift */; };
-		4B957B392AC7AE700062CA31 /* StatisticsStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = B69B50362726A12000758A2B /* StatisticsStore.swift */; };
-		4B957B3A2AC7AE700062CA31 /* BWInstallationService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BBDEE8C28FC14760092FAA6 /* BWInstallationService.swift */; };
-		4B957B3B2AC7AE700062CA31 /* BookmarksBarPromptPopover.swift in Sources */ = {isa = PBXBuildFile; fileRef = 859F30632A72A7BB00C20372 /* BookmarksBarPromptPopover.swift */; };
-		4B957B3C2AC7AE700062CA31 /* NetworkProtectionInvitePresenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B4D606F2A0B29FA00BCD287 /* NetworkProtectionInvitePresenter.swift */; };
-		4B957B3D2AC7AE700062CA31 /* ColorView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B693954626F04BEA0015B914 /* ColorView.swift */; };
-		4B957B3E2AC7AE700062CA31 /* RecentlyClosedCacheItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA5C1DD2285A217F0089850C /* RecentlyClosedCacheItem.swift */; };
-		4B957B3F2AC7AE700062CA31 /* PopupBlockedPopover.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6BBF17327475B15004F850E /* PopupBlockedPopover.swift */; };
-		4B957B402AC7AE700062CA31 /* SaveCredentialsPopover.swift in Sources */ = {isa = PBXBuildFile; fileRef = 85890639267BCD8E00D23B0D /* SaveCredentialsPopover.swift */; };
-		4B957B412AC7AE700062CA31 /* LegacyBookmarksStoreMigration.swift in Sources */ = {isa = PBXBuildFile; fileRef = 987799F02999993C005D8EB6 /* LegacyBookmarksStoreMigration.swift */; };
-		4B957B422AC7AE700062CA31 /* QuartzIdleStateProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B379C1427BD91E3008A968E /* QuartzIdleStateProvider.swift */; };
-		4B957B432AC7AE700062CA31 /* DuckPlayerPreferences.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37F19A6628E1B43200740DC6 /* DuckPlayerPreferences.swift */; };
-		4B957B442AC7AE700062CA31 /* DownloadViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6C0B22D26E61CE70031CB7F /* DownloadViewModel.swift */; };
-		4B957B452AC7AE700062CA31 /* BookmarkHTMLReader.swift in Sources */ = {isa = PBXBuildFile; fileRef = 373A1AA7283ED1B900586521 /* BookmarkHTMLReader.swift */; };
-		4B957B462AC7AE700062CA31 /* Tab+NSSecureCoding.swift in Sources */ = {isa = PBXBuildFile; fileRef = B68458B725C7E8B200DC17B6 /* Tab+NSSecureCoding.swift */; };
-		4B957B472AC7AE700062CA31 /* NSNotificationName+EmailManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 85378D9F274E6F42007C5CBF /* NSNotificationName+EmailManager.swift */; };
-		4B957B482AC7AE700062CA31 /* MouseOverButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = B693954926F04BEB0015B914 /* MouseOverButton.swift */; };
-		4B957B492AC7AE700062CA31 /* FireInfoViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA61C0CF2722159B00E6B681 /* FireInfoViewController.swift */; };
-		4B957B4A2AC7AE700062CA31 /* LoginItem+NetworkProtection.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9D9AE8682AA76CDC0026E7DC /* LoginItem+NetworkProtection.swift */; };
-		4B957B4B2AC7AE700062CA31 /* PermissionButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = B64C85412694590B0048FEBE /* PermissionButton.swift */; };
-		4B957B4C2AC7AE700062CA31 /* MoreOptionsMenu.swift in Sources */ = {isa = PBXBuildFile; fileRef = AAA0CC462533833C0079BC96 /* MoreOptionsMenu.swift */; };
-		4B957B4D2AC7AE700062CA31 /* PermissionAuthorizationViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B64C84E22692DC9F0048FEBE /* PermissionAuthorizationViewController.swift */; };
-		4B957B4E2AC7AE700062CA31 /* BookmarkNode.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B92929326670D2A00AD2C21 /* BookmarkNode.swift */; };
-		4B957B4F2AC7AE700062CA31 /* LongPressButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = B693954426F04BE90015B914 /* LongPressButton.swift */; };
-		4B957B502AC7AE700062CA31 /* CoreDataStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6085D052743905F00A9C456 /* CoreDataStore.swift */; };
-		4B957B512AC7AE700062CA31 /* BundleExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6106B9D26A565DA0013B453 /* BundleExtension.swift */; };
-		4B957B522AC7AE700062CA31 /* NSOpenPanelExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B0511DF262CAA8600F6079C /* NSOpenPanelExtensions.swift */; };
-		4B957B532AC7AE700062CA31 /* FirePopover.swift in Sources */ = {isa = PBXBuildFile; fileRef = AAE99B8827088A19008B6BD9 /* FirePopover.swift */; };
-		4B957B552AC7AE700062CA31 /* NetworkProtectionOnboardingMenu.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B05829D2A812AC000AC3F7C /* NetworkProtectionOnboardingMenu.swift */; };
-		4B957B562AC7AE700062CA31 /* VariantManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = B69B50372726A12000758A2B /* VariantManager.swift */; };
-		4B957B572AC7AE700062CA31 /* ApplicationDockMenu.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA97BF4525135DD30014931A /* ApplicationDockMenu.swift */; };
-		4B957B582AC7AE700062CA31 /* SaveIdentityViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B8A4DFE27C83B29005F40E8 /* SaveIdentityViewController.swift */; };
-		4B957B592AC7AE700062CA31 /* AppLauncher.swift in Sources */ = {isa = PBXBuildFile; fileRef = EEAD7A6E2A1D3E1F002A24E7 /* AppLauncher.swift */; };
-		4B957B5A2AC7AE700062CA31 /* FileStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BA1A69A258B076900F6F690 /* FileStore.swift */; };
-		4B957B5B2AC7AE700062CA31 /* PixelArguments.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6A9E47E26146A800067D1B9 /* PixelArguments.swift */; };
-		4B957B5C2AC7AE700062CA31 /* PinnedTabsViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37BF3F1E286F0A7A00BD9014 /* PinnedTabsViewModel.swift */; };
-		4B957B5D2AC7AE700062CA31 /* BookmarkList.swift in Sources */ = {isa = PBXBuildFile; fileRef = AAC5E4CF25D6A709007F5990 /* BookmarkList.swift */; };
-		4B957B5E2AC7AE700062CA31 /* NEOnDemandRuleExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = B602E81C2A1E25B0006D261F /* NEOnDemandRuleExtension.swift */; };
-		4B957B5F2AC7AE700062CA31 /* BookmarkTableRowView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B9292C92667123700AD2C21 /* BookmarkTableRowView.swift */; };
-		4B957B602AC7AE700062CA31 /* FavoritesView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 85589E9327BFE1E70038AD11 /* FavoritesView.swift */; };
-		4B957B612AC7AE700062CA31 /* HomePage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 85AC7ADA27BD628400FFB69B /* HomePage.swift */; };
-		4B957B622AC7AE700062CA31 /* RoundedSelectionRowView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B0511B3262CAA5A00F6079C /* RoundedSelectionRowView.swift */; };
-		4B957B632AC7AE700062CA31 /* LocalStatisticsStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = B69B50392726A12500758A2B /* LocalStatisticsStore.swift */; };
-		4B957B642AC7AE700062CA31 /* BackForwardListItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = B689ECD426C247DB006FB0C5 /* BackForwardListItem.swift */; };
-		4B957B672AC7AE700062CA31 /* AtbAndVariantCleanup.swift in Sources */ = {isa = PBXBuildFile; fileRef = B69B50562727D16900758A2B /* AtbAndVariantCleanup.swift */; };
-		4B957B692AC7AE700062CA31 /* FeedbackWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA3D531427A1ED9300074EC1 /* FeedbackWindow.swift */; };
-		4B957B6A2AC7AE700062CA31 /* WorkspaceProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6685E3E29A606190043D2EE /* WorkspaceProtocol.swift */; };
-		4B957B6B2AC7AE700062CA31 /* RecentlyVisitedView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 85F0FF1227CFAB04001C7C6E /* RecentlyVisitedView.swift */; };
-		4B957B6C2AC7AE700062CA31 /* MouseOverAnimationButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA7EB6DE27E7C57D00036718 /* MouseOverAnimationButton.swift */; };
-		4B957B6D2AC7AE700062CA31 /* TabBarScrollView.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA7412B624D1687000D22FE0 /* TabBarScrollView.swift */; };
-		4B957B6E2AC7AE700062CA31 /* BookmarkListTreeControllerDataSource.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B9292D82667124B00AD2C21 /* BookmarkListTreeControllerDataSource.swift */; };
-		4B957B6F2AC7AE700062CA31 /* AddressBarViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 14D9B8F924F7E089000D4D13 /* AddressBarViewController.swift */; };
-		4B957B702AC7AE700062CA31 /* Permissions.swift in Sources */ = {isa = PBXBuildFile; fileRef = B65536A52685B82B00085A79 /* Permissions.swift */; };
-		4B957B712AC7AE700062CA31 /* TabPreviewWindowController.swift in Sources */ = {isa = PBXBuildFile; fileRef = AAC82C5F258B6CB5009B6B42 /* TabPreviewWindowController.swift */; };
-		4B957B722AC7AE700062CA31 /* NSSizeExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = AAC5E4E325D6BA9C007F5990 /* NSSizeExtension.swift */; };
-		4B957B732AC7AE700062CA31 /* Fire.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA6820EA25503D6A005ED0D5 /* Fire.swift */; };
-		4B957B742AC7AE700062CA31 /* SyncBookmarksAdapter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37445F9B2A1569F00029F789 /* SyncBookmarksAdapter.swift */; };
-		4B957B752AC7AE700062CA31 /* RandomAccessCollectionExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6AAAC3D26048F690029438D /* RandomAccessCollectionExtension.swift */; };
-		4B957B762AC7AE700062CA31 /* NSOutlineViewExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B9292AE26670F5300AD2C21 /* NSOutlineViewExtensions.swift */; };
-		4B957B772AC7AE700062CA31 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA585D81248FD31100E9A3E2 /* AppDelegate.swift */; };
-		4B957B782AC7AE700062CA31 /* ContentOverlayViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B1E819D27C8874900FF0E60 /* ContentOverlayViewController.swift */; };
-		4B957B792AC7AE700062CA31 /* ContentBlockingTabExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6D574B12947224C008ED1B6 /* ContentBlockingTabExtension.swift */; };
-		4B957B7A2AC7AE700062CA31 /* OnboardingViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 85B7184B27677C6500B4277F /* OnboardingViewController.swift */; };
-		4B957B7B2AC7AE700062CA31 /* DeviceAuthenticator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B379C1D27BDB7FF008A968E /* DeviceAuthenticator.swift */; };
-		4B957B7C2AC7AE700062CA31 /* NetworkProtectionWaitlistFeatureFlagOverridesMenu.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7BFE95512A9DF1CE0081ABE9 /* NetworkProtectionWaitlistFeatureFlagOverridesMenu.swift */; };
-		4B957B7D2AC7AE700062CA31 /* TabBarCollectionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1456D6E024EFCBC300775049 /* TabBarCollectionView.swift */; };
-		4B957B7E2AC7AE700062CA31 /* NetworkProtection+ConvenienceInitializers.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B4D60692A0B29FA00BCD287 /* NetworkProtection+ConvenienceInitializers.swift */; };
-		4B957B7F2AC7AE700062CA31 /* NavigationActionExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = B66B9C5B29A5EBAD0010E8F3 /* NavigationActionExtension.swift */; };
-		4B957B802AC7AE700062CA31 /* NSAlertExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 85308E24267FC9F2001ABD76 /* NSAlertExtension.swift */; };
-		4B957B812AC7AE700062CA31 /* ThirdPartyBrowser.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B59024726B3673600489384 /* ThirdPartyBrowser.swift */; };
-		4B957B822AC7AE700062CA31 /* SearchNonexistentDomainNavigationResponder.swift in Sources */ = {isa = PBXBuildFile; fileRef = B60C6F7629B0E286007BFAA8 /* SearchNonexistentDomainNavigationResponder.swift */; };
-		4B957B832AC7AE700062CA31 /* CircularProgressView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B65E6B9D26D9EC0800095F96 /* CircularProgressView.swift */; };
-		4B957B842AC7AE700062CA31 /* SuggestionContainer.swift in Sources */ = {isa = PBXBuildFile; fileRef = AABEE69B24A902BB0043105B /* SuggestionContainer.swift */; };
-		4B957B852AC7AE700062CA31 /* FindInPageTabExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6C00ECC292F89D9009C73A6 /* FindInPageTabExtension.swift */; };
-		4B957B862AC7AE700062CA31 /* HomePageViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 85589E7D27BBB8630038AD11 /* HomePageViewController.swift */; };
-		4B957B882AC7AE700062CA31 /* OperatingSystemVersionExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6A9E46A2614618A0067D1B9 /* OperatingSystemVersionExtension.swift */; };
-		4B957B892AC7AE700062CA31 /* ToggleableScrollView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BDFA4AD27BF19E500648192 /* ToggleableScrollView.swift */; };
-		4B957B8A2AC7AE700062CA31 /* TabCleanupPreparer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1D36F4232A3B85C50052B527 /* TabCleanupPreparer.swift */; };
-		4B957B8B2AC7AE700062CA31 /* NetworkProtectionOptionKeyExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B4D605F2A0B29FA00BCD287 /* NetworkProtectionOptionKeyExtension.swift */; };
-		4B957B8C2AC7AE700062CA31 /* UserScripts.swift in Sources */ = {isa = PBXBuildFile; fileRef = 85AC3AEE25D5CE9800C7D2AA /* UserScripts.swift */; };
-		4B957B8D2AC7AE700062CA31 /* NSWorkspaceExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = B643BF1327ABF772000BACEC /* NSWorkspaceExtension.swift */; };
-		4B957B8E2AC7AE700062CA31 /* AutofillTabExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6C00ECA292F839D009C73A6 /* AutofillTabExtension.swift */; };
-		4B957B8F2AC7AE700062CA31 /* Assertions.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6E319372953446000DD3BCF /* Assertions.swift */; };
-		4B957B902AC7AE700062CA31 /* BookmarkViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = AAB549DE25DAB8F80058460B /* BookmarkViewModel.swift */; };
-		4B957B912AC7AE700062CA31 /* DaxSpeech.swift in Sources */ = {isa = PBXBuildFile; fileRef = 85707F27276A34D900DC0649 /* DaxSpeech.swift */; };
-		4B957B922AC7AE700062CA31 /* DuckURLSchemeHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 31F28C5228C8EECA00119F70 /* DuckURLSchemeHandler.swift */; };
-		4B957B932AC7AE700062CA31 /* FirePopoverViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA13DCB3271480B0006D48D3 /* FirePopoverViewModel.swift */; };
-		4B957B942AC7AE700062CA31 /* BWCommand.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1D43EB37292B636E0065E5D6 /* BWCommand.swift */; };
-		4B957B952AC7AE700062CA31 /* NSColorExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = F41D174025CB131900472416 /* NSColorExtension.swift */; };
-		4B957B972AC7AE700062CA31 /* AddressBarButtonsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = AAC5E4F525D6BF2C007F5990 /* AddressBarButtonsViewController.swift */; };
-		4B957B982AC7AE700062CA31 /* BWError.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1DDF076028F815AD00EDFBE3 /* BWError.swift */; };
-		4B957B9A2AC7AE700062CA31 /* PixelDataRecord.swift in Sources */ = {isa = PBXBuildFile; fileRef = B68C92C32750EF76002AC6B0 /* PixelDataRecord.swift */; };
-		4B957B9B2AC7AE700062CA31 /* PageObserverUserScript.swift in Sources */ = {isa = PBXBuildFile; fileRef = 853014D525E671A000FB8205 /* PageObserverUserScript.swift */; };
-		4B957B9C2AC7AE700062CA31 /* SecureVaultErrorReporter.swift in Sources */ = {isa = PBXBuildFile; fileRef = B642738127B65BAC0005DFD1 /* SecureVaultErrorReporter.swift */; };
-		4B957B9D2AC7AE700062CA31 /* NSImageExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B139AFC26B60BD800894F82 /* NSImageExtensions.swift */; };
-		4B957B9E2AC7AE700062CA31 /* WaitlistKeychainStorage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B9DB00F2A983B24000927DB /* WaitlistKeychainStorage.swift */; };
-		4B957B9F2AC7AE700062CA31 /* PasswordManagementViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 85625995269C953C00EE44BC /* PasswordManagementViewController.swift */; };
-		4B957BA02AC7AE700062CA31 /* ImportedBookmarks.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BB99CFA26FE191E001E4761 /* ImportedBookmarks.swift */; };
-		4B957BA12AC7AE700062CA31 /* UserDefaults+NetworkProtectionShared.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B934C402A866DD400FC8F9C /* UserDefaults+NetworkProtectionShared.swift */; };
-		4B957BA22AC7AE700062CA31 /* NavigationActionPolicyExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = B626A75929921FAA00053070 /* NavigationActionPolicyExtension.swift */; };
-		4B957BA32AC7AE700062CA31 /* CIImageExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = B603FD9D2A02712E00F3FCA9 /* CIImageExtension.swift */; };
-		4B957BA42AC7AE700062CA31 /* NSMenuExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA6EF9B2250785D5004754E6 /* NSMenuExtension.swift */; };
-		4B957BA52AC7AE700062CA31 /* MainWindowController.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA7412B424D1536B00D22FE0 /* MainWindowController.swift */; };
-		4B957BA62AC7AE700062CA31 /* Tab.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA9FF95824A1ECF20039E328 /* Tab.swift */; };
-		4B957BA72AC7AE700062CA31 /* ConnectBitwardenView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BBDEE8E28FC14760092FAA6 /* ConnectBitwardenView.swift */; };
-		4B957BA82AC7AE700062CA31 /* DispatchQueueExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = B63D467025BFA6C100874977 /* DispatchQueueExtensions.swift */; };
-		4B957BA92AC7AE700062CA31 /* BookmarksBarAppearance.swift in Sources */ = {isa = PBXBuildFile; fileRef = 850E8DFA2A6FEC5E00691187 /* BookmarksBarAppearance.swift */; };
-		4B957BAA2AC7AE700062CA31 /* PermissionAuthorizationPopover.swift in Sources */ = {isa = PBXBuildFile; fileRef = B64C84EA2692DD650048FEBE /* PermissionAuthorizationPopover.swift */; };
-		4B957BAB2AC7AE700062CA31 /* PopoverMessageViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 85378D9D274E664C007C5CBF /* PopoverMessageViewController.swift */; };
-		4B957BAC2AC7AE700062CA31 /* WebView.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA6FFB4524DC3B5A0028F4D0 /* WebView.swift */; };
-		4B957BAD2AC7AE700062CA31 /* ShadowView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B693954226F04BE90015B914 /* ShadowView.swift */; };
-		4B957BAE2AC7AE700062CA31 /* FeedbackSender.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA3D531C27A2F58F00074EC1 /* FeedbackSender.swift */; };
-		4B957BAF2AC7AE700062CA31 /* TabExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6BDDA002942389000F68088 /* TabExtensions.swift */; };
-		4B957BB02AC7AE700062CA31 /* TabBarViewItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA7412B024D0B3AC00D22FE0 /* TabBarViewItem.swift */; };
-		4B957BB12AC7AE700062CA31 /* NSWindow+Toast.swift in Sources */ = {isa = PBXBuildFile; fileRef = 856C98D42570116900A22F1F /* NSWindow+Toast.swift */; };
-		4B957BB22AC7AE700062CA31 /* AutoconsentUserScript.swift in Sources */ = {isa = PBXBuildFile; fileRef = B31055BC27A1BA1D001AC618 /* AutoconsentUserScript.swift */; };
-		4B957BB32AC7AE700062CA31 /* BookmarksExporter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 859E7D6A27453BF3009C2B69 /* BookmarksExporter.swift */; };
-		4B957BB42AC7AE700062CA31 /* NetworkProtectionAppEvents.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B2DDCF72A93A8BB0039D884 /* NetworkProtectionAppEvents.swift */; };
-		4B957BB52AC7AE700062CA31 /* FirefoxDataImporter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B5FF67726B602B100D42879 /* FirefoxDataImporter.swift */; };
-		4B957BB62AC7AE700062CA31 /* PreferencesGeneralView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37AFCE8A27DB69BC00471A10 /* PreferencesGeneralView.swift */; };
-		4B957BB72AC7AE700062CA31 /* PinnedTabsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37BF3F1F286F0A7A00BD9014 /* PinnedTabsView.swift */; };
-		4B957BB92AC7AE700062CA31 /* SyncErrorHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37FD78102A29EBD100B36DB1 /* SyncErrorHandler.swift */; };
-		4B957BBA2AC7AE700062CA31 /* URLExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA8EDF2324923E980071C2E8 /* URLExtension.swift */; };
-		4B957BBB2AC7AE700062CA31 /* Tab+UIDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = B634DBDE293C8F7F00C3C99E /* Tab+UIDelegate.swift */; };
-		4B957BBD2AC7AE700062CA31 /* NSStoryboardExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BE0DF0426781961006337B7 /* NSStoryboardExtension.swift */; };
-		4B957BBE2AC7AE700062CA31 /* PreferencesViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37AFCE8027DA2CA600471A10 /* PreferencesViewController.swift */; };
-		4B957BBF2AC7AE700062CA31 /* FireproofDomains.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B02198125E05FAC00ED7DEA /* FireproofDomains.swift */; };
-		4B957BC02AC7AE700062CA31 /* Database.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B677440255DBEEA00025BD8 /* Database.swift */; };
-		4B957BC12AC7AE700062CA31 /* HorizontallyCenteredLayout.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BE5336D286915A10019DBFD /* HorizontallyCenteredLayout.swift */; };
-		4B957BC22AC7AE700062CA31 /* BookmarksOutlineView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B92928526670D1600AD2C21 /* BookmarksOutlineView.swift */; };
-		4B957BC32AC7AE700062CA31 /* CountryList.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BE65482271FCD53008D1D63 /* CountryList.swift */; };
-		4B957BC42AC7AE700062CA31 /* PreferencesSection.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37CD54C427F2FDD100F1F7B9 /* PreferencesSection.swift */; };
-		4B957BC52AC7AE700062CA31 /* NetworkProtectionNavBarButtonModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B4D60652A0B29FA00BCD287 /* NetworkProtectionNavBarButtonModel.swift */; };
-		4B957BC62AC7AE700062CA31 /* AutoconsentManagement.swift in Sources */ = {isa = PBXBuildFile; fileRef = FD23FD2C2886A81D007F6985 /* AutoconsentManagement.swift */; };
-		4B957BC72AC7AE700062CA31 /* UserText+NetworkProtection.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B4D60D22A0C84F700BCD287 /* UserText+NetworkProtection.swift */; };
-		4B957BC82AC7AE700062CA31 /* WebViewContainerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6B2400D28083B49001B8F3A /* WebViewContainerView.swift */; };
-		4B957BC92AC7AE700062CA31 /* BookmarkStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = AAC5E4D625D6A710007F5990 /* BookmarkStore.swift */; };
-		4B957BCA2AC7AE700062CA31 /* PrivacyDashboardViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6FA893E269C424500588ECD /* PrivacyDashboardViewController.swift */; };
-		4B957BCB2AC7AE700062CA31 /* PreferencesAppearanceView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37D2771427E870D4003365FD /* PreferencesAppearanceView.swift */; };
-		4B957BCC2AC7AE700062CA31 /* NSMenuItemExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA72D5FD25FFF94E00C77619 /* NSMenuItemExtension.swift */; };
-		4B957BCD2AC7AE700062CA31 /* ContiguousBytesExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BA1A6C1258B0A1300F6F690 /* ContiguousBytesExtension.swift */; };
-		4B957BCE2AC7AE700062CA31 /* AdjacentItemEnumerator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37534CA62811988E002621E7 /* AdjacentItemEnumerator.swift */; };
-		4B957BCF2AC7AE700062CA31 /* BookmarkDatabase.swift in Sources */ = {isa = PBXBuildFile; fileRef = 987799F52999996B005D8EB6 /* BookmarkDatabase.swift */; };
-		4B957BD02AC7AE700062CA31 /* ChromiumKeychainPrompt.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BE53373286E39F10019DBFD /* ChromiumKeychainPrompt.swift */; };
-		4B957BD12AC7AE700062CA31 /* WKProcessPool+GeolocationProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6553691268440D700085A79 /* WKProcessPool+GeolocationProvider.swift */; };
-		4B957BD22AC7AE700062CA31 /* RecentlyClosedMenu.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA5C1DD0285A154E0089850C /* RecentlyClosedMenu.swift */; };
-		4B957BD52AC7AE700062CA31 /* QuickLookUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B6F7128029F681EB00594A45 /* QuickLookUI.framework */; };
-		4B957BD62AC7AE700062CA31 /* LoginItems in Frameworks */ = {isa = PBXBuildFile; productRef = 4B95793F2AC7AE700062CA31 /* LoginItems */; };
-		4B957BD72AC7AE700062CA31 /* NetworkProtection in Frameworks */ = {isa = PBXBuildFile; productRef = 4B95793E2AC7AE700062CA31 /* NetworkProtection */; };
-		4B957BD82AC7AE700062CA31 /* BrowserServicesKit in Frameworks */ = {isa = PBXBuildFile; productRef = 4B95792B2AC7AE700062CA31 /* BrowserServicesKit */; };
-		4B957BDA2AC7AE700062CA31 /* Bookmarks in Frameworks */ = {isa = PBXBuildFile; productRef = 4B9579342AC7AE700062CA31 /* Bookmarks */; };
-		4B957BDB2AC7AE700062CA31 /* ContentBlocking in Frameworks */ = {isa = PBXBuildFile; productRef = 4B95792E2AC7AE700062CA31 /* ContentBlocking */; };
-		4B957BDC2AC7AE700062CA31 /* SwiftUIExtensions in Frameworks */ = {isa = PBXBuildFile; productRef = 4B9579372AC7AE700062CA31 /* SwiftUIExtensions */; };
-		4B957BDD2AC7AE700062CA31 /* UserScript in Frameworks */ = {isa = PBXBuildFile; productRef = 4B9579302AC7AE700062CA31 /* UserScript */; };
-		4B957BDE2AC7AE700062CA31 /* Configuration in Frameworks */ = {isa = PBXBuildFile; productRef = 4B9579322AC7AE700062CA31 /* Configuration */; };
-		4B957BE22AC7AE700062CA31 /* Sparkle in Frameworks */ = {isa = PBXBuildFile; productRef = 4B9579292AC7AE700062CA31 /* Sparkle */; };
-		4B957BE32AC7AE700062CA31 /* Navigation in Frameworks */ = {isa = PBXBuildFile; productRef = 4B9579332AC7AE700062CA31 /* Navigation */; };
-		4B957BE42AC7AE700062CA31 /* DDGSync in Frameworks */ = {isa = PBXBuildFile; productRef = 4B9579352AC7AE700062CA31 /* DDGSync */; };
-		4B957BE52AC7AE700062CA31 /* OpenSSL in Frameworks */ = {isa = PBXBuildFile; productRef = 4B9579382AC7AE700062CA31 /* OpenSSL */; };
-		4B957BE62AC7AE700062CA31 /* PrivacyDashboard in Frameworks */ = {isa = PBXBuildFile; productRef = 4B95792F2AC7AE700062CA31 /* PrivacyDashboard */; };
-		4B957BE72AC7AE700062CA31 /* SyncDataProviders in Frameworks */ = {isa = PBXBuildFile; productRef = 4B95793C2AC7AE700062CA31 /* SyncDataProviders */; };
-		4B957BE82AC7AE700062CA31 /* SyncUI in Frameworks */ = {isa = PBXBuildFile; productRef = 4B9579362AC7AE700062CA31 /* SyncUI */; };
-		4B957BE92AC7AE700062CA31 /* NetworkProtectionUI in Frameworks */ = {isa = PBXBuildFile; productRef = 4B95793D2AC7AE700062CA31 /* NetworkProtectionUI */; };
-		4B957BEB2AC7AE700062CA31 /* Persistence in Frameworks */ = {isa = PBXBuildFile; productRef = 4B9579312AC7AE700062CA31 /* Persistence */; };
-		4B957BEF2AC7AE700062CA31 /* CrashReports.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = AA693E5D2696E5B90007BB78 /* CrashReports.storyboard */; };
-		4B957BF02AC7AE700062CA31 /* trackerData.json in Resources */ = {isa = PBXBuildFile; fileRef = 9833913027AAA4B500DAF119 /* trackerData.json */; };
-		4B957BF12AC7AE700062CA31 /* dark-shield-dot-mouse-over.json in Resources */ = {isa = PBXBuildFile; fileRef = AA7EB6EC27E880B600036718 /* dark-shield-dot-mouse-over.json */; };
-		4B957BF22AC7AE700062CA31 /* 01_Fire_really_small.json in Resources */ = {isa = PBXBuildFile; fileRef = 8511E18325F82B34002F516B /* 01_Fire_really_small.json */; };
-		4B957BF32AC7AE700062CA31 /* Onboarding.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 85B7184927677C2D00B4277F /* Onboarding.storyboard */; };
-		4B957BF42AC7AE700062CA31 /* FireproofDomains.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 4B0511AD262CAA5A00F6079C /* FireproofDomains.storyboard */; };
-		4B957BF52AC7AE700062CA31 /* clickToLoadConfig.json in Resources */ = {isa = PBXBuildFile; fileRef = EA47767F272A21B700419EDA /* clickToLoadConfig.json */; };
-		4B957BF62AC7AE700062CA31 /* Downloads.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = B6B1E88126D5DAC30062C350 /* Downloads.storyboard */; };
-		4B957BF72AC7AE700062CA31 /* dark-shield.json in Resources */ = {isa = PBXBuildFile; fileRef = AA34396F2754D4E900B241FA /* dark-shield.json */; };
-		4B957BF82AC7AE700062CA31 /* BookmarksBarPromptAssets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 859F30662A72B38500C20372 /* BookmarksBarPromptAssets.xcassets */; };
-		4B957BF92AC7AE700062CA31 /* dark-shield-mouse-over.json in Resources */ = {isa = PBXBuildFile; fileRef = AA7EB6EA27E880AE00036718 /* dark-shield-mouse-over.json */; };
-		4B957BFA2AC7AE700062CA31 /* autoconsent-bundle.js in Resources */ = {isa = PBXBuildFile; fileRef = B31055C327A1BA1D001AC618 /* autoconsent-bundle.js */; };
-		4B957BFB2AC7AE700062CA31 /* ContentOverlay.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 7B1E819C27C8874900FF0E60 /* ContentOverlay.storyboard */; };
-		4B957BFC2AC7AE700062CA31 /* FindInPage.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 85A0117325AF2EDF00FA6A0C /* FindInPage.storyboard */; };
-		4B957BFD2AC7AE700062CA31 /* JSAlert.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = EEC111E3294D06020086524F /* JSAlert.storyboard */; };
-		4B957C002AC7AE700062CA31 /* userscript.js in Resources */ = {isa = PBXBuildFile; fileRef = B31055BE27A1BA1D001AC618 /* userscript.js */; };
-		4B957C012AC7AE700062CA31 /* fb-tds.json in Resources */ = {isa = PBXBuildFile; fileRef = EA4617EF273A28A700F110A2 /* fb-tds.json */; };
-		4B957C032AC7AE700062CA31 /* README.md in Resources */ = {isa = PBXBuildFile; fileRef = AA68C3D62490F821001B8783 /* README.md */; };
-		4B957C042AC7AE700062CA31 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = AA585D85248FD31400E9A3E2 /* Assets.xcassets */; };
-		4B957C052AC7AE700062CA31 /* NavigationBar.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 85589E8C27BBBB870038AD11 /* NavigationBar.storyboard */; };
-		4B957C062AC7AE700062CA31 /* FirePopoverCollectionViewHeader.xib in Resources */ = {isa = PBXBuildFile; fileRef = AAE246F5270A3D3000BEEAEE /* FirePopoverCollectionViewHeader.xib */; };
-		4B957C072AC7AE700062CA31 /* TabBar.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = AA80EC7B256C46AA007083E7 /* TabBar.storyboard */; };
-		4B957C082AC7AE700062CA31 /* shield-dot.json in Resources */ = {isa = PBXBuildFile; fileRef = AA34396B2754D4E300B241FA /* shield-dot.json */; };
-		4B957C0B2AC7AE700062CA31 /* BookmarksBarCollectionViewItem.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4BE53369286912D40019DBFD /* BookmarksBarCollectionViewItem.xib */; };
-		4B957C0C2AC7AE700062CA31 /* PrivacyDashboard.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = B6FA893C269C423100588ECD /* PrivacyDashboard.storyboard */; };
-		4B957C0D2AC7AE700062CA31 /* shield.json in Resources */ = {isa = PBXBuildFile; fileRef = AA34396A2754D4E200B241FA /* shield.json */; };
-		4B957C0E2AC7AE700062CA31 /* TabBarViewItem.xib in Resources */ = {isa = PBXBuildFile; fileRef = AA7412B124D0B3AC00D22FE0 /* TabBarViewItem.xib */; };
-		4B957C102AC7AE700062CA31 /* httpsMobileV2FalsePositives.json in Resources */ = {isa = PBXBuildFile; fileRef = 4B67742A255DBEB800025BD8 /* httpsMobileV2FalsePositives.json */; };
-		4B957C112AC7AE700062CA31 /* BookmarksBar.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 4BD18F04283F151F00058124 /* BookmarksBar.storyboard */; };
-		4B957C122AC7AE700062CA31 /* trackers-1.json in Resources */ = {isa = PBXBuildFile; fileRef = AA3439732754D55100B241FA /* trackers-1.json */; };
-		4B957C132AC7AE700062CA31 /* dark-trackers-1.json in Resources */ = {isa = PBXBuildFile; fileRef = AA3439762754D55100B241FA /* dark-trackers-1.json */; };
-		4B957C142AC7AE700062CA31 /* Feedback.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = AA3863C427A1E28F00749AB5 /* Feedback.storyboard */; };
-		4B957C182AC7AE700062CA31 /* shield-mouse-over.json in Resources */ = {isa = PBXBuildFile; fileRef = AA7EB6E627E8809D00036718 /* shield-mouse-over.json */; };
-		4B957C1A2AC7AE700062CA31 /* PermissionAuthorization.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = B64C84DD2692D7400048FEBE /* PermissionAuthorization.storyboard */; };
-		4B957C1B2AC7AE700062CA31 /* dark-trackers-3.json in Resources */ = {isa = PBXBuildFile; fileRef = AA3439772754D55100B241FA /* dark-trackers-3.json */; };
-		4B957C1C2AC7AE700062CA31 /* dark-trackers-2.json in Resources */ = {isa = PBXBuildFile; fileRef = AA3439722754D55100B241FA /* dark-trackers-2.json */; };
-		4B957C1D2AC7AE700062CA31 /* Fire.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = AAB7320626DD0C37002FACF9 /* Fire.storyboard */; };
-		4B957C1F2AC7AE700062CA31 /* social_images in Resources */ = {isa = PBXBuildFile; fileRef = EA18D1C9272F0DC8006DC101 /* social_images */; };
-		4B957C202AC7AE700062CA31 /* shield-dot-mouse-over.json in Resources */ = {isa = PBXBuildFile; fileRef = AA7EB6E827E880A600036718 /* shield-dot-mouse-over.json */; };
-		4B957C222AC7AE700062CA31 /* fb-sdk.js in Resources */ = {isa = PBXBuildFile; fileRef = EAC80DDF271F6C0100BBF02D /* fb-sdk.js */; };
-		4B957C232AC7AE700062CA31 /* PasswordManager.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 85625993269C8F9600EE44BC /* PasswordManager.storyboard */; };
-		4B957C242AC7AE700062CA31 /* dark-flame-mouse-over.json in Resources */ = {isa = PBXBuildFile; fileRef = AA7EB6E127E7D05500036718 /* dark-flame-mouse-over.json */; };
-		4B957C252AC7AE700062CA31 /* flame-mouse-over.json in Resources */ = {isa = PBXBuildFile; fileRef = AA7EB6E027E7D05500036718 /* flame-mouse-over.json */; };
-		4B957C262AC7AE700062CA31 /* httpsMobileV2Bloom.bin in Resources */ = {isa = PBXBuildFile; fileRef = 4B677428255DBEB800025BD8 /* httpsMobileV2Bloom.bin */; };
-		4B957C272AC7AE700062CA31 /* trackers-3.json in Resources */ = {isa = PBXBuildFile; fileRef = AA3439752754D55100B241FA /* trackers-3.json */; };
-		4B957C282AC7AE700062CA31 /* macos-config.json in Resources */ = {isa = PBXBuildFile; fileRef = 026ADE1326C3010C002518EE /* macos-config.json */; };
-		4B957C292AC7AE700062CA31 /* httpsMobileV2BloomSpec.json in Resources */ = {isa = PBXBuildFile; fileRef = 4B677427255DBEB800025BD8 /* httpsMobileV2BloomSpec.json */; };
-		4B957C2A2AC7AE700062CA31 /* TabBarFooter.xib in Resources */ = {isa = PBXBuildFile; fileRef = AA2CB12C2587BB5600AA6FBE /* TabBarFooter.xib */; };
-		4B957C2C2AC7AE700062CA31 /* FirePopoverCollectionViewItem.xib in Resources */ = {isa = PBXBuildFile; fileRef = AAE246F22709EF3B00BEEAEE /* FirePopoverCollectionViewItem.xib */; };
-		4B957C2D2AC7AE700062CA31 /* ProximaNova-Bold-webfont.woff2 in Resources */ = {isa = PBXBuildFile; fileRef = EAA29AE7278D2E43007070CF /* ProximaNova-Bold-webfont.woff2 */; };
-		4B957C2E2AC7AE700062CA31 /* dark-shield-dot.json in Resources */ = {isa = PBXBuildFile; fileRef = AA34396E2754D4E900B241FA /* dark-shield-dot.json */; };
-		4B957C2F2AC7AE700062CA31 /* trackers-2.json in Resources */ = {isa = PBXBuildFile; fileRef = AA3439742754D55100B241FA /* trackers-2.json */; };
-		4B957C302AC7AE700062CA31 /* ProximaNova-Reg-webfont.woff2 in Resources */ = {isa = PBXBuildFile; fileRef = EAA29AE8278D2E43007070CF /* ProximaNova-Reg-webfont.woff2 */; };
-		4B957C312AC7AE700062CA31 /* clickToLoad.js in Resources */ = {isa = PBXBuildFile; fileRef = EAFAD6C92728BD1200F9DF00 /* clickToLoad.js */; };
-		4B957C342AC7AE700062CA31 /* DuckDuckGo VPN.app in Embed Login Items */ = {isa = PBXBuildFile; fileRef = 4B2D06392A11CFBB00DE1F49 /* DuckDuckGo VPN.app */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
-		4B957C352AC7AE700062CA31 /* DuckDuckGo Notifications.app in Embed Login Items */ = {isa = PBXBuildFile; fileRef = 4B4BEC202A11B4E2001D9AC5 /* DuckDuckGo Notifications.app */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
 		4B9754EC2984300100D7B834 /* EmailManagerExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B3B848F297A0E1000A384BD /* EmailManagerExtension.swift */; };
 		4B980E212817604000282EE1 /* NSNotificationName+Debug.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B980E202817604000282EE1 /* NSNotificationName+Debug.swift */; };
 		4B98D27A28D95F1A003C2B6F /* ChromiumFaviconsReaderTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B98D27928D95F1A003C2B6F /* ChromiumFaviconsReaderTests.swift */; };
@@ -2033,8 +1281,6 @@
 		4B9DB02A2A983B24000927DB /* WaitlistStorage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B9DB00E2A983B24000927DB /* WaitlistStorage.swift */; };
 		4B9DB02C2A983B24000927DB /* WaitlistKeychainStorage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B9DB00F2A983B24000927DB /* WaitlistKeychainStorage.swift */; };
 		4B9DB02D2A983B24000927DB /* WaitlistKeychainStorage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B9DB00F2A983B24000927DB /* WaitlistKeychainStorage.swift */; };
-		4B9DB0322A983B24000927DB /* EnableWaitlistFeatureView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B9DB0132A983B24000927DB /* EnableWaitlistFeatureView.swift */; };
-		4B9DB0332A983B24000927DB /* EnableWaitlistFeatureView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B9DB0132A983B24000927DB /* EnableWaitlistFeatureView.swift */; };
 		4B9DB0352A983B24000927DB /* WaitlistTermsAndConditionsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B9DB0142A983B24000927DB /* WaitlistTermsAndConditionsView.swift */; };
 		4B9DB0362A983B24000927DB /* WaitlistTermsAndConditionsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B9DB0142A983B24000927DB /* WaitlistTermsAndConditionsView.swift */; };
 		4B9DB0382A983B24000927DB /* JoinedWaitlistView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B9DB0152A983B24000927DB /* JoinedWaitlistView.swift */; };
@@ -2055,8 +1301,6 @@
 		4B9DB0552A983B55000927DB /* MockWaitlistStorage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B9DB04F2A983B55000927DB /* MockWaitlistStorage.swift */; };
 		4B9DB0562A983B55000927DB /* MockNotificationService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B9DB0502A983B55000927DB /* MockNotificationService.swift */; };
 		4B9DB0572A983B55000927DB /* MockNotificationService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B9DB0502A983B55000927DB /* MockNotificationService.swift */; };
-		4B9DB0582A983B55000927DB /* MockNetworkProtectionCodeRedeemer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B9DB0512A983B55000927DB /* MockNetworkProtectionCodeRedeemer.swift */; };
-		4B9DB0592A983B55000927DB /* MockNetworkProtectionCodeRedeemer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B9DB0512A983B55000927DB /* MockNetworkProtectionCodeRedeemer.swift */; };
 		4B9DB05A2A983B55000927DB /* MockWaitlistRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B9DB0522A983B55000927DB /* MockWaitlistRequest.swift */; };
 		4B9DB05B2A983B55000927DB /* MockWaitlistRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B9DB0522A983B55000927DB /* MockWaitlistRequest.swift */; };
 		4B9DB05C2A983B55000927DB /* WaitlistViewModelTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B9DB0532A983B55000927DB /* WaitlistViewModelTests.swift */; };
@@ -2106,7 +1350,6 @@
 		4BBF0917282DD6EF00EE1418 /* TemporaryFileHandlerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BBF0916282DD6EF00EE1418 /* TemporaryFileHandlerTests.swift */; };
 		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 */; };
@@ -2123,7 +1366,6 @@
 		4BD57C042AC112DF00B580EE /* NetworkProtectionRemoteMessagingTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BD57C032AC112DF00B580EE /* NetworkProtectionRemoteMessagingTests.swift */; };
 		4BD57C052AC112DF00B580EE /* NetworkProtectionRemoteMessagingTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BD57C032AC112DF00B580EE /* NetworkProtectionRemoteMessagingTests.swift */; };
 		4BDFA4AE27BF19E500648192 /* ToggleableScrollView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BDFA4AD27BF19E500648192 /* ToggleableScrollView.swift */; };
-		4BE0DF06267819A1006337B7 /* NSStoryboardExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BE0DF0426781961006337B7 /* NSStoryboardExtension.swift */; };
 		4BE344EE2B2376DF003FC223 /* VPNFeedbackFormViewModelTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BE344ED2B2376DF003FC223 /* VPNFeedbackFormViewModelTests.swift */; };
 		4BE344EF2B23786F003FC223 /* VPNFeedbackFormViewModelTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BE344ED2B2376DF003FC223 /* VPNFeedbackFormViewModelTests.swift */; };
 		4BE4005327CF3DC3007D3161 /* SavePaymentMethodPopover.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BE4005227CF3DC3007D3161 /* SavePaymentMethodPopover.swift */; };
@@ -2148,14 +1390,12 @@
 		4BF0E5062AD2551A00FFEC9E /* NetworkProtectionPixelEvent.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BF0E5042AD2551A00FFEC9E /* NetworkProtectionPixelEvent.swift */; };
 		4BF0E5072AD2551A00FFEC9E /* NetworkProtectionPixelEvent.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BF0E5042AD2551A00FFEC9E /* NetworkProtectionPixelEvent.swift */; };
 		4BF0E5082AD2551A00FFEC9E /* NetworkProtectionPixelEvent.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BF0E5042AD2551A00FFEC9E /* NetworkProtectionPixelEvent.swift */; };
-		4BF0E50A2AD2551A00FFEC9E /* NetworkProtectionPixelEvent.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BF0E5042AD2551A00FFEC9E /* NetworkProtectionPixelEvent.swift */; };
 		4BF0E50B2AD2552200FFEC9E /* NetworkProtectionPixelEvent.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BF0E5042AD2551A00FFEC9E /* NetworkProtectionPixelEvent.swift */; };
 		4BF0E50C2AD2552300FFEC9E /* NetworkProtectionPixelEvent.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BF0E5042AD2551A00FFEC9E /* NetworkProtectionPixelEvent.swift */; };
 		4BF0E5122AD25A2600FFEC9E /* DuckDuckGoUserAgent.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BF0E5112AD25A2600FFEC9E /* DuckDuckGoUserAgent.swift */; };
 		4BF0E5132AD25A2600FFEC9E /* DuckDuckGoUserAgent.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BF0E5112AD25A2600FFEC9E /* DuckDuckGoUserAgent.swift */; };
 		4BF0E5142AD25A2600FFEC9E /* DuckDuckGoUserAgent.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BF0E5112AD25A2600FFEC9E /* DuckDuckGoUserAgent.swift */; };
 		4BF0E5152AD25A2600FFEC9E /* DuckDuckGoUserAgent.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BF0E5112AD25A2600FFEC9E /* DuckDuckGoUserAgent.swift */; };
-		4BF0E5172AD25A2600FFEC9E /* DuckDuckGoUserAgent.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BF0E5112AD25A2600FFEC9E /* DuckDuckGoUserAgent.swift */; };
 		4BF4951826C08395000547B8 /* ThirdPartyBrowserTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BF4951726C08395000547B8 /* ThirdPartyBrowserTests.swift */; };
 		4BF4EA5027C71F26004E57C4 /* PasswordManagementListSectionTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BF4EA4F27C71F26004E57C4 /* PasswordManagementListSectionTests.swift */; };
 		4BF6961D28BE911100D402D4 /* RecentlyVisitedSiteModelTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BF6961C28BE911100D402D4 /* RecentlyVisitedSiteModelTests.swift */; };
@@ -2182,6 +1422,12 @@
 		561D66682B95C45A008ACC5C /* Suggestion.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 561D66692B95C45A008ACC5C /* Suggestion.storyboard */; };
 		562532A02BC069180034D316 /* ZoomPopoverViewModelTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5625329D2BC069100034D316 /* ZoomPopoverViewModelTests.swift */; };
 		562532A12BC069190034D316 /* ZoomPopoverViewModelTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5625329D2BC069100034D316 /* ZoomPopoverViewModelTests.swift */; };
+		560C3FFC2BC9911000F589CE /* PermanentSurveyManagerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 560C3FFB2BC9911000F589CE /* PermanentSurveyManagerTests.swift */; };
+		560C3FFD2BC9911000F589CE /* PermanentSurveyManagerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 560C3FFB2BC9911000F589CE /* PermanentSurveyManagerTests.swift */; };
+		560C3FFF2BCD5A1E00F589CE /* PermanentSurveyManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 560C3FFE2BCD5A1E00F589CE /* PermanentSurveyManager.swift */; };
+		560C40002BCD5A1E00F589CE /* PermanentSurveyManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 560C3FFE2BCD5A1E00F589CE /* PermanentSurveyManager.swift */; };
+		561D66662B95C45A008ACC5C /* Suggestion.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 561D66692B95C45A008ACC5C /* Suggestion.storyboard */; };
+		561D66672B95C45A008ACC5C /* Suggestion.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 561D66692B95C45A008ACC5C /* Suggestion.storyboard */; };
 		562984702AC4610100AC20EB /* SyncPreferencesTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5629846E2AC4610100AC20EB /* SyncPreferencesTests.swift */; };
 		562984712AC469E400AC20EB /* SyncPreferencesTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5629846E2AC4610100AC20EB /* SyncPreferencesTests.swift */; };
 		56534DED29DF252C00121467 /* CapturingDefaultBrowserProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 56534DEC29DF252C00121467 /* CapturingDefaultBrowserProvider.swift */; };
@@ -2202,9 +1448,18 @@
 		569277C529DEE09D00B633EF /* ContinueSetUpModelTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 569277C329DEE09D00B633EF /* ContinueSetUpModelTests.swift */; };
 		56B234BF2A84EFD200F2A1CC /* NavigationBarUrlExtensionsTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 56B234BE2A84EFD200F2A1CC /* NavigationBarUrlExtensionsTests.swift */; };
 		56B234C02A84EFD800F2A1CC /* NavigationBarUrlExtensionsTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 56B234BE2A84EFD200F2A1CC /* NavigationBarUrlExtensionsTests.swift */; };
+		56BA1E752BAAF70F001CF69F /* SSLErrorPageTabExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 56BA1E742BAAF70F001CF69F /* SSLErrorPageTabExtension.swift */; };
+		56BA1E762BAAF70F001CF69F /* SSLErrorPageTabExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 56BA1E742BAAF70F001CF69F /* SSLErrorPageTabExtension.swift */; };
+		56BA1E7F2BAB2D29001CF69F /* ErrorPageTabExtensionTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 56BA1E7C2BAB290E001CF69F /* ErrorPageTabExtensionTest.swift */; };
+		56BA1E802BAB2E43001CF69F /* ErrorPageTabExtensionTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 56BA1E7C2BAB290E001CF69F /* ErrorPageTabExtensionTest.swift */; };
+		56BA1E822BAC506F001CF69F /* SSLErrorPageUserScript.swift in Sources */ = {isa = PBXBuildFile; fileRef = 56BA1E812BAC506F001CF69F /* SSLErrorPageUserScript.swift */; };
+		56BA1E832BAC506F001CF69F /* SSLErrorPageUserScript.swift in Sources */ = {isa = PBXBuildFile; fileRef = 56BA1E812BAC506F001CF69F /* SSLErrorPageUserScript.swift */; };
+		56BA1E872BAC8239001CF69F /* SSLErrorPageUserScriptTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 56BA1E862BAC8239001CF69F /* SSLErrorPageUserScriptTests.swift */; };
+		56BA1E882BAC8239001CF69F /* SSLErrorPageUserScriptTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 56BA1E862BAC8239001CF69F /* SSLErrorPageUserScriptTests.swift */; };
+		56BA1E8A2BB1CB5B001CF69F /* CertificateTrustEvaluator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 56BA1E892BB1CB5B001CF69F /* CertificateTrustEvaluator.swift */; };
+		56BA1E8B2BB1CB5B001CF69F /* CertificateTrustEvaluator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 56BA1E892BB1CB5B001CF69F /* CertificateTrustEvaluator.swift */; };
 		56CEE90E2B7A725B00CF10AA /* InfoPlist.xcstrings in Resources */ = {isa = PBXBuildFile; fileRef = 56CEE90D2B7A6DE100CF10AA /* InfoPlist.xcstrings */; };
 		56CEE90F2B7A725C00CF10AA /* InfoPlist.xcstrings in Resources */ = {isa = PBXBuildFile; fileRef = 56CEE90D2B7A6DE100CF10AA /* InfoPlist.xcstrings */; };
-		56CEE9102B7A72FE00CF10AA /* InfoPlist.xcstrings in Resources */ = {isa = PBXBuildFile; fileRef = 56CEE90D2B7A6DE100CF10AA /* InfoPlist.xcstrings */; };
 		56D145E829E6BB6300E3488A /* CapturingDataImportProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 56D145E729E6BB6300E3488A /* CapturingDataImportProvider.swift */; };
 		56D145E929E6BB6300E3488A /* CapturingDataImportProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 56D145E729E6BB6300E3488A /* CapturingDataImportProvider.swift */; };
 		56D145EB29E6C99B00E3488A /* DataImportStatusProviding.swift in Sources */ = {isa = PBXBuildFile; fileRef = 56D145EA29E6C99B00E3488A /* DataImportStatusProviding.swift */; };
@@ -2235,33 +1490,28 @@
 		7B2DDCFB2A93B25F0039D884 /* KeychainType+ClientDefault.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7BD3AF5C2A8E7AF1006F9F56 /* KeychainType+ClientDefault.swift */; };
 		7B2E52252A5FEC09000C6D39 /* NetworkProtectionAgentNotificationsPresenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B2E52242A5FEC09000C6D39 /* NetworkProtectionAgentNotificationsPresenter.swift */; };
 		7B31FD8C2AD125620086AA24 /* NetworkProtectionIPC in Frameworks */ = {isa = PBXBuildFile; productRef = 7B31FD8B2AD125620086AA24 /* NetworkProtectionIPC */; };
-		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 */; };
+		7B4D8A212BDA857300852966 /* VPNOperationErrorRecorder.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B4D8A202BDA857300852966 /* VPNOperationErrorRecorder.swift */; };
+		7B4D8A222BDA857300852966 /* VPNOperationErrorRecorder.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B4D8A202BDA857300852966 /* VPNOperationErrorRecorder.swift */; };
+		7B4D8A232BDA857300852966 /* VPNOperationErrorRecorder.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B4D8A202BDA857300852966 /* VPNOperationErrorRecorder.swift */; };
+		7B4D8A242BDA857300852966 /* VPNOperationErrorRecorder.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B4D8A202BDA857300852966 /* VPNOperationErrorRecorder.swift */; };
 		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 */; };
-		7B94E1652B7ED95100E32B96 /* NetworkProtectionProxy in Frameworks */ = {isa = PBXBuildFile; productRef = 7B94E1642B7ED95100E32B96 /* NetworkProtectionProxy */; };
 		7B97CD592B7E0B57004FEF43 /* NetworkProtectionProxy in Frameworks */ = {isa = PBXBuildFile; productRef = 7B97CD582B7E0B57004FEF43 /* NetworkProtectionProxy */; };
 		7B97CD5B2B7E0B85004FEF43 /* Common in Frameworks */ = {isa = PBXBuildFile; productRef = 7B97CD5A2B7E0B85004FEF43 /* Common */; };
 		7B97CD5C2B7E0BBB004FEF43 /* UserDefaultsWrapper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 85C6A29525CC1FFD00EEB5F1 /* UserDefaultsWrapper.swift */; };
 		7B97CD5D2B7E0BCE004FEF43 /* BundleExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6106B9D26A565DA0013B453 /* BundleExtension.swift */; };
 		7B97CD5E2B7E0BEA004FEF43 /* OptionalExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = B637273C26CCF0C200C8CB02 /* OptionalExtension.swift */; };
 		7B97CD5F2B7E0BF7004FEF43 /* NSApplicationExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA5C8F622591021700748EB7 /* NSApplicationExtension.swift */; };
-		7B97CD602B7E0C2E004FEF43 /* Logging.swift in Sources */ = {isa = PBXBuildFile; fileRef = 85799C1725DEBB3F0007EC87 /* Logging.swift */; };
-		7B97CD622B7E0C4B004FEF43 /* PixelKit in Frameworks */ = {isa = PBXBuildFile; productRef = 7B97CD612B7E0C4B004FEF43 /* PixelKit */; };
 		7BA076BB2B65D61400D7FB72 /* NetworkProtectionProxy in Frameworks */ = {isa = PBXBuildFile; productRef = 7BA076BA2B65D61400D7FB72 /* NetworkProtectionProxy */; };
 		7BA4727D26F01BC400EAA165 /* CoreDataTestUtilities.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B9292C42667104B00AD2C21 /* CoreDataTestUtilities.swift */; };
 		7BA59C9B2AE18B49009A97B1 /* SystemExtensionManager in Frameworks */ = {isa = PBXBuildFile; productRef = 7BA59C9A2AE18B49009A97B1 /* SystemExtensionManager */; };
@@ -2281,7 +1531,6 @@
 		7BA7CC4B2AD11EC60042E5CE /* NetworkProtectionControllerErrorStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B4D606A2A0B29FA00BCD287 /* NetworkProtectionControllerErrorStore.swift */; };
 		7BA7CC4C2AD11EC70042E5CE /* NetworkProtectionControllerErrorStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B4D606A2A0B29FA00BCD287 /* NetworkProtectionControllerErrorStore.swift */; };
 		7BA7CC4E2AD11F6F0042E5CE /* NetworkProtectionIPCTunnelController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7BA7CC4D2AD11F6F0042E5CE /* NetworkProtectionIPCTunnelController.swift */; };
-		7BA7CC502AD11F6F0042E5CE /* NetworkProtectionIPCTunnelController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7BA7CC4D2AD11F6F0042E5CE /* NetworkProtectionIPCTunnelController.swift */; };
 		7BA7CC532AD11FCE0042E5CE /* Bundle+VPN.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B4D605E2A0B29FA00BCD287 /* Bundle+VPN.swift */; };
 		7BA7CC542AD11FCE0042E5CE /* Bundle+VPN.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B4D605E2A0B29FA00BCD287 /* Bundle+VPN.swift */; };
 		7BA7CC552AD11FFB0042E5CE /* NetworkProtectionOptionKeyExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B4D605F2A0B29FA00BCD287 /* NetworkProtectionOptionKeyExtension.swift */; };
@@ -2298,8 +1547,6 @@
 		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 */; };
 		7BBE2B7B2B61663C00697445 /* NetworkProtectionProxy in Frameworks */ = {isa = PBXBuildFile; productRef = 7BBE2B7A2B61663C00697445 /* NetworkProtectionProxy */; };
@@ -2313,23 +1560,16 @@
 		7BEC182F2AD5D8DC00D30536 /* SystemExtensionManager in Frameworks */ = {isa = PBXBuildFile; productRef = 7BEC182E2AD5D8DC00D30536 /* SystemExtensionManager */; };
 		7BEC20422B0F505F00243D3E /* AddBookmarkPopoverView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7BEC20402B0F505F00243D3E /* AddBookmarkPopoverView.swift */; };
 		7BEC20432B0F505F00243D3E /* AddBookmarkPopoverView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7BEC20402B0F505F00243D3E /* AddBookmarkPopoverView.swift */; };
-		7BEC20442B0F505F00243D3E /* AddBookmarkPopoverView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7BEC20402B0F505F00243D3E /* AddBookmarkPopoverView.swift */; };
 		7BEC20452B0F505F00243D3E /* AddBookmarkFolderPopoverView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7BEC20412B0F505F00243D3E /* AddBookmarkFolderPopoverView.swift */; };
 		7BEC20462B0F505F00243D3E /* AddBookmarkFolderPopoverView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7BEC20412B0F505F00243D3E /* AddBookmarkFolderPopoverView.swift */; };
-		7BEC20472B0F505F00243D3E /* AddBookmarkFolderPopoverView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7BEC20412B0F505F00243D3E /* AddBookmarkFolderPopoverView.swift */; };
 		7BEEA5122AD1235B00A9E72B /* NetworkProtectionIPC in Frameworks */ = {isa = PBXBuildFile; productRef = 7BEEA5112AD1235B00A9E72B /* NetworkProtectionIPC */; };
 		7BEEA5142AD1236300A9E72B /* NetworkProtectionIPC in Frameworks */ = {isa = PBXBuildFile; productRef = 7BEEA5132AD1236300A9E72B /* NetworkProtectionIPC */; };
 		7BEEA5162AD1236E00A9E72B /* NetworkProtectionUI in Frameworks */ = {isa = PBXBuildFile; productRef = 7BEEA5152AD1236E00A9E72B /* NetworkProtectionUI */; };
-		7BFCB74E2ADE7E1A00DA3EA7 /* PixelKit in Frameworks */ = {isa = PBXBuildFile; productRef = 7BFCB74D2ADE7E1A00DA3EA7 /* PixelKit */; };
-		7BFCB7502ADE7E2300DA3EA7 /* PixelKit in Frameworks */ = {isa = PBXBuildFile; productRef = 7BFCB74F2ADE7E2300DA3EA7 /* PixelKit */; };
-		7BFE95522A9DF1CE0081ABE9 /* NetworkProtectionWaitlistFeatureFlagOverridesMenu.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7BFE95512A9DF1CE0081ABE9 /* NetworkProtectionWaitlistFeatureFlagOverridesMenu.swift */; };
 		7BFE95542A9DF2930081ABE9 /* UserDefaults+NetworkProtectionWaitlist.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7BFE95532A9DF2930081ABE9 /* UserDefaults+NetworkProtectionWaitlist.swift */; };
 		7BFE95552A9DF2990081ABE9 /* UserDefaults+NetworkProtectionWaitlist.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7BFE95532A9DF2930081ABE9 /* UserDefaults+NetworkProtectionWaitlist.swift */; };
 		7BFE95562A9DF29B0081ABE9 /* UserDefaults+NetworkProtectionWaitlist.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7BFE95532A9DF2930081ABE9 /* UserDefaults+NetworkProtectionWaitlist.swift */; };
 		7BFE95592A9DF2AF0081ABE9 /* UserDefaults+NetworkProtectionWaitlist.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7BFE95532A9DF2930081ABE9 /* UserDefaults+NetworkProtectionWaitlist.swift */; };
-		7BFE955A2A9DF4550081ABE9 /* NetworkProtectionWaitlistFeatureFlagOverridesMenu.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7BFE95512A9DF1CE0081ABE9 /* NetworkProtectionWaitlistFeatureFlagOverridesMenu.swift */; };
 		7BFF850F2B0C09DA00ECACA2 /* DuckDuckGo Personal Information Removal.app in Embed Login Items */ = {isa = PBXBuildFile; fileRef = 9D9AE8D12AAA39A70026E7DC /* DuckDuckGo Personal Information Removal.app */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
-		7BFF85102B0C09E300ECACA2 /* DuckDuckGo Personal Information Removal.app in Embed Login Items */ = {isa = PBXBuildFile; fileRef = 9D9AE8D12AAA39A70026E7DC /* DuckDuckGo Personal Information Removal.app */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
 		85012B0229133F9F003D0DCC /* NavigationBarPopovers.swift in Sources */ = {isa = PBXBuildFile; fileRef = 85012B0129133F9F003D0DCC /* NavigationBarPopovers.swift */; };
 		850E8DFB2A6FEC5E00691187 /* BookmarksBarAppearance.swift in Sources */ = {isa = PBXBuildFile; fileRef = 850E8DFA2A6FEC5E00691187 /* BookmarksBarAppearance.swift */; };
 		8511E18425F82B34002F516B /* 01_Fire_really_small.json in Resources */ = {isa = PBXBuildFile; fileRef = 8511E18325F82B34002F516B /* 01_Fire_really_small.json */; };
@@ -2409,17 +1649,14 @@
 		85CC1D7D26A05F250062F04E /* PasswordManagementItemModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 85CC1D7C26A05F250062F04E /* PasswordManagementItemModel.swift */; };
 		85D0327B2B8E3D090041D1FB /* HistoryCoordinatorExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 85D0327A2B8E3D090041D1FB /* HistoryCoordinatorExtension.swift */; };
 		85D0327C2B8E3D090041D1FB /* HistoryCoordinatorExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 85D0327A2B8E3D090041D1FB /* HistoryCoordinatorExtension.swift */; };
-		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 */; };
 		85E2BBD02B8F534A00DBEC7A /* History in Frameworks */ = {isa = PBXBuildFile; productRef = 85E2BBCF2B8F534A00DBEC7A /* History */; };
-		85E2BBD22B8F536F00DBEC7A /* History in Frameworks */ = {isa = PBXBuildFile; productRef = 85E2BBD12B8F536F00DBEC7A /* History */; };
 		85F0FF1327CFAB04001C7C6E /* RecentlyVisitedView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 85F0FF1227CFAB04001C7C6E /* RecentlyVisitedView.swift */; };
 		85F1B0C925EF9759004792B6 /* URLEventHandlerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 85F1B0C825EF9759004792B6 /* URLEventHandlerTests.swift */; };
 		85F487B5276A8F2E003CE668 /* OnboardingTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 85F487B4276A8F2E003CE668 /* OnboardingTests.swift */; };
@@ -2450,8 +1687,6 @@
 		98A50964294B691800D10880 /* Persistence in Frameworks */ = {isa = PBXBuildFile; productRef = 98A50963294B691800D10880 /* Persistence */; };
 		98A95D88299A2DF900B9B81A /* BookmarkMigrationTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 98A95D87299A2DF900B9B81A /* BookmarkMigrationTests.swift */; };
 		98EB5D1027516A4800681FE6 /* AppPrivacyConfigurationTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 98EB5D0F27516A4800681FE6 /* AppPrivacyConfigurationTests.swift */; };
-		9D6983F92AC773C3002C02FC /* PixelKit in Frameworks */ = {isa = PBXBuildFile; productRef = 9D6983F82AC773C3002C02FC /* PixelKit */; };
-		9D6983FB2AC773C8002C02FC /* PixelKit in Frameworks */ = {isa = PBXBuildFile; productRef = 9D6983FA2AC773C8002C02FC /* PixelKit */; };
 		9D9AE8692AA76CDC0026E7DC /* LoginItem+NetworkProtection.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9D9AE8682AA76CDC0026E7DC /* LoginItem+NetworkProtection.swift */; };
 		9D9AE86B2AA76CF90026E7DC /* LoginItemsManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9D9AE86A2AA76CF90026E7DC /* LoginItemsManager.swift */; };
 		9D9AE86C2AA76D1B0026E7DC /* LoginItemsManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9D9AE86A2AA76CF90026E7DC /* LoginItemsManager.swift */; };
@@ -2468,11 +1703,18 @@
 		9D9AE92A2AAA43EB0026E7DC /* DataBrokerProtectionBackgroundManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9D9AE9282AAA43EB0026E7DC /* DataBrokerProtectionBackgroundManager.swift */; };
 		9D9AE92C2AAB84FF0026E7DC /* DBPMocks.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9D9AE92B2AAB84FF0026E7DC /* DBPMocks.swift */; };
 		9D9AE92D2AAB84FF0026E7DC /* DBPMocks.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9D9AE92B2AAB84FF0026E7DC /* DBPMocks.swift */; };
-		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 */; };
+		9F0FFFB42BCCAE37007C87DD /* BookmarkAllTabsDialogCoordinatorViewModelTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9F0FFFB32BCCAE37007C87DD /* BookmarkAllTabsDialogCoordinatorViewModelTests.swift */; };
+		9F0FFFB52BCCAE37007C87DD /* BookmarkAllTabsDialogCoordinatorViewModelTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9F0FFFB32BCCAE37007C87DD /* BookmarkAllTabsDialogCoordinatorViewModelTests.swift */; };
+		9F0FFFB82BCCAE9C007C87DD /* AddEditBookmarkDialogViewModelMock.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9F0FFFB72BCCAE9C007C87DD /* AddEditBookmarkDialogViewModelMock.swift */; };
+		9F0FFFB92BCCAE9C007C87DD /* AddEditBookmarkDialogViewModelMock.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9F0FFFB72BCCAE9C007C87DD /* AddEditBookmarkDialogViewModelMock.swift */; };
+		9F0FFFBB2BCCAEC2007C87DD /* AddEditBookmarkFolderDialogViewModelMock.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9F0FFFBA2BCCAEC2007C87DD /* AddEditBookmarkFolderDialogViewModelMock.swift */; };
+		9F0FFFBC2BCCAEC2007C87DD /* AddEditBookmarkFolderDialogViewModelMock.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9F0FFFBA2BCCAEC2007C87DD /* AddEditBookmarkFolderDialogViewModelMock.swift */; };
+		9F0FFFBE2BCCAF1F007C87DD /* BookmarkAllTabsDialogViewModelMock.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9F0FFFBD2BCCAF1F007C87DD /* BookmarkAllTabsDialogViewModelMock.swift */; };
+		9F0FFFBF2BCCAF1F007C87DD /* BookmarkAllTabsDialogViewModelMock.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9F0FFFBD2BCCAF1F007C87DD /* BookmarkAllTabsDialogViewModelMock.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 */; };
@@ -2481,69 +1723,92 @@
 		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 */; };
+		9F33445E2BBFA77F0040CBEB /* BookmarksBarVisibilityManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9F33445D2BBFA77F0040CBEB /* BookmarksBarVisibilityManager.swift */; };
+		9F33445F2BBFA77F0040CBEB /* BookmarksBarVisibilityManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9F33445D2BBFA77F0040CBEB /* BookmarksBarVisibilityManager.swift */; };
+		9F3344622BBFBDA40040CBEB /* BookmarksBarVisibilityManagerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9F3344612BBFBDA40040CBEB /* BookmarksBarVisibilityManagerTests.swift */; };
+		9F3344632BBFBDA40040CBEB /* BookmarksBarVisibilityManagerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9F3344612BBFBDA40040CBEB /* BookmarksBarVisibilityManagerTests.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 */; };
+		9F8D57322BCCCB9A00AEA660 /* UserDefaultsBookmarkFoldersStoreTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9F8D57312BCCCB9A00AEA660 /* UserDefaultsBookmarkFoldersStoreTests.swift */; };
+		9F8D57332BCCCB9A00AEA660 /* UserDefaultsBookmarkFoldersStoreTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9F8D57312BCCCB9A00AEA660 /* UserDefaultsBookmarkFoldersStoreTests.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 */; };
+		9F9C49F62BC786790099738D /* MoreOptionsMenu+BookmarksTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9F9C49F52BC786790099738D /* MoreOptionsMenu+BookmarksTests.swift */; };
+		9F9C49F72BC786790099738D /* MoreOptionsMenu+BookmarksTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9F9C49F52BC786790099738D /* MoreOptionsMenu+BookmarksTests.swift */; };
+		9F9C49F92BC7BC970099738D /* BookmarkAllTabsDialogView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9F9C49F82BC7BC970099738D /* BookmarkAllTabsDialogView.swift */; };
+		9F9C49FA2BC7BC970099738D /* BookmarkAllTabsDialogView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9F9C49F82BC7BC970099738D /* BookmarkAllTabsDialogView.swift */; };
+		9F9C49FD2BC7E9830099738D /* BookmarkAllTabsDialogViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9F9C49FC2BC7E9820099738D /* BookmarkAllTabsDialogViewModel.swift */; };
+		9F9C49FE2BC7E9830099738D /* BookmarkAllTabsDialogViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9F9C49FC2BC7E9820099738D /* BookmarkAllTabsDialogViewModel.swift */; };
+		9F9C4A012BC7F36D0099738D /* BookmarkAllTabsDialogCoordinatorViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9F9C4A002BC7F36D0099738D /* BookmarkAllTabsDialogCoordinatorViewModel.swift */; };
+		9F9C4A022BC7F36D0099738D /* BookmarkAllTabsDialogCoordinatorViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9F9C4A002BC7F36D0099738D /* BookmarkAllTabsDialogCoordinatorViewModel.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 */; };
+		9FA5A0A52BC8F34900153786 /* UserDefaultsBookmarkFoldersStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9FA5A0A42BC8F34900153786 /* UserDefaultsBookmarkFoldersStore.swift */; };
+		9FA5A0A62BC8F34900153786 /* UserDefaultsBookmarkFoldersStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9FA5A0A42BC8F34900153786 /* UserDefaultsBookmarkFoldersStore.swift */; };
+		9FA5A0A92BC900FC00153786 /* BookmarkAllTabsDialogViewModelTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9FA5A0A82BC900FC00153786 /* BookmarkAllTabsDialogViewModelTests.swift */; };
+		9FA5A0AA2BC900FC00153786 /* BookmarkAllTabsDialogViewModelTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9FA5A0A82BC900FC00153786 /* BookmarkAllTabsDialogViewModelTests.swift */; };
+		9FA5A0B02BC9039200153786 /* BookmarkFolderStoreMock.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9FA5A0AC2BC9037A00153786 /* BookmarkFolderStoreMock.swift */; };
+		9FA5A0B12BC9039300153786 /* BookmarkFolderStoreMock.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9FA5A0AC2BC9037A00153786 /* BookmarkFolderStoreMock.swift */; };
 		9FA75A3E2BA00E1400DA5FA6 /* BookmarksBarMenuFactoryTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9FA75A3D2BA00E1400DA5FA6 /* BookmarksBarMenuFactoryTests.swift */; };
 		9FA75A3F2BA00E1400DA5FA6 /* BookmarksBarMenuFactoryTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9FA75A3D2BA00E1400DA5FA6 /* BookmarksBarMenuFactoryTests.swift */; };
+		9FAD623A2BCFDB32007F3A65 /* WebsiteInfoHelpers.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9FAD62392BCFDB32007F3A65 /* WebsiteInfoHelpers.swift */; };
+		9FAD623B2BCFDB32007F3A65 /* WebsiteInfoHelpers.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9FAD62392BCFDB32007F3A65 /* WebsiteInfoHelpers.swift */; };
+		9FAD623D2BD09DE5007F3A65 /* WebsiteInfoTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9FAD623C2BD09DE5007F3A65 /* WebsiteInfoTests.swift */; };
+		9FAD623E2BD09DE5007F3A65 /* WebsiteInfoTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9FAD623C2BD09DE5007F3A65 /* WebsiteInfoTests.swift */; };
+		9FBD84522BB3AACB00220859 /* AttributionOriginFileProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9FBD84512BB3AACB00220859 /* AttributionOriginFileProvider.swift */; };
+		9FBD84532BB3AACB00220859 /* AttributionOriginFileProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9FBD84512BB3AACB00220859 /* AttributionOriginFileProvider.swift */; };
+		9FBD84562BB3ACFD00220859 /* AttributionOriginFileProviderTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9FBD84552BB3ACFD00220859 /* AttributionOriginFileProviderTests.swift */; };
+		9FBD84572BB3ACFD00220859 /* AttributionOriginFileProviderTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9FBD84552BB3ACFD00220859 /* AttributionOriginFileProviderTests.swift */; };
+		9FBD845D2BB3B80300220859 /* Origin.txt in Resources */ = {isa = PBXBuildFile; fileRef = 9FBD845C2BB3B80300220859 /* Origin.txt */; };
+		9FBD845E2BB3B80300220859 /* Origin.txt in Resources */ = {isa = PBXBuildFile; fileRef = 9FBD845C2BB3B80300220859 /* Origin.txt */; };
+		9FBD84612BB3BC6400220859 /* Origin-empty.txt in Resources */ = {isa = PBXBuildFile; fileRef = 9FBD84602BB3BC6400220859 /* Origin-empty.txt */; };
+		9FBD84622BB3BC6400220859 /* Origin-empty.txt in Resources */ = {isa = PBXBuildFile; fileRef = 9FBD84602BB3BC6400220859 /* Origin-empty.txt */; };
+		9FBD84702BB3DD8400220859 /* MockAttributionsPixelHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9FBD846F2BB3DD8400220859 /* MockAttributionsPixelHandler.swift */; };
+		9FBD84712BB3DD8400220859 /* MockAttributionsPixelHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9FBD846F2BB3DD8400220859 /* MockAttributionsPixelHandler.swift */; };
+		9FBD84732BB3E15D00220859 /* InstallationAttributionPixelHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9FBD84722BB3E15D00220859 /* InstallationAttributionPixelHandler.swift */; };
+		9FBD84742BB3E15D00220859 /* InstallationAttributionPixelHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9FBD84722BB3E15D00220859 /* InstallationAttributionPixelHandler.swift */; };
+		9FBD84772BB3E54200220859 /* InstallationAttributionPixelHandlerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9FBD84762BB3E54200220859 /* InstallationAttributionPixelHandlerTests.swift */; };
+		9FBD84782BB3E54200220859 /* InstallationAttributionPixelHandlerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9FBD84762BB3E54200220859 /* InstallationAttributionPixelHandlerTests.swift */; };
+		9FBD847A2BB3EC3300220859 /* MockAttributionOriginProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9FBD84792BB3EC3300220859 /* MockAttributionOriginProvider.swift */; };
+		9FBD847B2BB3EC3300220859 /* MockAttributionOriginProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9FBD84792BB3EC3300220859 /* MockAttributionOriginProvider.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 */; };
 		9FF521462BAA908500B9819B /* Lottie in Frameworks */ = {isa = PBXBuildFile; productRef = 9FF521452BAA908500B9819B /* Lottie */; };
 		9FF521482BAA909C00B9819B /* Lottie in Frameworks */ = {isa = PBXBuildFile; productRef = 9FF521472BAA909C00B9819B /* Lottie */; };
-		9FF5214A2BAA90C400B9819B /* Lottie in Frameworks */ = {isa = PBXBuildFile; productRef = 9FF521492BAA90C400B9819B /* Lottie */; };
 		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 */; };
@@ -2664,7 +1929,6 @@
 		AAC30A26268DFEE200D2D9CD /* CrashReporter.swift in Sources */ = {isa = PBXBuildFile; fileRef = AAC30A25268DFEE200D2D9CD /* CrashReporter.swift */; };
 		AAC30A28268E045400D2D9CD /* CrashReportReader.swift in Sources */ = {isa = PBXBuildFile; fileRef = AAC30A27268E045400D2D9CD /* CrashReportReader.swift */; };
 		AAC30A2A268E239100D2D9CD /* CrashReport.swift in Sources */ = {isa = PBXBuildFile; fileRef = AAC30A29268E239100D2D9CD /* CrashReport.swift */; };
-		AAC30A2C268F1ECD00D2D9CD /* CrashReportSender.swift in Sources */ = {isa = PBXBuildFile; fileRef = AAC30A2B268F1ECD00D2D9CD /* CrashReportSender.swift */; };
 		AAC30A2E268F1EE300D2D9CD /* CrashReportPromptPresenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = AAC30A2D268F1EE300D2D9CD /* CrashReportPromptPresenter.swift */; };
 		AAC5E4C725D6A6E8007F5990 /* AddBookmarkPopover.swift in Sources */ = {isa = PBXBuildFile; fileRef = AAC5E4C425D6A6E8007F5990 /* AddBookmarkPopover.swift */; };
 		AAC5E4D025D6A709007F5990 /* Bookmark.swift in Sources */ = {isa = PBXBuildFile; fileRef = AAC5E4CD25D6A709007F5990 /* Bookmark.swift */; };
@@ -2707,7 +1971,6 @@
 		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 */; };
@@ -2744,7 +2007,6 @@
 		B604085C274B8FBA00680351 /* UnprotectedDomains.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = B604085A274B8CA300680351 /* UnprotectedDomains.xcdatamodeld */; };
 		B6080BC52B21E78100B418EF /* DataImportErrorView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6080BC42B21E78100B418EF /* DataImportErrorView.swift */; };
 		B6080BC62B21E78100B418EF /* DataImportErrorView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6080BC42B21E78100B418EF /* DataImportErrorView.swift */; };
-		B6080BC82B21E78100B418EF /* DataImportErrorView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6080BC42B21E78100B418EF /* DataImportErrorView.swift */; };
 		B6085D062743905F00A9C456 /* CoreDataStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6085D052743905F00A9C456 /* CoreDataStore.swift */; };
 		B6085D092743AAB600A9C456 /* FireproofDomains.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = B6085D072743993C00A9C456 /* FireproofDomains.xcdatamodeld */; };
 		B60C6F7729B0E286007BFAA8 /* SearchNonexistentDomainNavigationResponder.swift in Sources */ = {isa = PBXBuildFile; fileRef = B60C6F7629B0E286007BFAA8 /* SearchNonexistentDomainNavigationResponder.swift */; };
@@ -2767,7 +2029,6 @@
 		B60D644A2AAF1B7C00B26F50 /* AddressBarTextSelectionNavigation.swift in Sources */ = {isa = PBXBuildFile; fileRef = B60D64482AAF1B7C00B26F50 /* AddressBarTextSelectionNavigation.swift */; };
 		B6104E9B2BA9C173008636B2 /* DownloadResumeData.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6104E9A2BA9C173008636B2 /* DownloadResumeData.swift */; };
 		B6104E9C2BA9C173008636B2 /* DownloadResumeData.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6104E9A2BA9C173008636B2 /* DownloadResumeData.swift */; };
-		B6104E9D2BA9C174008636B2 /* DownloadResumeData.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6104E9A2BA9C173008636B2 /* DownloadResumeData.swift */; };
 		B6106BA026A7BE0B0013B453 /* PermissionManagerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6106B9F26A7BE0B0013B453 /* PermissionManagerTests.swift */; };
 		B6106BA726A7BECC0013B453 /* PermissionAuthorizationQuery.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6106BA526A7BEC80013B453 /* PermissionAuthorizationQuery.swift */; };
 		B6106BAB26A7BF1D0013B453 /* PermissionType.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6106BAA26A7BF1D0013B453 /* PermissionType.swift */; };
@@ -2796,13 +2057,10 @@
 		B62A234129C41D4400D22475 /* HistoryIntegrationTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = B62A233F29C41D4400D22475 /* HistoryIntegrationTests.swift */; };
 		B62B48392ADE46FC000DECE5 /* Application.swift in Sources */ = {isa = PBXBuildFile; fileRef = B62B48382ADE46FC000DECE5 /* Application.swift */; };
 		B62B483A2ADE46FC000DECE5 /* Application.swift in Sources */ = {isa = PBXBuildFile; fileRef = B62B48382ADE46FC000DECE5 /* Application.swift */; };
-		B62B483C2ADE46FC000DECE5 /* Application.swift in Sources */ = {isa = PBXBuildFile; fileRef = B62B48382ADE46FC000DECE5 /* Application.swift */; };
 		B62B483E2ADE48DE000DECE5 /* ArrayBuilder.swift in Sources */ = {isa = PBXBuildFile; fileRef = B62B483D2ADE48DE000DECE5 /* ArrayBuilder.swift */; };
 		B62B483F2ADE48DE000DECE5 /* ArrayBuilder.swift in Sources */ = {isa = PBXBuildFile; fileRef = B62B483D2ADE48DE000DECE5 /* ArrayBuilder.swift */; };
-		B62B48412ADE48DE000DECE5 /* ArrayBuilder.swift in Sources */ = {isa = PBXBuildFile; fileRef = B62B483D2ADE48DE000DECE5 /* ArrayBuilder.swift */; };
 		B62B48562ADE730D000DECE5 /* FileImportView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B62B48552ADE730D000DECE5 /* FileImportView.swift */; };
 		B62B48572ADE730D000DECE5 /* FileImportView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B62B48552ADE730D000DECE5 /* FileImportView.swift */; };
-		B62B48592ADE730D000DECE5 /* FileImportView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B62B48552ADE730D000DECE5 /* FileImportView.swift */; };
 		B62EB47C25BAD3BB005745C6 /* WKWebViewPrivateMethodsAvailabilityTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = B62EB47B25BAD3BB005745C6 /* WKWebViewPrivateMethodsAvailabilityTests.swift */; };
 		B630793526731BC400DCEE41 /* URLSuggestedFilenameTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8553FF51257523760029327F /* URLSuggestedFilenameTests.swift */; };
 		B630793A26731F2600DCEE41 /* FileDownloadManagerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = B630793926731F2600DCEE41 /* FileDownloadManagerTests.swift */; };
@@ -2829,7 +2087,7 @@
 		B63ED0E026AFE32F00A9DAD1 /* GeolocationProviderMock.swift in Sources */ = {isa = PBXBuildFile; fileRef = B63ED0DF26AFE32F00A9DAD1 /* GeolocationProviderMock.swift */; };
 		B63ED0E326B3E7FA00A9DAD1 /* CLLocationManagerMock.swift in Sources */ = {isa = PBXBuildFile; fileRef = B63ED0E226B3E7FA00A9DAD1 /* CLLocationManagerMock.swift */; };
 		B63ED0E526BB8FB900A9DAD1 /* SharingMenu.swift in Sources */ = {isa = PBXBuildFile; fileRef = B63ED0E426BB8FB900A9DAD1 /* SharingMenu.swift */; };
-		B642738227B65BAC0005DFD1 /* SecureVaultErrorReporter.swift in Sources */ = {isa = PBXBuildFile; fileRef = B642738127B65BAC0005DFD1 /* SecureVaultErrorReporter.swift */; };
+		B642738227B65BAC0005DFD1 /* SecureVaultReporter.swift in Sources */ = {isa = PBXBuildFile; fileRef = B642738127B65BAC0005DFD1 /* SecureVaultReporter.swift */; };
 		B643BF1427ABF772000BACEC /* NSWorkspaceExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = B643BF1327ABF772000BACEC /* NSWorkspaceExtension.swift */; };
 		B644B43D29D56829003FA9AB /* SearchNonexistentDomainTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = B644B43929D565DB003FA9AB /* SearchNonexistentDomainTests.swift */; };
 		B644B43E29D5682B003FA9AB /* SearchNonexistentDomainTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = B644B43929D565DB003FA9AB /* SearchNonexistentDomainTests.swift */; };
@@ -2854,7 +2112,6 @@
 		B64E42AC2B909DC9006C1346 /* test.pdf in Resources */ = {isa = PBXBuildFile; fileRef = B64E42AA2B909DC9006C1346 /* test.pdf */; };
 		B65211252B29A42C00B30633 /* BookmarkStoreMock.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA652CDA25DDAB32009059CC /* BookmarkStoreMock.swift */; };
 		B65211262B29A42E00B30633 /* BookmarkStoreMock.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA652CDA25DDAB32009059CC /* BookmarkStoreMock.swift */; };
-		B65211272B29A43000B30633 /* BookmarkStoreMock.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA652CDA25DDAB32009059CC /* BookmarkStoreMock.swift */; };
 		B65349AA265CF45000DCC645 /* DispatchQueueExtensionsTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = B65349A9265CF45000DCC645 /* DispatchQueueExtensionsTests.swift */; };
 		B655124829A79465009BFE1C /* NavigationActionExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = B66B9C5B29A5EBAD0010E8F3 /* NavigationActionExtension.swift */; };
 		B655124929A79465009BFE1C /* NavigationActionExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = B66B9C5B29A5EBAD0010E8F3 /* NavigationActionExtension.swift */; };
@@ -2867,10 +2124,8 @@
 		B657841F25FA497600D8DB33 /* NSException+Catch.swift in Sources */ = {isa = PBXBuildFile; fileRef = B657841E25FA497600D8DB33 /* NSException+Catch.swift */; };
 		B658BAB62B0F845D00D1F2C7 /* Localizable.xcstrings in Resources */ = {isa = PBXBuildFile; fileRef = B658BAB52B0F845D00D1F2C7 /* Localizable.xcstrings */; };
 		B658BAB72B0F848D00D1F2C7 /* Localizable.xcstrings in Resources */ = {isa = PBXBuildFile; fileRef = B658BAB52B0F845D00D1F2C7 /* Localizable.xcstrings */; };
-		B658BAB92B0F849100D1F2C7 /* Localizable.xcstrings in Resources */ = {isa = PBXBuildFile; fileRef = B658BAB52B0F845D00D1F2C7 /* Localizable.xcstrings */; };
 		B65C7DFB2B886CF0001E2D5C /* WKPDFHUDViewWrapper.swift in Sources */ = {isa = PBXBuildFile; fileRef = B65C7DFA2B886CF0001E2D5C /* WKPDFHUDViewWrapper.swift */; };
 		B65C7DFC2B886CF0001E2D5C /* WKPDFHUDViewWrapper.swift in Sources */ = {isa = PBXBuildFile; fileRef = B65C7DFA2B886CF0001E2D5C /* WKPDFHUDViewWrapper.swift */; };
-		B65C7DFD2B886CF0001E2D5C /* WKPDFHUDViewWrapper.swift in Sources */ = {isa = PBXBuildFile; fileRef = B65C7DFA2B886CF0001E2D5C /* WKPDFHUDViewWrapper.swift */; };
 		B65CD8CB2B316DF100A595BB /* SnapshotTesting in Frameworks */ = {isa = PBXBuildFile; productRef = B65CD8CA2B316DF100A595BB /* SnapshotTesting */; };
 		B65CD8CD2B316DFC00A595BB /* SnapshotTesting in Frameworks */ = {isa = PBXBuildFile; productRef = B65CD8CC2B316DFC00A595BB /* SnapshotTesting */; };
 		B65CD8CF2B316E0200A595BB /* SnapshotTesting in Frameworks */ = {isa = PBXBuildFile; productRef = B65CD8CE2B316E0200A595BB /* SnapshotTesting */; };
@@ -2886,14 +2141,12 @@
 		B65DA5F52A77D3FA00CBEE8D /* BundleExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6106B9D26A565DA0013B453 /* BundleExtension.swift */; };
 		B65E5DAF2B74DE6D00480415 /* TrackerNetwork.swift in Sources */ = {isa = PBXBuildFile; fileRef = B65E5DAE2B74DE6D00480415 /* TrackerNetwork.swift */; };
 		B65E5DB02B74E6A900480415 /* TrackerNetwork.swift in Sources */ = {isa = PBXBuildFile; fileRef = B65E5DAE2B74DE6D00480415 /* TrackerNetwork.swift */; };
-		B65E5DB12B74E6AA00480415 /* TrackerNetwork.swift in Sources */ = {isa = PBXBuildFile; fileRef = B65E5DAE2B74DE6D00480415 /* TrackerNetwork.swift */; };
 		B65E6B9E26D9EC0800095F96 /* CircularProgressView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B65E6B9D26D9EC0800095F96 /* CircularProgressView.swift */; };
 		B65E6BA026D9F10600095F96 /* NSBezierPathExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = B65E6B9F26D9F10600095F96 /* NSBezierPathExtension.swift */; };
 		B6619EF62B10DFF700CD9186 /* InstructionsFormatParserTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6619EF52B10DFF700CD9186 /* InstructionsFormatParserTests.swift */; };
 		B6619EF72B10DFF700CD9186 /* InstructionsFormatParserTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6619EF52B10DFF700CD9186 /* InstructionsFormatParserTests.swift */; };
 		B6619EFB2B111CC500CD9186 /* InstructionsFormatParser.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6619EF82B111CBE00CD9186 /* InstructionsFormatParser.swift */; };
 		B6619EFC2B111CC600CD9186 /* InstructionsFormatParser.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6619EF82B111CBE00CD9186 /* InstructionsFormatParser.swift */; };
-		B6619EFE2B111CCC00CD9186 /* InstructionsFormatParser.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6619EF82B111CBE00CD9186 /* InstructionsFormatParser.swift */; };
 		B6619F032B17123200CD9186 /* DataImportViewModelTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6619F022B17123200CD9186 /* DataImportViewModelTests.swift */; };
 		B6619F042B17123200CD9186 /* DataImportViewModelTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6619F022B17123200CD9186 /* DataImportViewModelTests.swift */; };
 		B6619F062B17138D00CD9186 /* DataImportSourceViewModelTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6619F052B17138D00CD9186 /* DataImportSourceViewModelTests.swift */; };
@@ -2905,13 +2158,10 @@
 		B66260E629ACAE4B00E9E3EE /* NavigationHotkeyHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = B66260E529ACAE4B00E9E3EE /* NavigationHotkeyHandler.swift */; };
 		B66260E729ACAE4B00E9E3EE /* NavigationHotkeyHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = B66260E529ACAE4B00E9E3EE /* NavigationHotkeyHandler.swift */; };
 		B66260E829ACD0C900E9E3EE /* DuckPlayerTabExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6C416A6294A4AE500C4F2E7 /* DuckPlayerTabExtension.swift */; };
-		B662D3D92755D7AD0035D4D6 /* PixelStoreTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = B662D3D82755D7AD0035D4D6 /* PixelStoreTests.swift */; };
 		B662D3DE275613BB0035D4D6 /* EncryptionKeyStoreMock.swift in Sources */ = {isa = PBXBuildFile; fileRef = B662D3DD275613BB0035D4D6 /* EncryptionKeyStoreMock.swift */; };
 		B662D3DF275616FF0035D4D6 /* EncryptionKeyStoreMock.swift in Sources */ = {isa = PBXBuildFile; fileRef = B662D3DD275613BB0035D4D6 /* EncryptionKeyStoreMock.swift */; };
 		B6656E0D2B29C733008798A1 /* FileImportViewLocalizationTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6656E0C2B29C733008798A1 /* FileImportViewLocalizationTests.swift */; };
 		B6656E0E2B29C733008798A1 /* FileImportViewLocalizationTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6656E0C2B29C733008798A1 /* FileImportViewLocalizationTests.swift */; };
-		B6656E122B29E3BE008798A1 /* DownloadListStoreMock.swift in Sources */ = {isa = PBXBuildFile; fileRef = B693956026F1C1BC0015B914 /* DownloadListStoreMock.swift */; };
-		B6656E5B2B2ADB1C008798A1 /* RequestFilePermissionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6B5F5832B03580A008DB58A /* RequestFilePermissionView.swift */; };
 		B6676BE12AA986A700525A21 /* AddressBarTextEditor.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6676BE02AA986A700525A21 /* AddressBarTextEditor.swift */; };
 		B6676BE22AA986A700525A21 /* AddressBarTextEditor.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6676BE02AA986A700525A21 /* AddressBarTextEditor.swift */; };
 		B6685E3D29A602D90043D2EE /* ExternalAppSchemeHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = B687B7CB2947A1E9001DEA6F /* ExternalAppSchemeHandler.swift */; };
@@ -2921,13 +2171,10 @@
 		B6685E4329A61C470043D2EE /* DownloadsTabExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6685E4129A61C460043D2EE /* DownloadsTabExtension.swift */; };
 		B66CA41E2AD910B300447CF0 /* DataImportView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B66CA41D2AD910B300447CF0 /* DataImportView.swift */; };
 		B66CA41F2AD910B300447CF0 /* DataImportView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B66CA41D2AD910B300447CF0 /* DataImportView.swift */; };
-		B66CA4212AD910B300447CF0 /* DataImportView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B66CA41D2AD910B300447CF0 /* DataImportView.swift */; };
 		B677FC4F2B06376B0099EB04 /* ReportFeedbackView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B677FC4E2B06376B0099EB04 /* ReportFeedbackView.swift */; };
 		B677FC502B06376B0099EB04 /* ReportFeedbackView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B677FC4E2B06376B0099EB04 /* ReportFeedbackView.swift */; };
-		B677FC522B06376B0099EB04 /* ReportFeedbackView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B677FC4E2B06376B0099EB04 /* ReportFeedbackView.swift */; };
 		B677FC542B064A9C0099EB04 /* DataImportViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = B677FC532B064A9C0099EB04 /* DataImportViewModel.swift */; };
 		B677FC552B064A9C0099EB04 /* DataImportViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = B677FC532B064A9C0099EB04 /* DataImportViewModel.swift */; };
-		B677FC572B064A9C0099EB04 /* DataImportViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = B677FC532B064A9C0099EB04 /* DataImportViewModel.swift */; };
 		B67C6C3D2654B897006C872E /* WebViewExtensionTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = B67C6C3C2654B897006C872E /* WebViewExtensionTests.swift */; };
 		B67C6C422654BF49006C872E /* DuckDuckGo-Symbol.jpg in Resources */ = {isa = PBXBuildFile; fileRef = B67C6C412654BF49006C872E /* DuckDuckGo-Symbol.jpg */; };
 		B67C6C472654C643006C872E /* FileManagerExtensionTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = B67C6C462654C643006C872E /* FileManagerExtensionTests.swift */; };
@@ -2936,15 +2183,12 @@
 		B6830963274CDEC7004B46BB /* FireproofDomainsStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6830962274CDEC7004B46BB /* FireproofDomainsStore.swift */; };
 		B68412142B694BA10092F66A /* NSObject+performSelector.m in Sources */ = {isa = PBXBuildFile; fileRef = B68412132B694BA10092F66A /* NSObject+performSelector.m */; };
 		B68412152B694BA10092F66A /* NSObject+performSelector.m in Sources */ = {isa = PBXBuildFile; fileRef = B68412132B694BA10092F66A /* NSObject+performSelector.m */; };
-		B68412162B694BA10092F66A /* NSObject+performSelector.m in Sources */ = {isa = PBXBuildFile; fileRef = B68412132B694BA10092F66A /* NSObject+performSelector.m */; };
 		B684121C2B6A1D880092F66A /* ErrorPageHTMLTemplate.swift in Sources */ = {isa = PBXBuildFile; fileRef = B684121B2B6A1D880092F66A /* ErrorPageHTMLTemplate.swift */; };
 		B684121D2B6A1D880092F66A /* ErrorPageHTMLTemplate.swift in Sources */ = {isa = PBXBuildFile; fileRef = B684121B2B6A1D880092F66A /* ErrorPageHTMLTemplate.swift */; };
-		B684121E2B6A1D880092F66A /* ErrorPageHTMLTemplate.swift in Sources */ = {isa = PBXBuildFile; fileRef = B684121B2B6A1D880092F66A /* ErrorPageHTMLTemplate.swift */; };
 		B68412202B6A30680092F66A /* StringExtensionTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = B684121F2B6A30680092F66A /* StringExtensionTests.swift */; };
 		B68412212B6A30680092F66A /* StringExtensionTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = B684121F2B6A30680092F66A /* StringExtensionTests.swift */; };
 		B68412272B6A68C10092F66A /* WKBackForwardListItemExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = B68412242B6A67920092F66A /* WKBackForwardListItemExtension.swift */; };
 		B68412282B6A68C20092F66A /* WKBackForwardListItemExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = B68412242B6A67920092F66A /* WKBackForwardListItemExtension.swift */; };
-		B68412292B6A68C90092F66A /* WKBackForwardListItemExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = B68412242B6A67920092F66A /* WKBackForwardListItemExtension.swift */; };
 		B68458B025C7E76A00DC17B6 /* WindowManager+StateRestoration.swift in Sources */ = {isa = PBXBuildFile; fileRef = B68458AF25C7E76A00DC17B6 /* WindowManager+StateRestoration.swift */; };
 		B68458B825C7E8B200DC17B6 /* Tab+NSSecureCoding.swift in Sources */ = {isa = PBXBuildFile; fileRef = B68458B725C7E8B200DC17B6 /* Tab+NSSecureCoding.swift */; };
 		B68458C025C7E9E000DC17B6 /* TabCollectionViewModel+NSSecureCoding.swift in Sources */ = {isa = PBXBuildFile; fileRef = B68458BF25C7E9E000DC17B6 /* TabCollectionViewModel+NSSecureCoding.swift */; };
@@ -2962,19 +2206,14 @@
 		B689ECD526C247DB006FB0C5 /* BackForwardListItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = B689ECD426C247DB006FB0C5 /* BackForwardListItem.swift */; };
 		B68C2FB227706E6A00BF2C7D /* ProcessExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = B68C2FB127706E6A00BF2C7D /* ProcessExtension.swift */; };
 		B68C92C1274E3EF4002AC6B0 /* PopUpWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = B68C92C0274E3EF4002AC6B0 /* PopUpWindow.swift */; };
-		B68C92C42750EF76002AC6B0 /* PixelDataRecord.swift in Sources */ = {isa = PBXBuildFile; fileRef = B68C92C32750EF76002AC6B0 /* PixelDataRecord.swift */; };
 		B68D21C32ACBC916002DA3C2 /* ContentBlockingMock.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6BDD9F429409DDD00F68088 /* ContentBlockingMock.swift */; };
 		B68D21C42ACBC917002DA3C2 /* ContentBlockingMock.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6BDD9F429409DDD00F68088 /* ContentBlockingMock.swift */; };
 		B68D21C82ACBC96D002DA3C2 /* MockPrivacyConfiguration.swift in Sources */ = {isa = PBXBuildFile; fileRef = B626A76F29928C4100053070 /* MockPrivacyConfiguration.swift */; };
 		B68D21C92ACBC96E002DA3C2 /* MockPrivacyConfiguration.swift in Sources */ = {isa = PBXBuildFile; fileRef = B626A76F29928C4100053070 /* MockPrivacyConfiguration.swift */; };
-		B68D21CA2ACBC971002DA3C2 /* MockPrivacyConfiguration.swift in Sources */ = {isa = PBXBuildFile; fileRef = B626A76F29928C4100053070 /* MockPrivacyConfiguration.swift */; };
-		B68D21CB2ACBC9A3002DA3C2 /* ContentBlockingMock.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6BDD9F429409DDD00F68088 /* ContentBlockingMock.swift */; };
 		B68D21CF2ACBC9FC002DA3C2 /* ContentBlockerRulesManagerMock.swift in Sources */ = {isa = PBXBuildFile; fileRef = B610F2E727AA397100FCEBE9 /* ContentBlockerRulesManagerMock.swift */; };
 		B68D21D02ACBC9FD002DA3C2 /* ContentBlockerRulesManagerMock.swift in Sources */ = {isa = PBXBuildFile; fileRef = B610F2E727AA397100FCEBE9 /* ContentBlockerRulesManagerMock.swift */; };
-		B68D21D22ACBCA01002DA3C2 /* ContentBlockerRulesManagerMock.swift in Sources */ = {isa = PBXBuildFile; fileRef = B610F2E727AA397100FCEBE9 /* ContentBlockerRulesManagerMock.swift */; };
 		B690152C2ACBF4DA00AD0BAB /* MenuPreview.swift in Sources */ = {isa = PBXBuildFile; fileRef = B690152B2ACBF4DA00AD0BAB /* MenuPreview.swift */; };
 		B690152D2ACBF4DA00AD0BAB /* MenuPreview.swift in Sources */ = {isa = PBXBuildFile; fileRef = B690152B2ACBF4DA00AD0BAB /* MenuPreview.swift */; };
-		B690152F2ACBF4DA00AD0BAB /* MenuPreview.swift in Sources */ = {isa = PBXBuildFile; fileRef = B690152B2ACBF4DA00AD0BAB /* MenuPreview.swift */; };
 		B693766E2B6B5F27005BD9D4 /* ErrorPageTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = B693766D2B6B5F26005BD9D4 /* ErrorPageTests.swift */; };
 		B693766F2B6B5F27005BD9D4 /* ErrorPageTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = B693766D2B6B5F26005BD9D4 /* ErrorPageTests.swift */; };
 		B693954B26F04BEB0015B914 /* MouseOverView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B693953D26F04BE70015B914 /* MouseOverView.swift */; };
@@ -2997,13 +2236,10 @@
 		B698E5042908011E00A746A8 /* AppKitPrivateMethodsAvailabilityTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = B698E5032908011E00A746A8 /* AppKitPrivateMethodsAvailabilityTests.swift */; };
 		B69A14F22B4D6FE800B9417D /* AddBookmarkFolderPopoverViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = B69A14F12B4D6FE800B9417D /* AddBookmarkFolderPopoverViewModel.swift */; };
 		B69A14F32B4D6FE800B9417D /* AddBookmarkFolderPopoverViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = B69A14F12B4D6FE800B9417D /* AddBookmarkFolderPopoverViewModel.swift */; };
-		B69A14F42B4D6FE800B9417D /* AddBookmarkFolderPopoverViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = B69A14F12B4D6FE800B9417D /* AddBookmarkFolderPopoverViewModel.swift */; };
 		B69A14F62B4D701F00B9417D /* AddBookmarkPopoverViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = B69A14F52B4D701F00B9417D /* AddBookmarkPopoverViewModel.swift */; };
 		B69A14F72B4D701F00B9417D /* AddBookmarkPopoverViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = B69A14F52B4D701F00B9417D /* AddBookmarkPopoverViewModel.swift */; };
-		B69A14F82B4D701F00B9417D /* AddBookmarkPopoverViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = B69A14F52B4D701F00B9417D /* AddBookmarkPopoverViewModel.swift */; };
 		B69A14FA2B4D705D00B9417D /* BookmarkFolderPicker.swift in Sources */ = {isa = PBXBuildFile; fileRef = B69A14F92B4D705D00B9417D /* BookmarkFolderPicker.swift */; };
 		B69A14FB2B4D705D00B9417D /* BookmarkFolderPicker.swift in Sources */ = {isa = PBXBuildFile; fileRef = B69A14F92B4D705D00B9417D /* BookmarkFolderPicker.swift */; };
-		B69A14FC2B4D705D00B9417D /* BookmarkFolderPicker.swift in Sources */ = {isa = PBXBuildFile; fileRef = B69A14F92B4D705D00B9417D /* BookmarkFolderPicker.swift */; };
 		B69B503A2726A12500758A2B /* StatisticsLoader.swift in Sources */ = {isa = PBXBuildFile; fileRef = B69B50342726A11F00758A2B /* StatisticsLoader.swift */; };
 		B69B503B2726A12500758A2B /* Atb.swift in Sources */ = {isa = PBXBuildFile; fileRef = B69B50352726A11F00758A2B /* Atb.swift */; };
 		B69B503C2726A12500758A2B /* StatisticsStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = B69B50362726A12000758A2B /* StatisticsStore.swift */; };
@@ -3023,25 +2259,23 @@
 		B69B50572727D16900758A2B /* AtbAndVariantCleanup.swift in Sources */ = {isa = PBXBuildFile; fileRef = B69B50562727D16900758A2B /* AtbAndVariantCleanup.swift */; };
 		B6A22B622B1E29D000ECD2BA /* DataImportSummaryViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6A22B612B1E29D000ECD2BA /* DataImportSummaryViewModel.swift */; };
 		B6A22B632B1E29D000ECD2BA /* DataImportSummaryViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6A22B612B1E29D000ECD2BA /* DataImportSummaryViewModel.swift */; };
-		B6A22B652B1E29D000ECD2BA /* DataImportSummaryViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6A22B612B1E29D000ECD2BA /* DataImportSummaryViewModel.swift */; };
 		B6A5A27125B9377300AA7ADA /* StatePersistenceService.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6A5A27025B9377300AA7ADA /* StatePersistenceService.swift */; };
 		B6A5A27925B93FFF00AA7ADA /* StateRestorationManagerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6A5A27825B93FFE00AA7ADA /* StateRestorationManagerTests.swift */; };
 		B6A5A27E25B9403E00AA7ADA /* FileStoreMock.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6A5A27D25B9403E00AA7ADA /* FileStoreMock.swift */; };
 		B6A5A2A025B96E8300AA7ADA /* AppStateChangePublisherTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6A5A29F25B96E8300AA7ADA /* AppStateChangePublisherTests.swift */; };
 		B6A5A2A825BAA35500AA7ADA /* WindowManagerStateRestorationTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6A5A2A725BAA35500AA7ADA /* WindowManagerStateRestorationTests.swift */; };
 		B6A924D92664C72E001A28CA /* WebKitDownloadTask.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6A924D82664C72D001A28CA /* WebKitDownloadTask.swift */; };
-		B6A9E45326142B070067D1B9 /* Pixel.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6A9E45226142B070067D1B9 /* Pixel.swift */; };
 		B6A9E46B2614618A0067D1B9 /* OperatingSystemVersionExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6A9E46A2614618A0067D1B9 /* OperatingSystemVersionExtension.swift */; };
-		B6A9E47726146A570067D1B9 /* PixelEvent.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6A9E47626146A570067D1B9 /* PixelEvent.swift */; };
-		B6A9E47F26146A800067D1B9 /* PixelArguments.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6A9E47E26146A800067D1B9 /* PixelArguments.swift */; };
-		B6A9E48426146AAB0067D1B9 /* PixelParameters.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6A9E48326146AAB0067D1B9 /* PixelParameters.swift */; };
 		B6AA64732994B43300D99CD6 /* FutureExtensionTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6AA64722994B43300D99CD6 /* FutureExtensionTests.swift */; };
 		B6AA64742994B43300D99CD6 /* FutureExtensionTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6AA64722994B43300D99CD6 /* FutureExtensionTests.swift */; };
 		B6AAAC2D260330580029438D /* PublishedAfter.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6AAAC2C260330580029438D /* PublishedAfter.swift */; };
 		B6AAAC3E26048F690029438D /* RandomAccessCollectionExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6AAAC3D26048F690029438D /* RandomAccessCollectionExtension.swift */; };
 		B6ABC5962B4861D4008343B9 /* FocusableTextField.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6ABC5952B4861D4008343B9 /* FocusableTextField.swift */; };
 		B6ABC5972B4861D4008343B9 /* FocusableTextField.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6ABC5952B4861D4008343B9 /* FocusableTextField.swift */; };
-		B6ABC5982B4861D4008343B9 /* FocusableTextField.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6ABC5952B4861D4008343B9 /* FocusableTextField.swift */; };
+		B6ABD0CA2BC03F610000EB69 /* SecurityScopedFileURLController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6ABD0C92BC03F610000EB69 /* SecurityScopedFileURLController.swift */; };
+		B6ABD0CB2BC03F610000EB69 /* SecurityScopedFileURLController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6ABD0C92BC03F610000EB69 /* SecurityScopedFileURLController.swift */; };
+		B6ABD0CE2BC042CE0000EB69 /* NSURL+sandboxExtensionRetainCount.m in Sources */ = {isa = PBXBuildFile; fileRef = B6ABD0CD2BC042CE0000EB69 /* NSURL+sandboxExtensionRetainCount.m */; };
+		B6ABD0CF2BC042CE0000EB69 /* NSURL+sandboxExtensionRetainCount.m in Sources */ = {isa = PBXBuildFile; fileRef = B6ABD0CD2BC042CE0000EB69 /* NSURL+sandboxExtensionRetainCount.m */; };
 		B6AE39F129373AF200C37AA4 /* EmptyAttributionRulesProver.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6AE39F029373AF200C37AA4 /* EmptyAttributionRulesProver.swift */; };
 		B6AE39F329374AEC00C37AA4 /* OHHTTPStubs in Frameworks */ = {isa = PBXBuildFile; productRef = B6AE39F229374AEC00C37AA4 /* OHHTTPStubs */; };
 		B6AE39F529374AEC00C37AA4 /* OHHTTPStubsSwift in Frameworks */ = {isa = PBXBuildFile; productRef = B6AE39F429374AEC00C37AA4 /* OHHTTPStubsSwift */; };
@@ -3053,50 +2287,38 @@
 		B6B1E87B26D381710062C350 /* DownloadListCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6B1E87A26D381710062C350 /* DownloadListCoordinator.swift */; };
 		B6B1E87E26D5DA0E0062C350 /* DownloadsPopover.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6B1E87D26D5DA0E0062C350 /* DownloadsPopover.swift */; };
 		B6B1E88026D5DA9B0062C350 /* DownloadsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6B1E87F26D5DA9B0062C350 /* DownloadsViewController.swift */; };
-		B6B1E88226D5DAC30062C350 /* Downloads.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = B6B1E88126D5DAC30062C350 /* Downloads.storyboard */; };
 		B6B1E88426D5EB570062C350 /* DownloadsCellView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6B1E88326D5EB570062C350 /* DownloadsCellView.swift */; };
 		B6B1E88B26D774090062C350 /* LinkButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6B1E88A26D774090062C350 /* LinkButton.swift */; };
 		B6B2400E28083B49001B8F3A /* WebViewContainerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6B2400D28083B49001B8F3A /* WebViewContainerView.swift */; };
 		B6B3E0E12657EA7A0040E0A2 /* NSScreenExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6B3E0DC2657E9CF0040E0A2 /* NSScreenExtension.swift */; };
 		B6B4D1C52B0B3B5400C26286 /* DataImportReportModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6B4D1C42B0B3B5400C26286 /* DataImportReportModel.swift */; };
 		B6B4D1C62B0B3B5400C26286 /* DataImportReportModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6B4D1C42B0B3B5400C26286 /* DataImportReportModel.swift */; };
-		B6B4D1C82B0B3B5400C26286 /* DataImportReportModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6B4D1C42B0B3B5400C26286 /* DataImportReportModel.swift */; };
 		B6B4D1CA2B0C8C9200C26286 /* FirefoxCompatibilityPreferences.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6B4D1C92B0C8C9200C26286 /* FirefoxCompatibilityPreferences.swift */; };
 		B6B4D1CB2B0C8C9200C26286 /* FirefoxCompatibilityPreferences.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6B4D1C92B0C8C9200C26286 /* FirefoxCompatibilityPreferences.swift */; };
-		B6B4D1CD2B0C8C9200C26286 /* FirefoxCompatibilityPreferences.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6B4D1C92B0C8C9200C26286 /* FirefoxCompatibilityPreferences.swift */; };
 		B6B4D1CF2B0E0DD000C26286 /* DataImportNoDataView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6B4D1CE2B0E0DD000C26286 /* DataImportNoDataView.swift */; };
 		B6B4D1D02B0E0DD000C26286 /* DataImportNoDataView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6B4D1CE2B0E0DD000C26286 /* DataImportNoDataView.swift */; };
-		B6B4D1D22B0E0DD000C26286 /* DataImportNoDataView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6B4D1CE2B0E0DD000C26286 /* DataImportNoDataView.swift */; };
 		B6B5F57F2B024105008DB58A /* DataImportSummaryView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6B5F57E2B024105008DB58A /* DataImportSummaryView.swift */; };
 		B6B5F5802B024105008DB58A /* DataImportSummaryView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6B5F57E2B024105008DB58A /* DataImportSummaryView.swift */; };
-		B6B5F5822B024105008DB58A /* DataImportSummaryView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6B5F57E2B024105008DB58A /* DataImportSummaryView.swift */; };
 		B6B5F5842B03580A008DB58A /* RequestFilePermissionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6B5F5832B03580A008DB58A /* RequestFilePermissionView.swift */; };
 		B6B5F5852B03580A008DB58A /* RequestFilePermissionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6B5F5832B03580A008DB58A /* RequestFilePermissionView.swift */; };
 		B6B5F5892B03673B008DB58A /* BrowserImportMoreInfoView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6B5F5882B03673B008DB58A /* BrowserImportMoreInfoView.swift */; };
 		B6B5F58A2B03673B008DB58A /* BrowserImportMoreInfoView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6B5F5882B03673B008DB58A /* BrowserImportMoreInfoView.swift */; };
-		B6B5F58C2B03673B008DB58A /* BrowserImportMoreInfoView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6B5F5882B03673B008DB58A /* BrowserImportMoreInfoView.swift */; };
 		B6B71C582B23379600487131 /* NSLayoutConstraintExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6B71C572B23379600487131 /* NSLayoutConstraintExtension.swift */; };
 		B6B71C592B23379600487131 /* NSLayoutConstraintExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6B71C572B23379600487131 /* NSLayoutConstraintExtension.swift */; };
-		B6B71C5A2B23379600487131 /* NSLayoutConstraintExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6B71C572B23379600487131 /* NSLayoutConstraintExtension.swift */; };
 		B6B77BE8297973D4001E68A1 /* Navigation in Frameworks */ = {isa = PBXBuildFile; productRef = B6B77BE7297973D4001E68A1 /* Navigation */; };
 		B6BBF1702744CDE1004F850E /* CoreDataStoreTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6BBF16F2744CDE1004F850E /* CoreDataStoreTests.swift */; };
 		B6BBF1722744CE36004F850E /* FireproofDomainsStoreMock.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6BBF1712744CE36004F850E /* FireproofDomainsStoreMock.swift */; };
 		B6BBF17427475B15004F850E /* PopupBlockedPopover.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6BBF17327475B15004F850E /* PopupBlockedPopover.swift */; };
 		B6BCC51E2AFCD9ED002C5499 /* DataImportSourcePicker.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6BCC51D2AFCD9ED002C5499 /* DataImportSourcePicker.swift */; };
 		B6BCC51F2AFCD9ED002C5499 /* DataImportSourcePicker.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6BCC51D2AFCD9ED002C5499 /* DataImportSourcePicker.swift */; };
-		B6BCC5212AFCD9ED002C5499 /* DataImportSourcePicker.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6BCC51D2AFCD9ED002C5499 /* DataImportSourcePicker.swift */; };
 		B6BCC5232AFCDABB002C5499 /* DataImportSourceViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6BCC5222AFCDABB002C5499 /* DataImportSourceViewModel.swift */; };
 		B6BCC5242AFCDABB002C5499 /* DataImportSourceViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6BCC5222AFCDABB002C5499 /* DataImportSourceViewModel.swift */; };
-		B6BCC5262AFCDABB002C5499 /* DataImportSourceViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6BCC5222AFCDABB002C5499 /* DataImportSourceViewModel.swift */; };
 		B6BCC53B2AFD15DF002C5499 /* DataImportProfilePicker.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6BCC53A2AFD15DF002C5499 /* DataImportProfilePicker.swift */; };
 		B6BCC53C2AFD15DF002C5499 /* DataImportProfilePicker.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6BCC53A2AFD15DF002C5499 /* DataImportProfilePicker.swift */; };
-		B6BCC53E2AFD15DF002C5499 /* DataImportProfilePicker.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6BCC53A2AFD15DF002C5499 /* DataImportProfilePicker.swift */; };
 		B6BCC54A2AFDF24B002C5499 /* TaskWithProgress.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6BCC5492AFDF24B002C5499 /* TaskWithProgress.swift */; };
 		B6BCC54B2AFDF24B002C5499 /* TaskWithProgress.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6BCC5492AFDF24B002C5499 /* TaskWithProgress.swift */; };
-		B6BCC54D2AFDF24B002C5499 /* TaskWithProgress.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6BCC5492AFDF24B002C5499 /* TaskWithProgress.swift */; };
 		B6BCC54F2AFE4F7D002C5499 /* DataImportTypePicker.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6BCC54E2AFE4F7D002C5499 /* DataImportTypePicker.swift */; };
 		B6BCC5502AFE4F7D002C5499 /* DataImportTypePicker.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6BCC54E2AFE4F7D002C5499 /* DataImportTypePicker.swift */; };
-		B6BCC5522AFE4F7D002C5499 /* DataImportTypePicker.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6BCC54E2AFE4F7D002C5499 /* DataImportTypePicker.swift */; };
 		B6BDDA012942389000F68088 /* TabExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6BDDA002942389000F68088 /* TabExtensions.swift */; };
 		B6BE9FAA293F7955006363C6 /* ModalSheetCancellable.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6BE9FA9293F7955006363C6 /* ModalSheetCancellable.swift */; };
 		B6BF5D852946FFDA006742B1 /* PrivacyDashboardTabExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6BF5D842946FFDA006742B1 /* PrivacyDashboardTabExtension.swift */; };
@@ -3125,15 +2347,12 @@
 		B6C843DB2BA1CAB6006FDEC3 /* FilePresenterTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6C843D92BA1CAB6006FDEC3 /* FilePresenterTests.swift */; };
 		B6C8CAA72AD010DD0060E1CD /* YandexDataImporter.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6C8CAA62AD010DD0060E1CD /* YandexDataImporter.swift */; };
 		B6C8CAA82AD010DD0060E1CD /* YandexDataImporter.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6C8CAA62AD010DD0060E1CD /* YandexDataImporter.swift */; };
-		B6C8CAAA2AD010DD0060E1CD /* YandexDataImporter.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6C8CAA62AD010DD0060E1CD /* YandexDataImporter.swift */; };
 		B6CA4824298CDC2E0067ECCE /* AdClickAttributionTabExtensionTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6CA4823298CDC2E0067ECCE /* AdClickAttributionTabExtensionTests.swift */; };
 		B6CA4825298CE4B70067ECCE /* AdClickAttributionTabExtensionTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6CA4823298CDC2E0067ECCE /* AdClickAttributionTabExtensionTests.swift */; };
 		B6CC26682BAD959500F53F8D /* DownloadProgress.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6CC26672BAD959500F53F8D /* DownloadProgress.swift */; };
 		B6CC26692BAD959500F53F8D /* DownloadProgress.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6CC26672BAD959500F53F8D /* DownloadProgress.swift */; };
-		B6CC266A2BAD959500F53F8D /* DownloadProgress.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6CC26672BAD959500F53F8D /* DownloadProgress.swift */; };
 		B6CC266C2BAD9CD800F53F8D /* FileProgressPresenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6CC266B2BAD9CD800F53F8D /* FileProgressPresenter.swift */; };
 		B6CC266D2BAD9CD800F53F8D /* FileProgressPresenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6CC266B2BAD9CD800F53F8D /* FileProgressPresenter.swift */; };
-		B6CC266E2BAD9CD800F53F8D /* FileProgressPresenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6CC266B2BAD9CD800F53F8D /* FileProgressPresenter.swift */; };
 		B6D574B429472253008ED1B6 /* FBProtectionTabExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6D574B329472253008ED1B6 /* FBProtectionTabExtension.swift */; };
 		B6D6A5DD2982A4CE001F5F11 /* Tab+Navigation.swift in Sources */ = {isa = PBXBuildFile; fileRef = B61E2CD4294346C000773D8A /* Tab+Navigation.swift */; };
 		B6DA06E12913AEDC00225DE2 /* TestNavigationDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6DA06E02913AEDB00225DE2 /* TestNavigationDelegate.swift */; };
@@ -3141,27 +2360,29 @@
 		B6DA06E42913ECEE00225DE2 /* ContextMenuManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6DA06E32913ECEE00225DE2 /* ContextMenuManager.swift */; };
 		B6DA06E62913F39400225DE2 /* MenuItemSelectors.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6DA06E52913F39400225DE2 /* MenuItemSelectors.swift */; };
 		B6DA06E8291401D700225DE2 /* WKMenuItemIdentifier.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6DA06E7291401D700225DE2 /* WKMenuItemIdentifier.swift */; };
-		B6DA44022616B28300DD1EC2 /* PixelDataStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6DA44012616B28300DD1EC2 /* PixelDataStore.swift */; };
-		B6DA44082616B30600DD1EC2 /* PixelDataModel.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = B6DA44062616B30600DD1EC2 /* PixelDataModel.xcdatamodeld */; };
-		B6DA44112616C0FC00DD1EC2 /* PixelTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6DA44102616C0FC00DD1EC2 /* PixelTests.swift */; };
 		B6DA44172616C13800DD1EC2 /* OHHTTPStubs in Frameworks */ = {isa = PBXBuildFile; productRef = B6DA44162616C13800DD1EC2 /* OHHTTPStubs */; };
 		B6DA44192616C13800DD1EC2 /* OHHTTPStubsSwift in Frameworks */ = {isa = PBXBuildFile; productRef = B6DA44182616C13800DD1EC2 /* OHHTTPStubsSwift */; };
 		B6DA441E2616C84600DD1EC2 /* PixelStoreMock.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6DA441D2616C84600DD1EC2 /* PixelStoreMock.swift */; };
-		B6DA44232616CABC00DD1EC2 /* PixelArgumentsTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6DA44222616CABC00DD1EC2 /* PixelArgumentsTests.swift */; };
 		B6DB3AEF278D5C370024C5C4 /* URLSessionExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6DB3AEE278D5C370024C5C4 /* URLSessionExtension.swift */; };
 		B6DB3AF6278EA0130024C5C4 /* BundleExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6106B9D26A565DA0013B453 /* BundleExtension.swift */; };
 		B6DB3CF926A00E2D00D459B7 /* AVCaptureDevice+SwizzledAuthState.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6DB3CF826A00E2D00D459B7 /* AVCaptureDevice+SwizzledAuthState.swift */; };
 		B6DB3CFB26A17CB800D459B7 /* PermissionModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6DB3CFA26A17CB800D459B7 /* PermissionModel.swift */; };
 		B6DE57F62B05EA9000CD54B9 /* SheetHostingWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6DE57F52B05EA9000CD54B9 /* SheetHostingWindow.swift */; };
 		B6DE57F72B05EA9000CD54B9 /* SheetHostingWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6DE57F52B05EA9000CD54B9 /* SheetHostingWindow.swift */; };
-		B6DE57F92B05EA9000CD54B9 /* SheetHostingWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6DE57F52B05EA9000CD54B9 /* SheetHostingWindow.swift */; };
 		B6E1491029A5C30500AAFBE8 /* ContentBlockingTabExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6D574B12947224C008ED1B6 /* ContentBlockingTabExtension.swift */; };
 		B6E1491129A5C30A00AAFBE8 /* FBProtectionTabExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6D574B329472253008ED1B6 /* FBProtectionTabExtension.swift */; };
 		B6E319382953446000DD3BCF /* Assertions.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6E319372953446000DD3BCF /* Assertions.swift */; };
+		B6E3E5502BBFCDEE00A41922 /* OpenDownloadsCellView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6E3E54F2BBFCDEE00A41922 /* OpenDownloadsCellView.swift */; };
+		B6E3E5512BBFCDEE00A41922 /* OpenDownloadsCellView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6E3E54F2BBFCDEE00A41922 /* OpenDownloadsCellView.swift */; };
+		B6E3E5542BBFCEE300A41922 /* NoDownloadsCellView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6E3E5532BBFCEE300A41922 /* NoDownloadsCellView.swift */; };
+		B6E3E5552BBFCEE300A41922 /* NoDownloadsCellView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6E3E5532BBFCEE300A41922 /* NoDownloadsCellView.swift */; };
+		B6E3E5582BBFD51400A41922 /* PreviewViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6E3E5572BBFD51400A41922 /* PreviewViewController.swift */; };
+		B6E3E5592BBFD51400A41922 /* PreviewViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6E3E5572BBFD51400A41922 /* PreviewViewController.swift */; };
+		B6E3E55B2BC0041900A41922 /* DownloadListStoreMock.swift in Sources */ = {isa = PBXBuildFile; fileRef = B693956026F1C1BC0015B914 /* DownloadListStoreMock.swift */; };
+		B6E3E55C2BC0041A00A41922 /* DownloadListStoreMock.swift in Sources */ = {isa = PBXBuildFile; fileRef = B693956026F1C1BC0015B914 /* DownloadListStoreMock.swift */; };
 		B6E61EE3263AC0C8004E11AB /* FileManagerExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6E61EE2263AC0C8004E11AB /* FileManagerExtension.swift */; };
 		B6E6B9E32BA1F5F1008AA7E1 /* FilePresenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6E6B9E22BA1F5F1008AA7E1 /* FilePresenter.swift */; };
 		B6E6B9E42BA1F5F1008AA7E1 /* FilePresenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6E6B9E22BA1F5F1008AA7E1 /* FilePresenter.swift */; };
-		B6E6B9E52BA1F5F1008AA7E1 /* FilePresenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6E6B9E22BA1F5F1008AA7E1 /* FilePresenter.swift */; };
 		B6E6B9F62BA1FD90008AA7E1 /* SandboxTestTool.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6E6B9F52BA1FD90008AA7E1 /* SandboxTestTool.swift */; };
 		B6E6BA042BA1FE05008AA7E1 /* FilePresenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6E6B9E22BA1F5F1008AA7E1 /* FilePresenter.swift */; };
 		B6E6BA052BA1FE09008AA7E1 /* URLExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA8EDF2324923E980071C2E8 /* URLExtension.swift */; };
@@ -3182,8 +2403,19 @@
 		B6EC37FC29B83E99001ACE79 /* TestsURLExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6EC37FB29B83E99001ACE79 /* TestsURLExtension.swift */; };
 		B6EC37FD29B83E99001ACE79 /* TestsURLExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6EC37FB29B83E99001ACE79 /* TestsURLExtension.swift */; };
 		B6EC37FF29B8D915001ACE79 /* Configuration in Frameworks */ = {isa = PBXBuildFile; productRef = B6EC37FE29B8D915001ACE79 /* Configuration */; };
+		B6EECB302BC3FA5A00B3CB77 /* SecurityScopedFileURLController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6ABD0C92BC03F610000EB69 /* SecurityScopedFileURLController.swift */; };
+		B6EECB312BC3FAB100B3CB77 /* NSURL+sandboxExtensionRetainCount.m in Sources */ = {isa = PBXBuildFile; fileRef = B6ABD0CD2BC042CE0000EB69 /* NSURL+sandboxExtensionRetainCount.m */; };
+		B6EECB322BC40A1400B3CB77 /* FileManagerExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6E61EE2263AC0C8004E11AB /* FileManagerExtension.swift */; };
 		B6EEDD7D2B8C69E900637EBC /* TabContentTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6EEDD7C2B8C69E900637EBC /* TabContentTests.swift */; };
 		B6EEDD7E2B8C69E900637EBC /* TabContentTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6EEDD7C2B8C69E900637EBC /* TabContentTests.swift */; };
+		B6F1B0222BCE5658005E863C /* BrokenSiteInfoTabExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6F1B0212BCE5658005E863C /* BrokenSiteInfoTabExtension.swift */; };
+		B6F1B0232BCE5658005E863C /* BrokenSiteInfoTabExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6F1B0212BCE5658005E863C /* BrokenSiteInfoTabExtension.swift */; };
+		B6F1B0262BCE5A50005E863C /* TabContent.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6F1B0252BCE5A50005E863C /* TabContent.swift */; };
+		B6F1B0272BCE5A50005E863C /* TabContent.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6F1B0252BCE5A50005E863C /* TabContent.swift */; };
+		B6F1B02A2BCE675C005E863C /* NetworkProtectionControllerTabExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6F1B0292BCE675C005E863C /* NetworkProtectionControllerTabExtension.swift */; };
+		B6F1B02B2BCE675C005E863C /* NetworkProtectionControllerTabExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6F1B0292BCE675C005E863C /* NetworkProtectionControllerTabExtension.swift */; };
+		B6F1B02E2BCE6B47005E863C /* TunnelControllerProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6F1B02D2BCE6B47005E863C /* TunnelControllerProvider.swift */; };
+		B6F1B02F2BCE6B47005E863C /* TunnelControllerProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6F1B02D2BCE6B47005E863C /* TunnelControllerProvider.swift */; };
 		B6F1C80B2761C45400334924 /* LocalUnprotectedDomains.swift in Sources */ = {isa = PBXBuildFile; fileRef = 336B39E22726B4B700C417D3 /* LocalUnprotectedDomains.swift */; };
 		B6F41031264D2B23003DA42C /* ProgressExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6F41030264D2B23003DA42C /* ProgressExtension.swift */; };
 		B6F56567299A414300A04298 /* WKWebViewMockingExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6F56566299A414300A04298 /* WKWebViewMockingExtension.swift */; };
@@ -3200,41 +2432,54 @@
 		B6F92BAD2A6937B5002ABA6B /* OptionalExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = B637273C26CCF0C200C8CB02 /* OptionalExtension.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 */; };
 		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 */; };
 		B6FA893D269C423100588ECD /* PrivacyDashboard.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = B6FA893C269C423100588ECD /* PrivacyDashboard.storyboard */; };
 		B6FA893F269C424500588ECD /* PrivacyDashboardViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6FA893E269C424500588ECD /* PrivacyDashboardViewController.swift */; };
 		B6FA8941269C425400588ECD /* PrivacyDashboardPopover.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6FA8940269C425400588ECD /* PrivacyDashboardPopover.swift */; };
 		BB5789722B2CA70F0009DFE2 /* DataBrokerProtectionSubscriptionEventHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB5789712B2CA70F0009DFE2 /* DataBrokerProtectionSubscriptionEventHandler.swift */; };
-		BB5789732B2CC0300009DFE2 /* DataBrokerProtectionSubscriptionEventHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB5789712B2CA70F0009DFE2 /* DataBrokerProtectionSubscriptionEventHandler.swift */; };
 		BBDFDC5A2B2B8A0900F62D90 /* DataBrokerProtectionExternalWaitlistPixels.swift in Sources */ = {isa = PBXBuildFile; fileRef = BBDFDC592B2B8A0900F62D90 /* DataBrokerProtectionExternalWaitlistPixels.swift */; };
-		BBDFDC5C2B2B8D7000F62D90 /* DataBrokerProtectionExternalWaitlistPixels.swift in Sources */ = {isa = PBXBuildFile; fileRef = BBDFDC592B2B8A0900F62D90 /* DataBrokerProtectionExternalWaitlistPixels.swift */; };
 		BBDFDC5D2B2B8E2100F62D90 /* DataBrokerProtectionExternalWaitlistPixels.swift in Sources */ = {isa = PBXBuildFile; fileRef = BBDFDC592B2B8A0900F62D90 /* DataBrokerProtectionExternalWaitlistPixels.swift */; };
+		BD384AC92BBC821A00EF3735 /* vpn-dark-mode.json in Resources */ = {isa = PBXBuildFile; fileRef = BD384AC82BBC821100EF3735 /* vpn-dark-mode.json */; };
+		BD384ACA2BBC821A00EF3735 /* vpn-light-mode.json in Resources */ = {isa = PBXBuildFile; fileRef = BD384AC72BBC821100EF3735 /* vpn-light-mode.json */; };
+		BD384ACB2BBC821B00EF3735 /* vpn-dark-mode.json in Resources */ = {isa = PBXBuildFile; fileRef = BD384AC82BBC821100EF3735 /* vpn-dark-mode.json */; };
+		BD384ACC2BBC821B00EF3735 /* vpn-light-mode.json in Resources */ = {isa = PBXBuildFile; fileRef = BD384AC72BBC821100EF3735 /* vpn-light-mode.json */; };
+		BDA7647C2BC497BE00D0400C /* DefaultVPNLocationFormatter.swift in Sources */ = {isa = PBXBuildFile; fileRef = BDA7647B2BC497BE00D0400C /* DefaultVPNLocationFormatter.swift */; };
+		BDA7647D2BC497BE00D0400C /* DefaultVPNLocationFormatter.swift in Sources */ = {isa = PBXBuildFile; fileRef = BDA7647B2BC497BE00D0400C /* DefaultVPNLocationFormatter.swift */; };
+		BDA7647F2BC4998900D0400C /* DefaultVPNLocationFormatter.swift in Sources */ = {isa = PBXBuildFile; fileRef = BDA7647B2BC497BE00D0400C /* DefaultVPNLocationFormatter.swift */; };
+		BDA764802BC4998A00D0400C /* DefaultVPNLocationFormatter.swift in Sources */ = {isa = PBXBuildFile; fileRef = BDA7647B2BC497BE00D0400C /* DefaultVPNLocationFormatter.swift */; };
+		BDA764842BC49E3F00D0400C /* NetworkProtectionVPNCountryLabelsModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = EEA3EEB02B24EBD000E8333A /* NetworkProtectionVPNCountryLabelsModel.swift */; };
+		BDA764852BC49E4000D0400C /* NetworkProtectionVPNCountryLabelsModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = EEA3EEB02B24EBD000E8333A /* NetworkProtectionVPNCountryLabelsModel.swift */; };
+		BDA7648D2BC4E4EF00D0400C /* DefaultVPNLocationFormatterTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = BDA7648C2BC4E4EF00D0400C /* DefaultVPNLocationFormatterTests.swift */; };
+		BDA7648E2BC4E4EF00D0400C /* DefaultVPNLocationFormatterTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = BDA7648C2BC4E4EF00D0400C /* DefaultVPNLocationFormatterTests.swift */; };
+		BDA764912BC4E57200D0400C /* MockVPNLocationFormatter.swift in Sources */ = {isa = PBXBuildFile; fileRef = BDA764902BC4E57200D0400C /* MockVPNLocationFormatter.swift */; };
+		BDA764922BC4E57200D0400C /* MockVPNLocationFormatter.swift in Sources */ = {isa = PBXBuildFile; fileRef = BDA764902BC4E57200D0400C /* MockVPNLocationFormatter.swift */; };
+		BDADBDC92BD2BC2200421B9B /* Lottie in Frameworks */ = {isa = PBXBuildFile; productRef = BDADBDC82BD2BC2200421B9B /* Lottie */; };
+		BDADBDCB2BD2BC2800421B9B /* Lottie in Frameworks */ = {isa = PBXBuildFile; productRef = BDADBDCA2BD2BC2800421B9B /* Lottie */; };
+		BDADBDCC2BD2BC4D00421B9B /* vpn-dark-mode.json in Resources */ = {isa = PBXBuildFile; fileRef = BD384AC82BBC821100EF3735 /* vpn-dark-mode.json */; };
+		BDADBDCD2BD2BC5700421B9B /* vpn-light-mode.json in Resources */ = {isa = PBXBuildFile; fileRef = BD384AC72BBC821100EF3735 /* vpn-light-mode.json */; };
+		BDE981D92BBD10D600645880 /* vpn-dark-mode.json in Resources */ = {isa = PBXBuildFile; fileRef = BD384AC82BBC821100EF3735 /* vpn-dark-mode.json */; };
+		BDE981DA2BBD10D600645880 /* vpn-light-mode.json in Resources */ = {isa = PBXBuildFile; fileRef = BD384AC72BBC821100EF3735 /* vpn-light-mode.json */; };
+		C1372EF42BBC5BAD003F8793 /* SecureTextField.swift in Sources */ = {isa = PBXBuildFile; fileRef = C1372EF32BBC5BAD003F8793 /* SecureTextField.swift */; };
+		C1372EF52BBC5BAD003F8793 /* SecureTextField.swift in Sources */ = {isa = PBXBuildFile; fileRef = C1372EF32BBC5BAD003F8793 /* SecureTextField.swift */; };
 		C13909EF2B85FD4E001626ED /* AutofillActionExecutor.swift in Sources */ = {isa = PBXBuildFile; fileRef = C13909EE2B85FD4E001626ED /* AutofillActionExecutor.swift */; };
 		C13909F02B85FD4E001626ED /* AutofillActionExecutor.swift in Sources */ = {isa = PBXBuildFile; fileRef = C13909EE2B85FD4E001626ED /* AutofillActionExecutor.swift */; };
-		C13909F12B85FD4E001626ED /* AutofillActionExecutor.swift in Sources */ = {isa = PBXBuildFile; fileRef = C13909EE2B85FD4E001626ED /* AutofillActionExecutor.swift */; };
 		C13909F42B85FD79001626ED /* AutofillDeleteAllPasswordsExecutorTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C13909F32B85FD79001626ED /* AutofillDeleteAllPasswordsExecutorTests.swift */; };
 		C13909F52B85FD79001626ED /* AutofillDeleteAllPasswordsExecutorTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C13909F32B85FD79001626ED /* AutofillDeleteAllPasswordsExecutorTests.swift */; };
 		C13909FB2B861039001626ED /* AutofillActionPresenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = C13909FA2B861039001626ED /* AutofillActionPresenter.swift */; };
 		C13909FC2B861039001626ED /* AutofillActionPresenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = C13909FA2B861039001626ED /* AutofillActionPresenter.swift */; };
-		C13909FD2B861039001626ED /* AutofillActionPresenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = C13909FA2B861039001626ED /* AutofillActionPresenter.swift */; };
 		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 */; };
 		C1E961F02B87AA29001760E1 /* AutofillActionBuilder.swift in Sources */ = {isa = PBXBuildFile; fileRef = C1E961EE2B87AA29001760E1 /* AutofillActionBuilder.swift */; };
-		C1E961F22B87AA29001760E1 /* AutofillActionBuilder.swift in Sources */ = {isa = PBXBuildFile; fileRef = C1E961EE2B87AA29001760E1 /* AutofillActionBuilder.swift */; };
 		C1E961F32B87B273001760E1 /* MockAutofillActionExecutor.swift in Sources */ = {isa = PBXBuildFile; fileRef = C1E961EC2B879ED9001760E1 /* MockAutofillActionExecutor.swift */; };
 		C1E961F42B87B276001760E1 /* MockAutofillActionPresenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = C1E961E72B879E4D001760E1 /* MockAutofillActionPresenter.swift */; };
 		CB24F70C29A3D9CB006DCC58 /* AppConfigurationURLProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = CB24F70B29A3D9CB006DCC58 /* AppConfigurationURLProvider.swift */; };
@@ -3245,7 +2490,6 @@
 		CBDD5DE429A6800300832877 /* MockConfigurationStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = CBDD5DE229A67F2700832877 /* MockConfigurationStore.swift */; };
 		D64A5FF82AEA5C2B00B6D6E7 /* HomeButtonMenuFactory.swift in Sources */ = {isa = PBXBuildFile; fileRef = D64A5FF72AEA5C2B00B6D6E7 /* HomeButtonMenuFactory.swift */; };
 		D64A5FF92AEA5C2B00B6D6E7 /* HomeButtonMenuFactory.swift in Sources */ = {isa = PBXBuildFile; fileRef = D64A5FF72AEA5C2B00B6D6E7 /* HomeButtonMenuFactory.swift */; };
-		D64A5FFB2AEA5C2B00B6D6E7 /* HomeButtonMenuFactory.swift in Sources */ = {isa = PBXBuildFile; fileRef = D64A5FF72AEA5C2B00B6D6E7 /* HomeButtonMenuFactory.swift */; };
 		EA0BA3A9272217E6002A0B6C /* ClickToLoadUserScript.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA0BA3A8272217E6002A0B6C /* ClickToLoadUserScript.swift */; };
 		EA18D1CA272F0DC8006DC101 /* social_images in Resources */ = {isa = PBXBuildFile; fileRef = EA18D1C9272F0DC8006DC101 /* social_images */; };
 		EA1E52B52798CF98002EC53C /* ClickToLoadModelTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA1E52B42798CF98002EC53C /* ClickToLoadModelTests.swift */; };
@@ -3267,19 +2511,24 @@
 		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 */; };
+		EE42CBCC2BC8004700AD411C /* PermissionsTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE42CBCB2BC8004700AD411C /* PermissionsTests.swift */; };
+		EE54F7B32BBFEA49006218DB /* BookmarksAndFavoritesTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE54F7B22BBFEA48006218DB /* BookmarksAndFavoritesTests.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 */; };
 		EE7295ED2A545C0A008C0991 /* NetworkProtection in Frameworks */ = {isa = PBXBuildFile; productRef = EE7295EC2A545C0A008C0991 /* NetworkProtection */; };
 		EE7295EF2A545C12008C0991 /* NetworkProtection in Frameworks */ = {isa = PBXBuildFile; productRef = EE7295EE2A545C12008C0991 /* NetworkProtection */; };
+		EE7F74912BB5D76600CD9456 /* BookmarksBarTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE7F74902BB5D76600CD9456 /* BookmarksBarTests.swift */; };
+		EE9D81C32BC57A3700338BE3 /* StateRestorationTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE9D81C22BC57A3700338BE3 /* StateRestorationTests.swift */; };
 		EEA3EEB12B24EBD000E8333A /* NetworkProtectionVPNCountryLabelsModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = EEA3EEB02B24EBD000E8333A /* NetworkProtectionVPNCountryLabelsModel.swift */; };
 		EEA3EEB32B24EC0600E8333A /* VPNLocationViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = EEA3EEB22B24EC0600E8333A /* VPNLocationViewModel.swift */; };
 		EEAD7A7C2A1D3E20002A24E7 /* AppLauncher.swift in Sources */ = {isa = PBXBuildFile; fileRef = EEAD7A6E2A1D3E1F002A24E7 /* AppLauncher.swift */; };
+		EEBCA0C62BD7CE2C004DF19C /* VPNFailureRecoveryPixel.swift in Sources */ = {isa = PBXBuildFile; fileRef = EEBCA0C52BD7CE2C004DF19C /* VPNFailureRecoveryPixel.swift */; };
+		EEBCA0C72BD7CE2C004DF19C /* VPNFailureRecoveryPixel.swift in Sources */ = {isa = PBXBuildFile; fileRef = EEBCA0C52BD7CE2C004DF19C /* VPNFailureRecoveryPixel.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 */; };
@@ -3287,21 +2536,17 @@
 		EEC111E6294D06290086524F /* JSAlertViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = EEC111E5294D06290086524F /* JSAlertViewModel.swift */; };
 		EEC4A65E2B277E8D00F7C0AA /* NetworkProtectionVPNCountryLabelsModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = EEA3EEB02B24EBD000E8333A /* NetworkProtectionVPNCountryLabelsModel.swift */; };
 		EEC4A65F2B277EE100F7C0AA /* VPNLocationViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = EEA3EEB22B24EC0600E8333A /* VPNLocationViewModel.swift */; };
-		EEC4A6602B277F0D00F7C0AA /* VPNLocationViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = EEA3EEB22B24EC0600E8333A /* VPNLocationViewModel.swift */; };
-		EEC4A6612B277F1100F7C0AA /* NetworkProtectionVPNCountryLabelsModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = EEA3EEB02B24EBD000E8333A /* NetworkProtectionVPNCountryLabelsModel.swift */; };
 		EEC4A6692B2C87D300F7C0AA /* VPNLocationView.swift in Sources */ = {isa = PBXBuildFile; fileRef = EEC4A6682B2C87D300F7C0AA /* VPNLocationView.swift */; };
 		EEC4A66A2B2C87D300F7C0AA /* VPNLocationView.swift in Sources */ = {isa = PBXBuildFile; fileRef = EEC4A6682B2C87D300F7C0AA /* VPNLocationView.swift */; };
-		EEC4A66B2B2C87D300F7C0AA /* VPNLocationView.swift in Sources */ = {isa = PBXBuildFile; fileRef = EEC4A6682B2C87D300F7C0AA /* VPNLocationView.swift */; };
 		EEC4A66D2B2C894F00F7C0AA /* VPNLocationPreferenceItemModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = EEC4A66C2B2C894F00F7C0AA /* VPNLocationPreferenceItemModel.swift */; };
 		EEC4A66E2B2C894F00F7C0AA /* VPNLocationPreferenceItemModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = EEC4A66C2B2C894F00F7C0AA /* VPNLocationPreferenceItemModel.swift */; };
-		EEC4A66F2B2C894F00F7C0AA /* VPNLocationPreferenceItemModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = EEC4A66C2B2C894F00F7C0AA /* VPNLocationPreferenceItemModel.swift */; };
 		EEC4A6712B2C90AB00F7C0AA /* VPNLocationPreferenceItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = EEC4A6702B2C90AB00F7C0AA /* VPNLocationPreferenceItem.swift */; };
 		EEC4A6722B2C90AB00F7C0AA /* VPNLocationPreferenceItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = EEC4A6702B2C90AB00F7C0AA /* VPNLocationPreferenceItem.swift */; };
-		EEC4A6732B2C90AB00F7C0AA /* VPNLocationPreferenceItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = EEC4A6702B2C90AB00F7C0AA /* VPNLocationPreferenceItem.swift */; };
 		EEC589D92A4F1CE300BCD60C /* AppLauncher.swift in Sources */ = {isa = PBXBuildFile; fileRef = EEAD7A6E2A1D3E1F002A24E7 /* AppLauncher.swift */; };
 		EEC589DA2A4F1CE400BCD60C /* AppLauncher.swift in Sources */ = {isa = PBXBuildFile; fileRef = EEAD7A6E2A1D3E1F002A24E7 /* AppLauncher.swift */; };
 		EEC589DB2A4F1CE700BCD60C /* AppLauncher.swift in Sources */ = {isa = PBXBuildFile; fileRef = EEAD7A6E2A1D3E1F002A24E7 /* AppLauncher.swift */; };
 		EEC589DC2A4F1CE800BCD60C /* AppLauncher.swift in Sources */ = {isa = PBXBuildFile; fileRef = EEAD7A6E2A1D3E1F002A24E7 /* AppLauncher.swift */; };
+		EEC7BE2E2BC6C09500F86835 /* AddressBarKeyboardShortcutsTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = EEC7BE2D2BC6C09400F86835 /* AddressBarKeyboardShortcutsTests.swift */; };
 		EEC8EB3E2982CA3B0065AA39 /* JSAlertViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = EEC111E5294D06290086524F /* JSAlertViewModel.swift */; };
 		EEC8EB3F2982CA440065AA39 /* JSAlert.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = EEC111E3294D06020086524F /* JSAlert.storyboard */; };
 		EEC8EB402982CD550065AA39 /* JSAlertViewModelTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = EEF53E172950CED5002D78F4 /* JSAlertViewModelTests.swift */; };
@@ -3312,18 +2557,41 @@
 		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 */; };
+		F116A7C32BD1924B00F3FCF7 /* PixelKitTestingUtilities in Frameworks */ = {isa = PBXBuildFile; productRef = F116A7C22BD1924B00F3FCF7 /* PixelKitTestingUtilities */; };
+		F116A7C72BD1925500F3FCF7 /* PixelKitTestingUtilities in Frameworks */ = {isa = PBXBuildFile; productRef = F116A7C62BD1925500F3FCF7 /* PixelKitTestingUtilities */; };
+		F116A7C92BD1929000F3FCF7 /* PixelKitTestingUtilities in Frameworks */ = {isa = PBXBuildFile; productRef = F116A7C82BD1929000F3FCF7 /* PixelKitTestingUtilities */; };
+		F188267C2BBEB3AA00D9AC4F /* GeneralPixel.swift in Sources */ = {isa = PBXBuildFile; fileRef = F188267B2BBEB3AA00D9AC4F /* GeneralPixel.swift */; };
+		F188267D2BBEB3AA00D9AC4F /* GeneralPixel.swift in Sources */ = {isa = PBXBuildFile; fileRef = F188267B2BBEB3AA00D9AC4F /* GeneralPixel.swift */; };
+		F18826802BBEB58100D9AC4F /* PrivacyProPixel.swift in Sources */ = {isa = PBXBuildFile; fileRef = F188267F2BBEB58100D9AC4F /* PrivacyProPixel.swift */; };
+		F18826812BBEB58100D9AC4F /* PrivacyProPixel.swift in Sources */ = {isa = PBXBuildFile; fileRef = F188267F2BBEB58100D9AC4F /* PrivacyProPixel.swift */; };
+		F18826842BBEE31700D9AC4F /* PixelKit+Assertion.swift in Sources */ = {isa = PBXBuildFile; fileRef = F18826832BBEE31700D9AC4F /* PixelKit+Assertion.swift */; };
+		F18826852BBEE31700D9AC4F /* PixelKit+Assertion.swift in Sources */ = {isa = PBXBuildFile; fileRef = F18826832BBEE31700D9AC4F /* PixelKit+Assertion.swift */; };
+		F188268D2BBF01C300D9AC4F /* PixelDataModel.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = B6DA44062616B30600DD1EC2 /* PixelDataModel.xcdatamodeld */; };
+		F188268E2BBF01C400D9AC4F /* PixelDataModel.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = B6DA44062616B30600DD1EC2 /* PixelDataModel.xcdatamodeld */; };
+		F18826902BC0105800D9AC4F /* PixelDataRecord.swift in Sources */ = {isa = PBXBuildFile; fileRef = B68C92C32750EF76002AC6B0 /* PixelDataRecord.swift */; };
+		F18826912BC0105800D9AC4F /* PixelDataStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6DA44012616B28300DD1EC2 /* PixelDataStore.swift */; };
+		F18826922BC0105900D9AC4F /* PixelDataRecord.swift in Sources */ = {isa = PBXBuildFile; fileRef = B68C92C32750EF76002AC6B0 /* PixelDataRecord.swift */; };
+		F18826932BC0105900D9AC4F /* PixelDataStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6DA44012616B28300DD1EC2 /* PixelDataStore.swift */; };
+		F198C7122BD18A28000BF24D /* PixelKit in Frameworks */ = {isa = PBXBuildFile; productRef = F198C7112BD18A28000BF24D /* PixelKit */; };
+		F198C7142BD18A30000BF24D /* PixelKit in Frameworks */ = {isa = PBXBuildFile; productRef = F198C7132BD18A30000BF24D /* PixelKit */; };
+		F198C7162BD18A44000BF24D /* PixelKit in Frameworks */ = {isa = PBXBuildFile; productRef = F198C7152BD18A44000BF24D /* PixelKit */; };
+		F198C7182BD18A4C000BF24D /* PixelKit in Frameworks */ = {isa = PBXBuildFile; productRef = F198C7172BD18A4C000BF24D /* PixelKit */; };
+		F198C71A2BD18A5B000BF24D /* PixelKit in Frameworks */ = {isa = PBXBuildFile; productRef = F198C7192BD18A5B000BF24D /* PixelKit */; };
+		F198C71C2BD18A61000BF24D /* PixelKit in Frameworks */ = {isa = PBXBuildFile; productRef = F198C71B2BD18A61000BF24D /* PixelKit */; };
+		F198C71E2BD18D88000BF24D /* SwiftLintTool in Frameworks */ = {isa = PBXBuildFile; productRef = F198C71D2BD18D88000BF24D /* SwiftLintTool */; };
+		F198C7202BD18D92000BF24D /* SwiftLintTool in Frameworks */ = {isa = PBXBuildFile; productRef = F198C71F2BD18D92000BF24D /* SwiftLintTool */; };
 		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 */; };
 		F1D43AF32B98E47800BAB743 /* BareBonesBrowserKit in Frameworks */ = {isa = PBXBuildFile; productRef = F1D43AF22B98E47800BAB743 /* BareBonesBrowserKit */; };
 		F1D43AF52B98E48900BAB743 /* BareBonesBrowserKit in Frameworks */ = {isa = PBXBuildFile; productRef = F1D43AF42B98E48900BAB743 /* BareBonesBrowserKit */; };
-		F1D43AF72B98E48F00BAB743 /* BareBonesBrowserKit in Frameworks */ = {isa = PBXBuildFile; productRef = F1D43AF62B98E48F00BAB743 /* BareBonesBrowserKit */; };
+		F1DF95E32BD1807C0045E591 /* Crashes in Frameworks */ = {isa = PBXBuildFile; productRef = 08D4923DC968236E22E373E2 /* Crashes */; };
+		F1DF95E42BD1807C0045E591 /* Crashes in Frameworks */ = {isa = PBXBuildFile; productRef = 537FC71EA5115A983FAF3170 /* Crashes */; };
+		F1DF95E52BD1807C0045E591 /* Subscription in Frameworks */ = {isa = PBXBuildFile; productRef = DC3F73D49B2D44464AFEFCD8 /* Subscription */; };
+		F1DF95E72BD188B60045E591 /* LoginItems in Frameworks */ = {isa = PBXBuildFile; productRef = F1DF95E62BD188B60045E591 /* LoginItems */; };
 		F41D174125CB131900472416 /* NSColorExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = F41D174025CB131900472416 /* NSColorExtension.swift */; };
 		F44C130225C2DA0400426E3E /* NSAppearanceExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = F44C130125C2DA0400426E3E /* NSAppearanceExtension.swift */; };
 		F4A6198C283CFFBB007F2080 /* ContentScopeFeatureFlagging.swift in Sources */ = {isa = PBXBuildFile; fileRef = F4A6198B283CFFBB007F2080 /* ContentScopeFeatureFlagging.swift */; };
@@ -3332,13 +2600,6 @@
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
-		31C6E9AA2B0C07A30086DC30 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = AA585D76248FD31100E9A3E2 /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = 9D9AE8B22AAA39A70026E7DC;
-			remoteInfo = DuckDuckGoDBPBackgroundAgent;
-		};
 		31C6E9AC2B0C07BA0086DC30 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = AA585D76248FD31100E9A3E2 /* Project object */;
@@ -3474,19 +2735,6 @@
 			name = "Embed Login Items";
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		4B957C332AC7AE700062CA31 /* Embed Login Items */ = {
-			isa = PBXCopyFilesBuildPhase;
-			buildActionMask = 2147483647;
-			dstPath = Contents/Library/LoginItems;
-			dstSubfolderSpec = 1;
-			files = (
-				7BFF85102B0C09E300ECACA2 /* DuckDuckGo Personal Information Removal.app in Embed Login Items */,
-				4B957C342AC7AE700062CA31 /* DuckDuckGo VPN.app in Embed Login Items */,
-				4B957C352AC7AE700062CA31 /* DuckDuckGo Notifications.app in Embed Login Items */,
-			);
-			name = "Embed Login Items";
-			runOnlyForDeploymentPostprocessing = 0;
-		};
 		4BA7C4E02B3F6F7500AFE511 /* Embed Network Extensions */ = {
 			isa = PBXCopyFilesBuildPhase;
 			buildActionMask = 2147483647;
@@ -3510,9 +2758,12 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
+		021EA07F2BD2A9D500772C9A /* TabsPreferences.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TabsPreferences.swift; sourceTree = "<group>"; };
+		021EA0822BD6DF1B00772C9A /* TabsPreferencesTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TabsPreferencesTests.swift; sourceTree = "<group>"; };
 		0230C0A2272080090018F728 /* KeyedCodingExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KeyedCodingExtension.swift; sourceTree = "<group>"; };
 		026ADE1326C3010C002518EE /* macos-config.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = "macos-config.json"; sourceTree = "<group>"; };
 		0289041E2A7B23CE0028369C /* AppConfigurationURLProviderTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppConfigurationURLProviderTests.swift; sourceTree = "<group>"; };
+		02C0737C2BE5B7E000BFE2F5 /* InfoPlist.xcstrings */ = {isa = PBXFileReference; lastKnownFileType = text.json.xcstrings; path = InfoPlist.xcstrings; sourceTree = "<group>"; };
 		142879D924CE1179005419BB /* SuggestionViewModelTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SuggestionViewModelTests.swift; sourceTree = "<group>"; };
 		142879DB24CE1185005419BB /* SuggestionContainerViewModelTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SuggestionContainerViewModelTests.swift; sourceTree = "<group>"; };
 		1430DFF424D0580F00B8978C /* TabBarViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TabBarViewController.swift; sourceTree = "<group>"; };
@@ -3588,9 +2839,11 @@
 		1DDF075F28F815AD00EDFBE3 /* BWStatus.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BWStatus.swift; sourceTree = "<group>"; };
 		1DDF076028F815AD00EDFBE3 /* BWError.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BWError.swift; sourceTree = "<group>"; };
 		1DDF076128F815AD00EDFBE3 /* BWResponse.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BWResponse.swift; sourceTree = "<group>"; };
+		1DEF3BAC2BD145A9004A2FBA /* AutoClearHandler.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AutoClearHandler.swift; sourceTree = "<group>"; };
 		1DFAB51C2A8982A600A0F7F6 /* SetExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SetExtension.swift; sourceTree = "<group>"; };
 		1DFAB51F2A89830D00A0F7F6 /* SetExtensionTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SetExtensionTests.swift; sourceTree = "<group>"; };
 		1E0C72052ABC63BD00802009 /* SubscriptionPagesUserScript.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SubscriptionPagesUserScript.swift; sourceTree = "<group>"; };
+		1E559BB02BBCA9F1002B4AF6 /* RedirectNavigationResponder.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RedirectNavigationResponder.swift; sourceTree = "<group>"; };
 		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>"; };
@@ -3602,6 +2855,9 @@
 		315AA06F28CA5CC800200030 /* YoutubePlayerNavigationHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YoutubePlayerNavigationHandler.swift; sourceTree = "<group>"; };
 		3168506C2AF3AD1C009A2828 /* WaitlistViewControllerPresenter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = WaitlistViewControllerPresenter.swift; sourceTree = "<group>"; };
 		316850712AF3AD58009A2828 /* DataBrokerProtectionDebugMenu.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DataBrokerProtectionDebugMenu.swift; sourceTree = "<group>"; };
+		316913222BD2B6250051B46D /* DataBrokerProtectionPixelsHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DataBrokerProtectionPixelsHandler.swift; sourceTree = "<group>"; };
+		316913252BD2B76F0051B46D /* DataBrokerPrerequisitesStatusVerifier.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DataBrokerPrerequisitesStatusVerifier.swift; sourceTree = "<group>"; };
+		316913282BD2C7570051B46D /* DataBrokerProtectionErrorViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DataBrokerProtectionErrorViewController.swift; sourceTree = "<group>"; };
 		3171D6B72889849F0068632A /* CookieManagedNotificationView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CookieManagedNotificationView.swift; sourceTree = "<group>"; };
 		3171D6B9288984D00068632A /* BadgeAnimationView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BadgeAnimationView.swift; sourceTree = "<group>"; };
 		3171D6DA2889B64D0068632A /* CookieManagedNotificationContainerView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CookieManagedNotificationContainerView.swift; sourceTree = "<group>"; };
@@ -3614,6 +2870,7 @@
 		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>"; };
+		31A83FB42BE28D7D00F74E67 /* UserText+DBP.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UserText+DBP.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>"; };
@@ -3621,6 +2878,7 @@
 		31C9ADE42AF0564500CEF57D /* WaitlistFeatureSetupHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WaitlistFeatureSetupHandler.swift; sourceTree = "<group>"; };
 		31CF3431288B0B1B0087244B /* NavigationBarBadgeAnimator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NavigationBarBadgeAnimator.swift; sourceTree = "<group>"; };
 		31D5375B291D944100407A95 /* PasswordManagementBitwardenItemView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PasswordManagementBitwardenItemView.swift; sourceTree = "<group>"; };
+		31DC2F202BD6DE65001354EF /* DataBrokerPrerequisitesStatusVerifierTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DataBrokerPrerequisitesStatusVerifierTests.swift; sourceTree = "<group>"; };
 		31E163B9293A56F400963C10 /* BrokenSiteReportingReferenceTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BrokenSiteReportingReferenceTests.swift; sourceTree = "<group>"; };
 		31E163BC293A579E00963C10 /* PrivacyReferenceTestHelper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PrivacyReferenceTestHelper.swift; sourceTree = "<group>"; };
 		31E163BF293A581900963C10 /* privacy-reference-tests */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = "privacy-reference-tests"; path = "Submodules/privacy-reference-tests"; sourceTree = SOURCE_ROOT; };
@@ -3666,6 +2924,7 @@
 		376C4DB828A1A48A00CC0F5B /* FirePopoverViewModelTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FirePopoverViewModelTests.swift; sourceTree = "<group>"; };
 		376CC8B4296EB630006B63A7 /* AppStore.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = AppStore.xcconfig; sourceTree = "<group>"; };
 		376CC8B5296EBA8F006B63A7 /* BuildNumber.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = BuildNumber.xcconfig; sourceTree = "<group>"; };
+		376E708D2BD686260082B7EB /* UI Tests.xctestplan */ = {isa = PBXFileReference; lastKnownFileType = text; path = "UI Tests.xctestplan"; sourceTree = "<group>"; };
 		37717E66296B5A20002FAEDF /* Global.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Global.xcconfig; sourceTree = "<group>"; };
 		3775912C29AAC72700E26367 /* SyncPreferences.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SyncPreferences.swift; sourceTree = "<group>"; };
 		3775913529AB9A1C00E26367 /* SyncManagementDialogViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SyncManagementDialogViewController.swift; sourceTree = "<group>"; };
@@ -3816,9 +3075,6 @@
 		4B4D60652A0B29FA00BCD287 /* NetworkProtectionNavBarButtonModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NetworkProtectionNavBarButtonModel.swift; sourceTree = "<group>"; };
 		4B4D60692A0B29FA00BCD287 /* NetworkProtection+ConvenienceInitializers.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NetworkProtection+ConvenienceInitializers.swift"; sourceTree = "<group>"; };
 		4B4D606A2A0B29FA00BCD287 /* NetworkProtectionControllerErrorStore.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NetworkProtectionControllerErrorStore.swift; sourceTree = "<group>"; };
-		4B4D606C2A0B29FA00BCD287 /* NetworkProtectionInviteDialog.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NetworkProtectionInviteDialog.swift; sourceTree = "<group>"; };
-		4B4D606F2A0B29FA00BCD287 /* NetworkProtectionInvitePresenter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NetworkProtectionInvitePresenter.swift; sourceTree = "<group>"; };
-		4B4D60702A0B29FA00BCD287 /* NetworkProtectionInviteCodeViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NetworkProtectionInviteCodeViewModel.swift; sourceTree = "<group>"; };
 		4B4D60722A0B29FA00BCD287 /* EventMapping+NetworkProtectionError.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "EventMapping+NetworkProtectionError.swift"; sourceTree = "<group>"; };
 		4B4D60762A0B29FA00BCD287 /* NetworkProtectionUNNotificationsPresenter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NetworkProtectionUNNotificationsPresenter.swift; sourceTree = "<group>"; };
 		4B4D607C2A0B29FA00BCD287 /* UserText+NetworkProtectionExtensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UserText+NetworkProtectionExtensions.swift"; sourceTree = "<group>"; };
@@ -3842,7 +3098,6 @@
 		4B67742A255DBEB800025BD8 /* httpsMobileV2FalsePositives.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = httpsMobileV2FalsePositives.json; sourceTree = "<group>"; };
 		4B677440255DBEEA00025BD8 /* Database.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Database.swift; sourceTree = "<group>"; };
 		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>"; };
@@ -3905,8 +3160,6 @@
 		4B9292D82667124B00AD2C21 /* BookmarkListTreeControllerDataSource.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BookmarkListTreeControllerDataSource.swift; sourceTree = "<group>"; };
 		4B9292DA2667125D00AD2C21 /* ContextualMenu.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ContextualMenu.swift; sourceTree = "<group>"; };
 		4B9579202AC687170062CA31 /* HardwareModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HardwareModel.swift; sourceTree = "<group>"; };
-		4B957C412AC7AE700062CA31 /* DuckDuckGo Privacy Pro.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "DuckDuckGo Privacy Pro.app"; sourceTree = BUILT_PRODUCTS_DIR; };
-		4B957C432AC7AF190062CA31 /* DuckDuckGoPrivacyPro.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = DuckDuckGoPrivacyPro.xcconfig; sourceTree = "<group>"; };
 		4B980E202817604000282EE1 /* NSNotificationName+Debug.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NSNotificationName+Debug.swift"; sourceTree = "<group>"; };
 		4B98D27928D95F1A003C2B6F /* ChromiumFaviconsReaderTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChromiumFaviconsReaderTests.swift; sourceTree = "<group>"; };
 		4B98D27B28D960DD003C2B6F /* FirefoxFaviconsReaderTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FirefoxFaviconsReaderTests.swift; sourceTree = "<group>"; };
@@ -3916,7 +3169,6 @@
 		4B9DB00C2A983B24000927DB /* WaitlistViewModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = WaitlistViewModel.swift; sourceTree = "<group>"; };
 		4B9DB00E2A983B24000927DB /* WaitlistStorage.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = WaitlistStorage.swift; sourceTree = "<group>"; };
 		4B9DB00F2A983B24000927DB /* WaitlistKeychainStorage.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = WaitlistKeychainStorage.swift; sourceTree = "<group>"; };
-		4B9DB0132A983B24000927DB /* EnableWaitlistFeatureView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EnableWaitlistFeatureView.swift; sourceTree = "<group>"; };
 		4B9DB0142A983B24000927DB /* WaitlistTermsAndConditionsView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = WaitlistTermsAndConditionsView.swift; sourceTree = "<group>"; };
 		4B9DB0152A983B24000927DB /* JoinedWaitlistView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = JoinedWaitlistView.swift; sourceTree = "<group>"; };
 		4B9DB0162A983B24000927DB /* InvitedToWaitlistView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = InvitedToWaitlistView.swift; sourceTree = "<group>"; };
@@ -3927,7 +3179,6 @@
 		4B9DB01C2A983B24000927DB /* NotificationService.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NotificationService.swift; sourceTree = "<group>"; };
 		4B9DB04F2A983B55000927DB /* MockWaitlistStorage.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MockWaitlistStorage.swift; sourceTree = "<group>"; };
 		4B9DB0502A983B55000927DB /* MockNotificationService.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MockNotificationService.swift; sourceTree = "<group>"; };
-		4B9DB0512A983B55000927DB /* MockNetworkProtectionCodeRedeemer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MockNetworkProtectionCodeRedeemer.swift; sourceTree = "<group>"; };
 		4B9DB0522A983B55000927DB /* MockWaitlistRequest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MockWaitlistRequest.swift; sourceTree = "<group>"; };
 		4B9DB0532A983B55000927DB /* WaitlistViewModelTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = WaitlistViewModelTests.swift; sourceTree = "<group>"; };
 		4BA1A69A258B076900F6F690 /* FileStore.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FileStore.swift; sourceTree = "<group>"; };
@@ -3972,7 +3223,6 @@
 		4BBF0916282DD6EF00EE1418 /* TemporaryFileHandlerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TemporaryFileHandlerTests.swift; sourceTree = "<group>"; };
 		4BBF09222830812900EE1418 /* FileSystemDSL.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FileSystemDSL.swift; sourceTree = "<group>"; };
 		4BBF0924283083EC00EE1418 /* FileSystemDSLTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FileSystemDSLTests.swift; sourceTree = "<group>"; };
-		4BC2621C293996410087A482 /* PixelEventTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PixelEventTests.swift; sourceTree = "<group>"; };
 		4BCF15D62ABB8A110083F6DF /* NetworkProtectionRemoteMessaging.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NetworkProtectionRemoteMessaging.swift; sourceTree = "<group>"; };
 		4BCF15D82ABB8A7F0083F6DF /* NetworkProtectionRemoteMessage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NetworkProtectionRemoteMessage.swift; sourceTree = "<group>"; };
 		4BCF15E42ABB98990083F6DF /* NetworkProtectionRemoteMessageTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NetworkProtectionRemoteMessageTests.swift; sourceTree = "<group>"; };
@@ -3981,8 +3231,6 @@
 		4BD18F04283F151F00058124 /* BookmarksBar.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = BookmarksBar.storyboard; sourceTree = "<group>"; };
 		4BD57C032AC112DF00B580EE /* NetworkProtectionRemoteMessagingTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NetworkProtectionRemoteMessagingTests.swift; sourceTree = "<group>"; };
 		4BDFA4AD27BF19E500648192 /* ToggleableScrollView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ToggleableScrollView.swift; sourceTree = "<group>"; };
-		4BE0DF0426781961006337B7 /* NSStoryboardExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NSStoryboardExtension.swift; sourceTree = "<group>"; };
-		4BE15DB12A0B0DD500898243 /* PixelKit */ = {isa = PBXFileReference; lastKnownFileType = wrapper; path = PixelKit; sourceTree = "<group>"; };
 		4BE344ED2B2376DF003FC223 /* VPNFeedbackFormViewModelTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VPNFeedbackFormViewModelTests.swift; sourceTree = "<group>"; };
 		4BE4005227CF3DC3007D3161 /* SavePaymentMethodPopover.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SavePaymentMethodPopover.swift; sourceTree = "<group>"; };
 		4BE4005427CF3F19007D3161 /* SavePaymentMethodViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SavePaymentMethodViewController.swift; sourceTree = "<group>"; };
@@ -4011,6 +3259,8 @@
 		5601FECC29B7973D00068905 /* TabBarViewItemTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TabBarViewItemTests.swift; sourceTree = "<group>"; };
 		5603D90529B7B746007F9F01 /* MockTabViewItemDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MockTabViewItemDelegate.swift; sourceTree = "<group>"; };
 		5614B3A02BBD639D009B5031 /* ZoomPopover.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ZoomPopover.swift; sourceTree = "<group>"; };
+		560C3FFB2BC9911000F589CE /* PermanentSurveyManagerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PermanentSurveyManagerTests.swift; sourceTree = "<group>"; };
+		560C3FFE2BCD5A1E00F589CE /* PermanentSurveyManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PermanentSurveyManager.swift; sourceTree = "<group>"; };
 		561D66692B95C45A008ACC5C /* Suggestion.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = Suggestion.storyboard; sourceTree = "<group>"; };
 		5625329D2BC069100034D316 /* ZoomPopoverViewModelTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ZoomPopoverViewModelTests.swift; sourceTree = "<group>"; };
 		5629846E2AC4610100AC20EB /* SyncPreferencesTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SyncPreferencesTests.swift; sourceTree = "<group>"; };
@@ -4024,6 +3274,11 @@
 		569277C029DDCBB500B633EF /* HomePageContinueSetUpModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomePageContinueSetUpModel.swift; sourceTree = "<group>"; };
 		569277C329DEE09D00B633EF /* ContinueSetUpModelTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContinueSetUpModelTests.swift; sourceTree = "<group>"; };
 		56B234BE2A84EFD200F2A1CC /* NavigationBarUrlExtensionsTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NavigationBarUrlExtensionsTests.swift; sourceTree = "<group>"; };
+		56BA1E742BAAF70F001CF69F /* SSLErrorPageTabExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SSLErrorPageTabExtension.swift; sourceTree = "<group>"; };
+		56BA1E7C2BAB290E001CF69F /* ErrorPageTabExtensionTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ErrorPageTabExtensionTest.swift; sourceTree = "<group>"; };
+		56BA1E812BAC506F001CF69F /* SSLErrorPageUserScript.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SSLErrorPageUserScript.swift; sourceTree = "<group>"; };
+		56BA1E862BAC8239001CF69F /* SSLErrorPageUserScriptTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SSLErrorPageUserScriptTests.swift; sourceTree = "<group>"; };
+		56BA1E892BB1CB5B001CF69F /* CertificateTrustEvaluator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CertificateTrustEvaluator.swift; sourceTree = "<group>"; };
 		56CEE9092B7A66C500CF10AA /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		56CEE90D2B7A6DE100CF10AA /* InfoPlist.xcstrings */ = {isa = PBXFileReference; lastKnownFileType = text.json.xcstrings; path = InfoPlist.xcstrings; sourceTree = "<group>"; };
 		56D145E729E6BB6300E3488A /* CapturingDataImportProvider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CapturingDataImportProvider.swift; sourceTree = "<group>"; };
@@ -4046,6 +3301,7 @@
 		7B430EA02A71411A00BAC4A1 /* NetworkProtectionSimulateFailureMenu.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NetworkProtectionSimulateFailureMenu.swift; sourceTree = "<group>"; };
 		7B4CE8DA26F02108009134B1 /* UI Tests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "UI Tests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
 		7B4CE8E626F02134009134B1 /* TabBarTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TabBarTests.swift; sourceTree = "<group>"; };
+		7B4D8A202BDA857300852966 /* VPNOperationErrorRecorder.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VPNOperationErrorRecorder.swift; sourceTree = "<group>"; };
 		7B5291882A1697680022E406 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		7B5291892A169BC90022E406 /* DeveloperID.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = DeveloperID.xcconfig; sourceTree = "<group>"; };
 		7B6D98662ADEB4B000CD35FE /* DataBrokerProtectionLoginItemScheduler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DataBrokerProtectionLoginItemScheduler.swift; sourceTree = "<group>"; };
@@ -4087,7 +3343,6 @@
 		7BEC20402B0F505F00243D3E /* AddBookmarkPopoverView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AddBookmarkPopoverView.swift; sourceTree = "<group>"; };
 		7BEC20412B0F505F00243D3E /* AddBookmarkFolderPopoverView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AddBookmarkFolderPopoverView.swift; sourceTree = "<group>"; };
 		7BF1A9D72AE054D300FCA683 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
-		7BFE95512A9DF1CE0081ABE9 /* NetworkProtectionWaitlistFeatureFlagOverridesMenu.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NetworkProtectionWaitlistFeatureFlagOverridesMenu.swift; sourceTree = "<group>"; };
 		7BFE95532A9DF2930081ABE9 /* UserDefaults+NetworkProtectionWaitlist.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UserDefaults+NetworkProtectionWaitlist.swift"; sourceTree = "<group>"; };
 		85012B0129133F9F003D0DCC /* NavigationBarPopovers.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NavigationBarPopovers.swift; sourceTree = "<group>"; };
 		850E8DFA2A6FEC5E00691187 /* BookmarksBarAppearance.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BookmarksBarAppearance.swift; sourceTree = "<group>"; };
@@ -4204,10 +3459,16 @@
 		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>"; };
+		9F0FFFB32BCCAE37007C87DD /* BookmarkAllTabsDialogCoordinatorViewModelTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BookmarkAllTabsDialogCoordinatorViewModelTests.swift; sourceTree = "<group>"; };
+		9F0FFFB72BCCAE9C007C87DD /* AddEditBookmarkDialogViewModelMock.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddEditBookmarkDialogViewModelMock.swift; sourceTree = "<group>"; };
+		9F0FFFBA2BCCAEC2007C87DD /* AddEditBookmarkFolderDialogViewModelMock.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddEditBookmarkFolderDialogViewModelMock.swift; sourceTree = "<group>"; };
+		9F0FFFBD2BCCAF1F007C87DD /* BookmarkAllTabsDialogViewModelMock.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BookmarkAllTabsDialogViewModelMock.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>"; };
+		9F33445D2BBFA77F0040CBEB /* BookmarksBarVisibilityManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BookmarksBarVisibilityManager.swift; sourceTree = "<group>"; };
+		9F3344612BBFBDA40040CBEB /* BookmarksBarVisibilityManagerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BookmarksBarVisibilityManagerTests.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>"; };
@@ -4218,14 +3479,32 @@
 		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>"; };
+		9F8D57312BCCCB9A00AEA660 /* UserDefaultsBookmarkFoldersStoreTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserDefaultsBookmarkFoldersStoreTests.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>"; };
+		9F9C49F52BC786790099738D /* MoreOptionsMenu+BookmarksTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "MoreOptionsMenu+BookmarksTests.swift"; sourceTree = "<group>"; };
+		9F9C49F82BC7BC970099738D /* BookmarkAllTabsDialogView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BookmarkAllTabsDialogView.swift; sourceTree = "<group>"; };
+		9F9C49FC2BC7E9820099738D /* BookmarkAllTabsDialogViewModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BookmarkAllTabsDialogViewModel.swift; sourceTree = "<group>"; };
+		9F9C4A002BC7F36D0099738D /* BookmarkAllTabsDialogCoordinatorViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BookmarkAllTabsDialogCoordinatorViewModel.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>"; };
+		9FA5A0A42BC8F34900153786 /* UserDefaultsBookmarkFoldersStore.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserDefaultsBookmarkFoldersStore.swift; sourceTree = "<group>"; };
+		9FA5A0A82BC900FC00153786 /* BookmarkAllTabsDialogViewModelTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BookmarkAllTabsDialogViewModelTests.swift; sourceTree = "<group>"; };
+		9FA5A0AC2BC9037A00153786 /* BookmarkFolderStoreMock.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BookmarkFolderStoreMock.swift; sourceTree = "<group>"; };
 		9FA75A3D2BA00E1400DA5FA6 /* BookmarksBarMenuFactoryTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BookmarksBarMenuFactoryTests.swift; sourceTree = "<group>"; };
+		9FAD62392BCFDB32007F3A65 /* WebsiteInfoHelpers.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WebsiteInfoHelpers.swift; sourceTree = "<group>"; };
+		9FAD623C2BD09DE5007F3A65 /* WebsiteInfoTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WebsiteInfoTests.swift; sourceTree = "<group>"; };
+		9FBD84512BB3AACB00220859 /* AttributionOriginFileProvider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AttributionOriginFileProvider.swift; sourceTree = "<group>"; };
+		9FBD84552BB3ACFD00220859 /* AttributionOriginFileProviderTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AttributionOriginFileProviderTests.swift; sourceTree = "<group>"; };
+		9FBD845C2BB3B80300220859 /* Origin.txt */ = {isa = PBXFileReference; lastKnownFileType = text; path = Origin.txt; sourceTree = "<group>"; };
+		9FBD84602BB3BC6400220859 /* Origin-empty.txt */ = {isa = PBXFileReference; lastKnownFileType = text; path = "Origin-empty.txt"; sourceTree = "<group>"; };
+		9FBD846F2BB3DD8400220859 /* MockAttributionsPixelHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MockAttributionsPixelHandler.swift; sourceTree = "<group>"; };
+		9FBD84722BB3E15D00220859 /* InstallationAttributionPixelHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InstallationAttributionPixelHandler.swift; sourceTree = "<group>"; };
+		9FBD84762BB3E54200220859 /* InstallationAttributionPixelHandlerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InstallationAttributionPixelHandlerTests.swift; sourceTree = "<group>"; };
+		9FBD84792BB3EC3300220859 /* MockAttributionOriginProvider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MockAttributionOriginProvider.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>"; };
@@ -4356,7 +3635,6 @@
 		AAC30A25268DFEE200D2D9CD /* CrashReporter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CrashReporter.swift; sourceTree = "<group>"; };
 		AAC30A27268E045400D2D9CD /* CrashReportReader.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CrashReportReader.swift; sourceTree = "<group>"; };
 		AAC30A29268E239100D2D9CD /* CrashReport.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CrashReport.swift; sourceTree = "<group>"; };
-		AAC30A2B268F1ECD00D2D9CD /* CrashReportSender.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CrashReportSender.swift; sourceTree = "<group>"; };
 		AAC30A2D268F1EE300D2D9CD /* CrashReportPromptPresenter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CrashReportPromptPresenter.swift; sourceTree = "<group>"; };
 		AAC5E4C425D6A6E8007F5990 /* AddBookmarkPopover.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AddBookmarkPopover.swift; sourceTree = "<group>"; };
 		AAC5E4CD25D6A709007F5990 /* Bookmark.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Bookmark.swift; sourceTree = "<group>"; };
@@ -4471,7 +3749,7 @@
 		B63ED0DF26AFE32F00A9DAD1 /* GeolocationProviderMock.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GeolocationProviderMock.swift; sourceTree = "<group>"; };
 		B63ED0E226B3E7FA00A9DAD1 /* CLLocationManagerMock.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CLLocationManagerMock.swift; sourceTree = "<group>"; };
 		B63ED0E426BB8FB900A9DAD1 /* SharingMenu.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SharingMenu.swift; sourceTree = "<group>"; };
-		B642738127B65BAC0005DFD1 /* SecureVaultErrorReporter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SecureVaultErrorReporter.swift; sourceTree = "<group>"; };
+		B642738127B65BAC0005DFD1 /* SecureVaultReporter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SecureVaultReporter.swift; sourceTree = "<group>"; };
 		B643BF1327ABF772000BACEC /* NSWorkspaceExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NSWorkspaceExtension.swift; sourceTree = "<group>"; };
 		B644B43929D565DB003FA9AB /* SearchNonexistentDomainTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SearchNonexistentDomainTests.swift; sourceTree = "<group>"; };
 		B645D8F529FA95440024461F /* WKProcessPoolExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WKProcessPoolExtension.swift; sourceTree = "<group>"; };
@@ -4511,7 +3789,6 @@
 		B66260DC29AC5D4300E9E3EE /* NavigationProtectionTabExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NavigationProtectionTabExtension.swift; sourceTree = "<group>"; };
 		B66260DF29AC6EBD00E9E3EE /* HistoryTabExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HistoryTabExtension.swift; sourceTree = "<group>"; };
 		B66260E529ACAE4B00E9E3EE /* NavigationHotkeyHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NavigationHotkeyHandler.swift; sourceTree = "<group>"; };
-		B662D3D82755D7AD0035D4D6 /* PixelStoreTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PixelStoreTests.swift; sourceTree = "<group>"; };
 		B662D3DD275613BB0035D4D6 /* EncryptionKeyStoreMock.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EncryptionKeyStoreMock.swift; sourceTree = "<group>"; };
 		B6656E0C2B29C733008798A1 /* FileImportViewLocalizationTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FileImportViewLocalizationTests.swift; sourceTree = "<group>"; };
 		B6676BE02AA986A700525A21 /* AddressBarTextEditor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddressBarTextEditor.swift; sourceTree = "<group>"; };
@@ -4600,15 +3877,13 @@
 		B6A60E4F2B73C3B800FD4968 /* WKURLSchemeTask+Private.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "WKURLSchemeTask+Private.h"; sourceTree = "<group>"; };
 		B6A60E502B73C46B00FD4968 /* IntegrationTestsBridging.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = IntegrationTestsBridging.h; sourceTree = "<group>"; };
 		B6A924D82664C72D001A28CA /* WebKitDownloadTask.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WebKitDownloadTask.swift; sourceTree = "<group>"; };
-		B6A9E45226142B070067D1B9 /* Pixel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Pixel.swift; sourceTree = "<group>"; };
 		B6A9E46A2614618A0067D1B9 /* OperatingSystemVersionExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OperatingSystemVersionExtension.swift; sourceTree = "<group>"; };
-		B6A9E47626146A570067D1B9 /* PixelEvent.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PixelEvent.swift; sourceTree = "<group>"; };
-		B6A9E47E26146A800067D1B9 /* PixelArguments.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PixelArguments.swift; sourceTree = "<group>"; };
-		B6A9E48326146AAB0067D1B9 /* PixelParameters.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PixelParameters.swift; sourceTree = "<group>"; };
 		B6AA64722994B43300D99CD6 /* FutureExtensionTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FutureExtensionTests.swift; sourceTree = "<group>"; };
 		B6AAAC2C260330580029438D /* PublishedAfter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PublishedAfter.swift; sourceTree = "<group>"; };
 		B6AAAC3D26048F690029438D /* RandomAccessCollectionExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RandomAccessCollectionExtension.swift; sourceTree = "<group>"; };
 		B6ABC5952B4861D4008343B9 /* FocusableTextField.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FocusableTextField.swift; sourceTree = "<group>"; };
+		B6ABD0C92BC03F610000EB69 /* SecurityScopedFileURLController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SecurityScopedFileURLController.swift; sourceTree = "<group>"; };
+		B6ABD0CD2BC042CE0000EB69 /* NSURL+sandboxExtensionRetainCount.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "NSURL+sandboxExtensionRetainCount.m"; sourceTree = "<group>"; };
 		B6AE39F029373AF200C37AA4 /* EmptyAttributionRulesProver.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EmptyAttributionRulesProver.swift; sourceTree = "<group>"; };
 		B6AE74332609AFCE005B9B1A /* ProgressEstimationTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProgressEstimationTests.swift; sourceTree = "<group>"; };
 		B6B040072B95C4C80085279D /* Downloads 2.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "Downloads 2.xcdatamodel"; sourceTree = "<group>"; };
@@ -4616,7 +3891,6 @@
 		B6B1E87A26D381710062C350 /* DownloadListCoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DownloadListCoordinator.swift; sourceTree = "<group>"; };
 		B6B1E87D26D5DA0E0062C350 /* DownloadsPopover.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DownloadsPopover.swift; sourceTree = "<group>"; };
 		B6B1E87F26D5DA9B0062C350 /* DownloadsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DownloadsViewController.swift; sourceTree = "<group>"; };
-		B6B1E88126D5DAC30062C350 /* Downloads.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = Downloads.storyboard; sourceTree = "<group>"; };
 		B6B1E88326D5EB570062C350 /* DownloadsCellView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DownloadsCellView.swift; sourceTree = "<group>"; };
 		B6B1E88A26D774090062C350 /* LinkButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LinkButton.swift; sourceTree = "<group>"; };
 		B6B2400D28083B49001B8F3A /* WebViewContainerView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WebViewContainerView.swift; sourceTree = "<group>"; };
@@ -4672,14 +3946,15 @@
 		B6DA06E7291401D700225DE2 /* WKMenuItemIdentifier.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WKMenuItemIdentifier.swift; sourceTree = "<group>"; };
 		B6DA44012616B28300DD1EC2 /* PixelDataStore.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PixelDataStore.swift; sourceTree = "<group>"; };
 		B6DA44072616B30600DD1EC2 /* PixelDataModel.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = PixelDataModel.xcdatamodel; sourceTree = "<group>"; };
-		B6DA44102616C0FC00DD1EC2 /* PixelTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PixelTests.swift; sourceTree = "<group>"; };
 		B6DA441D2616C84600DD1EC2 /* PixelStoreMock.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PixelStoreMock.swift; sourceTree = "<group>"; };
-		B6DA44222616CABC00DD1EC2 /* PixelArgumentsTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PixelArgumentsTests.swift; sourceTree = "<group>"; };
 		B6DB3AEE278D5C370024C5C4 /* URLSessionExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = URLSessionExtension.swift; sourceTree = "<group>"; };
 		B6DB3CF826A00E2D00D459B7 /* AVCaptureDevice+SwizzledAuthState.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "AVCaptureDevice+SwizzledAuthState.swift"; sourceTree = "<group>"; };
 		B6DB3CFA26A17CB800D459B7 /* PermissionModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PermissionModel.swift; sourceTree = "<group>"; };
 		B6DE57F52B05EA9000CD54B9 /* SheetHostingWindow.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SheetHostingWindow.swift; sourceTree = "<group>"; };
 		B6E319372953446000DD3BCF /* Assertions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Assertions.swift; sourceTree = "<group>"; };
+		B6E3E54F2BBFCDEE00A41922 /* OpenDownloadsCellView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OpenDownloadsCellView.swift; sourceTree = "<group>"; };
+		B6E3E5532BBFCEE300A41922 /* NoDownloadsCellView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NoDownloadsCellView.swift; sourceTree = "<group>"; };
+		B6E3E5572BBFD51400A41922 /* PreviewViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PreviewViewController.swift; sourceTree = "<group>"; };
 		B6E61EE2263AC0C8004E11AB /* FileManagerExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FileManagerExtension.swift; sourceTree = "<group>"; };
 		B6E6B9E22BA1F5F1008AA7E1 /* FilePresenter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FilePresenter.swift; sourceTree = "<group>"; };
 		B6E6B9E82BA1FA1C008AA7E1 /* SandboxTestTool.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = SandboxTestTool.xcconfig; sourceTree = "<group>"; };
@@ -4696,6 +3971,10 @@
 		B6EC37FA29B6447F001ACE79 /* TestsServer.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = TestsServer.xcconfig; sourceTree = "<group>"; };
 		B6EC37FB29B83E99001ACE79 /* TestsURLExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TestsURLExtension.swift; sourceTree = "<group>"; };
 		B6EEDD7C2B8C69E900637EBC /* TabContentTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TabContentTests.swift; sourceTree = "<group>"; };
+		B6F1B0212BCE5658005E863C /* BrokenSiteInfoTabExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BrokenSiteInfoTabExtension.swift; sourceTree = "<group>"; };
+		B6F1B0252BCE5A50005E863C /* TabContent.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TabContent.swift; sourceTree = "<group>"; };
+		B6F1B0292BCE675C005E863C /* NetworkProtectionControllerTabExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NetworkProtectionControllerTabExtension.swift; sourceTree = "<group>"; };
+		B6F1B02D2BCE6B47005E863C /* TunnelControllerProvider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TunnelControllerProvider.swift; sourceTree = "<group>"; };
 		B6F41030264D2B23003DA42C /* ProgressExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProgressExtension.swift; sourceTree = "<group>"; };
 		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>"; };
@@ -4707,6 +3986,12 @@
 		B6FA8940269C425400588ECD /* PrivacyDashboardPopover.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PrivacyDashboardPopover.swift; sourceTree = "<group>"; };
 		BB5789712B2CA70F0009DFE2 /* DataBrokerProtectionSubscriptionEventHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DataBrokerProtectionSubscriptionEventHandler.swift; sourceTree = "<group>"; };
 		BBDFDC592B2B8A0900F62D90 /* DataBrokerProtectionExternalWaitlistPixels.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DataBrokerProtectionExternalWaitlistPixels.swift; sourceTree = "<group>"; };
+		BD384AC72BBC821100EF3735 /* vpn-light-mode.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; path = "vpn-light-mode.json"; sourceTree = "<group>"; };
+		BD384AC82BBC821100EF3735 /* vpn-dark-mode.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; path = "vpn-dark-mode.json"; sourceTree = "<group>"; };
+		BDA7647B2BC497BE00D0400C /* DefaultVPNLocationFormatter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DefaultVPNLocationFormatter.swift; sourceTree = "<group>"; };
+		BDA7648C2BC4E4EF00D0400C /* DefaultVPNLocationFormatterTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DefaultVPNLocationFormatterTests.swift; sourceTree = "<group>"; };
+		BDA764902BC4E57200D0400C /* MockVPNLocationFormatter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MockVPNLocationFormatter.swift; sourceTree = "<group>"; };
+		C1372EF32BBC5BAD003F8793 /* SecureTextField.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SecureTextField.swift; sourceTree = "<group>"; };
 		C13909EE2B85FD4E001626ED /* AutofillActionExecutor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AutofillActionExecutor.swift; sourceTree = "<group>"; };
 		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>"; };
@@ -4737,22 +4022,31 @@
 		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>"; };
+		EE42CBCB2BC8004700AD411C /* PermissionsTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PermissionsTests.swift; sourceTree = "<group>"; };
+		EE54F7B22BBFEA48006218DB /* BookmarksAndFavoritesTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BookmarksAndFavoritesTests.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>"; };
+		EE7F74902BB5D76600CD9456 /* BookmarksBarTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BookmarksBarTests.swift; sourceTree = "<group>"; };
+		EE9D81C22BC57A3700338BE3 /* StateRestorationTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = StateRestorationTests.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>"; };
+		EEBCA0C52BD7CE2C004DF19C /* VPNFailureRecoveryPixel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = VPNFailureRecoveryPixel.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>"; };
+		EEC7BE2D2BC6C09400F86835 /* AddressBarKeyboardShortcutsTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AddressBarKeyboardShortcutsTests.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>"; };
+		F188267B2BBEB3AA00D9AC4F /* GeneralPixel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GeneralPixel.swift; sourceTree = "<group>"; };
+		F188267F2BBEB58100D9AC4F /* PrivacyProPixel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PrivacyProPixel.swift; sourceTree = "<group>"; };
+		F18826832BBEE31700D9AC4F /* PixelKit+Assertion.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "PixelKit+Assertion.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>"; };
@@ -4768,8 +4062,8 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				F1DF95E42BD1807C0045E591 /* Crashes in Frameworks */,
 				373FB4B32B4D6C4B004C88D6 /* PreferencesViews in Frameworks */,
-				7B5F9A752AE2BE4E002AEBC0 /* PixelKit in Frameworks */,
 				4BF97AD32B43C43F00EB4240 /* NetworkProtectionUI in Frameworks */,
 				7B1459572B7D43E500047F2C /* NetworkProtectionProxy in Frameworks */,
 				B6F7128229F6820A00594A45 /* QuickLookUI.framework in Frameworks */,
@@ -4778,10 +4072,12 @@
 				37A5E2F0298AA1B20047046B /* Persistence in Frameworks */,
 				9DC70B1A2AA1FA5B005A844B /* LoginItems in Frameworks */,
 				37269EFD2B332FAC005E8E46 /* Common in Frameworks */,
+				F198C7142BD18A30000BF24D /* PixelKit in Frameworks */,
 				F1D43AF52B98E48900BAB743 /* BareBonesBrowserKit in Frameworks */,
 				378F44E629B4BDEE00899924 /* SwiftUIExtensions in Frameworks */,
 				3706FCA7293F65D500E42796 /* BrowserServicesKit in Frameworks */,
 				3129788A2B64131200B67619 /* DataBrokerProtection in Frameworks */,
+				F198C7202BD18D92000BF24D /* SwiftLintTool in Frameworks */,
 				4BCBE4582BA7E17800FC75A1 /* SubscriptionUI in Frameworks */,
 				3706FCA9293F65D500E42796 /* ContentBlocking in Frameworks */,
 				85D44B882BA08D30001B4AB5 /* Suggestions in Frameworks */,
@@ -4806,9 +4102,9 @@
 			buildActionMask = 2147483647;
 			files = (
 				3706FE88293F661700E42796 /* OHHTTPStubs in Frameworks */,
+				F116A7C72BD1925500F3FCF7 /* PixelKitTestingUtilities in Frameworks */,
 				B65CD8CF2B316E0200A595BB /* SnapshotTesting in Frameworks */,
 				3706FE89293F661700E42796 /* OHHTTPStubsSwift in Frameworks */,
-				4B81AD372B29513100706C96 /* PixelKitTestingUtilities in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -4831,6 +4127,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				F116A7C92BD1929000F3FCF7 /* PixelKitTestingUtilities in Frameworks */,
 				B65CD8CD2B316DFC00A595BB /* SnapshotTesting in Frameworks */,
 				B6AE39F329374AEC00C37AA4 /* OHHTTPStubs in Frameworks */,
 				B6AE39F529374AEC00C37AA4 /* OHHTTPStubsSwift in Frameworks */,
@@ -4843,8 +4140,8 @@
 			files = (
 				37269F012B332FC8005E8E46 /* Common in Frameworks */,
 				EE7295E92A545BC4008C0991 /* NetworkProtection in Frameworks */,
-				4B2537772A11BFE100610219 /* PixelKit in Frameworks */,
 				7B37C7A52BAA32A50062546A /* Subscription in Frameworks */,
+				F198C7182BD18A4C000BF24D /* PixelKit in Frameworks */,
 				7BBE2B7B2B61663C00697445 /* NetworkProtectionProxy in Frameworks */,
 				4B2D062C2A11C0E100DE1F49 /* Networking in Frameworks */,
 				4B25375B2A11BE7300610219 /* NetworkExtension.framework in Frameworks */,
@@ -4855,12 +4152,13 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				F198C71A2BD18A5B000BF24D /* PixelKit in Frameworks */,
 				4B41EDAB2B1544B2001EEDF4 /* LoginItems in Frameworks */,
 				7B00997D2B6508B700FE7C31 /* NetworkProtectionProxy in Frameworks */,
 				7BEEA5122AD1235B00A9E72B /* NetworkProtectionIPC in Frameworks */,
 				7BA7CC5F2AD1210C0042E5CE /* Networking in Frameworks */,
 				7BEEA5162AD1236E00A9E72B /* NetworkProtectionUI in Frameworks */,
-				7BFCB74E2ADE7E1A00DA3EA7 /* PixelKit in Frameworks */,
+				BDADBDC92BD2BC2200421B9B /* Lottie in Frameworks */,
 				EE7295ED2A545C0A008C0991 /* NetworkProtection in Frameworks */,
 				EE2F9C5B2B90F2FF00D45FC9 /* Subscription in Frameworks */,
 				7BEC182F2AD5D8DC00D30536 /* SystemExtensionManager in Frameworks */,
@@ -4871,10 +4169,11 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				7BFCB7502ADE7E2300DA3EA7 /* PixelKit in Frameworks */,
 				4BCBE45C2BA7E18500FC75A1 /* Subscription in Frameworks */,
 				7BA7CC612AD1211C0042E5CE /* Networking in Frameworks */,
+				F198C71C2BD18A61000BF24D /* PixelKit in Frameworks */,
 				7BEEA5142AD1236300A9E72B /* NetworkProtectionIPC in Frameworks */,
+				BDADBDCB2BD2BC2800421B9B /* Lottie in Frameworks */,
 				7B00997F2B6508C200FE7C31 /* NetworkProtectionProxy in Frameworks */,
 				EE7295EF2A545C12008C0991 /* NetworkProtection in Frameworks */,
 				4B2D067F2A1334D700DE1F49 /* NetworkProtectionUI in Frameworks */,
@@ -4886,7 +4185,9 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				4B1EFF1C2BD71EEF007CC84F /* PixelKit in Frameworks */,
 				7B624F172BA25C1F00A6C544 /* NetworkProtectionUI in Frameworks */,
+				4B1EFF212BD72189007CC84F /* Networking in Frameworks */,
 				37269F052B3332C2005E8E46 /* Common in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -4895,54 +4196,16 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				F1DF95E52BD1807C0045E591 /* Subscription in Frameworks */,
 				37269EFF2B332FBB005E8E46 /* Common in Frameworks */,
 				EE7295E72A545BBB008C0991 /* NetworkProtection in Frameworks */,
-				4B4D60982A0B2A5C00BCD287 /* PixelKit in Frameworks */,
+				F198C7162BD18A44000BF24D /* PixelKit in Frameworks */,
 				4B4D60AF2A0C837F00BCD287 /* Networking in Frameworks */,
 				7B25856E2BA2F2ED00D49F79 /* NetworkProtectionUI in Frameworks */,
 				4B4D603F2A0B290200BCD287 /* NetworkExtension.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		4B957BD42AC7AE700062CA31 /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				4B957BD52AC7AE700062CA31 /* QuickLookUI.framework in Frameworks */,
-				3143C8792B0D1F3D00382627 /* DataBrokerProtection in Frameworks */,
-				372217842B33380E00B8E9C2 /* TestUtils in Frameworks */,
-				4B957BD62AC7AE700062CA31 /* LoginItems in Frameworks */,
-				7B94E1652B7ED95100E32B96 /* NetworkProtectionProxy in Frameworks */,
-				4B957BD72AC7AE700062CA31 /* NetworkProtection in Frameworks */,
-				4B957BD82AC7AE700062CA31 /* BrowserServicesKit in Frameworks */,
-				4B957BDA2AC7AE700062CA31 /* Bookmarks in Frameworks */,
-				4B957BDB2AC7AE700062CA31 /* ContentBlocking in Frameworks */,
-				4B957BDC2AC7AE700062CA31 /* SwiftUIExtensions in Frameworks */,
-				4B957BDD2AC7AE700062CA31 /* UserScript in Frameworks */,
-				7BBD44282AD730A400D0A064 /* PixelKit in Frameworks */,
-				F1D43AF72B98E48F00BAB743 /* BareBonesBrowserKit in Frameworks */,
-				7B31FD902AD1257B0086AA24 /* NetworkProtectionIPC in Frameworks */,
-				4B957BDE2AC7AE700062CA31 /* Configuration in Frameworks */,
-				4B957BE22AC7AE700062CA31 /* Sparkle in Frameworks */,
-				373FB4B52B4D6C57004C88D6 /* PreferencesViews in Frameworks */,
-				4B957BE32AC7AE700062CA31 /* Navigation in Frameworks */,
-				1E21F8E32B73E48600FB272E /* Subscription in Frameworks */,
-				4B957BE42AC7AE700062CA31 /* DDGSync in Frameworks */,
-				4B957BE52AC7AE700062CA31 /* OpenSSL in Frameworks */,
-				85E2BBD22B8F536F00DBEC7A /* History in Frameworks */,
-				4B957BE62AC7AE700062CA31 /* PrivacyDashboard in Frameworks */,
-				9FF5214A2BAA90C400B9819B /* Lottie in Frameworks */,
-				7B8C083C2AE1268E00F4C67F /* PixelKit in Frameworks */,
-				85D44B8A2BA08D3B001B4AB5 /* Suggestions in Frameworks */,
-				4B957BE72AC7AE700062CA31 /* SyncDataProviders in Frameworks */,
-				37269F032B332FD8005E8E46 /* Common in Frameworks */,
-				4B957BE82AC7AE700062CA31 /* SyncUI in Frameworks */,
-				4B957BE92AC7AE700062CA31 /* NetworkProtectionUI in Frameworks */,
-				1E0068AD2B1673BB00BBF43B /* SubscriptionUI in Frameworks */,
-				4B957BEB2AC7AE700062CA31 /* Persistence in Frameworks */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
 		565E46DA2B2725DC0013AC2A /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
@@ -4965,7 +4228,6 @@
 			files = (
 				7BDA36E62B7E037100AD5388 /* NetworkExtension.framework in Frameworks */,
 				7B97CD592B7E0B57004FEF43 /* NetworkProtectionProxy in Frameworks */,
-				7B97CD622B7E0C4B004FEF43 /* PixelKit in Frameworks */,
 				7B7DFB222B7E7473009EA1A3 /* Networking in Frameworks */,
 				7B97CD5B2B7E0B85004FEF43 /* Common in Frameworks */,
 			);
@@ -4976,7 +4238,6 @@
 			buildActionMask = 2147483647;
 			files = (
 				9DEF97E12B06C4EE00764F03 /* Networking in Frameworks */,
-				9D6983F92AC773C3002C02FC /* PixelKit in Frameworks */,
 				9D9AE8F92AAA3AD00026E7DC /* DataBrokerProtection in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -4985,7 +4246,6 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				9D6983FB2AC773C8002C02FC /* PixelKit in Frameworks */,
 				315A023F2B6421AE00BFA577 /* Networking in Frameworks */,
 				9D9AE8FB2AAA3AD90026E7DC /* DataBrokerProtection in Frameworks */,
 			);
@@ -4995,15 +4255,13 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				373FB4B12B4D6C42004C88D6 /* PreferencesViews in Frameworks */,
+				F1DF95E32BD1807C0045E591 /* Crashes in Frameworks */,
 				85E2BBCE2B8F534000DBEC7A /* History in Frameworks */,
 				1EA7B8D32B7E078C000330A4 /* SubscriptionUI in Frameworks */,
 				B6F7128129F681EB00594A45 /* QuickLookUI.framework in Frameworks */,
-				9DB6E7242AA0DC5800A17F3C /* LoginItems in Frameworks */,
 				EE7295E32A545B9A008C0991 /* NetworkProtection in Frameworks */,
 				9807F645278CA16F00E1547B /* BrowserServicesKit in Frameworks */,
 				987799ED299998B1005D8EB6 /* Bookmarks in Frameworks */,
-				7B5DD69A2AE51FFA001DE99C /* PixelKit in Frameworks */,
 				1E950E3F2912A10D0051A99B /* ContentBlocking in Frameworks */,
 				31A3A4E32B0C115F0021063C /* DataBrokerProtection in Frameworks */,
 				378F44E429B4BDE900899924 /* SwiftUIExtensions in Frameworks */,
@@ -5013,8 +4271,10 @@
 				7B31FD8C2AD125620086AA24 /* NetworkProtectionIPC in Frameworks */,
 				37269EFB2B332F9E005E8E46 /* Common in Frameworks */,
 				AA06B6B72672AF8100F541C5 /* Sparkle in Frameworks */,
+				F198C71E2BD18D88000BF24D /* SwiftLintTool in Frameworks */,
 				1EA7B8D52B7E078C000330A4 /* Subscription in Frameworks */,
 				B6B77BE8297973D4001E68A1 /* Navigation in Frameworks */,
+				F198C7122BD18A28000BF24D /* PixelKit in Frameworks */,
 				3739326729AE4B42009346AE /* DDGSync in Frameworks */,
 				7BA59C9B2AE18B49009A97B1 /* SystemExtensionManager in Frameworks */,
 				371D00E129D8509400EC8598 /* OpenSSL in Frameworks */,
@@ -5023,6 +4283,7 @@
 				85D44B862BA08D29001B4AB5 /* Suggestions in Frameworks */,
 				37DF000529F9C056002B7D3E /* SyncDataProviders in Frameworks */,
 				37BA812D29B3CD690053F1A3 /* SyncUI in Frameworks */,
+				F1DF95E72BD188B60045E591 /* LoginItems in Frameworks */,
 				372217802B3337FE00B8E9C2 /* TestUtils in Frameworks */,
 				7BA076BB2B65D61400D7FB72 /* NetworkProtectionProxy in Frameworks */,
 				4B4D60B12A0C83B900BCD287 /* NetworkProtectionUI in Frameworks */,
@@ -5035,9 +4296,9 @@
 			buildActionMask = 2147483647;
 			files = (
 				B6DA44172616C13800DD1EC2 /* OHHTTPStubs in Frameworks */,
+				F116A7C32BD1924B00F3FCF7 /* PixelKitTestingUtilities in Frameworks */,
 				B65CD8CB2B316DF100A595BB /* SnapshotTesting in Frameworks */,
 				B6DA44192616C13800DD1EC2 /* OHHTTPStubsSwift in Frameworks */,
-				4B81AD352B29512B00706C96 /* PixelKitTestingUtilities in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -5242,6 +4503,14 @@
 			path = Subscription;
 			sourceTree = "<group>";
 		};
+		3169132B2BD2C7960051B46D /* ErrorView */ = {
+			isa = PBXGroup;
+			children = (
+				316913282BD2C7570051B46D /* DataBrokerProtectionErrorViewController.swift */,
+			);
+			path = ErrorView;
+			sourceTree = "<group>";
+		};
 		3171D6DC2889B6700068632A /* CookieManaged */ = {
 			isa = PBXGroup;
 			children = (
@@ -5264,6 +4533,8 @@
 		3192EC862A4DCF0E001E97A5 /* DBP */ = {
 			isa = PBXGroup;
 			children = (
+				3169132B2BD2C7960051B46D /* ErrorView */,
+				316913222BD2B6250051B46D /* DataBrokerProtectionPixelsHandler.swift */,
 				316850712AF3AD58009A2828 /* DataBrokerProtectionDebugMenu.swift */,
 				3192EC872A4DCF21001E97A5 /* DBPHomeViewController.swift */,
 				3139A1512AA4B3C000969C7D /* DataBrokerProtectionManager.swift */,
@@ -5276,6 +4547,7 @@
 				BBDFDC592B2B8A0900F62D90 /* DataBrokerProtectionExternalWaitlistPixels.swift */,
 				BB5789712B2CA70F0009DFE2 /* DataBrokerProtectionSubscriptionEventHandler.swift */,
 				4B37EE652B4CFC9500A89A61 /* RemoteMessaging */,
+				316913252BD2B76F0051B46D /* DataBrokerPrerequisitesStatusVerifier.swift */,
 			);
 			path = DBP;
 			sourceTree = "<group>";
@@ -5284,6 +4556,7 @@
 			isa = PBXGroup;
 			children = (
 				31A2FD162BAB41C500D0E741 /* DataBrokerProtectionVisibilityTests.swift */,
+				31DC2F202BD6DE65001354EF /* DataBrokerPrerequisitesStatusVerifierTests.swift */,
 			);
 			path = DBP;
 			sourceTree = "<group>";
@@ -5403,6 +4676,7 @@
 				566B195F29CDB7A9007E38F4 /* Mocks */,
 				378205FA283C277800D1D4AA /* MainMenuTests.swift */,
 				566B195C29CDB692007E38F4 /* MoreOptionsMenuTests.swift */,
+				9F9C49F52BC786790099738D /* MoreOptionsMenu+BookmarksTests.swift */,
 			);
 			path = Menus;
 			sourceTree = "<group>";
@@ -5430,7 +4704,6 @@
 				378B588B295CF3B9002C0CC0 /* AppTargetsBase.xcconfig */,
 				378B58CD295ECA75002C0CC0 /* DuckDuckGo.xcconfig */,
 				37DD516C296EAEDC00837F27 /* DuckDuckGoAppStore.xcconfig */,
-				4B957C432AC7AF190062CA31 /* DuckDuckGoPrivacyPro.xcconfig */,
 				378E2799296F6FDE00FCADA2 /* ManualAppStoreRelease.xcconfig */,
 				7B6EC5E32AE2D88C004FE6DF /* DBP */,
 				4B18E3222A1D31E4005D0AAA /* NetworkProtection */,
@@ -5469,7 +4742,6 @@
 				3192A2702A4C4E330084EA89 /* DataBrokerProtection */,
 				9DB6E7222AA0DA7A00A17F3C /* LoginItems */,
 				7B25FE322AD12C990012AFAB /* NetworkProtectionMac */,
-				4BE15DB12A0B0DD500898243 /* PixelKit */,
 				378F44E229B4B7B600899924 /* SwiftUIExtensions */,
 				37BA812B29B3CB8A0053F1A3 /* SyncUI */,
 				1E862A882A9FC01200F84D4B /* SubscriptionUI */,
@@ -5519,6 +4791,7 @@
 				37F19A6628E1B43200740DC6 /* DuckPlayerPreferences.swift */,
 				37CD54C527F2FDD100F1F7B9 /* AboutModel.swift */,
 				1D220BFB2B87AACF00F8BBC6 /* PrivacyProtectionStatus.swift */,
+				021EA07F2BD2A9D500772C9A /* TabsPreferences.swift */,
 			);
 			path = Model;
 			sourceTree = "<group>";
@@ -5630,6 +4903,7 @@
 				1D9FDEC22B9B63C90040B78C /* DataClearingPreferencesTests.swift */,
 				3714B1E628EDB7FA0056C57A /* DuckPlayerPreferencesTests.swift */,
 				1D9FDEC52B9B64DB0040B78C /* PrivacyProtectionStatusTests.swift */,
+				021EA0822BD6DF1B00772C9A /* TabsPreferencesTests.swift */,
 			);
 			path = Preferences;
 			sourceTree = "<group>";
@@ -5732,6 +5006,7 @@
 			isa = PBXGroup;
 			children = (
 				4B43468E285ED6CB00177407 /* ViewModel */,
+				9F3344612BBFBDA40040CBEB /* BookmarksBarVisibilityManagerTests.swift */,
 			);
 			path = BookmarksBar;
 			sourceTree = "<group>";
@@ -5816,38 +5091,28 @@
 		4B4D60632A0B29FA00BCD287 /* BothAppTargets */ = {
 			isa = PBXGroup;
 			children = (
-				EEA3EEAF2B24EB5100E8333A /* VPNLocation */,
+				4B4D60722A0B29FA00BCD287 /* EventMapping+NetworkProtectionError.swift */,
+				BDE981DB2BBD110800645880 /* Assets */,
+				7BD3AF5C2A8E7AF1006F9F56 /* KeychainType+ClientDefault.swift */,
 				9D9AE8682AA76CDC0026E7DC /* LoginItem+NetworkProtection.swift */,
+				B602E81C2A1E25B0006D261F /* NEOnDemandRuleExtension.swift */,
+				4B4D60692A0B29FA00BCD287 /* NetworkProtection+ConvenienceInitializers.swift */,
+				7B2DDCF72A93A8BB0039D884 /* NetworkProtectionAppEvents.swift */,
+				4B4D606A2A0B29FA00BCD287 /* NetworkProtectionControllerErrorStore.swift */,
 				7BE146062A6A83C700C313B8 /* NetworkProtectionDebugMenu.swift */,
-				7B05829D2A812AC000AC3F7C /* NetworkProtectionOnboardingMenu.swift */,
-				7B430EA02A71411A00BAC4A1 /* NetworkProtectionSimulateFailureMenu.swift */,
 				7BBD45B02A691AB500C83CA9 /* NetworkProtectionDebugUtilities.swift */,
-				7B934C3D2A866CFF00FC8F9C /* NetworkProtectionOnboardingMenu.swift */,
-				7BFE95512A9DF1CE0081ABE9 /* NetworkProtectionWaitlistFeatureFlagOverridesMenu.swift */,
-				B602E81C2A1E25B0006D261F /* NEOnDemandRuleExtension.swift */,
 				4B4D60652A0B29FA00BCD287 /* NetworkProtectionNavBarButtonModel.swift */,
 				7B3618C12ADE75C8000D6154 /* NetworkProtectionNavBarPopoverManager.swift */,
+				7B05829D2A812AC000AC3F7C /* NetworkProtectionOnboardingMenu.swift */,
+				7B430EA02A71411A00BAC4A1 /* NetworkProtectionSimulateFailureMenu.swift */,
 				4B8F52402A18326600BE7131 /* NetworkProtectionTunnelController.swift */,
-				4B4D60692A0B29FA00BCD287 /* NetworkProtection+ConvenienceInitializers.swift */,
-				7BD3AF5C2A8E7AF1006F9F56 /* KeychainType+ClientDefault.swift */,
-				4B4D606A2A0B29FA00BCD287 /* NetworkProtectionControllerErrorStore.swift */,
-				4B4D606B2A0B29FA00BCD287 /* Invite */,
-				4B4D60722A0B29FA00BCD287 /* EventMapping+NetworkProtectionError.swift */,
-				7B2DDCF72A93A8BB0039D884 /* NetworkProtectionAppEvents.swift */,
+				EEA3EEAF2B24EB5100E8333A /* VPNLocation */,
+				7B934C3D2A866CFF00FC8F9C /* NetworkProtectionOnboardingMenu.swift */,
+				B6F1B02D2BCE6B47005E863C /* TunnelControllerProvider.swift */,
 			);
 			path = BothAppTargets;
 			sourceTree = "<group>";
 		};
-		4B4D606B2A0B29FA00BCD287 /* Invite */ = {
-			isa = PBXGroup;
-			children = (
-				4B4D606C2A0B29FA00BCD287 /* NetworkProtectionInviteDialog.swift */,
-				4B4D606F2A0B29FA00BCD287 /* NetworkProtectionInvitePresenter.swift */,
-				4B4D60702A0B29FA00BCD287 /* NetworkProtectionInviteCodeViewModel.swift */,
-			);
-			path = Invite;
-			sourceTree = "<group>";
-		};
 		4B4D60742A0B29FA00BCD287 /* NetworkExtensionTargets */ = {
 			isa = PBXGroup;
 			children = (
@@ -5886,6 +5151,7 @@
 		4B4D607D2A0B29FA00BCD287 /* NetworkExtensionTargets */ = {
 			isa = PBXGroup;
 			children = (
+				EEBCA0C12BD7CDDA004DF19C /* Pixels */,
 				4B41ED9F2B15437A001EEDF4 /* NetworkProtectionNotificationsPresenterFactory.swift */,
 				EEF12E6D2A2111880023E6BF /* MacPacketTunnelProvider.swift */,
 				7B0099802B65C6B300FE7C31 /* MacTransparentProxyProvider.swift */,
@@ -5967,8 +5233,8 @@
 		4B67743D255DBEEA00025BD8 /* Database */ = {
 			isa = PBXGroup;
 			children = (
-				4B677440255DBEEA00025BD8 /* Database.swift */,
 				B6085D052743905F00A9C456 /* CoreDataStore.swift */,
+				4B677440255DBEEA00025BD8 /* Database.swift */,
 			);
 			path = Database;
 			sourceTree = "<group>";
@@ -6201,7 +5467,6 @@
 		4B9DB0122A983B24000927DB /* WaitlistSteps */ = {
 			isa = PBXGroup;
 			children = (
-				4B9DB0132A983B24000927DB /* EnableWaitlistFeatureView.swift */,
 				4B9DB0142A983B24000927DB /* WaitlistTermsAndConditionsView.swift */,
 				4B9DB0152A983B24000927DB /* JoinedWaitlistView.swift */,
 				4B9DB0162A983B24000927DB /* InvitedToWaitlistView.swift */,
@@ -6234,7 +5499,6 @@
 				317295D02AF058D3002C3206 /* MockWaitlistTermsAndConditionsActionHandler.swift */,
 				4B9DB04F2A983B55000927DB /* MockWaitlistStorage.swift */,
 				4B9DB0502A983B55000927DB /* MockNotificationService.swift */,
-				4B9DB0512A983B55000927DB /* MockNetworkProtectionCodeRedeemer.swift */,
 				4B9DB0522A983B55000927DB /* MockWaitlistRequest.swift */,
 			);
 			path = Mocks;
@@ -6294,6 +5558,7 @@
 				4BB88B4F25B7BA2B006F6B06 /* TabInstrumentation.swift */,
 				85C6A29525CC1FFD00EEB5F1 /* UserDefaultsWrapper.swift */,
 				4B9579202AC687170062CA31 /* HardwareModel.swift */,
+				56BA1E892BB1CB5B001CF69F /* CertificateTrustEvaluator.swift */,
 			);
 			path = Utilities;
 			sourceTree = "<group>";
@@ -6388,10 +5653,12 @@
 		4BCF15E32ABB987F0083F6DF /* NetworkProtection */ = {
 			isa = PBXGroup;
 			children = (
+				BDA7648F2BC4E56200D0400C /* Mocks */,
 				4BCF15E62ABB98A20083F6DF /* Resources */,
 				4BCF15E42ABB98990083F6DF /* NetworkProtectionRemoteMessageTests.swift */,
 				4BD57C032AC112DF00B580EE /* NetworkProtectionRemoteMessagingTests.swift */,
 				7B09CBA72BA4BE7000CF245B /* NetworkProtectionPixelEventTests.swift */,
+				BDA7648C2BC4E4EF00D0400C /* DefaultVPNLocationFormatterTests.swift */,
 			);
 			path = NetworkProtection;
 			sourceTree = "<group>";
@@ -6435,6 +5702,7 @@
 				4BF6961C28BE911100D402D4 /* RecentlyVisitedSiteModelTests.swift */,
 				569277C329DEE09D00B633EF /* ContinueSetUpModelTests.swift */,
 				56D145ED29E6DAD900E3488A /* DataImportProviderTests.swift */,
+				560C3FFB2BC9911000F589CE /* PermanentSurveyManagerTests.swift */,
 			);
 			path = HomePage;
 			sourceTree = "<group>";
@@ -6452,6 +5720,7 @@
 			children = (
 				4BD18F02283F0F1000058124 /* View */,
 				850E8DFA2A6FEC5E00691187 /* BookmarksBarAppearance.swift */,
+				9F33445D2BBFA77F0040CBEB /* BookmarksBarVisibilityManager.swift */,
 			);
 			path = BookmarksBar;
 			sourceTree = "<group>";
@@ -6500,6 +5769,14 @@
 			path = Mocks;
 			sourceTree = "<group>";
 		};
+		56BA1E852BAC820D001CF69F /* UserScripts */ = {
+			isa = PBXGroup;
+			children = (
+				56BA1E862BAC8239001CF69F /* SSLErrorPageUserScriptTests.swift */,
+			);
+			path = UserScripts;
+			sourceTree = "<group>";
+		};
 		7B1E819A27C8874900FF0E60 /* Autofill */ = {
 			isa = PBXGroup;
 			children = (
@@ -6516,10 +5793,16 @@
 		7B4CE8DB26F02108009134B1 /* UITests */ = {
 			isa = PBXGroup;
 			children = (
+				376E708D2BD686260082B7EB /* UI Tests.xctestplan */,
 				EEBCE6802BA444FA00B9DF00 /* Common */,
+				EEC7BE2D2BC6C09400F86835 /* AddressBarKeyboardShortcutsTests.swift */,
 				EED735352BB46B6000F173D6 /* AutocompleteTests.swift */,
+				EE54F7B22BBFEA48006218DB /* BookmarksAndFavoritesTests.swift */,
+				EE7F74902BB5D76600CD9456 /* BookmarksBarTests.swift */,
 				EE02D41B2BB460A600DBE6B3 /* BrowsingHistoryTests.swift */,
 				EE0429DF2BA31D2F009EB20F /* FindInPageTests.swift */,
+				EE42CBCB2BC8004700AD411C /* PermissionsTests.swift */,
+				EE9D81C22BC57A3700338BE3 /* StateRestorationTests.swift */,
 				7B4CE8E626F02134009134B1 /* TabBarTests.swift */,
 			);
 			path = UITests;
@@ -6638,6 +5921,7 @@
 			isa = PBXGroup;
 			children = (
 				B6C0B23526E732000031CB7F /* DownloadListItem.swift */,
+				B693956026F1C1BC0015B914 /* DownloadListStoreMock.swift */,
 				B6C0B23D26E8BF1F0031CB7F /* DownloadListViewModel.swift */,
 				B6CC26672BAD959500F53F8D /* DownloadProgress.swift */,
 				B6104E9A2BA9C173008636B2 /* DownloadResumeData.swift */,
@@ -6645,8 +5929,10 @@
 				B6C0B23826E742610031CB7F /* FileDownloadError.swift */,
 				856C98DE257014BD00A22F1F /* FileDownloadManager.swift */,
 				B6E6B9E22BA1F5F1008AA7E1 /* FilePresenter.swift */,
-				B6A924D82664C72D001A28CA /* WebKitDownloadTask.swift */,
 				B6CC266B2BAD9CD800F53F8D /* FileProgressPresenter.swift */,
+				B6ABD0CD2BC042CE0000EB69 /* NSURL+sandboxExtensionRetainCount.m */,
+				B6ABD0C92BC03F610000EB69 /* SecurityScopedFileURLController.swift */,
+				B6A924D82664C72D001A28CA /* WebKitDownloadTask.swift */,
 			);
 			path = Model;
 			sourceTree = "<group>";
@@ -6659,6 +5945,7 @@
 				85589E9027BFB9810038AD11 /* HomePageRecentlyVisitedModel.swift */,
 				569277C029DDCBB500B633EF /* HomePageContinueSetUpModel.swift */,
 				56D145EA29E6C99B00E3488A /* DataImportStatusProviding.swift */,
+				560C3FFE2BCD5A1E00F589CE /* PermanentSurveyManager.swift */,
 			);
 			path = Model;
 			sourceTree = "<group>";
@@ -6702,6 +5989,7 @@
 				4B44FEF22B1FEF5A000619D8 /* FocusableTextEditor.swift */,
 				B6ABC5952B4861D4008343B9 /* FocusableTextField.swift */,
 				B6F9BDE32B45CD1900677B33 /* ModalView.swift */,
+				C1372EF32BBC5BAD003F8793 /* SecureTextField.swift */,
 			);
 			path = SwiftUI;
 			sourceTree = "<group>";
@@ -6709,26 +5997,27 @@
 		8585B63626D6E61500C1416F /* AppKit */ = {
 			isa = PBXGroup;
 			children = (
+				85774B022A71CDD000DE0561 /* BlockMenuItem.swift */,
 				B65E6B9D26D9EC0800095F96 /* CircularProgressView.swift */,
 				B693954626F04BEA0015B914 /* ColorView.swift */,
+				4B379C2327BDE1B0008A968E /* FlatButton.swift */,
 				B693953E26F04BE70015B914 /* FocusRingView.swift */,
 				B693954326F04BE90015B914 /* GradientView.swift */,
-				B6B1E88A26D774090062C350 /* LinkButton.swift */,
 				B6B140872ABDBCC1004F8E85 /* HoverTrackingArea.swift */,
+				B6B1E88A26D774090062C350 /* LinkButton.swift */,
+				B693954026F04BE80015B914 /* LoadingProgressView.swift */,
 				B693954426F04BE90015B914 /* LongPressButton.swift */,
-				B693954926F04BEB0015B914 /* MouseOverButton.swift */,
 				AA7EB6DE27E7C57D00036718 /* MouseOverAnimationButton.swift */,
+				B693954926F04BEB0015B914 /* MouseOverButton.swift */,
 				B693953D26F04BE70015B914 /* MouseOverView.swift */,
-				4B379C2327BDE1B0008A968E /* FlatButton.swift */,
+				1D26EBAB2B74BECB0002A93F /* NSImageSendable.swift */,
 				B693954726F04BEA0015B914 /* NSSavePanelExtension.swift */,
 				B693954126F04BE80015B914 /* PaddedImageButton.swift */,
-				B693954026F04BE80015B914 /* LoadingProgressView.swift */,
+				B6E3E5572BBFD51400A41922 /* PreviewViewController.swift */,
 				B60C6F8C29B200AB007BFAA8 /* SavePanelAccessoryView.swift */,
 				B693954226F04BE90015B914 /* ShadowView.swift */,
-				B693954526F04BEA0015B914 /* WindowDraggingView.swift */,
 				4BDFA4AD27BF19E500648192 /* ToggleableScrollView.swift */,
-				85774B022A71CDD000DE0561 /* BlockMenuItem.swift */,
-				1D26EBAB2B74BECB0002A93F /* NSImageSendable.swift */,
+				B693954526F04BEA0015B914 /* WindowDraggingView.swift */,
 			);
 			path = AppKit;
 			sourceTree = "<group>";
@@ -6740,7 +6029,7 @@
 				85CC1D7826A05E790062F04E /* Model */,
 				85CC1D7F26A05F6C0062F04E /* Services */,
 				85CC1D7926A05E820062F04E /* View */,
-				B642738127B65BAC0005DFD1 /* SecureVaultErrorReporter.swift */,
+				B642738127B65BAC0005DFD1 /* SecureVaultReporter.swift */,
 			);
 			path = SecureVault;
 			sourceTree = "<group>";
@@ -6973,6 +6262,16 @@
 			path = DuckDuckGoDBPBackgroundAgent;
 			sourceTree = "<group>";
 		};
+		9F0FFFB62BCCAE80007C87DD /* Mocks */ = {
+			isa = PBXGroup;
+			children = (
+				9F0FFFB72BCCAE9C007C87DD /* AddEditBookmarkDialogViewModelMock.swift */,
+				9F0FFFBA2BCCAEC2007C87DD /* AddEditBookmarkFolderDialogViewModelMock.swift */,
+				9F0FFFBD2BCCAF1F007C87DD /* BookmarkAllTabsDialogViewModelMock.swift */,
+			);
+			path = Mocks;
+			sourceTree = "<group>";
+		};
 		9F872D9B2B9058B000138637 /* Extensions */ = {
 			isa = PBXGroup;
 			children = (
@@ -6984,9 +6283,12 @@
 		9F982F102B82264400231028 /* ViewModels */ = {
 			isa = PBXGroup;
 			children = (
+				9F0FFFB62BCCAE80007C87DD /* Mocks */,
 				9F982F112B82268F00231028 /* AddEditBookmarkFolderDialogViewModelTests.swift */,
 				9F2606092B85C20400819292 /* AddEditBookmarkDialogViewModelTests.swift */,
 				9F26060D2B85E17D00819292 /* AddEditBookmarkDialogCoordinatorViewModelTests.swift */,
+				9F0FFFB32BCCAE37007C87DD /* BookmarkAllTabsDialogCoordinatorViewModelTests.swift */,
+				9FA5A0A82BC900FC00153786 /* BookmarkAllTabsDialogViewModelTests.swift */,
 			);
 			path = ViewModels;
 			sourceTree = "<group>";
@@ -7004,6 +6306,7 @@
 				9F56CFA82B82DC4300BB7F11 /* AddEditBookmarkFolderView.swift */,
 				9FEE98642B846870002E44E8 /* AddEditBookmarkView.swift */,
 				9F56CFB02B843F6C00BB7F11 /* BookmarksDialogViewFactory.swift */,
+				9F9C49F82BC7BC970099738D /* BookmarkAllTabsDialogView.swift */,
 			);
 			path = Dialog;
 			sourceTree = "<group>";
@@ -7016,6 +6319,14 @@
 			path = Factory;
 			sourceTree = "<group>";
 		};
+		9FAD62382BCFDB1D007F3A65 /* Helpers */ = {
+			isa = PBXGroup;
+			children = (
+				9FAD62392BCFDB32007F3A65 /* WebsiteInfoHelpers.swift */,
+			);
+			path = Helpers;
+			sourceTree = "<group>";
+		};
 		AA0877B626D515EE00B05660 /* UserAgent */ = {
 			isa = PBXGroup;
 			children = (
@@ -7101,6 +6412,7 @@
 				858A798226A8B75F00A75A42 /* CopyHandler.swift */,
 				1D36E65A298ACD2900AA485D /* AppIconChanger.swift */,
 				CB24F70B29A3D9CB006DCC58 /* AppConfigurationURLProvider.swift */,
+				1DEF3BAC2BD145A9004A2FBA /* AutoClearHandler.swift */,
 			);
 			path = Application;
 			sourceTree = "<group>";
@@ -7136,7 +6448,6 @@
 				565E46DE2B2725DD0013AC2A /* SyncE2EUITests */,
 				AA585D7F248FD31100E9A3E2 /* Products */,
 				85AE2FF024A33A2D002D507F /* Frameworks */,
-				EE0629702B90EE3500D868B4 /* Recovered References */,
 			);
 			sourceTree = "<group>";
 		};
@@ -7158,7 +6469,6 @@
 				4B2D06692A13318400DE1F49 /* DuckDuckGo VPN App Store.app */,
 				9D9AE8D12AAA39A70026E7DC /* DuckDuckGo Personal Information Removal.app */,
 				9D9AE8F22AAA39D30026E7DC /* DuckDuckGo Personal Information Removal App Store.app */,
-				4B957C412AC7AE700062CA31 /* DuckDuckGo Privacy Pro.app */,
 				565E46DD2B2725DC0013AC2A /* SyncE2EUITests.xctest */,
 				376113D42B29CD5B00E794BB /* SyncE2EUITests App Store.xctest */,
 				7BDA36E52B7E037100AD5388 /* VPNProxyExtension.appex */,
@@ -7245,6 +6555,7 @@
 		AA585D93248FD31400E9A3E2 /* UnitTests */ = {
 			isa = PBXGroup;
 			children = (
+				56BA1E852BAC820D001CF69F /* UserScripts */,
 				C13909F22B85FD60001626ED /* Autofill */,
 				5629846D2AC460DF00AC20EB /* Sync */,
 				B6A5A28C25B962CB00AA7ADA /* App */,
@@ -7366,6 +6677,7 @@
 		AA652CAB25DD820D009059CC /* Bookmarks */ = {
 			isa = PBXGroup;
 			children = (
+				9FAD62382BCFDB1D007F3A65 /* Helpers */,
 				9F872D9B2B9058B000138637 /* Extensions */,
 				9FA75A3C2BA00DF500DA5FA6 /* Factory */,
 				9F982F102B82264400231028 /* ViewModels */,
@@ -7392,6 +6704,7 @@
 				98A95D87299A2DF900B9B81A /* BookmarkMigrationTests.swift */,
 				9F872D9F2B90644800138637 /* ContextualMenuTests.swift */,
 				9F0A2CF72B96A58600C5B8C0 /* BaseBookmarkEntityTests.swift */,
+				9FAD623C2BD09DE5007F3A65 /* WebsiteInfoTests.swift */,
 			);
 			path = Model;
 			sourceTree = "<group>";
@@ -7401,6 +6714,8 @@
 			children = (
 				AA652CB025DD825B009059CC /* LocalBookmarkStoreTests.swift */,
 				986189E52A7CFB3E001B4519 /* LocalBookmarkStoreSavingTests.swift */,
+				9FA5A0AC2BC9037A00153786 /* BookmarkFolderStoreMock.swift */,
+				9F8D57312BCCCB9A00AEA660 /* UserDefaultsBookmarkFoldersStoreTests.swift */,
 			);
 			path = Services;
 			sourceTree = "<group>";
@@ -7508,6 +6823,7 @@
 			children = (
 				AA80EC53256BE3BC007083E7 /* UserText.swift */,
 				4B4D60D22A0C84F700BCD287 /* UserText+NetworkProtection.swift */,
+				31A83FB42BE28D7D00F74E67 /* UserText+DBP.swift */,
 			);
 			path = Localizables;
 			sourceTree = "<group>";
@@ -7646,6 +6962,7 @@
 				B626A75929921FAA00053070 /* NavigationActionPolicyExtension.swift */,
 				B634DBE4293C944700C3C99E /* NewWindowPolicy.swift */,
 				AA9FF95824A1ECF20039E328 /* Tab.swift */,
+				B6F1B0252BCE5A50005E863C /* TabContent.swift */,
 				B634DBE0293C8FD500C3C99E /* Tab+Dialogs.swift */,
 				B61E2CD4294346C000773D8A /* Tab+Navigation.swift */,
 				B634DBDE293C8F7F00C3C99E /* Tab+UIDelegate.swift */,
@@ -7786,6 +7103,8 @@
 				9F56CFAC2B84326C00BB7F11 /* AddEditBookmarkDialogViewModel.swift */,
 				9FEE98682B85B869002E44E8 /* BookmarksDialogViewModel.swift */,
 				9FEE986C2B85BA17002E44E8 /* AddEditBookmarkDialogCoordinatorViewModel.swift */,
+				9F9C4A002BC7F36D0099738D /* BookmarkAllTabsDialogCoordinatorViewModel.swift */,
+				9F9C49FC2BC7E9820099738D /* BookmarkAllTabsDialogViewModel.swift */,
 			);
 			path = ViewModel;
 			sourceTree = "<group>";
@@ -7833,7 +7152,6 @@
 			children = (
 				AAC30A25268DFEE200D2D9CD /* CrashReporter.swift */,
 				AAC30A27268E045400D2D9CD /* CrashReportReader.swift */,
-				AAC30A2B268F1ECD00D2D9CD /* CrashReportSender.swift */,
 				AAC30A2D268F1EE300D2D9CD /* CrashReportPromptPresenter.swift */,
 				AAC30A29268E239100D2D9CD /* CrashReport.swift */,
 			);
@@ -7909,6 +7227,7 @@
 				B6DA06E52913F39400225DE2 /* MenuItemSelectors.swift */,
 				AAC5E4D625D6A710007F5990 /* BookmarkStore.swift */,
 				987799F829999973005D8EB6 /* LocalBookmarkStore.swift */,
+				9FA5A0A42BC8F34900153786 /* UserDefaultsBookmarkFoldersStore.swift */,
 			);
 			path = Services;
 			sourceTree = "<group>";
@@ -8050,7 +7369,6 @@
 				B6B3E0DC2657E9CF0040E0A2 /* NSScreenExtension.swift */,
 				AAC5E4E325D6BA9C007F5990 /* NSSizeExtension.swift */,
 				4B39AAF527D9B2C700A73FD5 /* NSStackViewExtension.swift */,
-				4BE0DF0426781961006337B7 /* NSStoryboardExtension.swift */,
 				AA5C8F58258FE21F00748EB7 /* NSTextFieldExtension.swift */,
 				858A798426A8BB5D00A75A42 /* NSTextViewExtension.swift */,
 				4B0511E0262CAA8600F6079C /* NSViewControllerExtension.swift */,
@@ -8323,22 +7641,25 @@
 		B647EFB32922539400BA628D /* TabExtensions */ = {
 			isa = PBXGroup;
 			children = (
-				B6BDDA002942389000F68088 /* TabExtensions.swift */,
-				1D9A4E592B43213B00F449E2 /* TabSnapshotExtension.swift */,
 				B647EFBA2922584B00BA628D /* AdClickAttributionTabExtension.swift */,
 				B6C00ECA292F839D009C73A6 /* AutofillTabExtension.swift */,
+				B6F1B0212BCE5658005E863C /* BrokenSiteInfoTabExtension.swift */,
 				B6D574B12947224C008ED1B6 /* ContentBlockingTabExtension.swift */,
 				B6DA06E32913ECEE00225DE2 /* ContextMenuManager.swift */,
+				B6685E4129A61C460043D2EE /* DownloadsTabExtension.swift */,
 				B6C416A6294A4AE500C4F2E7 /* DuckPlayerTabExtension.swift */,
 				B6D574B329472253008ED1B6 /* FBProtectionTabExtension.swift */,
-				B6685E4129A61C460043D2EE /* DownloadsTabExtension.swift */,
 				B6C00ECC292F89D9009C73A6 /* FindInPageTabExtension.swift */,
 				B66260DF29AC6EBD00E9E3EE /* HistoryTabExtension.swift */,
 				B6C00ED4292FB21E009C73A6 /* HoveredLinkTabExtension.swift */,
 				B6BF5D8829470BC4006742B1 /* HTTPSUpgradeTabExtension.swift */,
-				B6BF5D842946FFDA006742B1 /* PrivacyDashboardTabExtension.swift */,
 				B66260E529ACAE4B00E9E3EE /* NavigationHotkeyHandler.swift */,
 				B66260DC29AC5D4300E9E3EE /* NavigationProtectionTabExtension.swift */,
+				B6F1B0292BCE675C005E863C /* NetworkProtectionControllerTabExtension.swift */,
+				B6BF5D842946FFDA006742B1 /* PrivacyDashboardTabExtension.swift */,
+				56BA1E742BAAF70F001CF69F /* SSLErrorPageTabExtension.swift */,
+				B6BDDA002942389000F68088 /* TabExtensions.swift */,
+				1D9A4E592B43213B00F449E2 /* TabSnapshotExtension.swift */,
 				B626A76C29928B1600053070 /* TestsClosureNavigationResponder.swift */,
 			);
 			path = TabExtensions;
@@ -8417,6 +7738,7 @@
 			isa = PBXGroup;
 			children = (
 				B684121B2B6A1D880092F66A /* ErrorPageHTMLTemplate.swift */,
+				56BA1E812BAC506F001CF69F /* SSLErrorPageUserScript.swift */,
 			);
 			path = ErrorPage;
 			sourceTree = "<group>";
@@ -8455,6 +7777,11 @@
 				B69B50392726A12500758A2B /* LocalStatisticsStore.swift */,
 				B69B50372726A12000758A2B /* VariantManager.swift */,
 				B69B50562727D16900758A2B /* AtbAndVariantCleanup.swift */,
+				B6DA44012616B28300DD1EC2 /* PixelDataStore.swift */,
+				B68C92C32750EF76002AC6B0 /* PixelDataRecord.swift */,
+				B6DA44062616B30600DD1EC2 /* PixelDataModel.xcdatamodeld */,
+				9FBD84512BB3AACB00220859 /* AttributionOriginFileProvider.swift */,
+				9FBD84722BB3E15D00220859 /* InstallationAttributionPixelHandler.swift */,
 			);
 			path = ATB;
 			sourceTree = "<group>";
@@ -8468,6 +7795,8 @@
 				B69B50442726C5C200758A2B /* StatisticsLoaderTests.swift */,
 				B69B50432726C5C100758A2B /* VariantManagerTests.swift */,
 				857E44612A9F6F3500ED77A7 /* CampaignVariantTests.swift */,
+				9FBD84552BB3ACFD00220859 /* AttributionOriginFileProviderTests.swift */,
+				9FBD84762BB3E54200220859 /* InstallationAttributionPixelHandlerTests.swift */,
 			);
 			path = ATB;
 			sourceTree = "<group>";
@@ -8481,6 +7810,10 @@
 				B69B504E2726CD7E00758A2B /* atb.json */,
 				B69B504F2726CD7F00758A2B /* empty */,
 				B69B50512726CD8000758A2B /* invalid.json */,
+				9FBD845C2BB3B80300220859 /* Origin.txt */,
+				9FBD84602BB3BC6400220859 /* Origin-empty.txt */,
+				9FBD846F2BB3DD8400220859 /* MockAttributionsPixelHandler.swift */,
+				9FBD84792BB3EC3300220859 /* MockAttributionOriginProvider.swift */,
 			);
 			path = Mock;
 			sourceTree = "<group>";
@@ -8498,17 +7831,12 @@
 		B6A9E44E26142AF90067D1B9 /* Statistics */ = {
 			isa = PBXGroup;
 			children = (
-				857E5AF32A79044900FC0FB4 /* Experiment */,
 				B69B50332726A10700758A2B /* ATB */,
-				B6A9E45226142B070067D1B9 /* Pixel.swift */,
-				4B67853E2AA7C726008A5004 /* DailyPixel.swift */,
-				B6A9E47626146A570067D1B9 /* PixelEvent.swift */,
-				B6A9E47E26146A800067D1B9 /* PixelArguments.swift */,
-				B6A9E48326146AAB0067D1B9 /* PixelParameters.swift */,
+				857E5AF32A79044900FC0FB4 /* Experiment */,
 				B610F2BA27A145C500FCEBE9 /* RulesCompilationMonitor.swift */,
-				B6DA44012616B28300DD1EC2 /* PixelDataStore.swift */,
-				B68C92C32750EF76002AC6B0 /* PixelDataRecord.swift */,
-				B6DA44062616B30600DD1EC2 /* PixelDataModel.xcdatamodeld */,
+				F188267B2BBEB3AA00D9AC4F /* GeneralPixel.swift */,
+				F18826832BBEE31700D9AC4F /* PixelKit+Assertion.swift */,
+				F188267F2BBEB58100D9AC4F /* PrivacyProPixel.swift */,
 			);
 			path = Statistics;
 			sourceTree = "<group>";
@@ -8524,11 +7852,12 @@
 		B6B1E87C26D5DA020062C350 /* View */ = {
 			isa = PBXGroup;
 			children = (
+				B6B1E88326D5EB570062C350 /* DownloadsCellView.swift */,
 				B6B1E87D26D5DA0E0062C350 /* DownloadsPopover.swift */,
 				B6B1E87F26D5DA9B0062C350 /* DownloadsViewController.swift */,
-				B6B1E88126D5DAC30062C350 /* Downloads.storyboard */,
-				B6B1E88326D5EB570062C350 /* DownloadsCellView.swift */,
+				B6E3E5532BBFCEE300A41922 /* NoDownloadsCellView.swift */,
 				B6C0B23B26E87D900031CB7F /* NSAlert+ActiveDownloadsTermination.swift */,
+				B6E3E54F2BBFCDEE00A41922 /* OpenDownloadsCellView.swift */,
 			);
 			path = View;
 			sourceTree = "<group>";
@@ -8563,6 +7892,7 @@
 			isa = PBXGroup;
 			children = (
 				B6BF5D922947199A006742B1 /* SerpHeadersNavigationResponder.swift */,
+				1E559BB02BBCA9F1002B4AF6 /* RedirectNavigationResponder.swift */,
 				B60C6F7629B0E286007BFAA8 /* SearchNonexistentDomainNavigationResponder.swift */,
 				B687B7CB2947A1E9001DEA6F /* ExternalAppSchemeHandler.swift */,
 			);
@@ -8572,9 +7902,9 @@
 		B6C0B23126E71A800031CB7F /* Services */ = {
 			isa = PBXGroup;
 			children = (
-				B6C0B23226E71BCD0031CB7F /* Downloads.xcdatamodeld */,
-				B6C0B22F26E61D630031CB7F /* DownloadListStore.swift */,
 				B6B1E87A26D381710062C350 /* DownloadListCoordinator.swift */,
+				B6C0B22F26E61D630031CB7F /* DownloadListStore.swift */,
+				B6C0B23226E71BCD0031CB7F /* Downloads.xcdatamodeld */,
 			);
 			path = Services;
 			sourceTree = "<group>";
@@ -8586,6 +7916,7 @@
 				B626A7632992506A00053070 /* SerpHeadersNavigationResponderTests.swift */,
 				1D1C36E529FB019C001FA40C /* HistoryTabExtensionTests.swift */,
 				1D8C2FE42B70F4C4005E4BBD /* TabSnapshotExtensionTests.swift */,
+				56BA1E7C2BAB290E001CF69F /* ErrorPageTabExtensionTest.swift */,
 			);
 			path = TabExtensionsTests;
 			sourceTree = "<group>";
@@ -8595,10 +7926,6 @@
 			children = (
 				857E5AF72A79617100FC0FB4 /* PixelExperiment */,
 				B69B50402726C3F400758A2B /* ATB */,
-				B6DA44102616C0FC00DD1EC2 /* PixelTests.swift */,
-				4BC2621C293996410087A482 /* PixelEventTests.swift */,
-				B662D3D82755D7AD0035D4D6 /* PixelStoreTests.swift */,
-				B6DA44222616CABC00DD1EC2 /* PixelArgumentsTests.swift */,
 				B6DA441D2616C84600DD1EC2 /* PixelStoreMock.swift */,
 				4B117F7C276C0CB5002F3D8C /* LocalStatisticsStoreTests.swift */,
 				B610F2E327A8F37A00FCEBE9 /* CBRCompileTimeReporterTests.swift */,
@@ -8609,6 +7936,7 @@
 		B6E6B9F42BA1FD90008AA7E1 /* sandbox-test-tool */ = {
 			isa = PBXGroup;
 			children = (
+				02C0737C2BE5B7E000BFE2F5 /* InfoPlist.xcstrings */,
 				B6E6BA212BA2E4FB008AA7E1 /* Info.plist */,
 				B6E6B9F52BA1FD90008AA7E1 /* SandboxTestTool.swift */,
 				B6E6BA222BA2EDDE008AA7E1 /* FileReadResult.swift */,
@@ -8632,7 +7960,6 @@
 				B693956726F352DB0015B914 /* DownloadsWebViewMock.h */,
 				B693956826F352DB0015B914 /* DownloadsWebViewMock.m */,
 				B630794126731F5400DCEE41 /* WKDownloadMock.swift */,
-				B693956026F1C1BC0015B914 /* DownloadListStoreMock.swift */,
 				B693956226F1C2A40015B914 /* FileDownloadManagerMock.swift */,
 				9F180D112B69C665000D695F /* DownloadsTabExtensionMock.swift */,
 			);
@@ -8677,6 +8004,23 @@
 			path = View;
 			sourceTree = "<group>";
 		};
+		BDA7648F2BC4E56200D0400C /* Mocks */ = {
+			isa = PBXGroup;
+			children = (
+				BDA764902BC4E57200D0400C /* MockVPNLocationFormatter.swift */,
+			);
+			path = Mocks;
+			sourceTree = "<group>";
+		};
+		BDE981DB2BBD110800645880 /* Assets */ = {
+			isa = PBXGroup;
+			children = (
+				BD384AC82BBC821100EF3735 /* vpn-dark-mode.json */,
+				BD384AC72BBC821100EF3735 /* vpn-light-mode.json */,
+			);
+			path = Assets;
+			sourceTree = "<group>";
+		};
 		C13909F22B85FD60001626ED /* Autofill */ = {
 			isa = PBXGroup;
 			children = (
@@ -8738,16 +8082,10 @@
 			path = fonts;
 			sourceTree = "<group>";
 		};
-		EE0629702B90EE3500D868B4 /* Recovered References */ = {
-			isa = PBXGroup;
-			children = (
-			);
-			name = "Recovered References";
-			sourceTree = "<group>";
-		};
 		EEA3EEAF2B24EB5100E8333A /* VPNLocation */ = {
 			isa = PBXGroup;
 			children = (
+				BDA7647B2BC497BE00D0400C /* DefaultVPNLocationFormatter.swift */,
 				EEA3EEB22B24EC0600E8333A /* VPNLocationViewModel.swift */,
 				EEA3EEB02B24EBD000E8333A /* NetworkProtectionVPNCountryLabelsModel.swift */,
 				EEC4A6682B2C87D300F7C0AA /* VPNLocationView.swift */,
@@ -8768,6 +8106,14 @@
 			path = JSAlert;
 			sourceTree = "<group>";
 		};
+		EEBCA0C12BD7CDDA004DF19C /* Pixels */ = {
+			isa = PBXGroup;
+			children = (
+				EEBCA0C52BD7CE2C004DF19C /* VPNFailureRecoveryPixel.swift */,
+			);
+			path = Pixels;
+			sourceTree = "<group>";
+		};
 		EEBCE6802BA444FA00B9DF00 /* Common */ = {
 			isa = PBXGroup;
 			children = (
@@ -8784,6 +8130,7 @@
 				4BF0E5042AD2551A00FFEC9E /* NetworkProtectionPixelEvent.swift */,
 				7B934C402A866DD400FC8F9C /* UserDefaults+NetworkProtectionShared.swift */,
 				7BFE95532A9DF2930081ABE9 /* UserDefaults+NetworkProtectionWaitlist.swift */,
+				7B4D8A202BDA857300852966 /* VPNOperationErrorRecorder.swift */,
 			);
 			path = AppAndExtensionAndAgentTargets;
 			sourceTree = "<group>";
@@ -8820,13 +8167,13 @@
 				3706FCA6293F65D500E42796 /* Frameworks */,
 				3706FCB1293F65D500E42796 /* Resources */,
 				4BBA2D272B6AC09D00F6A470 /* Embed Login Items */,
+				6A8856B31B2BC5078B61ED81 /* Run swiftlint */,
 			);
 			buildRules = (
 			);
 			dependencies = (
 				4BBA2D2B2B6AD01E00F6A470 /* PBXTargetDependency */,
 				4BBA2D292B6ACD4D00F6A470 /* PBXTargetDependency */,
-				B69D061C2A4C0BC10032D14D /* PBXTargetDependency */,
 				4B5F14FE2A1529230060320F /* PBXTargetDependency */,
 			);
 			name = "DuckDuckGo Privacy Browser App Store";
@@ -8845,7 +8192,6 @@
 				B6EC37FE29B8D915001ACE79 /* Configuration */,
 				37DF000629F9C061002B7D3E /* SyncDataProviders */,
 				9DC70B192AA1FA5B005A844B /* LoginItems */,
-				7B5F9A742AE2BE4E002AEBC0 /* PixelKit */,
 				37269EFC2B332FAC005E8E46 /* Common */,
 				372217812B33380700B8E9C2 /* TestUtils */,
 				4BF97AD02B43C43F00EB4240 /* NetworkProtectionIPC */,
@@ -8860,6 +8206,9 @@
 				85D44B872BA08D30001B4AB5 /* Suggestions */,
 				4BCBE4592BA7E17800FC75A1 /* Subscription */,
 				9FF521472BAA909C00B9819B /* Lottie */,
+				537FC71EA5115A983FAF3170 /* Crashes */,
+				F198C7132BD18A30000BF24D /* PixelKit */,
+				F198C71F2BD18D92000BF24D /* SwiftLintTool */,
 			);
 			productName = DuckDuckGo;
 			productReference = 3706FD05293F65D500E42796 /* DuckDuckGo App Store.app */;
@@ -8883,8 +8232,8 @@
 			packageProductDependencies = (
 				3706FDD6293F661700E42796 /* OHHTTPStubs */,
 				3706FDD8293F661700E42796 /* OHHTTPStubsSwift */,
-				4B81AD362B29513100706C96 /* PixelKitTestingUtilities */,
 				B65CD8CE2B316E0200A595BB /* SnapshotTesting */,
+				F116A7C62BD1925500F3FCF7 /* PixelKitTestingUtilities */,
 			);
 			productName = DuckDuckGoTests;
 			productReference = 3706FE99293F661700E42796 /* Unit Tests App Store.xctest */;
@@ -8901,7 +8250,6 @@
 			buildRules = (
 			);
 			dependencies = (
-				B69D061A2A4C0AD80032D14D /* PBXTargetDependency */,
 				B6EC37F429B5DA94001ACE79 /* PBXTargetDependency */,
 				37079A95294236FA0031BB3C /* PBXTargetDependency */,
 			);
@@ -8924,12 +8272,9 @@
 			buildRules = (
 			);
 			dependencies = (
-				B6F997C12B8F35F800476735 /* PBXTargetDependency */,
 				376113D62B29CD6800E794BB /* PBXTargetDependency */,
 			);
 			name = "SyncE2EUITests App Store";
-			packageProductDependencies = (
-			);
 			productName = DuckDuckGoSyncUITests;
 			productReference = 376113D42B29CD5B00E794BB /* SyncE2EUITests App Store.xctest */;
 			productType = "com.apple.product-type.bundle.ui-testing";
@@ -8946,7 +8291,6 @@
 			);
 			dependencies = (
 				B6CAC23F2B8F0ECA006CD402 /* PBXTargetDependency */,
-				B69D06162A4C0ACD0032D14D /* PBXTargetDependency */,
 				B6EC37F229B5DA8F001ACE79 /* PBXTargetDependency */,
 			);
 			name = "Integration Tests";
@@ -8954,6 +8298,7 @@
 				B6AE39F229374AEC00C37AA4 /* OHHTTPStubs */,
 				B6AE39F429374AEC00C37AA4 /* OHHTTPStubsSwift */,
 				B65CD8CC2B316DFC00A595BB /* SnapshotTesting */,
+				F116A7C82BD1929000F3FCF7 /* PixelKitTestingUtilities */,
 			);
 			productName = "Integration Tests";
 			productReference = 4B1AD89D25FC27E200261379 /* Integration Tests.xctest */;
@@ -8971,16 +8316,15 @@
 			buildRules = (
 			);
 			dependencies = (
-				B6080B9F2B20AF7B00B418EF /* PBXTargetDependency */,
 			);
 			name = NetworkProtectionSystemExtension;
 			packageProductDependencies = (
-				4B2537762A11BFE100610219 /* PixelKit */,
 				4B2D062B2A11C0E100DE1F49 /* Networking */,
 				EE7295E82A545BC4008C0991 /* NetworkProtection */,
 				37269F002B332FC8005E8E46 /* Common */,
 				7BBE2B7A2B61663C00697445 /* NetworkProtectionProxy */,
 				7B37C7A42BAA32A50062546A /* Subscription */,
+				F198C7172BD18A4C000BF24D /* PixelKit */,
 			);
 			productName = NetworkProtectionSystemExtension;
 			productReference = 4B25375A2A11BE7300610219 /* com.duckduckgo.macos.vpn.network-extension.debug.systemextension */;
@@ -8999,7 +8343,6 @@
 			buildRules = (
 			);
 			dependencies = (
-				B6080BA32B20AF8300B418EF /* PBXTargetDependency */,
 				7BEC18312AD5DA3300D30536 /* PBXTargetDependency */,
 			);
 			name = DuckDuckGoVPN;
@@ -9009,10 +8352,11 @@
 				7BEEA5112AD1235B00A9E72B /* NetworkProtectionIPC */,
 				7BEEA5152AD1236E00A9E72B /* NetworkProtectionUI */,
 				7BEC182E2AD5D8DC00D30536 /* SystemExtensionManager */,
-				7BFCB74D2ADE7E1A00DA3EA7 /* PixelKit */,
 				4B41EDAA2B1544B2001EEDF4 /* LoginItems */,
 				7B00997C2B6508B700FE7C31 /* NetworkProtectionProxy */,
 				EE2F9C5A2B90F2FF00D45FC9 /* Subscription */,
+				F198C7192BD18A5B000BF24D /* PixelKit */,
+				BDADBDC82BD2BC2200421B9B /* Lottie */,
 			);
 			productName = DuckDuckGoAgent;
 			productReference = 4B2D06392A11CFBB00DE1F49 /* DuckDuckGo VPN.app */;
@@ -9034,7 +8378,6 @@
 			dependencies = (
 				7BDA36F82B7E082100AD5388 /* PBXTargetDependency */,
 				4BA7C4DF2B3F6F4900AFE511 /* PBXTargetDependency */,
-				B6080BA52B20AF8800B418EF /* PBXTargetDependency */,
 			);
 			name = DuckDuckGoVPNAppStore;
 			packageProductDependencies = (
@@ -9042,10 +8385,11 @@
 				EE7295EE2A545C12008C0991 /* NetworkProtection */,
 				7BA7CC602AD1211C0042E5CE /* Networking */,
 				7BEEA5132AD1236300A9E72B /* NetworkProtectionIPC */,
-				7BFCB74F2ADE7E2300DA3EA7 /* PixelKit */,
 				7B00997E2B6508C200FE7C31 /* NetworkProtectionProxy */,
 				4BA7C4DC2B3F64E500AFE511 /* LoginItems */,
 				4BCBE45B2BA7E18500FC75A1 /* Subscription */,
+				F198C71B2BD18A61000BF24D /* PixelKit */,
+				BDADBDCA2BD2BC2800421B9B /* Lottie */,
 			);
 			productName = DuckDuckGoAgentAppStore;
 			productReference = 4B2D06692A13318400DE1F49 /* DuckDuckGo VPN App Store.app */;
@@ -9062,13 +8406,14 @@
 			buildRules = (
 			);
 			dependencies = (
-				B6080BA12B20AF7F00B418EF /* PBXTargetDependency */,
 				4B4BEC4A2A11B627001D9AC5 /* PBXTargetDependency */,
 			);
 			name = DuckDuckGoNotifications;
 			packageProductDependencies = (
 				37269F042B3332C2005E8E46 /* Common */,
 				7B624F162BA25C1F00A6C544 /* NetworkProtectionUI */,
+				4B1EFF1B2BD71EEF007CC84F /* PixelKit */,
+				4B1EFF202BD72189007CC84F /* Networking */,
 			);
 			productName = DuckDuckGoNotifications;
 			productReference = 4B4BEC202A11B4E2001D9AC5 /* DuckDuckGo Notifications.app */;
@@ -9085,76 +8430,21 @@
 			buildRules = (
 			);
 			dependencies = (
-				B6080B9D2B20AF7700B418EF /* PBXTargetDependency */,
 				4B4D60532A0B29CB00BCD287 /* PBXTargetDependency */,
 			);
 			name = NetworkProtectionAppExtension;
 			packageProductDependencies = (
-				4B4D60972A0B2A5C00BCD287 /* PixelKit */,
 				4B4D60AE2A0C837F00BCD287 /* Networking */,
 				EE7295E62A545BBB008C0991 /* NetworkProtection */,
 				37269EFE2B332FBB005E8E46 /* Common */,
 				7B25856D2BA2F2ED00D49F79 /* NetworkProtectionUI */,
+				DC3F73D49B2D44464AFEFCD8 /* Subscription */,
+				F198C7152BD18A44000BF24D /* PixelKit */,
 			);
 			productName = NetworkProtectionAppExtension;
 			productReference = 4B4D603D2A0B290200BCD287 /* NetworkProtectionAppExtension.appex */;
 			productType = "com.apple.product-type.app-extension";
 		};
-		4B9579252AC7AE700062CA31 /* DuckDuckGo Privacy Pro */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = 4B957C3C2AC7AE700062CA31 /* Build configuration list for PBXNativeTarget "DuckDuckGo Privacy Pro" */;
-			buildPhases = (
-				4B9579432AC7AE700062CA31 /* Assert Xcode version */,
-				4B9579442AC7AE700062CA31 /* Check Embedded Config URLs */,
-				4B9579452AC7AE700062CA31 /* Sources */,
-				4B957BD42AC7AE700062CA31 /* Frameworks */,
-				4B957BEC2AC7AE700062CA31 /* Resources */,
-				4B957C322AC7AE700062CA31 /* Make /Applications symlink, remove app on Clean build */,
-				4B957C332AC7AE700062CA31 /* Embed Login Items */,
-				7B31FD942AD126FA0086AA24 /* Embed System Network Extension */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-				4B9579262AC7AE700062CA31 /* PBXTargetDependency */,
-				31C6E9AB2B0C07A30086DC30 /* PBXTargetDependency */,
-			);
-			name = "DuckDuckGo Privacy Pro";
-			packageProductDependencies = (
-				4B9579292AC7AE700062CA31 /* Sparkle */,
-				4B95792B2AC7AE700062CA31 /* BrowserServicesKit */,
-				4B95792E2AC7AE700062CA31 /* ContentBlocking */,
-				4B95792F2AC7AE700062CA31 /* PrivacyDashboard */,
-				4B9579302AC7AE700062CA31 /* UserScript */,
-				4B9579312AC7AE700062CA31 /* Persistence */,
-				4B9579322AC7AE700062CA31 /* Configuration */,
-				4B9579332AC7AE700062CA31 /* Navigation */,
-				4B9579342AC7AE700062CA31 /* Bookmarks */,
-				4B9579352AC7AE700062CA31 /* DDGSync */,
-				4B9579362AC7AE700062CA31 /* SyncUI */,
-				4B9579372AC7AE700062CA31 /* SwiftUIExtensions */,
-				4B9579382AC7AE700062CA31 /* OpenSSL */,
-				4B95793C2AC7AE700062CA31 /* SyncDataProviders */,
-				4B95793D2AC7AE700062CA31 /* NetworkProtectionUI */,
-				4B95793E2AC7AE700062CA31 /* NetworkProtection */,
-				4B95793F2AC7AE700062CA31 /* LoginItems */,
-				7B31FD8F2AD1257B0086AA24 /* NetworkProtectionIPC */,
-				3143C8782B0D1F3D00382627 /* DataBrokerProtection */,
-				1E0068AC2B1673BB00BBF43B /* SubscriptionUI */,
-				37269F022B332FD8005E8E46 /* Common */,
-				372217832B33380E00B8E9C2 /* TestUtils */,
-				373FB4B42B4D6C57004C88D6 /* PreferencesViews */,
-				1E21F8E22B73E48600FB272E /* Subscription */,
-				7B94E1642B7ED95100E32B96 /* NetworkProtectionProxy */,
-				85E2BBD12B8F536F00DBEC7A /* History */,
-				F1D43AF62B98E48F00BAB743 /* BareBonesBrowserKit */,
-				85D44B892BA08D3B001B4AB5 /* Suggestions */,
-				9FF521492BAA90C400B9819B /* Lottie */,
-			);
-			productName = DuckDuckGo;
-			productReference = 4B957C412AC7AE700062CA31 /* DuckDuckGo Privacy Pro.app */;
-			productType = "com.apple.product-type.application";
-		};
 		565E46DC2B2725DC0013AC2A /* SyncE2EUITests */ = {
 			isa = PBXNativeTarget;
 			buildConfigurationList = 565E46E52B2725DD0013AC2A /* Build configuration list for PBXNativeTarget "SyncE2EUITests" */;
@@ -9166,11 +8456,8 @@
 			buildRules = (
 			);
 			dependencies = (
-				B6F997BF2B8F35F400476735 /* PBXTargetDependency */,
 			);
 			name = SyncE2EUITests;
-			packageProductDependencies = (
-			);
 			productName = DuckDuckGoSyncUITests;
 			productReference = 565E46DD2B2725DC0013AC2A /* SyncE2EUITests.xctest */;
 			productType = "com.apple.product-type.bundle.ui-testing";
@@ -9187,7 +8474,6 @@
 			);
 			dependencies = (
 				EE02D41E2BB460B500DBE6B3 /* PBXTargetDependency */,
-				B6F997BD2B8F35EF00476735 /* PBXTargetDependency */,
 			);
 			name = "UI Tests";
 			packageProductDependencies = (
@@ -9214,7 +8500,6 @@
 			packageProductDependencies = (
 				7B97CD582B7E0B57004FEF43 /* NetworkProtectionProxy */,
 				7B97CD5A2B7E0B85004FEF43 /* Common */,
-				7B97CD612B7E0C4B004FEF43 /* PixelKit */,
 				7B7DFB212B7E7473009EA1A3 /* Networking */,
 			);
 			productName = VPNProxyExtension;
@@ -9233,12 +8518,10 @@
 			buildRules = (
 			);
 			dependencies = (
-				B6080BA92B20AF8F00B418EF /* PBXTargetDependency */,
 			);
 			name = DuckDuckGoDBPBackgroundAgent;
 			packageProductDependencies = (
 				9D9AE8F82AAA3AD00026E7DC /* DataBrokerProtection */,
-				9D6983F82AC773C3002C02FC /* PixelKit */,
 				9DEF97E02B06C4EE00764F03 /* Networking */,
 			);
 			productName = DuckDuckGoAgent;
@@ -9257,12 +8540,10 @@
 			buildRules = (
 			);
 			dependencies = (
-				B6080BAB2B20AF9200B418EF /* PBXTargetDependency */,
 			);
 			name = DuckDuckGoDBPBackgroundAgentAppStore;
 			packageProductDependencies = (
 				9D9AE8FA2AAA3AD90026E7DC /* DataBrokerProtection */,
-				9D6983FA2AC773C8002C02FC /* PixelKit */,
 				315A023E2B6421AE00BFA577 /* Networking */,
 			);
 			productName = DuckDuckGoAgent;
@@ -9280,12 +8561,12 @@
 				AA585D7C248FD31100E9A3E2 /* Resources */,
 				B6F2C8722A7A4C7D000498CF /* Make /Applications symlink, remove app on Clean build */,
 				4B2D065D2A11D2AE00DE1F49 /* Embed Login Items */,
+				28003FDBDB96625F1630CFF2 /* Run swiftlint */,
 			);
 			buildRules = (
 			);
 			dependencies = (
 				7B4627742B9AF2C8004ACE0B /* PBXTargetDependency */,
-				B6F997BB2B8F353F00476735 /* PBXTargetDependency */,
 				4B5F14FC2A15291D0060320F /* PBXTargetDependency */,
 				31C6E9AD2B0C07BA0086DC30 /* PBXTargetDependency */,
 			);
@@ -9307,14 +8588,11 @@
 				37DF000429F9C056002B7D3E /* SyncDataProviders */,
 				4B4D60B02A0C83B900BCD287 /* NetworkProtectionUI */,
 				EE7295E22A545B9A008C0991 /* NetworkProtection */,
-				9DB6E7232AA0DC5800A17F3C /* LoginItems */,
 				7B31FD8B2AD125620086AA24 /* NetworkProtectionIPC */,
 				7BA59C9A2AE18B49009A97B1 /* SystemExtensionManager */,
-				7B5DD6992AE51FFA001DE99C /* PixelKit */,
 				31A3A4E22B0C115F0021063C /* DataBrokerProtection */,
 				37269EFA2B332F9E005E8E46 /* Common */,
 				3722177F2B3337FE00B8E9C2 /* TestUtils */,
-				373FB4B02B4D6C42004C88D6 /* PreferencesViews */,
 				7BA076BA2B65D61400D7FB72 /* NetworkProtectionProxy */,
 				85E2BBCD2B8F534000DBEC7A /* History */,
 				1EA7B8D22B7E078C000330A4 /* SubscriptionUI */,
@@ -9322,6 +8600,10 @@
 				F1D43AF22B98E47800BAB743 /* BareBonesBrowserKit */,
 				85D44B852BA08D29001B4AB5 /* Suggestions */,
 				9FF521452BAA908500B9819B /* Lottie */,
+				08D4923DC968236E22E373E2 /* Crashes */,
+				F1DF95E62BD188B60045E591 /* LoginItems */,
+				F198C7112BD18A28000BF24D /* PixelKit */,
+				F198C71D2BD18D88000BF24D /* SwiftLintTool */,
 			);
 			productName = DuckDuckGo;
 			productReference = AA585D7E248FD31100E9A3E2 /* DuckDuckGo.app */;
@@ -9340,14 +8622,13 @@
 			dependencies = (
 				B6E6BA1D2BA2E049008AA7E1 /* PBXTargetDependency */,
 				B6CAC23D2B8F0EC6006CD402 /* PBXTargetDependency */,
-				B69D06142A4C0AC50032D14D /* PBXTargetDependency */,
 			);
 			name = "Unit Tests";
 			packageProductDependencies = (
 				B6DA44162616C13800DD1EC2 /* OHHTTPStubs */,
 				B6DA44182616C13800DD1EC2 /* OHHTTPStubsSwift */,
-				4B81AD342B29512B00706C96 /* PixelKitTestingUtilities */,
 				B65CD8CA2B316DF100A595BB /* SnapshotTesting */,
+				F116A7C22BD1924B00F3FCF7 /* PixelKitTestingUtilities */,
 			);
 			productName = DuckDuckGoTests;
 			productReference = AA585D90248FD31400E9A3E2 /* Unit Tests.xctest */;
@@ -9360,6 +8641,7 @@
 				B6E6B9EF2BA1FD90008AA7E1 /* Sources */,
 				B6E6B9F02BA1FD90008AA7E1 /* Frameworks */,
 				B6AEB5532BA3029B00781A09 /* Cleanup entitlements */,
+				02C0737E2BE5B7E000BFE2F5 /* Resources */,
 			);
 			buildRules = (
 			);
@@ -9510,13 +8792,20 @@
 				4B2D06682A13318400DE1F49 /* DuckDuckGoVPNAppStore */,
 				9D9AE8B22AAA39A70026E7DC /* DuckDuckGoDBPBackgroundAgent */,
 				9D9AE8D32AAA39D30026E7DC /* DuckDuckGoDBPBackgroundAgentAppStore */,
-				4B9579252AC7AE700062CA31 /* DuckDuckGo Privacy Pro */,
 				B6E6B9F22BA1FD90008AA7E1 /* sandbox-test-tool */,
 			);
 		};
 /* End PBXProject section */
 
 /* Begin PBXResourcesBuildPhase section */
+		02C0737E2BE5B7E000BFE2F5 /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				02C0737D2BE5B7E000BFE2F5 /* InfoPlist.xcstrings in Resources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 		3706FCB1293F65D500E42796 /* Resources */ = {
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
@@ -9530,7 +8819,6 @@
 				56CEE90F2B7A725C00CF10AA /* InfoPlist.xcstrings in Resources */,
 				3706FCB9293F65D500E42796 /* FireproofDomains.storyboard in Resources */,
 				3706FCBA293F65D500E42796 /* clickToLoadConfig.json in Resources */,
-				3706FCBB293F65D500E42796 /* Downloads.storyboard in Resources */,
 				3706FCBC293F65D500E42796 /* dark-shield.json in Resources */,
 				854DAAAE2A72B613001E2E24 /* BookmarksBarPromptAssets.xcassets in Resources */,
 				3706FCBD293F65D500E42796 /* dark-shield-mouse-over.json in Resources */,
@@ -9564,7 +8852,9 @@
 				3706FCE6293F65D500E42796 /* social_images in Resources */,
 				3706FCE7293F65D500E42796 /* shield-dot-mouse-over.json in Resources */,
 				3706FCE9293F65D500E42796 /* fb-sdk.js in Resources */,
+				BD384ACB2BBC821B00EF3735 /* vpn-dark-mode.json in Resources */,
 				3706FCEA293F65D500E42796 /* PasswordManager.storyboard in Resources */,
+				BD384ACC2BBC821B00EF3735 /* vpn-light-mode.json in Resources */,
 				3706FCEB293F65D500E42796 /* dark-flame-mouse-over.json in Resources */,
 				3706FCEC293F65D500E42796 /* flame-mouse-over.json in Resources */,
 				3706FCED293F65D500E42796 /* httpsMobileV2Bloom.bin in Resources */,
@@ -9589,8 +8879,10 @@
 				3706FE8B293F661700E42796 /* empty in Resources */,
 				376E2D282942843D001CD31B /* privacy-reference-tests in Resources */,
 				3706FE8C293F661700E42796 /* atb-with-update.json in Resources */,
+				9FBD84622BB3BC6400220859 /* Origin-empty.txt in Resources */,
 				3706FE8D293F661700E42796 /* DataImportResources in Resources */,
 				3706FE8E293F661700E42796 /* atb.json in Resources */,
+				9FBD845E2BB3B80300220859 /* Origin.txt in Resources */,
 				3706FE8F293F661700E42796 /* DuckDuckGo-ExampleCrash.ips in Resources */,
 				3706FE90293F661700E42796 /* DuckDuckGo-Symbol.jpg in Resources */,
 				3706FE91293F661700E42796 /* invalid.json in Resources */,
@@ -9624,7 +8916,9 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				BDE981DA2BBD10D600645880 /* vpn-light-mode.json in Resources */,
 				7BA7CC482AD11E5C0042E5CE /* Assets.xcassets in Resources */,
+				BDE981D92BBD10D600645880 /* vpn-dark-mode.json in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -9632,7 +8926,9 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				BDADBDCD2BD2BC5700421B9B /* vpn-light-mode.json in Resources */,
 				7BA7CC472AD11E5C0042E5CE /* Assets.xcassets in Resources */,
+				BDADBDCC2BD2BC4D00421B9B /* vpn-dark-mode.json in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -9644,70 +8940,6 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		4B957BEC2AC7AE700062CA31 /* Resources */ = {
-			isa = PBXResourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				561D66682B95C45A008ACC5C /* Suggestion.storyboard in Resources */,
-				4B957BEF2AC7AE700062CA31 /* CrashReports.storyboard in Resources */,
-				4B957BF02AC7AE700062CA31 /* trackerData.json in Resources */,
-				4B957BF12AC7AE700062CA31 /* dark-shield-dot-mouse-over.json in Resources */,
-				4B957BF22AC7AE700062CA31 /* 01_Fire_really_small.json in Resources */,
-				4B957BF32AC7AE700062CA31 /* Onboarding.storyboard in Resources */,
-				56CEE9102B7A72FE00CF10AA /* InfoPlist.xcstrings in Resources */,
-				4B957BF42AC7AE700062CA31 /* FireproofDomains.storyboard in Resources */,
-				4B957BF52AC7AE700062CA31 /* clickToLoadConfig.json in Resources */,
-				4B957BF62AC7AE700062CA31 /* Downloads.storyboard in Resources */,
-				4B957BF72AC7AE700062CA31 /* dark-shield.json in Resources */,
-				4B957BF82AC7AE700062CA31 /* BookmarksBarPromptAssets.xcassets in Resources */,
-				4B957BF92AC7AE700062CA31 /* dark-shield-mouse-over.json in Resources */,
-				4B957BFA2AC7AE700062CA31 /* autoconsent-bundle.js in Resources */,
-				4B957BFB2AC7AE700062CA31 /* ContentOverlay.storyboard in Resources */,
-				4B957BFC2AC7AE700062CA31 /* FindInPage.storyboard in Resources */,
-				4B957BFD2AC7AE700062CA31 /* JSAlert.storyboard in Resources */,
-				4B957C002AC7AE700062CA31 /* userscript.js in Resources */,
-				4B957C012AC7AE700062CA31 /* fb-tds.json in Resources */,
-				4B957C032AC7AE700062CA31 /* README.md in Resources */,
-				4B957C042AC7AE700062CA31 /* Assets.xcassets in Resources */,
-				4B957C052AC7AE700062CA31 /* NavigationBar.storyboard in Resources */,
-				4B957C062AC7AE700062CA31 /* FirePopoverCollectionViewHeader.xib in Resources */,
-				4B957C072AC7AE700062CA31 /* TabBar.storyboard in Resources */,
-				4B957C082AC7AE700062CA31 /* shield-dot.json in Resources */,
-				4B957C0B2AC7AE700062CA31 /* BookmarksBarCollectionViewItem.xib in Resources */,
-				4B957C0C2AC7AE700062CA31 /* PrivacyDashboard.storyboard in Resources */,
-				4B957C0D2AC7AE700062CA31 /* shield.json in Resources */,
-				4B957C0E2AC7AE700062CA31 /* TabBarViewItem.xib in Resources */,
-				4B957C102AC7AE700062CA31 /* httpsMobileV2FalsePositives.json in Resources */,
-				4B957C112AC7AE700062CA31 /* BookmarksBar.storyboard in Resources */,
-				4B957C122AC7AE700062CA31 /* trackers-1.json in Resources */,
-				4B957C132AC7AE700062CA31 /* dark-trackers-1.json in Resources */,
-				4B957C142AC7AE700062CA31 /* Feedback.storyboard in Resources */,
-				B658BAB92B0F849100D1F2C7 /* Localizable.xcstrings in Resources */,
-				4B957C182AC7AE700062CA31 /* shield-mouse-over.json in Resources */,
-				4B957C1A2AC7AE700062CA31 /* PermissionAuthorization.storyboard in Resources */,
-				4B957C1B2AC7AE700062CA31 /* dark-trackers-3.json in Resources */,
-				4B957C1C2AC7AE700062CA31 /* dark-trackers-2.json in Resources */,
-				4B957C1D2AC7AE700062CA31 /* Fire.storyboard in Resources */,
-				4B957C1F2AC7AE700062CA31 /* social_images in Resources */,
-				4B957C202AC7AE700062CA31 /* shield-dot-mouse-over.json in Resources */,
-				4B957C222AC7AE700062CA31 /* fb-sdk.js in Resources */,
-				4B957C232AC7AE700062CA31 /* PasswordManager.storyboard in Resources */,
-				4B957C242AC7AE700062CA31 /* dark-flame-mouse-over.json in Resources */,
-				4B957C252AC7AE700062CA31 /* flame-mouse-over.json in Resources */,
-				4B957C262AC7AE700062CA31 /* httpsMobileV2Bloom.bin in Resources */,
-				4B957C272AC7AE700062CA31 /* trackers-3.json in Resources */,
-				4B957C282AC7AE700062CA31 /* macos-config.json in Resources */,
-				4B957C292AC7AE700062CA31 /* httpsMobileV2BloomSpec.json in Resources */,
-				4B957C2A2AC7AE700062CA31 /* TabBarFooter.xib in Resources */,
-				4B957C2C2AC7AE700062CA31 /* FirePopoverCollectionViewItem.xib in Resources */,
-				4B957C2D2AC7AE700062CA31 /* ProximaNova-Bold-webfont.woff2 in Resources */,
-				4B957C2E2AC7AE700062CA31 /* dark-shield-dot.json in Resources */,
-				4B957C2F2AC7AE700062CA31 /* trackers-2.json in Resources */,
-				4B957C302AC7AE700062CA31 /* ProximaNova-Reg-webfont.woff2 in Resources */,
-				4B957C312AC7AE700062CA31 /* clickToLoad.js in Resources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
 		565E46DB2B2725DC0013AC2A /* Resources */ = {
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
@@ -9773,7 +9005,6 @@
 				56CEE90E2B7A725B00CF10AA /* InfoPlist.xcstrings in Resources */,
 				4B0511C3262CAA5A00F6079C /* FireproofDomains.storyboard in Resources */,
 				EA477680272A21B700419EDA /* clickToLoadConfig.json in Resources */,
-				B6B1E88226D5DAC30062C350 /* Downloads.storyboard in Resources */,
 				AA3439712754D4E900B241FA /* dark-shield.json in Resources */,
 				859F30672A72B38500C20372 /* BookmarksBarPromptAssets.xcassets in Resources */,
 				AA7EB6EB27E880AE00036718 /* dark-shield-mouse-over.json in Resources */,
@@ -9807,7 +9038,9 @@
 				EA18D1CA272F0DC8006DC101 /* social_images in Resources */,
 				AA7EB6E927E880A600036718 /* shield-dot-mouse-over.json in Resources */,
 				EAC80DE0271F6C0100BBF02D /* fb-sdk.js in Resources */,
+				BD384AC92BBC821A00EF3735 /* vpn-dark-mode.json in Resources */,
 				85625994269C8F9600EE44BC /* PasswordManager.storyboard in Resources */,
+				BD384ACA2BBC821A00EF3735 /* vpn-light-mode.json in Resources */,
 				AA7EB6E327E7D05500036718 /* dark-flame-mouse-over.json in Resources */,
 				AA7EB6E227E7D05500036718 /* flame-mouse-over.json in Resources */,
 				4B677433255DBEB800025BD8 /* httpsMobileV2Bloom.bin in Resources */,
@@ -9828,6 +9061,7 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				9FBD845D2BB3B80300220859 /* Origin.txt in Resources */,
 				B69B50532726CD8100758A2B /* empty in Resources */,
 				31E163C0293A581900963C10 /* privacy-reference-tests in Resources */,
 				B69B50542726CD8100758A2B /* atb-with-update.json in Resources */,
@@ -9839,13 +9073,14 @@
 				4BCF15ED2ABB9B180083F6DF /* network-protection-messages.json in Resources */,
 				B67C6C422654BF49006C872E /* DuckDuckGo-Symbol.jpg in Resources */,
 				B69B50552726CD8100758A2B /* invalid.json in Resources */,
+				9FBD84612BB3BC6400220859 /* Origin-empty.txt in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXShellScriptBuildPhase section */
-		3121F62B2B64266A002F706A /* Copy Swift Package resources */ = {
+		28003FDBDB96625F1630CFF2 /* Run swiftlint */ = {
 			isa = PBXShellScriptBuildPhase;
 			alwaysOutOfDate = 1;
 			buildActionMask = 2147483647;
@@ -9855,16 +9090,16 @@
 			);
 			inputPaths = (
 			);
-			name = "Copy Swift Package resources";
+			name = "Run swiftlint";
 			outputFileListPaths = (
 			);
 			outputPaths = (
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "# Type a script or drag a script file from your workspace to insert its path.\n# We had issues where the Swift Package resources were not being added to the Agent Apps,\n# so we're manually coping them here.\n# It seems to be a known issue: https://forums.swift.org/t/swift-packages-resource-bundle-not-present-in-xcarchive-when-framework-using-said-package-is-archived/50084/2\ncp -RL \"${BUILT_PRODUCTS_DIR}\"/ContentScopeScripts_ContentScopeScripts.bundle \"${BUILT_PRODUCTS_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/\"\ncp -RL \"${BUILT_PRODUCTS_DIR}\"/DataBrokerProtection_DataBrokerProtection.bundle \"${BUILT_PRODUCTS_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/\"\n";
+			shellScript = "if [ \"$CONFIGURATION\" != \"Debug\" ] || [ \"$ENABLE_PREVIEWS\" = \"YES\" ]; then exit 0; fi\n${BUILT_PRODUCTS_DIR}/SwiftLintTool\n";
 		};
-		3705272528992C8A000C06A2 /* Check Embedded Config URLs */ = {
+		3121F62B2B64266A002F706A /* Copy Swift Package resources */ = {
 			isa = PBXShellScriptBuildPhase;
 			alwaysOutOfDate = 1;
 			buildActionMask = 2147483647;
@@ -9874,16 +9109,16 @@
 			);
 			inputPaths = (
 			);
-			name = "Check Embedded Config URLs";
+			name = "Copy Swift Package resources";
 			outputFileListPaths = (
 			);
 			outputPaths = (
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "if [ \"$ENABLE_PREVIEWS\" = \"YES\" ]; then exit 0; fi\nif [ \"$CONFIGURATION\" == \"Release\" ]; then\n   \"${SRCROOT}/scripts/update_embedded.sh\" -c\nfi\n";
+			shellScript = "# Type a script or drag a script file from your workspace to insert its path.\n# We had issues where the Swift Package resources were not being added to the Agent Apps,\n# so we're manually coping them here.\n# It seems to be a known issue: https://forums.swift.org/t/swift-packages-resource-bundle-not-present-in-xcarchive-when-framework-using-said-package-is-archived/50084/2\ncp -RL \"${BUILT_PRODUCTS_DIR}\"/ContentScopeScripts_ContentScopeScripts.bundle \"${BUILT_PRODUCTS_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/\"\ncp -RL \"${BUILT_PRODUCTS_DIR}\"/DataBrokerProtection_DataBrokerProtection.bundle \"${BUILT_PRODUCTS_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/\"\n";
 		};
-		3706FA79293F65D500E42796 /* Check Embedded Config URLs */ = {
+		3705272528992C8A000C06A2 /* Check Embedded Config URLs */ = {
 			isa = PBXShellScriptBuildPhase;
 			alwaysOutOfDate = 1;
 			buildActionMask = 2147483647;
@@ -9902,7 +9137,7 @@
 			shellPath = /bin/sh;
 			shellScript = "if [ \"$ENABLE_PREVIEWS\" = \"YES\" ]; then exit 0; fi\nif [ \"$CONFIGURATION\" == \"Release\" ]; then\n   \"${SRCROOT}/scripts/update_embedded.sh\" -c\nfi\n";
 		};
-		378E2798296F6D1D00FCADA2 /* Validate PRODUCT_NAME */ = {
+		3706FA79293F65D500E42796 /* Check Embedded Config URLs */ = {
 			isa = PBXShellScriptBuildPhase;
 			alwaysOutOfDate = 1;
 			buildActionMask = 2147483647;
@@ -9912,16 +9147,16 @@
 			);
 			inputPaths = (
 			);
-			name = "Validate PRODUCT_NAME";
+			name = "Check Embedded Config URLs";
 			outputFileListPaths = (
 			);
 			outputPaths = (
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "if [[ \"${CONFIGURATION}\" == \"Release\" && \"${PRODUCT_NAME}\" != \"DuckDuckGo\" ]]; then\n    echo \"PRODUCT_NAME must be equal to \\\"DuckDuckGo\\\" (is \\\"${PRODUCT_NAME}\\\")\"\n    echo \"See ManualAppStoreRelease.xcconfig for instructions.\"\n    exit 1\nfi\n";
+			shellScript = "if [ \"$ENABLE_PREVIEWS\" = \"YES\" ]; then exit 0; fi\nif [ \"$CONFIGURATION\" == \"Release\" ]; then\n   \"${SRCROOT}/scripts/update_embedded.sh\" -c\nfi\n";
 		};
-		4B2D065C2A11D23600DE1F49 /* Copy Assets */ = {
+		378E2798296F6D1D00FCADA2 /* Validate PRODUCT_NAME */ = {
 			isa = PBXShellScriptBuildPhase;
 			alwaysOutOfDate = 1;
 			buildActionMask = 2147483647;
@@ -9931,16 +9166,16 @@
 			);
 			inputPaths = (
 			);
-			name = "Copy Assets";
+			name = "Validate PRODUCT_NAME";
 			outputFileListPaths = (
 			);
 			outputPaths = (
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "# We had issues where the Swift Package resources were not being added to the Agent Apps,\n# so we're manually coping them here.\n# It seems to be a known issue: https://forums.swift.org/t/swift-packages-resource-bundle-not-present-in-xcarchive-when-framework-using-said-package-is-archived/50084/2\ncp -RL \"${BUILT_PRODUCTS_DIR}\"/NetworkProtectionMac_NetworkProtectionUI.bundle \"${BUILT_PRODUCTS_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/\"\n";
+			shellScript = "if [[ \"${CONFIGURATION}\" == \"Release\" && \"${PRODUCT_NAME}\" != \"DuckDuckGo\" ]]; then\n    echo \"PRODUCT_NAME must be equal to \\\"DuckDuckGo\\\" (is \\\"${PRODUCT_NAME}\\\")\"\n    echo \"See ManualAppStoreRelease.xcconfig for instructions.\"\n    exit 1\nfi\n";
 		};
-		4B2D067D2A13341200DE1F49 /* ShellScript */ = {
+		4B2D065C2A11D23600DE1F49 /* Copy Assets */ = {
 			isa = PBXShellScriptBuildPhase;
 			alwaysOutOfDate = 1;
 			buildActionMask = 2147483647;
@@ -9950,6 +9185,7 @@
 			);
 			inputPaths = (
 			);
+			name = "Copy Assets";
 			outputFileListPaths = (
 			);
 			outputPaths = (
@@ -9958,26 +9194,7 @@
 			shellPath = /bin/sh;
 			shellScript = "# We had issues where the Swift Package resources were not being added to the Agent Apps,\n# so we're manually coping them here.\n# It seems to be a known issue: https://forums.swift.org/t/swift-packages-resource-bundle-not-present-in-xcarchive-when-framework-using-said-package-is-archived/50084/2\ncp -RL \"${BUILT_PRODUCTS_DIR}\"/NetworkProtectionMac_NetworkProtectionUI.bundle \"${BUILT_PRODUCTS_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/\"\n";
 		};
-		4B9579432AC7AE700062CA31 /* Assert Xcode version */ = {
-			isa = PBXShellScriptBuildPhase;
-			alwaysOutOfDate = 1;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputFileListPaths = (
-			);
-			inputPaths = (
-			);
-			name = "Assert Xcode version";
-			outputFileListPaths = (
-			);
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/scripts/assert_xcode_version.sh\"\n";
-		};
-		4B9579442AC7AE700062CA31 /* Check Embedded Config URLs */ = {
+		4B2D067D2A13341200DE1F49 /* ShellScript */ = {
 			isa = PBXShellScriptBuildPhase;
 			alwaysOutOfDate = 1;
 			buildActionMask = 2147483647;
@@ -9987,33 +9204,13 @@
 			);
 			inputPaths = (
 			);
-			name = "Check Embedded Config URLs";
 			outputFileListPaths = (
 			);
 			outputPaths = (
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "if [ \"$CONFIGURATION\" == \"Release\" ]; then\n   \"${SRCROOT}/scripts/update_embedded.sh\" -c\nfi\n";
-		};
-		4B957C322AC7AE700062CA31 /* Make /Applications symlink, remove app on Clean build */ = {
-			isa = PBXShellScriptBuildPhase;
-			alwaysOutOfDate = 1;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputFileListPaths = (
-			);
-			inputPaths = (
-			);
-			name = "Make /Applications symlink, remove app on Clean build";
-			outputFileListPaths = (
-			);
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "if [[ \"${CONFIGURATION}\" != \"Debug\" ]]; then\n    # run only for Debug builds\n    exit 0\nfi\n\n# if Xcode created real Applications directory inside BUILT_PRODUCTS_DIR \nif [[ ! -L ${BUILT_PRODUCTS_DIR}/Applications ]]; then\n    # we only get here on clean build, remove an existing app in /Applications/DEBUG on clean build\n    echo \"rm -rf /${INSTALL_PATH}/${PRODUCT_NAME}.app\"\n    rm -rf \"/${INSTALL_PATH}/${PRODUCT_NAME}.app\"\n\n    # create /Applications/DEBUG dir\n    echo \"mkdir -p /${INSTALL_PATH}\"\n    mkdir -p \"/${INSTALL_PATH}\"\n\n    # move the app bundle to /Applications/DEBUG\n    echo \"mv ${DSTROOT}/${INSTALL_PATH}/${PRODUCT_NAME}.app /${INSTALL_PATH}/${PRODUCT_NAME}.app\"\n    mv \"${DSTROOT}/${INSTALL_PATH}/${PRODUCT_NAME}.app\" \"/${INSTALL_PATH}/${PRODUCT_NAME}.app\"\n\n    # rm ${BUILT_PRODUCTS_DIR}/Applications directory created by Xcode\n    echo \"rm -rf ${BUILT_PRODUCTS_DIR}/Applications\" \n    rm -rf \"${BUILT_PRODUCTS_DIR}/Applications\"\n    # create ${BUILT_PRODUCTS_DIR}/Applications symlink to /Applications\n    echo \"ln -s /Applications ${BUILT_PRODUCTS_DIR}/Applications\"\n    ln -s /Applications \"${BUILT_PRODUCTS_DIR}/Applications\"\nfi\n";
+			shellScript = "# We had issues where the Swift Package resources were not being added to the Agent Apps,\n# so we're manually coping them here.\n# It seems to be a known issue: https://forums.swift.org/t/swift-packages-resource-bundle-not-present-in-xcarchive-when-framework-using-said-package-is-archived/50084/2\ncp -RL \"${BUILT_PRODUCTS_DIR}\"/NetworkProtectionMac_NetworkProtectionUI.bundle \"${BUILT_PRODUCTS_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/\"\n";
 		};
 		4BBA2D272B6AC09D00F6A470 /* Embed Login Items */ = {
 			isa = PBXShellScriptBuildPhase;
@@ -10034,7 +9231,7 @@
 			shellPath = /bin/sh;
 			shellScript = "# Embeds login items for the App Store build.\n\n# Skip login item embedding for release builds until they're ready to go live.\nif [ \"${CONFIGURATION}\" = \"Release\" ]; then\n    VPN_AGENT_NAME=\"${AGENT_RELEASE_PRODUCT_NAME}\"\n    PIR_AGENT_NAME=\"${DBP_BACKGROUND_AGENT_RELEASE_PRODUCT_NAME}\"\nelse\n    VPN_AGENT_NAME=\"${AGENT_PRODUCT_NAME}\"\n    PIR_AGENT_NAME=\"${DBP_BACKGROUND_AGENT_PRODUCT_NAME}\"\nfi\n\nVPN_AGENT_ORIGIN=$(readlink -f \"${CONFIGURATION_BUILD_DIR}/${VPN_AGENT_NAME}.app\")\nPIR_AGENT_ORIGIN=$(readlink -f \"${CONFIGURATION_BUILD_DIR}/${PIR_AGENT_NAME}.app\")\nAGENT_DESTINATION=\"${CONFIGURATION_BUILD_DIR}/${CONTENTS_FOLDER_PATH}/Library/LoginItems\"\n    \n# Make sure that Library/LoginItems exists before copying\nmkdir -p \"$AGENT_DESTINATION\"\n    \necho \"Copying VPN agent from $VPN_AGENT_ORIGIN to $AGENT_DESTINATION\"\nrsync -r --links \"$VPN_AGENT_ORIGIN\" \"$AGENT_DESTINATION\"\n    \necho \"Copying Personal Information Removal agent from $PIR_AGENT_ORIGIN to $AGENT_DESTINATION\"\nrsync -r --links \"$PIR_AGENT_ORIGIN\" \"$AGENT_DESTINATION\"\n";
 		};
-		7B31FD922AD126C40086AA24 /* Embed System Network Extension */ = {
+		6A8856B31B2BC5078B61ED81 /* Run swiftlint */ = {
 			isa = PBXShellScriptBuildPhase;
 			alwaysOutOfDate = 1;
 			buildActionMask = 2147483647;
@@ -10044,16 +9241,16 @@
 			);
 			inputPaths = (
 			);
-			name = "Embed System Network Extension";
+			name = "Run swiftlint";
 			outputFileListPaths = (
 			);
 			outputPaths = (
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "if [[ -z \"${SYSEX_BUNDLE_ID}\" ]]; then\n    echo \"Required build settings are not defined, please check xcconfig files\"\n    exit 1\nfi\n\n\necho \"ditto ${BUILT_PRODUCTS_DIR}/${SYSEX_BUNDLE_ID}.systemextension $BUILT_PRODUCTS_DIR/${CONTENTS_FOLDER_PATH}/Library/SystemExtensions/${SYSEX_BUNDLE_ID}.systemextension\"\n\nditto \"${BUILT_PRODUCTS_DIR}/${SYSEX_BUNDLE_ID}.systemextension\" \"$BUILT_PRODUCTS_DIR/${CONTENTS_FOLDER_PATH}/Library/SystemExtensions/${SYSEX_BUNDLE_ID}.systemextension\" || exit 1\n";
+			shellScript = "if [ \"$CONFIGURATION\" != \"Debug\" ] || [ \"$ENABLE_PREVIEWS\" = \"YES\" ]; then exit 0; fi\n${BUILT_PRODUCTS_DIR}/SwiftLintTool\n";
 		};
-		7B31FD942AD126FA0086AA24 /* Embed System Network Extension */ = {
+		7B31FD922AD126C40086AA24 /* Embed System Network Extension */ = {
 			isa = PBXShellScriptBuildPhase;
 			alwaysOutOfDate = 1;
 			buildActionMask = 2147483647;
@@ -10220,6 +9417,7 @@
 				4B520F642BA5573A006405C7 /* WaitlistThankYouView.swift in Sources */,
 				3706FA80293F65D500E42796 /* TabLazyLoaderDataSource.swift in Sources */,
 				3706FA81293F65D500E42796 /* LoginImport.swift in Sources */,
+				560C40002BCD5A1E00F589CE /* PermanentSurveyManager.swift in Sources */,
 				C13909FC2B861039001626ED /* AutofillActionPresenter.swift in Sources */,
 				4BF97AD72B43C53D00EB4240 /* NetworkProtectionIPCTunnelController.swift in Sources */,
 				EEC4A66E2B2C894F00F7C0AA /* VPNLocationPreferenceItemModel.swift in Sources */,
@@ -10270,6 +9468,7 @@
 				3706FAAD293F65D500E42796 /* BadgeNotificationAnimationModel.swift in Sources */,
 				3706FAAE293F65D500E42796 /* HyperLink.swift in Sources */,
 				3706FAAF293F65D500E42796 /* PasteboardWriting.swift in Sources */,
+				B6E3E5512BBFCDEE00A41922 /* OpenDownloadsCellView.swift in Sources */,
 				3706FAB0293F65D500E42796 /* BookmarkOutlineCellView.swift in Sources */,
 				3706FAB1293F65D500E42796 /* UnprotectedDomains.xcdatamodeld in Sources */,
 				5614B3A22BBD639D009B5031 /* ZoomPopover.swift in Sources */,
@@ -10279,10 +9478,8 @@
 				3706FAB6293F65D500E42796 /* YoutubePlayerUserScript.swift in Sources */,
 				1D8057C92A83CB3C00F4FED6 /* SupportedOsChecker.swift in Sources */,
 				373D9B4929EEAC1B00381FDD /* SyncMetadataDatabase.swift in Sources */,
-				3706FAB7293F65D500E42796 /* PixelParameters.swift in Sources */,
 				3706FAB8293F65D500E42796 /* FaviconImageCache.swift in Sources */,
 				3706FAB9293F65D500E42796 /* TabBarViewController.swift in Sources */,
-				4B9DB0332A983B24000927DB /* EnableWaitlistFeatureView.swift in Sources */,
 				3706FABA293F65D500E42796 /* BookmarkOutlineViewDataSource.swift in Sources */,
 				3706FABB293F65D500E42796 /* PasswordManagementBitwardenItemView.swift in Sources */,
 				1D220BF92B86192200F8BBC6 /* PreferencesEmailProtectionView.swift in Sources */,
@@ -10296,6 +9493,7 @@
 				3706FAC2293F65D500E42796 /* FaviconSelector.swift in Sources */,
 				B696AFFC2AC5924800C93203 /* FileLineError.swift in Sources */,
 				F1D43AEF2B98D8DF00BAB743 /* MainMenuActions+VanillaBrowser.swift in Sources */,
+				56BA1E8B2BB1CB5B001CF69F /* CertificateTrustEvaluator.swift in Sources */,
 				B6E1491129A5C30A00AAFBE8 /* FBProtectionTabExtension.swift in Sources */,
 				3706FAC4293F65D500E42796 /* PrintingUserScript.swift in Sources */,
 				1D01A3D92B88DF8B00FE8150 /* PreferencesSyncView.swift in Sources */,
@@ -10333,6 +9531,7 @@
 				1DDD3EC52B84F96B004CBF2B /* CookiePopupProtectionPreferences.swift in Sources */,
 				3706FAE0293F65D500E42796 /* BookmarkSidebarTreeController.swift in Sources */,
 				3706FAE1293F65D500E42796 /* HomePageFavoritesModel.swift in Sources */,
+				7B4D8A222BDA857300852966 /* VPNOperationErrorRecorder.swift in Sources */,
 				3706FAE2293F65D500E42796 /* SequenceExtensions.swift in Sources */,
 				3706FAE3293F65D500E42796 /* ChromiumDataImporter.swift in Sources */,
 				3706FAE5293F65D500E42796 /* BackForwardListItemViewModel.swift in Sources */,
@@ -10356,6 +9555,7 @@
 				3706FAF3293F65D500E42796 /* LocalAuthenticationService.swift in Sources */,
 				1D36E659298AA3BA00AA485D /* InternalUserDeciderStore.swift in Sources */,
 				B6BCC5242AFCDABB002C5499 /* DataImportSourceViewModel.swift in Sources */,
+				B6F1B02B2BCE675C005E863C /* NetworkProtectionControllerTabExtension.swift in Sources */,
 				3706FEBC293F6EFF00E42796 /* BWResponse.swift in Sources */,
 				B65C7DFC2B886CF0001E2D5C /* WKPDFHUDViewWrapper.swift in Sources */,
 				3706FAF4293F65D500E42796 /* SafariBookmarksReader.swift in Sources */,
@@ -10366,8 +9566,10 @@
 				F1B33DF72BAD970E001128B3 /* SubscriptionErrorReporter.swift in Sources */,
 				3706FEC0293F6EFF00E42796 /* BWRequest.swift in Sources */,
 				3706FAF7293F65D500E42796 /* FireproofDomainsViewController.swift in Sources */,
+				F18826852BBEE31700D9AC4F /* PixelKit+Assertion.swift in Sources */,
 				4BF0E5062AD2551A00FFEC9E /* NetworkProtectionPixelEvent.swift in Sources */,
 				3706FAF8293F65D500E42796 /* URLEventHandler.swift in Sources */,
+				9FBD84742BB3E15D00220859 /* InstallationAttributionPixelHandler.swift in Sources */,
 				37197EA72942443D00394917 /* AuthenticationAlert.swift in Sources */,
 				3706FEC3293F6F0600E42796 /* BWCommunicator.swift in Sources */,
 				3706FAFA293F65D500E42796 /* CleanThisHistoryMenuItem.swift in Sources */,
@@ -10409,12 +9611,14 @@
 				3706FB17293F65D500E42796 /* FirePopoverCollectionViewHeader.swift in Sources */,
 				85774B042A71CDD000DE0561 /* BlockMenuItem.swift in Sources */,
 				3706FB19293F65D500E42796 /* FireViewController.swift in Sources */,
+				B6E3E55C2BC0041A00A41922 /* DownloadListStoreMock.swift in Sources */,
 				4B4D60D42A0C84F700BCD287 /* UserText+NetworkProtection.swift in Sources */,
 				3707C71F294B5D2900682A9F /* WKUserContentControllerExtension.swift in Sources */,
 				3706FB1A293F65D500E42796 /* OutlineSeparatorViewCell.swift in Sources */,
 				3706FB1B293F65D500E42796 /* SafariDataImporter.swift in Sources */,
 				3706FB1D293F65D500E42796 /* StatisticsLoader.swift in Sources */,
 				3793FDD829535EBA00A2E28F /* Assertions.swift in Sources */,
+				F188267D2BBEB3AA00D9AC4F /* GeneralPixel.swift in Sources */,
 				B62B48572ADE730D000DECE5 /* FileImportView.swift in Sources */,
 				B6676BE22AA986A700525A21 /* AddressBarTextEditor.swift in Sources */,
 				3706FB1F293F65D500E42796 /* DataClearingPreferences.swift in Sources */,
@@ -10446,6 +9650,7 @@
 				3706FB35293F65D500E42796 /* FlatButton.swift in Sources */,
 				3706FB36293F65D500E42796 /* PinnedTabView.swift in Sources */,
 				3706FB37293F65D500E42796 /* DataEncryption.swift in Sources */,
+				56BA1E762BAAF70F001CF69F /* SSLErrorPageTabExtension.swift in Sources */,
 				4B9DB0362A983B24000927DB /* WaitlistTermsAndConditionsView.swift in Sources */,
 				37197EA82942443D00394917 /* BrowserTabViewController.swift in Sources */,
 				3706FB39293F65D500E42796 /* PrivacyDashboardPopover.swift in Sources */,
@@ -10457,7 +9662,6 @@
 				1ED910D62B63BFB300936947 /* IdentityTheftRestorationPagesUserScript.swift in Sources */,
 				3706FB40293F65D500E42796 /* ContextualMenu.swift in Sources */,
 				3706FB41293F65D500E42796 /* NavigationBarViewController.swift in Sources */,
-				4B7534CC2A1FD7EA00158A99 /* NetworkProtectionInviteDialog.swift in Sources */,
 				3707C71C294B5D1900682A9F /* TabExtensionsBuilder.swift in Sources */,
 				3706FB42293F65D500E42796 /* MainViewController.swift in Sources */,
 				3706FB43293F65D500E42796 /* DuckPlayer.swift in Sources */,
@@ -10466,6 +9670,7 @@
 				3706FB46293F65D500E42796 /* FirePopoverWrapperViewController.swift in Sources */,
 				3706FB47293F65D500E42796 /* NSPasteboardItemExtension.swift in Sources */,
 				3706FB48293F65D500E42796 /* AutofillPreferencesModel.swift in Sources */,
+				B6F1B0272BCE5A50005E863C /* TabContent.swift in Sources */,
 				3168506E2AF3AD1D009A2828 /* WaitlistViewControllerPresenter.swift in Sources */,
 				3706FB49293F65D500E42796 /* NSException+Catch.swift in Sources */,
 				B6B71C592B23379600487131 /* NSLayoutConstraintExtension.swift in Sources */,
@@ -10486,6 +9691,7 @@
 				4B9DB0422A983B24000927DB /* WaitlistDialogView.swift in Sources */,
 				3706FB57293F65D500E42796 /* AppPrivacyConfigurationDataProvider.swift in Sources */,
 				857E5AF62A790B7000FC0FB4 /* PixelExperiment.swift in Sources */,
+				9F33445F2BBFA77F0040CBEB /* BookmarksBarVisibilityManager.swift in Sources */,
 				3706FB58293F65D500E42796 /* LinkButton.swift in Sources */,
 				4B0EF7272B578096009D6481 /* AppVersionExtension.swift in Sources */,
 				3706FB59293F65D500E42796 /* TemporaryFileHandler.swift in Sources */,
@@ -10498,7 +9704,6 @@
 				3706FB60293F65D500E42796 /* PasswordManagementIdentityItemView.swift in Sources */,
 				3706FB61293F65D500E42796 /* ProgressExtension.swift in Sources */,
 				3706FB62293F65D500E42796 /* CSVParser.swift in Sources */,
-				3706FB64293F65D500E42796 /* PixelDataModel.xcdatamodeld in Sources */,
 				B626A75B29921FAA00053070 /* NavigationActionPolicyExtension.swift in Sources */,
 				4B9DB02A2A983B24000927DB /* WaitlistStorage.swift in Sources */,
 				3706FB65293F65D500E42796 /* PrivacyDashboardWebView.swift in Sources */,
@@ -10512,11 +9717,11 @@
 				9FEE986A2B85B869002E44E8 /* BookmarksDialogViewModel.swift in Sources */,
 				3706FB6A293F65D500E42796 /* AddressBarButton.swift in Sources */,
 				4B41EDA42B1543B9001EEDF4 /* VPNPreferencesModel.swift in Sources */,
+				1E559BB22BBCA9F1002B4AF6 /* RedirectNavigationResponder.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 */,
 				3706FB72293F65D500E42796 /* RecentlyClosedCoordinator.swift in Sources */,
@@ -10556,8 +9761,11 @@
 				37197EA42942441D00394917 /* NewWindowPolicy.swift in Sources */,
 				3706FB84293F65D500E42796 /* NSWindowExtension.swift in Sources */,
 				3706FB85293F65D500E42796 /* AddBookmarkPopover.swift in Sources */,
+				F18826922BC0105900D9AC4F /* PixelDataRecord.swift in Sources */,
+				F18826932BC0105900D9AC4F /* PixelDataStore.swift in Sources */,
 				7BBD45B22A691AB500C83CA9 /* NetworkProtectionDebugUtilities.swift in Sources */,
 				3706FB87293F65D500E42796 /* ProcessExtension.swift in Sources */,
+				F18826812BBEB58100D9AC4F /* PrivacyProPixel.swift in Sources */,
 				3706FB88293F65D500E42796 /* PermissionAuthorizationQuery.swift in Sources */,
 				3706FB89293F65D500E42796 /* BadgeAnimationView.swift in Sources */,
 				4B4D60C32A0C849100BCD287 /* EventMapping+NetworkProtectionError.swift in Sources */,
@@ -10568,6 +9776,7 @@
 				B66260E129AC6EBD00E9E3EE /* HistoryTabExtension.swift in Sources */,
 				3706FB8E293F65D500E42796 /* FirefoxEncryptionKeyReader.swift in Sources */,
 				3706FB8F293F65D500E42796 /* BookmarkManagementSplitViewController.swift in Sources */,
+				316913272BD2B76F0051B46D /* DataBrokerPrerequisitesStatusVerifier.swift in Sources */,
 				3706FB90293F65D500E42796 /* CookieManagedNotificationContainerView.swift in Sources */,
 				3706FB91293F65D500E42796 /* FileManagerExtension.swift in Sources */,
 				3706FB92293F65D500E42796 /* PermissionModel.swift in Sources */,
@@ -10596,12 +9805,13 @@
 				98779A0129999B64005D8EB6 /* Bookmark.xcdatamodeld in Sources */,
 				3706FB9E293F65D500E42796 /* AboutModel.swift in Sources */,
 				3706FB9F293F65D500E42796 /* PasswordManagementCreditCardItemView.swift in Sources */,
+				9F9C4A022BC7F36D0099738D /* BookmarkAllTabsDialogCoordinatorViewModel.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 */,
+				3169132A2BD2C7570051B46D /* DataBrokerProtectionErrorViewController.swift in Sources */,
 				1DDD3EC12B84F5D5004CBF2B /* PreferencesCookiePopupProtectionView.swift in Sources */,
 				3706FBA4293F65D500E42796 /* ContentOverlayPopover.swift in Sources */,
 				3706FBA5293F65D500E42796 /* TabShadowView.swift in Sources */,
@@ -10613,6 +9823,7 @@
 				B66260E829ACD0C900E9E3EE /* DuckPlayerTabExtension.swift in Sources */,
 				3706FBAA293F65D500E42796 /* HoverUserScript.swift in Sources */,
 				3706FBAC293F65D500E42796 /* MainMenuActions.swift in Sources */,
+				9FBD84532BB3AACB00220859 /* AttributionOriginFileProvider.swift in Sources */,
 				4BF97AD92B43C5C000EB4240 /* Bundle+VPN.swift in Sources */,
 				3706FBAE293F65D500E42796 /* DataImport.swift in Sources */,
 				3706FBAF293F65D500E42796 /* FireproofDomains.xcdatamodeld in Sources */,
@@ -10636,6 +9847,7 @@
 				3706FBBE293F65D500E42796 /* DownloadListViewModel.swift in Sources */,
 				3706FBBF293F65D500E42796 /* BookmarkManagementDetailViewController.swift in Sources */,
 				B6B4D1CB2B0C8C9200C26286 /* FirefoxCompatibilityPreferences.swift in Sources */,
+				F188268E2BBF01C400D9AC4F /* PixelDataModel.xcdatamodeld in Sources */,
 				3706FBC0293F65D500E42796 /* CSVImporter.swift in Sources */,
 				3706FBC1293F65D500E42796 /* StartupPreferences.swift in Sources */,
 				3706FBC2293F65D500E42796 /* MainMenu.swift in Sources */,
@@ -10648,13 +9860,14 @@
 				3706FBC7293F65D500E42796 /* EncryptedHistoryStore.swift in Sources */,
 				3706FBC8293F65D500E42796 /* FirePopoverCollectionViewItem.swift in Sources */,
 				3706FBC9293F65D500E42796 /* ArrayExtension.swift in Sources */,
-				3706FBCA293F65D500E42796 /* CrashReportSender.swift in Sources */,
 				3706FBCB293F65D500E42796 /* BookmarkHTMLImporter.swift in Sources */,
 				4BF97ADC2B43C5E200EB4240 /* VPNFeedbackSender.swift in Sources */,
 				987799F72999996B005D8EB6 /* BookmarkDatabase.swift in Sources */,
+				BDA7647D2BC497BE00D0400C /* DefaultVPNLocationFormatter.swift in Sources */,
 				3706FBCC293F65D500E42796 /* CustomRoundedCornersShape.swift in Sources */,
 				3706FBCD293F65D500E42796 /* LocaleExtension.swift in Sources */,
 				3706FBCE293F65D500E42796 /* SavePaymentMethodViewController.swift in Sources */,
+				9FA5A0A62BC8F34900153786 /* UserDefaultsBookmarkFoldersStore.swift in Sources */,
 				1DDC85002B835BC000670238 /* SearchPreferences.swift in Sources */,
 				3706FBD0293F65D500E42796 /* WebKitVersionProvider.swift in Sources */,
 				3706FBD1293F65D500E42796 /* NSCoderExtensions.swift in Sources */,
@@ -10667,6 +9880,7 @@
 				7B430EA22A71411A00BAC4A1 /* NetworkProtectionSimulateFailureMenu.swift in Sources */,
 				3706FBD5293F65D500E42796 /* TabCollection+NSSecureCoding.swift in Sources */,
 				3706FBD6293F65D500E42796 /* Instruments.swift in Sources */,
+				B6ABD0CF2BC042CE0000EB69 /* NSURL+sandboxExtensionRetainCount.m in Sources */,
 				B62B483F2ADE48DE000DECE5 /* ArrayBuilder.swift in Sources */,
 				569277C229DDCBB500B633EF /* HomePageContinueSetUpModel.swift in Sources */,
 				3706FBD7293F65D500E42796 /* ContentBlockerRulesLists.swift in Sources */,
@@ -10714,10 +9928,7 @@
 				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 */,
 				B626A7612992407D00053070 /* CancellableExtension.swift in Sources */,
 				3706FBF9293F65D500E42796 /* BookmarksBarCollectionViewItem.swift in Sources */,
@@ -10743,8 +9954,8 @@
 				1DCFBC8B29ADF32B00313531 /* BurnerHomePageView.swift in Sources */,
 				3706FC06293F65D500E42796 /* OnboardingViewModel.swift in Sources */,
 				3706FC07293F65D500E42796 /* ScriptSourceProviding.swift in Sources */,
-				4B6785402AA7C726008A5004 /* DailyPixel.swift in Sources */,
 				31EF1E832B63FFCA00E6DB17 /* LoginItem+DataBrokerProtection.swift in Sources */,
+				021EA0812BD2A9D500772C9A /* TabsPreferences.swift in Sources */,
 				B6619EFC2B111CC600CD9186 /* InstructionsFormatParser.swift in Sources */,
 				3706FC08293F65D500E42796 /* CoreDataBookmarkImporter.swift in Sources */,
 				3706FC09293F65D500E42796 /* SuggestionViewModel.swift in Sources */,
@@ -10769,6 +9980,7 @@
 				3706FC13293F65D500E42796 /* FaviconView.swift in Sources */,
 				B69A14F72B4D701F00B9417D /* AddBookmarkPopoverViewModel.swift in Sources */,
 				3706FC14293F65D500E42796 /* OnboardingFlow.swift in Sources */,
+				B6E3E5592BBFD51400A41922 /* PreviewViewController.swift in Sources */,
 				EEC8EB3E2982CA3B0065AA39 /* JSAlertViewModel.swift in Sources */,
 				3706FC16293F65D500E42796 /* PasswordManagementLoginModel.swift in Sources */,
 				3706FC17293F65D500E42796 /* TabViewModel.swift in Sources */,
@@ -10808,10 +10020,14 @@
 				B6685E4029A606190043D2EE /* WorkspaceProtocol.swift in Sources */,
 				3706FC2F293F65D500E42796 /* MouseOverButton.swift in Sources */,
 				3706FC30293F65D500E42796 /* FireInfoViewController.swift in Sources */,
+				B6F1B02F2BCE6B47005E863C /* TunnelControllerProvider.swift in Sources */,
+				31A83FB62BE28D7D00F74E67 /* UserText+DBP.swift in Sources */,
+				56BA1E832BAC506F001CF69F /* SSLErrorPageUserScript.swift in Sources */,
 				3706FC31293F65D500E42796 /* PermissionButton.swift in Sources */,
 				3706FC32293F65D500E42796 /* MoreOptionsMenu.swift in Sources */,
 				3706FC34293F65D500E42796 /* PermissionAuthorizationViewController.swift in Sources */,
 				3706FC35293F65D500E42796 /* BookmarkNode.swift in Sources */,
+				B6ABD0CB2BC03F610000EB69 /* SecurityScopedFileURLController.swift in Sources */,
 				31EF1E822B63FFC200E6DB17 /* DataBrokerProtectionLoginItemScheduler.swift in Sources */,
 				B6B140892ABDBCC1004F8E85 /* HoverTrackingArea.swift in Sources */,
 				3706FC36293F65D500E42796 /* LongPressButton.swift in Sources */,
@@ -10828,7 +10044,6 @@
 				3706FC40293F65D500E42796 /* SaveIdentityViewController.swift in Sources */,
 				3706FC41293F65D500E42796 /* FileStore.swift in Sources */,
 				1DB67F2E2B6FEFDB003DF243 /* ViewSnapshotRenderer.swift in Sources */,
-				3706FC42293F65D500E42796 /* PixelArguments.swift in Sources */,
 				3706FC43293F65D500E42796 /* PinnedTabsViewModel.swift in Sources */,
 				85D0327C2B8E3D090041D1FB /* HistoryCoordinatorExtension.swift in Sources */,
 				B6685E4329A61C470043D2EE /* DownloadsTabExtension.swift in Sources */,
@@ -10848,7 +10063,9 @@
 				3706FC4E293F65D500E42796 /* AtbAndVariantCleanup.swift in Sources */,
 				3706FC50293F65D500E42796 /* FeedbackWindow.swift in Sources */,
 				3706FC51293F65D500E42796 /* RecentlyVisitedView.swift in Sources */,
+				B6E3E5552BBFCEE300A41922 /* NoDownloadsCellView.swift in Sources */,
 				B645D8F729FA95440024461F /* WKProcessPoolExtension.swift in Sources */,
+				9F9C49FE2BC7E9830099738D /* BookmarkAllTabsDialogViewModel.swift in Sources */,
 				9F514F922B7D88AD001832A9 /* AddEditBookmarkFolderDialogView.swift in Sources */,
 				3706FC52293F65D500E42796 /* MouseOverAnimationButton.swift in Sources */,
 				B60293E72BA19ECD0033186B /* NetPPopoverManagerMock.swift in Sources */,
@@ -10898,12 +10115,12 @@
 				3706FC71293F65D500E42796 /* NSColorExtension.swift in Sources */,
 				1DB9618229F67F6100CF5568 /* FaviconNullStore.swift in Sources */,
 				3706FC73293F65D500E42796 /* AddressBarButtonsViewController.swift in Sources */,
-				3706FC76293F65D500E42796 /* PixelDataRecord.swift in Sources */,
-				7BFE955A2A9DF4550081ABE9 /* NetworkProtectionWaitlistFeatureFlagOverridesMenu.swift in Sources */,
 				9FDA6C222B79A59D00E099A9 /* BookmarkFavoriteView.swift in Sources */,
+				C1372EF52BBC5BAD003F8793 /* SecureTextField.swift in Sources */,
+				316913242BD2B6250051B46D /* DataBrokerProtectionPixelsHandler.swift in Sources */,
 				3706FC77293F65D500E42796 /* PageObserverUserScript.swift in Sources */,
 				4BF0E5132AD25A2600FFEC9E /* DuckDuckGoUserAgent.swift in Sources */,
-				3706FC78293F65D500E42796 /* SecureVaultErrorReporter.swift in Sources */,
+				3706FC78293F65D500E42796 /* SecureVaultReporter.swift in Sources */,
 				3706FC79293F65D500E42796 /* NSImageExtensions.swift in Sources */,
 				3706FEBD293F6EFF00E42796 /* BWCommand.swift in Sources */,
 				3706FC7B293F65D500E42796 /* PasswordManagementViewController.swift in Sources */,
@@ -10923,6 +10140,7 @@
 				3707C721294B5D2900682A9F /* WKMenuItemIdentifier.swift in Sources */,
 				3706FEBE293F6EFF00E42796 /* BWMessageIdGenerator.swift in Sources */,
 				C1E961F02B87AA29001760E1 /* AutofillActionBuilder.swift in Sources */,
+				B6F1B0232BCE5658005E863C /* BrokenSiteInfoTabExtension.swift in Sources */,
 				3706FC85293F65D500E42796 /* ShadowView.swift in Sources */,
 				3706FC86293F65D500E42796 /* FeedbackSender.swift in Sources */,
 				3706FC88293F65D500E42796 /* TabBarViewItem.swift in Sources */,
@@ -10935,7 +10153,6 @@
 				3706FC8D293F65D500E42796 /* PreferencesGeneralView.swift in Sources */,
 				37197EA92942443D00394917 /* WebView.swift in Sources */,
 				3706FC8E293F65D500E42796 /* PinnedTabsView.swift in Sources */,
-				3706FC92293F65D500E42796 /* NSStoryboardExtension.swift in Sources */,
 				B6B5F58A2B03673B008DB58A /* BrowserImportMoreInfoView.swift in Sources */,
 				3706FC93293F65D500E42796 /* PreferencesViewController.swift in Sources */,
 				3706FC94293F65D500E42796 /* FireproofDomains.swift in Sources */,
@@ -10944,6 +10161,7 @@
 				3706FC96293F65D500E42796 /* HorizontallyCenteredLayout.swift in Sources */,
 				3706FC97293F65D500E42796 /* BookmarksOutlineView.swift in Sources */,
 				3706FC98293F65D500E42796 /* CountryList.swift in Sources */,
+				1DEF3BAE2BD145A9004A2FBA /* AutoClearHandler.swift in Sources */,
 				4B37EE732B4CFF0800A89A61 /* HomePageRemoteMessagingStorage.swift in Sources */,
 				3706FC99293F65D500E42796 /* PreferencesSection.swift in Sources */,
 				B6C8CAA82AD010DD0060E1CD /* YandexDataImporter.swift in Sources */,
@@ -10957,6 +10175,7 @@
 				3706FCA0293F65D500E42796 /* ContiguousBytesExtension.swift in Sources */,
 				B602E8172A1E2570006D261F /* URL+NetworkProtection.swift in Sources */,
 				3706FCA1293F65D500E42796 /* AdjacentItemEnumerator.swift in Sources */,
+				9F9C49FA2BC7BC970099738D /* BookmarkAllTabsDialogView.swift in Sources */,
 				3706FCA2293F65D500E42796 /* ChromiumKeychainPrompt.swift in Sources */,
 				3707C71E294B5D2900682A9F /* URLRequestExtension.swift in Sources */,
 				3706FCA3293F65D500E42796 /* WKProcessPool+GeolocationProvider.swift in Sources */,
@@ -10971,6 +10190,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				9F0FFFB92BCCAE9C007C87DD /* AddEditBookmarkDialogViewModelMock.swift in Sources */,
 				3706FDDA293F661700E42796 /* EmbeddedTrackerDataTests.swift in Sources */,
 				3706FDDB293F661700E42796 /* AutofillPreferencesTests.swift in Sources */,
 				3706FDDC293F661700E42796 /* FileManagerExtensionTests.swift in Sources */,
@@ -10980,7 +10200,6 @@
 				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 */,
 				3706FDE4293F661700E42796 /* TabLazyLoaderTests.swift in Sources */,
 				3706FDE5293F661700E42796 /* URLEventHandlerTests.swift in Sources */,
@@ -11004,12 +10223,14 @@
 				3706FDF5293F661700E42796 /* StartupPreferencesTests.swift in Sources */,
 				3706FDF6293F661700E42796 /* DuckPlayerTests.swift in Sources */,
 				3706FDF7293F661700E42796 /* WebViewExtensionTests.swift in Sources */,
+				9FA5A0AA2BC900FC00153786 /* BookmarkAllTabsDialogViewModelTests.swift in Sources */,
 				56534DEE29DF252C00121467 /* CapturingDefaultBrowserProvider.swift in Sources */,
 				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 */,
+				9FBD84782BB3E54200220859 /* InstallationAttributionPixelHandlerTests.swift in Sources */,
 				3706FDFB293F661700E42796 /* DispatchQueueExtensionsTests.swift in Sources */,
 				9F180D102B69C553000D695F /* Tab+WKUIDelegateTests.swift in Sources */,
 				981E20B6299A39B8002B68CD /* BookmarkMigrationTests.swift in Sources */,
@@ -11026,11 +10247,13 @@
 				3706FE04293F661700E42796 /* TreeControllerTests.swift in Sources */,
 				3706FE05293F661700E42796 /* DownloadsWebViewMock.m in Sources */,
 				3706FE06293F661700E42796 /* CoreDataEncryptionTesting.xcdatamodeld in Sources */,
+				56BA1E7F2BAB2D29001CF69F /* ErrorPageTabExtensionTest.swift in Sources */,
 				3706FE07293F661700E42796 /* PasswordManagementItemListModelTests.swift in Sources */,
 				3706FE08293F661700E42796 /* WKWebsiteDataStoreExtensionTests.swift in Sources */,
 				3706FE09293F661700E42796 /* VariantManagerTests.swift in Sources */,
 				3706FE0A293F661700E42796 /* UserAgentTests.swift in Sources */,
 				3706FE0B293F661700E42796 /* AVCaptureDeviceMock.swift in Sources */,
+				9FBD84572BB3ACFD00220859 /* AttributionOriginFileProviderTests.swift in Sources */,
 				3706FE0C293F661700E42796 /* GeolocationProviderMock.swift in Sources */,
 				CBDD5DE429A6800300832877 /* MockConfigurationStore.swift in Sources */,
 				3706FE0D293F661700E42796 /* MainMenuTests.swift in Sources */,
@@ -11042,7 +10265,6 @@
 				4BE344EF2B23786F003FC223 /* VPNFeedbackFormViewModelTests.swift in Sources */,
 				B6F56569299A414300A04298 /* WKWebViewMockingExtension.swift in Sources */,
 				3706FE13293F661700E42796 /* ConfigurationStorageTests.swift in Sources */,
-				3706FE14293F661700E42796 /* DownloadListStoreMock.swift in Sources */,
 				3706FE15293F661700E42796 /* PrivacyIconViewModelTests.swift in Sources */,
 				B68412212B6A30680092F66A /* StringExtensionTests.swift in Sources */,
 				1D8C2FEE2B70F5D0005E4BBD /* MockViewSnapshotRenderer.swift in Sources */,
@@ -11054,13 +10276,14 @@
 				3706FE1B293F661700E42796 /* PermissionManagerTests.swift in Sources */,
 				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 */,
 				9F39106A2B68D87B00CB5112 /* ProgressExtensionTests.swift in Sources */,
+				9FAD623B2BCFDB32007F3A65 /* WebsiteInfoHelpers.swift in Sources */,
 				3706FE1F293F661700E42796 /* AppStateChangePublisherTests.swift in Sources */,
+				9FA5A0B12BC9039300153786 /* BookmarkFolderStoreMock.swift in Sources */,
 				3706FE20293F661700E42796 /* CLLocationManagerMock.swift in Sources */,
 				B6656E0E2B29C733008798A1 /* FileImportViewLocalizationTests.swift in Sources */,
 				B6C843DB2BA1CAB6006FDEC3 /* FilePresenterTests.swift in Sources */,
@@ -11092,10 +10315,12 @@
 				B630E80129C887ED00363609 /* NSErrorAdditionalInfo.swift in Sources */,
 				3706FE31293F661700E42796 /* TabCollectionViewModelDelegateMock.swift in Sources */,
 				3706FE32293F661700E42796 /* BookmarksHTMLReaderTests.swift in Sources */,
+				9F0FFFBC2BCCAEC2007C87DD /* AddEditBookmarkFolderDialogViewModelMock.swift in Sources */,
 				3706FE33293F661700E42796 /* FireTests.swift in Sources */,
 				B60C6F8229B1B4AD007BFAA8 /* TestRunHelper.swift in Sources */,
 				567DA94029E8045D008AC5EE /* MockEmailStorage.swift in Sources */,
 				317295D32AF058D3002C3206 /* MockWaitlistTermsAndConditionsActionHandler.swift in Sources */,
+				9F0FFFB52BCCAE37007C87DD /* BookmarkAllTabsDialogCoordinatorViewModelTests.swift in Sources */,
 				3706FE34293F661700E42796 /* PermissionStoreTests.swift in Sources */,
 				3706FE35293F661700E42796 /* ThirdPartyBrowserTests.swift in Sources */,
 				1DFAB5232A8983E100A0F7F6 /* SetExtensionTests.swift in Sources */,
@@ -11103,6 +10328,7 @@
 				3706FE37293F661700E42796 /* TabCollectionViewModelTests+WithoutPinnedTabsManager.swift in Sources */,
 				3706FE38293F661700E42796 /* SuggestionContainerTests.swift in Sources */,
 				3706FE39293F661700E42796 /* TabTests.swift in Sources */,
+				9FAD623E2BD09DE5007F3A65 /* WebsiteInfoTests.swift in Sources */,
 				3706FE3A293F661700E42796 /* MockVariantManager.swift in Sources */,
 				3706FE3C293F661700E42796 /* FireproofDomainsStoreMock.swift in Sources */,
 				3706FE3D293F661700E42796 /* DataEncryptionTests.swift in Sources */,
@@ -11125,13 +10351,14 @@
 				3706FE46293F661700E42796 /* EncryptedValueTransformerTests.swift in Sources */,
 				9F3910632B68C35600CB5112 /* DownloadsTabExtensionTests.swift in Sources */,
 				3706FE47293F661700E42796 /* URLExtensionTests.swift in Sources */,
+				9F8D57332BCCCB9A00AEA660 /* UserDefaultsBookmarkFoldersStoreTests.swift in Sources */,
 				1DB9617B29F1D06D00CF5568 /* InternalUserDeciderMock.swift in Sources */,
 				317295D52AF058D3002C3206 /* MockWaitlistFeatureSetupHandler.swift in Sources */,
-				3706FE48293F661700E42796 /* PixelTests.swift in Sources */,
 				3706FE49293F661700E42796 /* BookmarkNodePathTests.swift in Sources */,
 				1DE03425298BC7F000CAB3D7 /* InternalUserDeciderStoreMock.swift in Sources */,
 				3706FE4A293F661700E42796 /* BookmarkManagedObjectTests.swift in Sources */,
 				EEC8EB402982CD550065AA39 /* JSAlertViewModelTests.swift in Sources */,
+				BDA764922BC4E57200D0400C /* MockVPNLocationFormatter.swift in Sources */,
 				3706FE4B293F661700E42796 /* BookmarksHTMLImporterTests.swift in Sources */,
 				9FA75A3F2BA00E1400DA5FA6 /* BookmarksBarMenuFactoryTests.swift in Sources */,
 				56D145E929E6BB6300E3488A /* CapturingDataImportProvider.swift in Sources */,
@@ -11150,22 +10377,23 @@
 				566B196429CDB824007E38F4 /* MoreOptionsMenuTests.swift in Sources */,
 				9F0A2CF92B96A58600C5B8C0 /* BaseBookmarkEntityTests.swift in Sources */,
 				3706FE56293F661700E42796 /* FaviconManagerMock.swift in Sources */,
+				9F9C49F72BC786790099738D /* MoreOptionsMenu+BookmarksTests.swift in Sources */,
 				3706FE57293F661700E42796 /* LocalPinningManagerTests.swift in Sources */,
 				3706FE58293F661700E42796 /* HistoryStoreTests.swift in Sources */,
 				3706FE59293F661700E42796 /* EncryptionKeyGeneratorTests.swift in Sources */,
 				3706FE5A293F661700E42796 /* GeolocationServiceMock.swift in Sources */,
 				3706FE5B293F661700E42796 /* FirefoxLoginReaderTests.swift in Sources */,
 				1D1C36E429FAE8DA001FA40C /* FaviconManagerTests.swift in Sources */,
-				376E2D29294286B8001CD31B /* PixelEventTests.swift in Sources */,
 				37716D8029707E5D00A9FC6D /* FireproofingReferenceTests.swift in Sources */,
 				B6AA64742994B43300D99CD6 /* FutureExtensionTests.swift in Sources */,
 				3706FE5C293F661700E42796 /* DuckPlayerPreferencesTests.swift in Sources */,
 				1D9FDEB82B9B5D150040B78C /* SearchPreferencesTests.swift in Sources */,
+				560C3FFD2BC9911000F589CE /* PermanentSurveyManagerTests.swift in Sources */,
 				3706FE5D293F661700E42796 /* FileSystemDSL.swift in Sources */,
 				3706FE5E293F661700E42796 /* DataImportMocks.swift in Sources */,
 				3706FE5F293F661700E42796 /* CrashReportTests.swift in Sources */,
 				B60C6F7F29B1B41D007BFAA8 /* TestRunHelperInitializer.m in Sources */,
-				4B9DB0592A983B55000927DB /* MockNetworkProtectionCodeRedeemer.swift in Sources */,
+				9F0FFFBF2BCCAF1F007C87DD /* BookmarkAllTabsDialogViewModelMock.swift in Sources */,
 				3706FE61293F661700E42796 /* PinnedTabsViewModelTests.swift in Sources */,
 				3706FE62293F661700E42796 /* PasswordManagementListSectionTests.swift in Sources */,
 				3706FE63293F661700E42796 /* RecentlyClosedCoordinatorMock.swift in Sources */,
@@ -11184,7 +10412,9 @@
 				1D9FDEBE2B9B5F0F0040B78C /* CookiePopupProtectionPreferencesTests.swift in Sources */,
 				028904212A7B25770028369C /* AppConfigurationURLProviderTests.swift in Sources */,
 				3706FE6F293F661700E42796 /* LocalStatisticsStoreTests.swift in Sources */,
+				31DC2F232BD6E028001354EF /* DataBrokerPrerequisitesStatusVerifierTests.swift in Sources */,
 				3706FE70293F661700E42796 /* HistoryCoordinatorTests.swift in Sources */,
+				9F3344632BBFBDA40040CBEB /* BookmarksBarVisibilityManagerTests.swift in Sources */,
 				3706FE71293F661700E42796 /* SavedStateMock.swift in Sources */,
 				3706FE72293F661700E42796 /* ClickToLoadTDSTests.swift in Sources */,
 				3706FE73293F661700E42796 /* PermissionManagerMock.swift in Sources */,
@@ -11197,12 +10427,14 @@
 				C1E961F32B87B273001760E1 /* MockAutofillActionExecutor.swift in Sources */,
 				376E2D2729428353001CD31B /* BrokenSiteReportingReferenceTests.swift in Sources */,
 				3707C72F294B5D4F00682A9F /* WebViewTests.swift in Sources */,
+				021EA0852BD6E0EB00772C9A /* TabsPreferencesTests.swift in Sources */,
 				5682C69429B79B57004DE3C8 /* TabBarViewItemTests.swift in Sources */,
 				3706FE77293F661700E42796 /* PreferencesSidebarModelTests.swift in Sources */,
 				3706FE78293F661700E42796 /* HistoryCoordinatingMock.swift in Sources */,
 				3706FE79293F661700E42796 /* AppearancePreferencesTests.swift in Sources */,
 				3706FE7A293F661700E42796 /* FirePopoverViewModelTests.swift in Sources */,
 				7B09CBAA2BA4BE8200CF245B /* NetworkProtectionPixelEventTests.swift in Sources */,
+				56BA1E882BAC8239001CF69F /* SSLErrorPageUserScriptTests.swift in Sources */,
 				3706FE7B293F661700E42796 /* HistoryStoringMock.swift in Sources */,
 				562984702AC4610100AC20EB /* SyncPreferencesTests.swift in Sources */,
 				3706FE7C293F661700E42796 /* LocalBookmarkStoreTests.swift in Sources */,
@@ -11218,12 +10450,15 @@
 				3706FE81293F661700E42796 /* PermissionModelTests.swift in Sources */,
 				B60C6F8529B1BAD3007BFAA8 /* FileManagerTempDirReplacement.swift in Sources */,
 				567DA94629E95C3F008AC5EE /* YoutubeOverlayUserScriptTests.swift in Sources */,
+				9FBD847B2BB3EC3300220859 /* MockAttributionOriginProvider.swift in Sources */,
 				3706FE82293F661700E42796 /* MockStatisticsStore.swift in Sources */,
+				9FBD84712BB3DD8400220859 /* MockAttributionsPixelHandler.swift in Sources */,
 				3706FE83293F661700E42796 /* AutofillPreferencesModelTests.swift in Sources */,
 				3706FE84293F661700E42796 /* TabCollectionViewModelTests+PinnedTabs.swift in Sources */,
 				B603975229C1FFAD00902A34 /* ExpectedNavigationExtension.swift in Sources */,
 				3706FE85293F661700E42796 /* BWRequestTests.swift in Sources */,
 				3706FE86293F661700E42796 /* FileDownloadManagerTests.swift in Sources */,
+				BDA7648E2BC4E4EF00D0400C /* DefaultVPNLocationFormatterTests.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -11310,7 +10545,7 @@
 				4B25377A2A11C01700610219 /* UserText+NetworkProtectionExtensions.swift in Sources */,
 				B65DA5F42A77D3FA00CBEE8D /* BundleExtension.swift in Sources */,
 				EE66418D2B9B1981005BCD17 /* NetworkProtectionTokenStore+SubscriptionTokenKeychainStorage.swift in Sources */,
-				4B2D062D2A11C12300DE1F49 /* Logging.swift in Sources */,
+				EEBCA0C72BD7CE2C004DF19C /* VPNFailureRecoveryPixel.swift in Sources */,
 				7B2E52252A5FEC09000C6D39 /* NetworkProtectionAgentNotificationsPresenter.swift in Sources */,
 				B602E8232A1E260E006D261F /* Bundle+NetworkProtectionExtensions.swift in Sources */,
 				4B2D062A2A11C0C900DE1F49 /* NetworkProtectionOptionKeyExtension.swift in Sources */,
@@ -11347,12 +10582,15 @@
 				7BA7CC5D2AD120C30042E5CE /* EventMapping+NetworkProtectionError.swift in Sources */,
 				7BA7CC4A2AD11EA00042E5CE /* NetworkProtectionTunnelController.swift in Sources */,
 				EE3424602BA0853900173B1B /* VPNUninstaller.swift in Sources */,
+				7B4D8A232BDA857300852966 /* VPNOperationErrorRecorder.swift in Sources */,
 				7BD1688E2AD4A4C400D24876 /* NetworkExtensionController.swift in Sources */,
 				7BA7CC3E2AD11E380042E5CE /* TunnelControllerIPCService.swift in Sources */,
 				7BA7CC402AD11E3D0042E5CE /* AppLauncher+DefaultInitializer.swift in Sources */,
 				7B0694982B6E980F00FA4DBA /* VPNProxyLauncher.swift in Sources */,
+				BDA764842BC49E3F00D0400C /* NetworkProtectionVPNCountryLabelsModel.swift in Sources */,
 				EEC589DB2A4F1CE700BCD60C /* AppLauncher.swift in Sources */,
 				B65DA5EF2A77CC3A00CBEE8D /* Bundle+NetworkProtectionExtensions.swift in Sources */,
+				BDA7647F2BC4998900D0400C /* DefaultVPNLocationFormatter.swift in Sources */,
 				4BF0E5072AD2551A00FFEC9E /* NetworkProtectionPixelEvent.swift in Sources */,
 				7BA7CC442AD11E490042E5CE /* UserText.swift in Sources */,
 				4BF0E5142AD25A2600FFEC9E /* DuckDuckGoUserAgent.swift in Sources */,
@@ -11381,12 +10619,15 @@
 				7BA7CC582AD1203A0042E5CE /* UserText+NetworkProtection.swift in Sources */,
 				7BA7CC4B2AD11EC60042E5CE /* NetworkProtectionControllerErrorStore.swift in Sources */,
 				EE3424612BA0853900173B1B /* VPNUninstaller.swift in Sources */,
+				7B4D8A242BDA857300852966 /* VPNOperationErrorRecorder.swift in Sources */,
 				4BF0E5152AD25A2600FFEC9E /* DuckDuckGoUserAgent.swift in Sources */,
 				7BFE95592A9DF2AF0081ABE9 /* UserDefaults+NetworkProtectionWaitlist.swift in Sources */,
 				7BA7CC5C2AD120C30042E5CE /* EventMapping+NetworkProtectionError.swift in Sources */,
 				B65DA5F02A77CC3C00CBEE8D /* Bundle+NetworkProtectionExtensions.swift in Sources */,
+				BDA764852BC49E4000D0400C /* NetworkProtectionVPNCountryLabelsModel.swift in Sources */,
 				7BAF9E4D2A8A3CCB002D3B6E /* UserDefaults+NetworkProtectionShared.swift in Sources */,
 				7BA7CC392AD11E2D0042E5CE /* DuckDuckGoVPNAppDelegate.swift in Sources */,
+				BDA764802BC4998A00D0400C /* DefaultVPNLocationFormatter.swift in Sources */,
 				7BA7CC552AD11FFB0042E5CE /* NetworkProtectionOptionKeyExtension.swift in Sources */,
 				7BA7CC3D2AD11E380042E5CE /* TunnelControllerIPCService.swift in Sources */,
 				4BA7C4DA2B3F639800AFE511 /* NetworkProtectionTunnelController.swift in Sources */,
@@ -11405,9 +10646,13 @@
 				4B4BEC432A11B5C7001D9AC5 /* Bundle+VPN.swift in Sources */,
 				4B4BEC452A11B5EE001D9AC5 /* UserText+NetworkProtectionExtensions.swift in Sources */,
 				4B4BEC422A11B5C7001D9AC5 /* NetworkProtectionOptionKeyExtension.swift in Sources */,
+				4B1EFF1D2BD71FCA007CC84F /* UserDefaultsWrapper.swift in Sources */,
 				B602E8222A1E2603006D261F /* Bundle+NetworkProtectionExtensions.swift in Sources */,
+				4B1EFF222BD7223D007CC84F /* NetworkProtectionPixelEvent.swift in Sources */,
 				B602E81A2A1E2570006D261F /* URL+NetworkProtection.swift in Sources */,
+				4B1EFF1F2BD72170007CC84F /* OptionalExtension.swift in Sources */,
 				EEAD7A7C2A1D3E20002A24E7 /* AppLauncher.swift in Sources */,
+				4B1EFF1E2BD72034007CC84F /* BundleExtension.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -11420,6 +10665,7 @@
 				4B4D609F2A0B2C7300BCD287 /* Logging.swift in Sources */,
 				EE66418C2B9B1981005BCD17 /* NetworkProtectionTokenStore+SubscriptionTokenKeychainStorage.swift in Sources */,
 				7B7DFB202B7E736B009EA1A3 /* MacPacketTunnelProvider.swift in Sources */,
+				EEBCA0C62BD7CE2C004DF19C /* VPNFailureRecoveryPixel.swift in Sources */,
 				4B4D60A12A0B2D6100BCD287 /* NetworkProtectionOptionKeyExtension.swift in Sources */,
 				B602E8182A1E2570006D261F /* URL+NetworkProtection.swift in Sources */,
 				B65DA5F52A77D3FA00CBEE8D /* BundleExtension.swift in Sources */,
@@ -11433,771 +10679,6 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		4B9579452AC7AE700062CA31 /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				4B9579462AC7AE700062CA31 /* FaviconUserScript.swift in Sources */,
-				4B9579472AC7AE700062CA31 /* BWResponse.swift in Sources */,
-				4B37EE7A2B4CFF7200A89A61 /* DataBrokerProtectionRemoteMessaging.swift in Sources */,
-				1E2AE4C72ACB215900684E0A /* NetworkProtectionRemoteMessaging.swift in Sources */,
-				4B9579482AC7AE700062CA31 /* LottieAnimationCache.swift in Sources */,
-				4B9579492AC7AE700062CA31 /* WaitlistDialogView.swift in Sources */,
-				4B95794A2AC7AE700062CA31 /* TabIndex.swift in Sources */,
-				4B95794B2AC7AE700062CA31 /* SavePanelAccessoryView.swift in Sources */,
-				4B95794C2AC7AE700062CA31 /* TabLazyLoaderDataSource.swift in Sources */,
-				4B95794D2AC7AE700062CA31 /* LoginImport.swift in Sources */,
-				4B95794E2AC7AE700062CA31 /* JoinWaitlistView.swift in Sources */,
-				4B95794F2AC7AE700062CA31 /* LazyLoadable.swift in Sources */,
-				4B9579502AC7AE700062CA31 /* ClickToLoadModel.swift in Sources */,
-				B6F9BDDE2B45B7EE00677B33 /* WebsiteInfo.swift in Sources */,
-				4B9579512AC7AE700062CA31 /* KeyedCodingExtension.swift in Sources */,
-				31AA6B992B960BA60025014E /* DataBrokerProtectionLoginItemPixels.swift in Sources */,
-				4B9579522AC7AE700062CA31 /* PrivacyDashboardTabExtension.swift in Sources */,
-				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 */,
-				4B95795A2AC7AE700062CA31 /* BookmarkTableCellView.swift in Sources */,
-				4B95795B2AC7AE700062CA31 /* BookmarkManagementSidebarViewController.swift in Sources */,
-				4B95795C2AC7AE700062CA31 /* NSStackViewExtension.swift in Sources */,
-				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 */,
-				C13909FD2B861039001626ED /* AutofillActionPresenter.swift in Sources */,
-				4B9579632AC7AE700062CA31 /* WKWebsiteDataStoreExtension.swift in Sources */,
-				4B9579642AC7AE700062CA31 /* WindowDraggingView.swift in Sources */,
-				4B9579652AC7AE700062CA31 /* SecureVaultSorting.swift in Sources */,
-				4B9579662AC7AE700062CA31 /* PreferencesSidebarModel.swift in Sources */,
-				4B9579672AC7AE700062CA31 /* DuckPlayerURLExtension.swift in Sources */,
-				C1E961F22B87AA29001760E1 /* AutofillActionBuilder.swift in Sources */,
-				4B41EDB72B169887001EEDF4 /* VPNFeedbackFormView.swift in Sources */,
-				4B9579682AC7AE700062CA31 /* BWEncryptionOutput.m in Sources */,
-				4B9579692AC7AE700062CA31 /* PermissionState.swift in Sources */,
-				4B95796A2AC7AE700062CA31 /* FeedbackPresenter.swift in Sources */,
-				4B95796B2AC7AE700062CA31 /* NavigationProtectionTabExtension.swift in Sources */,
-				4B95796C2AC7AE700062CA31 /* BurnerMode.swift in Sources */,
-				4B95796D2AC7AE700062CA31 /* UserAgent.swift in Sources */,
-				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 */,
-				4B9579742AC7AE700062CA31 /* GradientView.swift in Sources */,
-				4B9579752AC7AE700062CA31 /* PreferencesSidebar.swift in Sources */,
-				1D9A4E5C2B43213B00F449E2 /* TabSnapshotExtension.swift in Sources */,
-				4B9579762AC7AE700062CA31 /* HoveredLinkTabExtension.swift in Sources */,
-				4B9579772AC7AE700062CA31 /* NSPointExtension.swift in Sources */,
-				4B9579782AC7AE700062CA31 /* WindowsManager.swift in Sources */,
-				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 */,
-				4B9579802AC7AE700062CA31 /* SyncDataProviders.swift in Sources */,
-				4B9579812AC7AE700062CA31 /* PasteboardWriting.swift in Sources */,
-				4B9579822AC7AE700062CA31 /* BookmarkOutlineCellView.swift in Sources */,
-				4B9579832AC7AE700062CA31 /* UnprotectedDomains.xcdatamodeld in Sources */,
-				4B9579842AC7AE700062CA31 /* TabInstrumentation.swift in Sources */,
-				4B9579872AC7AE700062CA31 /* ConfigurationManager.swift in Sources */,
-				4B9579882AC7AE700062CA31 /* YoutubePlayerUserScript.swift in Sources */,
-				4B9579892AC7AE700062CA31 /* PixelParameters.swift in Sources */,
-				4B95798B2AC7AE700062CA31 /* FaviconImageCache.swift in Sources */,
-				4B95798C2AC7AE700062CA31 /* TabBarViewController.swift in Sources */,
-				4B95798D2AC7AE700062CA31 /* BookmarkOutlineViewDataSource.swift in Sources */,
-				4B95798E2AC7AE700062CA31 /* DataImportStatusProviding.swift in Sources */,
-				3158B14C2B0BF74500AF130C /* DataBrokerProtectionDebugMenu.swift in Sources */,
-				4B95798F2AC7AE700062CA31 /* PasswordManagementBitwardenItemView.swift in Sources */,
-				4B9579912AC7AE700062CA31 /* NSNotificationName+PasswordManager.swift in Sources */,
-				4B9579922AC7AE700062CA31 /* RulesCompilationMonitor.swift in Sources */,
-				4B9579932AC7AE700062CA31 /* FBProtectionTabExtension.swift in Sources */,
-				4B41EDB82B169889001EEDF4 /* VPNFeedbackFormViewModel.swift in Sources */,
-				4B9579942AC7AE700062CA31 /* CrashReportReader.swift in Sources */,
-				4B9579952AC7AE700062CA31 /* DataTaskProviding.swift in Sources */,
-				4B9579962AC7AE700062CA31 /* FeatureFlag.swift in Sources */,
-				B6B4D1C82B0B3B5400C26286 /* DataImportReportModel.swift in Sources */,
-				4B9579972AC7AE700062CA31 /* FeedbackViewController.swift in Sources */,
-				B6104E9D2BA9C174008636B2 /* DownloadResumeData.swift in Sources */,
-				4B9579982AC7AE700062CA31 /* FaviconSelector.swift in Sources */,
-				4B95799A2AC7AE700062CA31 /* PrintingUserScript.swift in Sources */,
-				4B95799B2AC7AE700062CA31 /* ConnectBitwardenViewController.swift in Sources */,
-				4B95799C2AC7AE700062CA31 /* BWManager.swift in Sources */,
-				B6BCC5262AFCDABB002C5499 /* DataImportSourceViewModel.swift in Sources */,
-				4B95799D2AC7AE700062CA31 /* AppTrackerDataSetProvider.swift in Sources */,
-				D64A5FFB2AEA5C2B00B6D6E7 /* HomeButtonMenuFactory.swift in Sources */,
-				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 */,
-				4B9579A42AC7AE700062CA31 /* NetworkProtectionInviteDialog.swift in Sources */,
-				4B9579A52AC7AE700062CA31 /* SuggestionViewController.swift in Sources */,
-				4B9579A82AC7AE700062CA31 /* BWKeyStorage.swift in Sources */,
-				4B9579A92AC7AE700062CA31 /* VisitViewModel.swift in Sources */,
-				4B9579AA2AC7AE700062CA31 /* AddressBarTextEditor.swift in Sources */,
-				3158B15B2B0BF76700AF130C /* DataBrokerProtectionFeatureDisabler.swift in Sources */,
-				1D26EBAE2B74BECB0002A93F /* NSImageSendable.swift in Sources */,
-				4B9579AB2AC7AE700062CA31 /* Atb.swift in Sources */,
-				4B9579AC2AC7AE700062CA31 /* BrowserTabView.swift in Sources */,
-				4B9579AD2AC7AE700062CA31 /* DownloadsViewController.swift in Sources */,
-				4B9579AE2AC7AE700062CA31 /* DataExtension.swift in Sources */,
-				4B9579AF2AC7AE700062CA31 /* ConfigurationStore.swift in Sources */,
-				4B9579B02AC7AE700062CA31 /* Feedback.swift in Sources */,
-				4B9579B22AC7AE700062CA31 /* FirefoxFaviconsReader.swift in Sources */,
-				4B9579B32AC7AE700062CA31 /* CopyHandler.swift in Sources */,
-				4B9579B42AC7AE700062CA31 /* ContentBlockingRulesUpdateObserver.swift in Sources */,
-				4B9579B52AC7AE700062CA31 /* FirefoxLoginReader.swift in Sources */,
-				4B9579B62AC7AE700062CA31 /* AtbParser.swift in Sources */,
-				4B9579B72AC7AE700062CA31 /* PreferencesDuckPlayerView.swift in Sources */,
-				4B41EDB62B169883001EEDF4 /* VPNFeedbackFormViewController.swift in Sources */,
-				4B9579B92AC7AE700062CA31 /* BookmarkSidebarTreeController.swift in Sources */,
-				4B9579BA2AC7AE700062CA31 /* HomePageFavoritesModel.swift in Sources */,
-				4B9579BB2AC7AE700062CA31 /* SequenceExtensions.swift in Sources */,
-				4B9579BC2AC7AE700062CA31 /* WKBackForwardListExtension.swift in Sources */,
-				5614B3A32BBD639D009B5031 /* ZoomPopover.swift in Sources */,
-				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 */,
-				4B9579C22AC7AE700062CA31 /* PDFSearchTextMenuItemHandler.swift in Sources */,
-				4B9579C42AC7AE700062CA31 /* HistoryMenu.swift in Sources */,
-				4B9579C52AC7AE700062CA31 /* ContentScopeFeatureFlagging.swift in Sources */,
-				4B9579C62AC7AE700062CA31 /* OnboardingButtonStyles.swift in Sources */,
-				4B9579C72AC7AE700062CA31 /* SaveIdentityPopover.swift in Sources */,
-				4B9579C82AC7AE700062CA31 /* AuthenticationAlert.swift in Sources */,
-				4B9579C92AC7AE700062CA31 /* SetExtension.swift in Sources */,
-				4B9579CA2AC7AE700062CA31 /* YoutubePlayerNavigationHandler.swift in Sources */,
-				4B9579CB2AC7AE700062CA31 /* PreferencesAboutView.swift in Sources */,
-				4B9579CC2AC7AE700062CA31 /* ContentBlocking.swift in Sources */,
-				4B37EE792B4CFF6F00A89A61 /* DataBrokerProtectionRemoteMessage.swift in Sources */,
-				4B9579CD2AC7AE700062CA31 /* LocalAuthenticationService.swift in Sources */,
-				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 */,
-				1ED910D72B63BFB300936947 /* IdentityTheftRestorationPagesUserScript.swift in Sources */,
-				4B9579D42AC7AE700062CA31 /* URLEventHandler.swift in Sources */,
-				3158B15E2B0BF76F00AF130C /* DataBrokerProtectionAppEvents.swift in Sources */,
-				4B9579D52AC7AE700062CA31 /* SupportedOsChecker.swift in Sources */,
-				4B9579D62AC7AE700062CA31 /* WKWebViewExtension.swift in Sources */,
-				4B9579D72AC7AE700062CA31 /* CleanThisHistoryMenuItem.swift in Sources */,
-				4B9579D92AC7AE700062CA31 /* DownloadListItem.swift in Sources */,
-				4B9579DA2AC7AE700062CA31 /* WaitlistRequest.swift in Sources */,
-				4B9579DB2AC7AE700062CA31 /* DownloadsPopover.swift in Sources */,
-				37A6A8F92AFCCA59008580A3 /* FaviconsFetcherOnboardingViewController.swift in Sources */,
-				4B9579DC2AC7AE700062CA31 /* BookmarksBarMenuFactory.swift in Sources */,
-				4B9579DD2AC7AE700062CA31 /* SpacerNode.swift in Sources */,
-				B62B483C2ADE46FC000DECE5 /* Application.swift in Sources */,
-				4B9579DF2AC7AE700062CA31 /* SyncManagementDialogViewController.swift in Sources */,
-				4B05265F2B1AEFDB0054955A /* VPNMetadataCollector.swift in Sources */,
-				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 */,
-				4B9579E92AC7AE700062CA31 /* CrashReport.swift in Sources */,
-				4B9579EA2AC7AE700062CA31 /* NSPopoverExtension.swift in Sources */,
-				4B9579EB2AC7AE700062CA31 /* NSPathControlView.swift in Sources */,
-				4B9579EC2AC7AE700062CA31 /* HTTPSUpgradeTabExtension.swift in Sources */,
-				4B9579ED2AC7AE700062CA31 /* AppIconChanger.swift in Sources */,
-				4B9579EE2AC7AE700062CA31 /* AppMain.swift in Sources */,
-				4B9579EF2AC7AE700062CA31 /* ProductWaitlistRequest.swift in Sources */,
-				7BEC20442B0F505F00243D3E /* AddBookmarkPopoverView.swift in Sources */,
-				4B9579F02AC7AE700062CA31 /* Bookmark.xcdatamodeld in Sources */,
-				4B9579F12AC7AE700062CA31 /* DefaultBrowserPromptView.swift in Sources */,
-				4B9579F22AC7AE700062CA31 /* WaitlistActivationDateStore.swift in Sources */,
-				4B9579F42AC7AE700062CA31 /* FaviconManager.swift in Sources */,
-				4B9579F52AC7AE700062CA31 /* PFMoveApplication.m in Sources */,
-				B68D21D22ACBCA01002DA3C2 /* ContentBlockerRulesManagerMock.swift in Sources */,
-				4B9579F62AC7AE700062CA31 /* ChromiumFaviconsReader.swift in Sources */,
-				4B9579F72AC7AE700062CA31 /* SuggestionTableRowView.swift in Sources */,
-				EEC4A6732B2C90AB00F7C0AA /* VPNLocationPreferenceItem.swift in Sources */,
-				4B9579F82AC7AE700062CA31 /* DownloadsPreferences.swift in Sources */,
-				4B9579F92AC7AE700062CA31 /* PasswordManagementItemList.swift in Sources */,
-				4B9579FA2AC7AE700062CA31 /* Bookmark.swift in Sources */,
-				4B9579FB2AC7AE700062CA31 /* ConnectBitwardenViewModel.swift in Sources */,
-				4B9579FC2AC7AE700062CA31 /* NSNotificationName+DataImport.swift in Sources */,
-				4B9579FD2AC7AE700062CA31 /* StoredPermission.swift in Sources */,
-				B6CC266A2BAD959500F53F8D /* DownloadProgress.swift in Sources */,
-				4B9579FE2AC7AE700062CA31 /* FirePopoverCollectionViewHeader.swift in Sources */,
-				4B9579FF2AC7AE700062CA31 /* FireViewController.swift in Sources */,
-				4B957A002AC7AE700062CA31 /* OutlineSeparatorViewCell.swift in Sources */,
-				4B957A012AC7AE700062CA31 /* SafariDataImporter.swift in Sources */,
-				4B957A022AC7AE700062CA31 /* WaitlistViewModel.swift in Sources */,
-				4B957A032AC7AE700062CA31 /* LocalBookmarkStore.swift in Sources */,
-				4B957A042AC7AE700062CA31 /* BWEncryption.m in Sources */,
-				4B957A052AC7AE700062CA31 /* StatisticsLoader.swift in Sources */,
-				4B957A072AC7AE700062CA31 /* DataClearingPreferences.swift in Sources */,
-				4B957A082AC7AE700062CA31 /* LocalUnprotectedDomains.swift in Sources */,
-				4B957A092AC7AE700062CA31 /* InternalUserDeciderStore.swift in Sources */,
-				4B957A0A2AC7AE700062CA31 /* NewWindowPolicy.swift in Sources */,
-				4B957A0B2AC7AE700062CA31 /* NavigationBarBadgeAnimator.swift in Sources */,
-				4B957A0C2AC7AE700062CA31 /* NSTextViewExtension.swift in Sources */,
-				4B957A0D2AC7AE700062CA31 /* FutureExtension.swift in Sources */,
-				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 */,
-				4B957A142AC7AE700062CA31 /* DeviceAuthenticationService.swift in Sources */,
-				4B957A152AC7AE700062CA31 /* AppConfigurationURLProvider.swift in Sources */,
-				4B957A162AC7AE700062CA31 /* SyncSettingsAdapter.swift in Sources */,
-				4B957A172AC7AE700062CA31 /* AutofillPreferences.swift in Sources */,
-				B6DE57F92B05EA9000CD54B9 /* SheetHostingWindow.swift in Sources */,
-				4B957A192AC7AE700062CA31 /* PasswordManagerCoordinator.swift in Sources */,
-				4B957A1A2AC7AE700062CA31 /* PasswordManagementIdentityModel.swift in Sources */,
-				4B957A1B2AC7AE700062CA31 /* UserDefaultsWrapper.swift in Sources */,
-				B65C7DFD2B886CF0001E2D5C /* WKPDFHUDViewWrapper.swift in Sources */,
-				4B957A1C2AC7AE700062CA31 /* PasswordManagementPopover.swift in Sources */,
-				4B957A1D2AC7AE700062CA31 /* BWCommunicator.swift in Sources */,
-				4B957A1E2AC7AE700062CA31 /* HomePageRecentlyVisitedModel.swift in Sources */,
-				4B957A1F2AC7AE700062CA31 /* NavigationBarPopovers.swift in Sources */,
-				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 */,
-				4B957A242AC7AE700062CA31 /* FlatButton.swift in Sources */,
-				4B957A252AC7AE700062CA31 /* PinnedTabView.swift in Sources */,
-				4B957A262AC7AE700062CA31 /* DataEncryption.swift in Sources */,
-				4B957A272AC7AE700062CA31 /* PrivacyDashboardPopover.swift in Sources */,
-				4B957A282AC7AE700062CA31 /* TestsClosureNavigationResponder.swift in Sources */,
-				4B957A292AC7AE700062CA31 /* RootView.swift in Sources */,
-				4B37EE7C2B4CFF8000A89A61 /* HomePageRemoteMessagingRequest.swift in Sources */,
-				4B957A2A2AC7AE700062CA31 /* AddressBarTextField.swift in Sources */,
-				4B957A2B2AC7AE700062CA31 /* FocusRingView.swift in Sources */,
-				4B957A2C2AC7AE700062CA31 /* BookmarksBarViewModel.swift in Sources */,
-				4B957A2D2AC7AE700062CA31 /* NSPopUpButtonView.swift in Sources */,
-				4B957A2E2AC7AE700062CA31 /* BlockMenuItem.swift in Sources */,
-				4B957A2F2AC7AE700062CA31 /* ContextualMenu.swift in Sources */,
-				4B957A302AC7AE700062CA31 /* NavigationBarViewController.swift in Sources */,
-				4B957A312AC7AE700062CA31 /* MainViewController.swift in Sources */,
-				4B957A322AC7AE700062CA31 /* DuckPlayer.swift in Sources */,
-				F1D43AF02B98D8DF00BAB743 /* MainMenuActions+VanillaBrowser.swift in Sources */,
-				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 */,
-				4B957A382AC7AE700062CA31 /* NetworkProtectionDebugUtilities.swift in Sources */,
-				4B957A392AC7AE700062CA31 /* NSException+Catch.swift in Sources */,
-				4B957A3A2AC7AE700062CA31 /* PasswordManagementNoteModel.swift in Sources */,
-				4B957A3B2AC7AE700062CA31 /* CookieNotificationAnimationModel.swift in Sources */,
-				4B957A3C2AC7AE700062CA31 /* JoinedWaitlistView.swift in Sources */,
-				4B957A3D2AC7AE700062CA31 /* SharingMenu.swift in Sources */,
-				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 */,
-				4B957A432AC7AE700062CA31 /* NSScreenExtension.swift in Sources */,
-				4B957A442AC7AE700062CA31 /* NSBezierPathExtension.swift in Sources */,
-				4B957A452AC7AE700062CA31 /* Bundle+VPN.swift in Sources */,
-				B68D21CA2ACBC971002DA3C2 /* MockPrivacyConfiguration.swift in Sources */,
-				4B957A462AC7AE700062CA31 /* WebsiteDataStore.swift in Sources */,
-				4B957A472AC7AE700062CA31 /* NetworkProtectionFeatureVisibility.swift in Sources */,
-				3778183D2AD6F86D00533759 /* FavoritesDisplayModeSyncHandler.swift in Sources */,
-				4B957A482AC7AE700062CA31 /* PermissionContextMenu.swift in Sources */,
-				4B957A492AC7AE700062CA31 /* ContextMenuUserScript.swift in Sources */,
-				4B957A4A2AC7AE700062CA31 /* NSSavePanelExtension.swift in Sources */,
-				4B957A4B2AC7AE700062CA31 /* AppPrivacyConfigurationDataProvider.swift in Sources */,
-				4B957A4C2AC7AE700062CA31 /* LinkButton.swift in Sources */,
-				4B957A4D2AC7AE700062CA31 /* TemporaryFileHandler.swift in Sources */,
-				4B957A4E2AC7AE700062CA31 /* URL+NetworkProtection.swift in Sources */,
-				4B957A4F2AC7AE700062CA31 /* PrivacyFeatures.swift in Sources */,
-				4B957A512AC7AE700062CA31 /* ViewExtension.swift in Sources */,
-				4B957A522AC7AE700062CA31 /* AVCaptureDevice+SwizzledAuthState.swift in Sources */,
-				4B957A532AC7AE700062CA31 /* SubscriptionPagesUserScript.swift in Sources */,
-				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 */,
-				4B44FEF52B1FEF5A000619D8 /* FocusableTextEditor.swift in Sources */,
-				4B957A5A2AC7AE700062CA31 /* CSVParser.swift in Sources */,
-				4B957A5B2AC7AE700062CA31 /* PixelDataModel.xcdatamodeld in Sources */,
-				4B957A5C2AC7AE700062CA31 /* PrivacyDashboardWebView.swift in Sources */,
-				B6656E5B2B2ADB1C008798A1 /* RequestFilePermissionView.swift in Sources */,
-				4B957A5D2AC7AE700062CA31 /* AppearancePreferences.swift in Sources */,
-				4B957A5E2AC7AE700062CA31 /* DownloadListCoordinator.swift in Sources */,
-				4B957A5F2AC7AE700062CA31 /* AdClickAttributionTabExtension.swift in Sources */,
-				7B3618C52ADE77D3000D6154 /* NetworkProtectionNavBarPopoverManager.swift in Sources */,
-				4B957A602AC7AE700062CA31 /* NSNotificationName+Debug.swift in Sources */,
-				4B957A612AC7AE700062CA31 /* NavigationBarBadgeAnimationView.swift in Sources */,
-				4B957A622AC7AE700062CA31 /* AddressBarButton.swift in Sources */,
-				4B957A642AC7AE700062CA31 /* FaviconStore.swift in Sources */,
-				4B957A652AC7AE700062CA31 /* WaitlistTermsAndConditionsView.swift in Sources */,
-				B62B48592ADE730D000DECE5 /* FileImportView.swift in Sources */,
-				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 */,
-				4B957A6D2AC7AE700062CA31 /* LoginItemsManager.swift in Sources */,
-				4B957A6E2AC7AE700062CA31 /* PixelExperiment.swift in Sources */,
-				4B957A6F2AC7AE700062CA31 /* DuckPlayerTabExtension.swift in Sources */,
-				4B957A702AC7AE700062CA31 /* RecentlyClosedCoordinator.swift in Sources */,
-				4B957A712AC7AE700062CA31 /* URLRequestExtension.swift in Sources */,
-				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 */,
-				4BF0E5172AD25A2600FFEC9E /* DuckDuckGoUserAgent.swift in Sources */,
-				4B957A782AC7AE700062CA31 /* KeySetDictionary.swift in Sources */,
-				B68D21CB2ACBC9A3002DA3C2 /* ContentBlockingMock.swift in Sources */,
-				4B957A792AC7AE700062CA31 /* HistoryTabExtension.swift in Sources */,
-				4B957A7A2AC7AE700062CA31 /* FireCoordinator.swift in Sources */,
-				4B957A7B2AC7AE700062CA31 /* GeolocationProvider.swift in Sources */,
-				4B957A7C2AC7AE700062CA31 /* NSAlert+ActiveDownloadsTermination.swift in Sources */,
-				B62B48412ADE48DE000DECE5 /* ArrayBuilder.swift in Sources */,
-				4B957A7D2AC7AE700062CA31 /* IndexPathExtension.swift in Sources */,
-				4B957A7E2AC7AE700062CA31 /* PasswordManagementNoteItemView.swift in Sources */,
-				B6B4D1D22B0E0DD000C26286 /* DataImportNoDataView.swift in Sources */,
-				4B957A7F2AC7AE700062CA31 /* NSApplicationExtension.swift in Sources */,
-				4B957A802AC7AE700062CA31 /* NSWindowExtension.swift in Sources */,
-				4B957A812AC7AE700062CA31 /* KeychainType+ClientDefault.swift in Sources */,
-				C13909F12B85FD4E001626ED /* AutofillActionExecutor.swift in Sources */,
-				4B41EDA52B1543B9001EEDF4 /* VPNPreferencesModel.swift in Sources */,
-				4B957A822AC7AE700062CA31 /* SyncDebugMenu.swift in Sources */,
-				4B957A832AC7AE700062CA31 /* AddBookmarkPopover.swift in Sources */,
-				4B957A852AC7AE700062CA31 /* QRSharingService.swift in Sources */,
-				4B957A862AC7AE700062CA31 /* ProcessExtension.swift in Sources */,
-				B68412162B694BA10092F66A /* NSObject+performSelector.m in Sources */,
-				4B957A872AC7AE700062CA31 /* PermissionAuthorizationQuery.swift in Sources */,
-				4B957A882AC7AE700062CA31 /* BadgeAnimationView.swift in Sources */,
-				4B957A892AC7AE700062CA31 /* BrowserTabSelectionDelegate.swift in Sources */,
-				4B957A8A2AC7AE700062CA31 /* ContinueSetUpView.swift in Sources */,
-				B69A14F42B4D6FE800B9417D /* AddBookmarkFolderPopoverViewModel.swift in Sources */,
-				4B957A8B2AC7AE700062CA31 /* PasswordManagementListSection.swift in Sources */,
-				4B957A8C2AC7AE700062CA31 /* FaviconReferenceCache.swift in Sources */,
-				4B957A8D2AC7AE700062CA31 /* BookmarkTreeController.swift in Sources */,
-				EEC4A6602B277F0D00F7C0AA /* VPNLocationViewModel.swift in Sources */,
-				4B957A8E2AC7AE700062CA31 /* FirefoxEncryptionKeyReader.swift in Sources */,
-				4B957A8F2AC7AE700062CA31 /* EventMapping+NetworkProtectionError.swift in Sources */,
-				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 */,
-				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 */,
-				3158B1552B0BF75900AF130C /* LoginItem+DataBrokerProtection.swift in Sources */,
-				4B957AA32AC7AE700062CA31 /* NSTextFieldExtension.swift in Sources */,
-				4B957AA42AC7AE700062CA31 /* BWManagement.swift in Sources */,
-				4B957AA52AC7AE700062CA31 /* FireproofDomainsContainer.swift in Sources */,
-				4B957AA62AC7AE700062CA31 /* ExternalAppSchemeHandler.swift in Sources */,
-				4B957AA72AC7AE700062CA31 /* GeolocationService.swift in Sources */,
-				4B957AA82AC7AE700062CA31 /* FireproofingURLExtensions.swift in Sources */,
-				4B957AA92AC7AE700062CA31 /* ContentOverlayPopover.swift in Sources */,
-				4B957AAA2AC7AE700062CA31 /* TabShadowView.swift in Sources */,
-				4B957AAB2AC7AE700062CA31 /* BWMessageIdGenerator.swift in Sources */,
-				B65E5DB12B74E6AA00480415 /* TrackerNetwork.swift in Sources */,
-				B6E6B9E52BA1F5F1008AA7E1 /* FilePresenter.swift in Sources */,
-				31F2D2022AF026D800BF0144 /* WaitlistTermsAndConditionsActionHandler.swift in Sources */,
-				4B957AAC2AC7AE700062CA31 /* EncryptedValueTransformer.swift in Sources */,
-				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 */,
-				B6F9BDE62B45CD1900677B33 /* ModalView.swift in Sources */,
-				4B957AB32AC7AE700062CA31 /* NetworkProtectionControllerErrorStore.swift in Sources */,
-				4B957AB42AC7AE700062CA31 /* DataImport.swift in Sources */,
-				4B957AB52AC7AE700062CA31 /* NetworkProtectionDebugMenu.swift in Sources */,
-				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 */,
-				4B957ABC2AC7AE700062CA31 /* ChromiumLoginReader.swift in Sources */,
-				B6BCC5522AFE4F7D002C5499 /* DataImportTypePicker.swift in Sources */,
-				4B957ABD2AC7AE700062CA31 /* NSAlert+PasswordManager.swift in Sources */,
-				4B957ABE2AC7AE700062CA31 /* UserContentUpdating.swift in Sources */,
-				4B957ABF2AC7AE700062CA31 /* ChromiumPreferences.swift in Sources */,
-				4B957AC02AC7AE700062CA31 /* FirePopoverViewController.swift in Sources */,
-				4B957AC12AC7AE700062CA31 /* SavePaymentMethodPopover.swift in Sources */,
-				4B957AC22AC7AE700062CA31 /* FindInPageViewController.swift in Sources */,
-				4B957AC32AC7AE700062CA31 /* Cryptography.swift in Sources */,
-				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 */,
-				4B957ACC2AC7AE700062CA31 /* MainMenu.swift in Sources */,
-				4B957ACE2AC7AE700062CA31 /* BrowserTabViewController.swift in Sources */,
-				4B957ACF2AC7AE700062CA31 /* CallToAction.swift in Sources */,
-				4B957AD02AC7AE700062CA31 /* MouseOverView.swift in Sources */,
-				4B957AD12AC7AE700062CA31 /* EncryptedHistoryStore.swift in Sources */,
-				4B957AD22AC7AE700062CA31 /* FirePopoverCollectionViewItem.swift in Sources */,
-				4B957AD32AC7AE700062CA31 /* ArrayExtension.swift in Sources */,
-				4B957AD42AC7AE700062CA31 /* NetworkProtectionInviteCodeViewModel.swift in Sources */,
-				4B957AD52AC7AE700062CA31 /* CrashReportSender.swift in Sources */,
-				B6BCC5212AFCD9ED002C5499 /* DataImportSourcePicker.swift in Sources */,
-				4B957AD62AC7AE700062CA31 /* BookmarkHTMLImporter.swift in Sources */,
-				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 */,
-				4B957ADC2AC7AE700062CA31 /* NSCoderExtensions.swift in Sources */,
-				4B957ADD2AC7AE700062CA31 /* RunningApplicationCheck.swift in Sources */,
-				4B957ADE2AC7AE700062CA31 /* StatePersistenceService.swift in Sources */,
-				4B957ADF2AC7AE700062CA31 /* WindowManager+StateRestoration.swift in Sources */,
-				4B957AE02AC7AE700062CA31 /* TabCollection+NSSecureCoding.swift in Sources */,
-				4B957AE12AC7AE700062CA31 /* Instruments.swift in Sources */,
-				4B957AE22AC7AE700062CA31 /* ContentBlockerRulesLists.swift in Sources */,
-				4B957AE32AC7AE700062CA31 /* NSViewControllerExtension.swift in Sources */,
-				4B957AE42AC7AE700062CA31 /* NSAppearanceExtension.swift in Sources */,
-				4B957AE52AC7AE700062CA31 /* EmailManagerExtension.swift in Sources */,
-				4B957AE62AC7AE700062CA31 /* PermissionManager.swift in Sources */,
-				4B957AE72AC7AE700062CA31 /* DefaultBrowserPreferences.swift in Sources */,
-				4B957AE82AC7AE700062CA31 /* Permissions.xcdatamodeld in Sources */,
-				4B957AE92AC7AE700062CA31 /* JSAlertController.swift in Sources */,
-				4B957AEA2AC7AE700062CA31 /* NotificationService.swift in Sources */,
-				4B41EDA92B1543C9001EEDF4 /* PreferencesVPNView.swift in Sources */,
-				4B957AEB2AC7AE700062CA31 /* SyncPreferences.swift in Sources */,
-				4B957AEC2AC7AE700062CA31 /* FaviconNullStore.swift in Sources */,
-				4B957AED2AC7AE700062CA31 /* PaddedImageButton.swift in Sources */,
-				4B957AEE2AC7AE700062CA31 /* EncryptionKeyStoring.swift in Sources */,
-				4B957AEF2AC7AE700062CA31 /* String+Punycode.swift in Sources */,
-				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 */,
-				B6CC266E2BAD9CD800F53F8D /* FileProgressPresenter.swift in Sources */,
-				4B957AF42AC7AE700062CA31 /* ClickToLoadUserScript.swift in Sources */,
-				4B957AF52AC7AE700062CA31 /* WindowControllersManager.swift in Sources */,
-				4B957AF62AC7AE700062CA31 /* FireAnimationView.swift in Sources */,
-				4B957AF72AC7AE700062CA31 /* FaviconUrlReference.swift in Sources */,
-				4B957AF92AC7AE700062CA31 /* PasswordManagementItemListModel.swift in Sources */,
-				4B957AFA2AC7AE700062CA31 /* SuggestionTableCellView.swift in Sources */,
-				4B957AFB2AC7AE700062CA31 /* FireViewModel.swift in Sources */,
-				4B957AFC2AC7AE700062CA31 /* SyncCredentialsAdapter.swift in Sources */,
-				4B957AFD2AC7AE700062CA31 /* WKUserContentControllerExtension.swift in Sources */,
-				4B957AFE2AC7AE700062CA31 /* EditableTextView.swift in Sources */,
-				4B957AFF2AC7AE700062CA31 /* TabCollection.swift in Sources */,
-				4B957B002AC7AE700062CA31 /* MainView.swift in Sources */,
-				4B957B012AC7AE700062CA31 /* Tab+Navigation.swift in Sources */,
-				4B957B022AC7AE700062CA31 /* EmailUrlExtensions.swift in Sources */,
-				4B957B032AC7AE700062CA31 /* PasswordManagementItemModel.swift in Sources */,
-				4B957B042AC7AE700062CA31 /* UpdateController.swift in Sources */,
-				4B957B052AC7AE700062CA31 /* FindInPageModel.swift in Sources */,
-				4B957B062AC7AE700062CA31 /* PseudoFolder.swift in Sources */,
-				4B2F565D2B38F93E001214C0 /* NetworkProtectionSubscriptionEventHandler.swift in Sources */,
-				4B957B082AC7AE700062CA31 /* PixelDataStore.swift in Sources */,
-				4B957B092AC7AE700062CA31 /* WaitlistStorage.swift in Sources */,
-				4B957B0A2AC7AE700062CA31 /* Pixel.swift in Sources */,
-				4B957B0B2AC7AE700062CA31 /* PixelEvent.swift in Sources */,
-				4B957B0C2AC7AE700062CA31 /* TabBarFooter.swift in Sources */,
-				C168B9AE2B31DC7F001AFAD9 /* AutofillNeverPromptWebsitesManager.swift in Sources */,
-				4B957B0D2AC7AE700062CA31 /* JSAlertViewModel.swift in Sources */,
-				4B957B0E2AC7AE700062CA31 /* BookmarksBarCollectionViewItem.swift in Sources */,
-				B69A14FC2B4D705D00B9417D /* BookmarkFolderPicker.swift in Sources */,
-				4B957B0F2AC7AE700062CA31 /* FileDownloadError.swift in Sources */,
-				4B957B102AC7AE700062CA31 /* MoreOrLessView.swift in Sources */,
-				4B957B122AC7AE700062CA31 /* History.xcdatamodeld in Sources */,
-				4B957B132AC7AE700062CA31 /* PermissionStore.swift in Sources */,
-				EEC4A6612B277F1100F7C0AA /* NetworkProtectionVPNCountryLabelsModel.swift in Sources */,
-				4B957B142AC7AE700062CA31 /* PrivacyIconViewModel.swift in Sources */,
-				4B957B152AC7AE700062CA31 /* ChromiumBookmarksReader.swift in Sources */,
-				B66CA4212AD910B300447CF0 /* DataImportView.swift in Sources */,
-				4B957B162AC7AE700062CA31 /* Downloads.xcdatamodeld in Sources */,
-				4B957B172AC7AE700062CA31 /* TabPreviewViewController.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 */,
-				4B957B1E2AC7AE700062CA31 /* BookmarkManagedObject.swift in Sources */,
-				4B957B1F2AC7AE700062CA31 /* CSVLoginExporter.swift in Sources */,
-				4B957B202AC7AE700062CA31 /* NSAttributedStringExtension.swift in Sources */,
-				4B957B212AC7AE700062CA31 /* AnimationView.swift in Sources */,
-				4B957B222AC7AE700062CA31 /* NSRectExtension.swift in Sources */,
-				4B957B232AC7AE700062CA31 /* WaitlistRootView.swift in Sources */,
-				4B957B242AC7AE700062CA31 /* YoutubeOverlayUserScript.swift in Sources */,
-				4B957B252AC7AE700062CA31 /* DictionaryExtension.swift in Sources */,
-				4B957B262AC7AE700062CA31 /* Publishers.NestedObjectChanges.swift in Sources */,
-				4B957B272AC7AE700062CA31 /* MenuItemSelectors.swift in Sources */,
-				4B957B282AC7AE700062CA31 /* FaviconView.swift in Sources */,
-				4B957B292AC7AE700062CA31 /* OnboardingFlow.swift in Sources */,
-				4B957B2A2AC7AE700062CA31 /* PasswordManagementLoginModel.swift in Sources */,
-				4B957B2B2AC7AE700062CA31 /* TabViewModel.swift in Sources */,
-				4B957B2C2AC7AE700062CA31 /* TabDragAndDropManager.swift in Sources */,
-				B677FC572B064A9C0099EB04 /* DataImportViewModel.swift in Sources */,
-				4B957B2D2AC7AE700062CA31 /* NSNotificationName+Favicons.swift in Sources */,
-				4B957B2E2AC7AE700062CA31 /* PinningManager.swift in Sources */,
-				4B957B2F2AC7AE700062CA31 /* SyncMetadataDatabase.swift in Sources */,
-				4B957B302AC7AE700062CA31 /* TabCollectionViewModel+NSSecureCoding.swift in Sources */,
-				4B957B312AC7AE700062CA31 /* StringExtension.swift in Sources */,
-				4B957B322AC7AE700062CA31 /* EmailManagerRequestDelegate.swift in Sources */,
-				4B957B332AC7AE700062CA31 /* ApplicationVersionReader.swift in Sources */,
-				4B957B342AC7AE700062CA31 /* BookmarksBarViewController.swift in Sources */,
-				4B957B352AC7AE700062CA31 /* PreferencesAutofillView.swift in Sources */,
-				4B957B362AC7AE700062CA31 /* BurnerHomePageView.swift in Sources */,
-				4B957B372AC7AE700062CA31 /* UserText+PasswordManager.swift in Sources */,
-				4B957B382AC7AE700062CA31 /* LoadingProgressView.swift in Sources */,
-				7BEC20472B0F505F00243D3E /* AddBookmarkFolderPopoverView.swift in Sources */,
-				4B957B392AC7AE700062CA31 /* StatisticsStore.swift in Sources */,
-				EEC4A66B2B2C87D300F7C0AA /* VPNLocationView.swift in Sources */,
-				4B957B3A2AC7AE700062CA31 /* BWInstallationService.swift in Sources */,
-				4B957B3B2AC7AE700062CA31 /* BookmarksBarPromptPopover.swift in Sources */,
-				4B957B3C2AC7AE700062CA31 /* NetworkProtectionInvitePresenter.swift in Sources */,
-				4B957B3D2AC7AE700062CA31 /* ColorView.swift in Sources */,
-				4B957B3E2AC7AE700062CA31 /* RecentlyClosedCacheItem.swift in Sources */,
-				4B957B3F2AC7AE700062CA31 /* PopupBlockedPopover.swift in Sources */,
-				4B957B402AC7AE700062CA31 /* SaveCredentialsPopover.swift in Sources */,
-				4B957B412AC7AE700062CA31 /* LegacyBookmarksStoreMigration.swift in Sources */,
-				4B957B422AC7AE700062CA31 /* QuartzIdleStateProvider.swift in Sources */,
-				4B957B432AC7AE700062CA31 /* DuckPlayerPreferences.swift in Sources */,
-				4B957B442AC7AE700062CA31 /* DownloadViewModel.swift in Sources */,
-				4B957B452AC7AE700062CA31 /* BookmarkHTMLReader.swift in Sources */,
-				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 */,
-				B6C8CAAA2AD010DD0060E1CD /* YandexDataImporter.swift in Sources */,
-				4B957B4B2AC7AE700062CA31 /* PermissionButton.swift in Sources */,
-				4B957B4C2AC7AE700062CA31 /* MoreOptionsMenu.swift in Sources */,
-				4B957B4D2AC7AE700062CA31 /* PermissionAuthorizationViewController.swift in Sources */,
-				EE6666712B56EDE4001D898D /* VPNLocationsHostingViewController.swift in Sources */,
-				4B957B4E2AC7AE700062CA31 /* BookmarkNode.swift in Sources */,
-				4B957B4F2AC7AE700062CA31 /* LongPressButton.swift in Sources */,
-				4B957B502AC7AE700062CA31 /* CoreDataStore.swift in Sources */,
-				4B957B512AC7AE700062CA31 /* BundleExtension.swift in Sources */,
-				4B957B522AC7AE700062CA31 /* NSOpenPanelExtensions.swift in Sources */,
-				EEC4A66F2B2C894F00F7C0AA /* VPNLocationPreferenceItemModel.swift in Sources */,
-				4B957B532AC7AE700062CA31 /* FirePopover.swift in Sources */,
-				4B957B552AC7AE700062CA31 /* NetworkProtectionOnboardingMenu.swift in Sources */,
-				4B957B562AC7AE700062CA31 /* VariantManager.swift in Sources */,
-				4B957B572AC7AE700062CA31 /* ApplicationDockMenu.swift in Sources */,
-				4B957B582AC7AE700062CA31 /* SaveIdentityViewController.swift in Sources */,
-				4B957B592AC7AE700062CA31 /* AppLauncher.swift in Sources */,
-				4B957B5A2AC7AE700062CA31 /* FileStore.swift in Sources */,
-				1DB67F2F2B6FEFDB003DF243 /* ViewSnapshotRenderer.swift in Sources */,
-				4B957B5B2AC7AE700062CA31 /* PixelArguments.swift in Sources */,
-				4B957B5C2AC7AE700062CA31 /* PinnedTabsViewModel.swift in Sources */,
-				4B957B5D2AC7AE700062CA31 /* BookmarkList.swift in Sources */,
-				4B957B5E2AC7AE700062CA31 /* NEOnDemandRuleExtension.swift in Sources */,
-				1DB67F2B2B6FEB19003DF243 /* WebViewSnapshotRenderer.swift in Sources */,
-				4B957B5F2AC7AE700062CA31 /* BookmarkTableRowView.swift in Sources */,
-				4B957B602AC7AE700062CA31 /* FavoritesView.swift in Sources */,
-				3158B1522B0BF75400AF130C /* DataBrokerProtectionLoginItemScheduler.swift in Sources */,
-				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 */,
-				4B957B692AC7AE700062CA31 /* FeedbackWindow.swift in Sources */,
-				4B957B6A2AC7AE700062CA31 /* WorkspaceProtocol.swift in Sources */,
-				4B957B6B2AC7AE700062CA31 /* RecentlyVisitedView.swift in Sources */,
-				4B957B6C2AC7AE700062CA31 /* MouseOverAnimationButton.swift in Sources */,
-				4B957B6D2AC7AE700062CA31 /* TabBarScrollView.swift in Sources */,
-				B6B5F5822B024105008DB58A /* DataImportSummaryView.swift in Sources */,
-				B684121E2B6A1D880092F66A /* ErrorPageHTMLTemplate.swift in Sources */,
-				4B957B6E2AC7AE700062CA31 /* BookmarkListTreeControllerDataSource.swift in Sources */,
-				4B957B6F2AC7AE700062CA31 /* AddressBarViewController.swift in Sources */,
-				4B957B702AC7AE700062CA31 /* Permissions.swift in Sources */,
-				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 */,
-				4B957B762AC7AE700062CA31 /* NSOutlineViewExtensions.swift in Sources */,
-				4B957B772AC7AE700062CA31 /* AppDelegate.swift in Sources */,
-				4B957B782AC7AE700062CA31 /* ContentOverlayViewController.swift in Sources */,
-				4B957B792AC7AE700062CA31 /* ContentBlockingTabExtension.swift in Sources */,
-				4B957B7A2AC7AE700062CA31 /* OnboardingViewController.swift in Sources */,
-				B68412292B6A68C90092F66A /* WKBackForwardListItemExtension.swift in Sources */,
-				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 */,
-				4B957B842AC7AE700062CA31 /* SuggestionContainer.swift in Sources */,
-				4B957B852AC7AE700062CA31 /* FindInPageTabExtension.swift in Sources */,
-				4B957B862AC7AE700062CA31 /* HomePageViewController.swift in Sources */,
-				4B957B882AC7AE700062CA31 /* OperatingSystemVersionExtension.swift in Sources */,
-				4B957B892AC7AE700062CA31 /* ToggleableScrollView.swift in Sources */,
-				4B957B8A2AC7AE700062CA31 /* TabCleanupPreparer.swift in Sources */,
-				4B37EE7B2B4CFF7C00A89A61 /* HomePageRemoteMessagingStorage.swift in Sources */,
-				4B957B8B2AC7AE700062CA31 /* NetworkProtectionOptionKeyExtension.swift in Sources */,
-				372A0FEE2B2379310033BF7F /* SyncMetricsEventsHandler.swift in Sources */,
-				316850702AF3AD1D009A2828 /* WaitlistViewControllerPresenter.swift in Sources */,
-				1E2AE4CB2ACB21C800684E0A /* HardwareModel.swift in Sources */,
-				4B957B8C2AC7AE700062CA31 /* UserScripts.swift in Sources */,
-				4B957B8D2AC7AE700062CA31 /* NSWorkspaceExtension.swift in Sources */,
-				4B957B8E2AC7AE700062CA31 /* AutofillTabExtension.swift in Sources */,
-				4B957B8F2AC7AE700062CA31 /* Assertions.swift in Sources */,
-				4B0EF7282B5780AB009D6481 /* AppVersionExtension.swift in Sources */,
-				4B957B902AC7AE700062CA31 /* BookmarkViewModel.swift in Sources */,
-				4B957B912AC7AE700062CA31 /* DaxSpeech.swift in Sources */,
-				BB5789732B2CC0300009DFE2 /* DataBrokerProtectionSubscriptionEventHandler.swift in Sources */,
-				4B957B922AC7AE700062CA31 /* DuckURLSchemeHandler.swift in Sources */,
-				4B957B932AC7AE700062CA31 /* FirePopoverViewModel.swift in Sources */,
-				4B957B942AC7AE700062CA31 /* BWCommand.swift in Sources */,
-				4B957B952AC7AE700062CA31 /* NSColorExtension.swift in Sources */,
-				4B957B972AC7AE700062CA31 /* AddressBarButtonsViewController.swift in Sources */,
-				4B957B982AC7AE700062CA31 /* BWError.swift in Sources */,
-				4B957B9A2AC7AE700062CA31 /* PixelDataRecord.swift in Sources */,
-				4B957B9B2AC7AE700062CA31 /* PageObserverUserScript.swift in Sources */,
-				4B957B9C2AC7AE700062CA31 /* SecureVaultErrorReporter.swift in Sources */,
-				4B68DDFF2ACBA14100FB0973 /* FileLineError.swift in Sources */,
-				4B957B9D2AC7AE700062CA31 /* NSImageExtensions.swift in Sources */,
-				4B957B9E2AC7AE700062CA31 /* WaitlistKeychainStorage.swift in Sources */,
-				B69A14F82B4D701F00B9417D /* AddBookmarkPopoverViewModel.swift in Sources */,
-				4B957B9F2AC7AE700062CA31 /* PasswordManagementViewController.swift in Sources */,
-				4B957BA02AC7AE700062CA31 /* ImportedBookmarks.swift in Sources */,
-				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 */,
-				4B957BA72AC7AE700062CA31 /* ConnectBitwardenView.swift in Sources */,
-				4B957BA82AC7AE700062CA31 /* DispatchQueueExtensions.swift in Sources */,
-				4B957BA92AC7AE700062CA31 /* BookmarksBarAppearance.swift in Sources */,
-				31C9ADE82AF0564500CEF57D /* WaitlistFeatureSetupHandler.swift in Sources */,
-				3158B1472B0BF72E00AF130C /* DBPHomeViewController.swift in Sources */,
-				4B957BAA2AC7AE700062CA31 /* PermissionAuthorizationPopover.swift in Sources */,
-				4B957BAB2AC7AE700062CA31 /* PopoverMessageViewController.swift in Sources */,
-				4B957BAC2AC7AE700062CA31 /* WebView.swift in Sources */,
-				4B957BAD2AC7AE700062CA31 /* ShadowView.swift in Sources */,
-				4B957BAE2AC7AE700062CA31 /* FeedbackSender.swift in Sources */,
-				4B957BAF2AC7AE700062CA31 /* TabExtensions.swift in Sources */,
-				4B957BB02AC7AE700062CA31 /* TabBarViewItem.swift in Sources */,
-				4B957BB12AC7AE700062CA31 /* NSWindow+Toast.swift in Sources */,
-				4B0526652B1D55D80054955A /* VPNFeedbackCategory.swift in Sources */,
-				4B957BB22AC7AE700062CA31 /* AutoconsentUserScript.swift in Sources */,
-				4B957BB32AC7AE700062CA31 /* BookmarksExporter.swift in Sources */,
-				4B957BB42AC7AE700062CA31 /* NetworkProtectionAppEvents.swift in Sources */,
-				4B957BB52AC7AE700062CA31 /* FirefoxDataImporter.swift in Sources */,
-				4B957BB62AC7AE700062CA31 /* PreferencesGeneralView.swift in Sources */,
-				4B957BB72AC7AE700062CA31 /* PinnedTabsView.swift in Sources */,
-				4B957BB92AC7AE700062CA31 /* SyncErrorHandler.swift in Sources */,
-				4BF0E50A2AD2551A00FFEC9E /* NetworkProtectionPixelEvent.swift in Sources */,
-				4B957BBA2AC7AE700062CA31 /* URLExtension.swift in Sources */,
-				4B957BBB2AC7AE700062CA31 /* Tab+UIDelegate.swift in Sources */,
-				4B957BBD2AC7AE700062CA31 /* NSStoryboardExtension.swift in Sources */,
-				4B957BBE2AC7AE700062CA31 /* PreferencesViewController.swift in Sources */,
-				4B957BBF2AC7AE700062CA31 /* FireproofDomains.swift in Sources */,
-				4B957BC02AC7AE700062CA31 /* Database.swift in Sources */,
-				4B957BC12AC7AE700062CA31 /* HorizontallyCenteredLayout.swift in Sources */,
-				4B957BC22AC7AE700062CA31 /* BookmarksOutlineView.swift in Sources */,
-				4B957BC32AC7AE700062CA31 /* CountryList.swift in Sources */,
-				4B957BC42AC7AE700062CA31 /* PreferencesSection.swift in Sources */,
-				4B957BC52AC7AE700062CA31 /* NetworkProtectionNavBarButtonModel.swift in Sources */,
-				4B957BC62AC7AE700062CA31 /* AutoconsentManagement.swift in Sources */,
-				4B957BC72AC7AE700062CA31 /* UserText+NetworkProtection.swift in Sources */,
-				4B957BC82AC7AE700062CA31 /* WebViewContainerView.swift in Sources */,
-				4B957BC92AC7AE700062CA31 /* BookmarkStore.swift in Sources */,
-				4B957BCA2AC7AE700062CA31 /* PrivacyDashboardViewController.swift in Sources */,
-				37A6A8F42AFCC988008580A3 /* FaviconsFetcherOnboarding.swift in Sources */,
-				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 */,
-				4B957BD12AC7AE700062CA31 /* WKProcessPool+GeolocationProvider.swift in Sources */,
-				4B957BD22AC7AE700062CA31 /* RecentlyClosedMenu.swift in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
 		565E46D92B2725DC0013AC2A /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
@@ -12211,11 +10692,16 @@
 			buildActionMask = 2147483647;
 			files = (
 				EEBCE6842BA4643200B9DF00 /* NSSizeExtension.swift in Sources */,
+				EE7F74912BB5D76600CD9456 /* BookmarksBarTests.swift in Sources */,
 				EE02D41C2BB460A600DBE6B3 /* BrowsingHistoryTests.swift in Sources */,
 				EE02D41A2BB4609900DBE6B3 /* UITests.swift in Sources */,
 				EE0429E02BA31D2F009EB20F /* FindInPageTests.swift in Sources */,
 				EE02D4212BB460FE00DBE6B3 /* StringExtension.swift in Sources */,
+				EE9D81C32BC57A3700338BE3 /* StateRestorationTests.swift in Sources */,
+				EEC7BE2E2BC6C09500F86835 /* AddressBarKeyboardShortcutsTests.swift in Sources */,
+				EE54F7B32BBFEA49006218DB /* BookmarksAndFavoritesTests.swift in Sources */,
 				EE02D4222BB4611A00DBE6B3 /* TestsURLExtension.swift in Sources */,
+				EE42CBCC2BC8004700AD411C /* PermissionsTests.swift in Sources */,
 				7B4CE8E726F02135009134B1 /* TabBarTests.swift in Sources */,
 				EEBCE6832BA463DD00B9DF00 /* NSImageExtensions.swift in Sources */,
 				EEBCE6822BA444FA00B9DF00 /* XCUIElementExtension.swift in Sources */,
@@ -12228,7 +10714,6 @@
 			buildActionMask = 2147483647;
 			files = (
 				7B97CD5C2B7E0BBB004FEF43 /* UserDefaultsWrapper.swift in Sources */,
-				7B97CD602B7E0C2E004FEF43 /* Logging.swift in Sources */,
 				7B97CD5E2B7E0BEA004FEF43 /* OptionalExtension.swift in Sources */,
 				7B97CD5F2B7E0BF7004FEF43 /* NSApplicationExtension.swift in Sources */,
 				7BDA36F52B7E055800AD5388 /* MacTransparentProxyProvider.swift in Sources */,
@@ -12240,6 +10725,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				31A83FB72BE28D8A00F74E67 /* UserText+DBP.swift in Sources */,
 				9D9AE92C2AAB84FF0026E7DC /* DBPMocks.swift in Sources */,
 				7B0099792B65013800FE7C31 /* BrowserWindowManager.swift in Sources */,
 				9D9AE9292AAA43EB0026E7DC /* DataBrokerProtectionBackgroundManager.swift in Sources */,
@@ -12253,6 +10739,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				31A83FB82BE28D8A00F74E67 /* UserText+DBP.swift in Sources */,
 				7B1459542B7D437200047F2C /* BrowserWindowManager.swift in Sources */,
 				9D9AE92D2AAB84FF0026E7DC /* DBPMocks.swift in Sources */,
 				9D9AE92A2AAA43EB0026E7DC /* DataBrokerProtectionBackgroundManager.swift in Sources */,
@@ -12283,11 +10770,14 @@
 				0230C0A3272080090018F728 /* KeyedCodingExtension.swift in Sources */,
 				31AA6B972B960B870025014E /* DataBrokerProtectionLoginItemPixels.swift in Sources */,
 				B6BF5D852946FFDA006742B1 /* PrivacyDashboardTabExtension.swift in Sources */,
+				B6E3E55B2BC0041900A41922 /* DownloadListStoreMock.swift in Sources */,
+				9FA5A0A52BC8F34900153786 /* UserDefaultsBookmarkFoldersStore.swift in Sources */,
 				B6C0B23026E61D630031CB7F /* DownloadListStore.swift in Sources */,
 				85799C1825DEBB3F0007EC87 /* Logging.swift in Sources */,
 				AAC30A2E268F1EE300D2D9CD /* CrashReportPromptPresenter.swift in Sources */,
 				1D2DC00629016798008083A1 /* BWCredential.swift in Sources */,
 				EEA3EEB12B24EBD000E8333A /* NetworkProtectionVPNCountryLabelsModel.swift in Sources */,
+				316913232BD2B6250051B46D /* DataBrokerProtectionPixelsHandler.swift in Sources */,
 				37AFCE8727DA334800471A10 /* PreferencesRootView.swift in Sources */,
 				B684590825C9027900DC17B6 /* AppStateChangedPublisher.swift in Sources */,
 				4B92928F26670D1700AD2C21 /* BookmarkTableCellView.swift in Sources */,
@@ -12334,6 +10824,7 @@
 				85AC7ADD27BEB6EE00FFB69B /* HomePageDefaultBrowserModel.swift in Sources */,
 				1D01A3D82B88DF8B00FE8150 /* PreferencesSyncView.swift in Sources */,
 				B6619EFB2B111CC500CD9186 /* InstructionsFormatParser.swift in Sources */,
+				9FBD84522BB3AACB00220859 /* AttributionOriginFileProvider.swift in Sources */,
 				1DC669702B6CF0D700AA0645 /* TabSnapshotStore.swift in Sources */,
 				AAC30A26268DFEE200D2D9CD /* CrashReporter.swift in Sources */,
 				B60D64492AAF1B7C00B26F50 /* AddressBarTextSelectionNavigation.swift in Sources */,
@@ -12345,12 +10836,12 @@
 				1D26EBAC2B74BECB0002A93F /* NSImageSendable.swift in Sources */,
 				B6B4D1C52B0B3B5400C26286 /* DataImportReportModel.swift in Sources */,
 				4B92928D26670D1700AD2C21 /* BookmarkOutlineCellView.swift in Sources */,
+				F18826802BBEB58100D9AC4F /* PrivacyProPixel.swift in Sources */,
 				B604085C274B8FBA00680351 /* UnprotectedDomains.xcdatamodeld in Sources */,
 				4BB88B5025B7BA2B006F6B06 /* TabInstrumentation.swift in Sources */,
 				85D33F1225C82EB3002B91A6 /* ConfigurationManager.swift in Sources */,
 				31F28C4F28C8EEC500119F70 /* YoutubePlayerUserScript.swift in Sources */,
 				4B41EDAE2B168AFF001EEDF4 /* VPNFeedbackFormViewController.swift in Sources */,
-				B6A9E48426146AAB0067D1B9 /* PixelParameters.swift in Sources */,
 				AA5FA697275F90C400DCE9C9 /* FaviconImageCache.swift in Sources */,
 				1430DFF524D0580F00B8978C /* TabBarViewController.swift in Sources */,
 				B62B483E2ADE48DE000DECE5 /* ArrayBuilder.swift in Sources */,
@@ -12367,8 +10858,10 @@
 				AA3D531727A1EEED00074EC1 /* FeedbackViewController.swift in Sources */,
 				AAEF6BC8276A081C0024DCF4 /* FaviconSelector.swift in Sources */,
 				4B2E7D6326FF9D6500D2DB17 /* PrintingUserScript.swift in Sources */,
+				B6E3E5542BBFCEE300A41922 /* NoDownloadsCellView.swift in Sources */,
 				4BBDEE9428FC14760092FAA6 /* ConnectBitwardenViewController.swift in Sources */,
 				1DDF076428F815AD00EDFBE3 /* BWManager.swift in Sources */,
+				560C3FFF2BCD5A1E00F589CE /* PermanentSurveyManager.swift in Sources */,
 				9833912F27AAA3CE00DAF119 /* AppTrackerDataSetProvider.swift in Sources */,
 				B65211252B29A42C00B30633 /* BookmarkStoreMock.swift in Sources */,
 				4BA1A6B3258B080A00F6F690 /* EncryptionKeyGeneration.swift in Sources */,
@@ -12376,7 +10869,6 @@
 				4B9DB03B2A983B24000927DB /* InvitedToWaitlistView.swift in Sources */,
 				8589063C267BCDC000D23B0D /* SaveCredentialsViewController.swift in Sources */,
 				4BBE0AA727B9B027003B37A8 /* PopUpButton.swift in Sources */,
-				4B4D60CF2A0C849600BCD287 /* NetworkProtectionInviteDialog.swift in Sources */,
 				AABEE6A524AA0A7F0043105B /* SuggestionViewController.swift in Sources */,
 				1D6216B229069BBF00386B2C /* BWKeyStorage.swift in Sources */,
 				AA7E919F287872EA00AB6B62 /* VisitViewModel.swift in Sources */,
@@ -12393,6 +10885,8 @@
 				858A798326A8B75F00A75A42 /* CopyHandler.swift in Sources */,
 				1E7E2E9029029A2A00C01B54 /* ContentBlockingRulesUpdateObserver.swift in Sources */,
 				4B8AC93926B48A5100879451 /* FirefoxLoginReader.swift in Sources */,
+				F18826902BC0105800D9AC4F /* PixelDataRecord.swift in Sources */,
+				F18826912BC0105800D9AC4F /* PixelDataStore.swift in Sources */,
 				B69B503E2726A12500758A2B /* AtbParser.swift in Sources */,
 				37F19A6528E1B3FB00740DC6 /* PreferencesDuckPlayerView.swift in Sources */,
 				4B92929E26670D2A00AD2C21 /* BookmarkSidebarTreeController.swift in Sources */,
@@ -12421,11 +10915,13 @@
 				4B379C2227BDBA29008A968E /* LocalAuthenticationService.swift in Sources */,
 				37CEFCA92A6737A2001EF741 /* CredentialsCleanupErrorHandling.swift in Sources */,
 				4BB99D0326FE191E001E4761 /* SafariBookmarksReader.swift in Sources */,
+				316913292BD2C7570051B46D /* DataBrokerProtectionErrorViewController.swift in Sources */,
 				1DA6D0FD2A1FF9A100540406 /* HTTPCookie.swift in Sources */,
 				AACF6FD626BC366D00CF09F9 /* SafariVersionReader.swift in Sources */,
 				4BE65485271FCD7B008D1D63 /* LoginFaviconView.swift in Sources */,
 				4B0511CA262CAA5A00F6079C /* FireproofDomainsViewController.swift in Sources */,
 				AA4D700725545EF800C3411E /* URLEventHandler.swift in Sources */,
+				56BA1E8A2BB1CB5B001CF69F /* CertificateTrustEvaluator.swift in Sources */,
 				1D8057C82A83CAEE00F4FED6 /* SupportedOsChecker.swift in Sources */,
 				AA92127725ADA07900600CD4 /* WKWebViewExtension.swift in Sources */,
 				AAAB9114288EB1D600A057A9 /* CleanThisHistoryMenuItem.swift in Sources */,
@@ -12495,6 +10991,7 @@
 				37054FCE2876472D00033B6F /* WebViewSnapshotView.swift in Sources */,
 				4BBC16A027C4859400E00A38 /* DeviceAuthenticationService.swift in Sources */,
 				CB24F70C29A3D9CB006DCC58 /* AppConfigurationURLProvider.swift in Sources */,
+				1DEF3BAD2BD145A9004A2FBA /* AutoClearHandler.swift in Sources */,
 				37CBCA9A2A8966E60050218F /* SyncSettingsAdapter.swift in Sources */,
 				EEC4A66D2B2C894F00F7C0AA /* VPNLocationPreferenceItemModel.swift in Sources */,
 				3776582F27F82E62009A6B35 /* AutofillPreferences.swift in Sources */,
@@ -12541,7 +11038,6 @@
 				3184AC6F288F2A1100C35E4B /* CookieNotificationAnimationModel.swift in Sources */,
 				4B9DB0382A983B24000927DB /* JoinedWaitlistView.swift in Sources */,
 				B63ED0E526BB8FB900A9DAD1 /* SharingMenu.swift in Sources */,
-				4B9DB0322A983B24000927DB /* EnableWaitlistFeatureView.swift in Sources */,
 				AA4FF40C2624751A004E2377 /* GrammarFeaturesManager.swift in Sources */,
 				4B9DB0442A983B24000927DB /* WaitlistModalViewController.swift in Sources */,
 				B6DA06E8291401D700225DE2 /* WKMenuItemIdentifier.swift in Sources */,
@@ -12572,7 +11068,6 @@
 				B68412142B694BA10092F66A /* NSObject+performSelector.m in Sources */,
 				B6F41031264D2B23003DA42C /* ProgressExtension.swift in Sources */,
 				4B723E0F26B0006500E14D75 /* CSVParser.swift in Sources */,
-				B6DA44082616B30600DD1EC2 /* PixelDataModel.xcdatamodeld in Sources */,
 				B63BDF7E27FDAA640072D75B /* PrivacyDashboardWebView.swift in Sources */,
 				37CD54CF27F2FDD100F1F7B9 /* AppearancePreferences.swift in Sources */,
 				B6B1E87B26D381710062C350 /* DownloadListCoordinator.swift in Sources */,
@@ -12652,6 +11147,7 @@
 				85707F2A276A35FE00DC0649 /* ActionSpeech.swift in Sources */,
 				B6BE9FAA293F7955006363C6 /* ModalSheetCancellable.swift in Sources */,
 				B6830963274CDEC7004B46BB /* FireproofDomainsStore.swift in Sources */,
+				F188268D2BBF01C300D9AC4F /* PixelDataModel.xcdatamodeld in Sources */,
 				7B430EA12A71411A00BAC4A1 /* NetworkProtectionSimulateFailureMenu.swift in Sources */,
 				1E7E2E942902AC0E00C01B54 /* PrivacyDashboardPermissionHandler.swift in Sources */,
 				AA9FF95F24A1FB690039E328 /* TabCollectionViewModel.swift in Sources */,
@@ -12659,6 +11155,7 @@
 				4BF0E5052AD2551A00FFEC9E /* NetworkProtectionPixelEvent.swift in Sources */,
 				AAC5E4D125D6A709007F5990 /* BookmarkManager.swift in Sources */,
 				37CD54CD27F2FDD100F1F7B9 /* AboutModel.swift in Sources */,
+				B6F1B0262BCE5A50005E863C /* TabContent.swift in Sources */,
 				4BE65476271FCD41008D1D63 /* PasswordManagementCreditCardItemView.swift in Sources */,
 				AA5C8F59258FE21F00748EB7 /* NSTextFieldExtension.swift in Sources */,
 				3706FEC8293F6F7500E42796 /* BWManagement.swift in Sources */,
@@ -12681,10 +11178,12 @@
 				B6DE57F62B05EA9000CD54B9 /* SheetHostingWindow.swift in Sources */,
 				AA6EF9B525081B4C004754E6 /* MainMenuActions.swift in Sources */,
 				B63D466925BEB6C200874977 /* WKWebView+SessionState.swift in Sources */,
+				B6F1B0222BCE5658005E863C /* BrokenSiteInfoTabExtension.swift in Sources */,
 				4B4D60C02A0C848D00BCD287 /* NetworkProtectionControllerErrorStore.swift in Sources */,
 				4B723E1226B0006E00E14D75 /* DataImport.swift in Sources */,
 				7BE146072A6A83C700C313B8 /* NetworkProtectionDebugMenu.swift in Sources */,
 				B6085D092743AAB600A9C456 /* FireproofDomains.xcdatamodeld in Sources */,
+				56BA1E752BAAF70F001CF69F /* SSLErrorPageTabExtension.swift in Sources */,
 				85589E8227BBB8630038AD11 /* HomePageView.swift in Sources */,
 				B6BF5D932947199A006742B1 /* SerpHeadersNavigationResponder.swift in Sources */,
 				569277C129DDCBB500B633EF /* HomePageContinueSetUpModel.swift in Sources */,
@@ -12697,6 +11196,7 @@
 				85D885B326A5A9DE0077C374 /* NSAlert+PasswordManager.swift in Sources */,
 				983DFB2528B67036006B7E34 /* UserContentUpdating.swift in Sources */,
 				1D9A4E5A2B43213B00F449E2 /* TabSnapshotExtension.swift in Sources */,
+				316913262BD2B76F0051B46D /* DataBrokerPrerequisitesStatusVerifier.swift in Sources */,
 				4B7A57CF279A4EF300B1C70E /* ChromiumPreferences.swift in Sources */,
 				AA6AD95B2704B6DB00159F8A /* FirePopoverViewController.swift in Sources */,
 				4BE4005327CF3DC3007D3161 /* SavePaymentMethodPopover.swift in Sources */,
@@ -12706,6 +11206,7 @@
 				AA6FFB4424DC33320028F4D0 /* NSViewExtension.swift in Sources */,
 				B6C0B23E26E8BF1F0031CB7F /* DownloadListViewModel.swift in Sources */,
 				4B9292D52667123700AD2C21 /* BookmarkManagementDetailViewController.swift in Sources */,
+				F188267C2BBEB3AA00D9AC4F /* GeneralPixel.swift in Sources */,
 				4B723E1026B0006700E14D75 /* CSVImporter.swift in Sources */,
 				37A4CEBA282E992F00D75B89 /* StartupPreferences.swift in Sources */,
 				4B41EDB12B168B1E001EEDF4 /* VPNFeedbackFormView.swift in Sources */,
@@ -12718,8 +11219,6 @@
 				AAE246F32709EF3B00BEEAEE /* FirePopoverCollectionViewItem.swift in Sources */,
 				4B41EDA32B1543B9001EEDF4 /* VPNPreferencesModel.swift in Sources */,
 				AA61C0D22727F59B00E6B681 /* ArrayExtension.swift in Sources */,
-				4B4D60CC2A0C849600BCD287 /* NetworkProtectionInviteCodeViewModel.swift in Sources */,
-				AAC30A2C268F1ECD00D2D9CD /* CrashReportSender.swift in Sources */,
 				373A1AB02842C4EA00586521 /* BookmarkHTMLImporter.swift in Sources */,
 				B6B5F57F2B024105008DB58A /* DataImportSummaryView.swift in Sources */,
 				31C3CE0228EDC1E70002C24A /* CustomRoundedCornersShape.swift in Sources */,
@@ -12755,10 +11254,10 @@
 				B65783E725F8AAFB00D8DB33 /* String+Punycode.swift in Sources */,
 				B657841A25FA484B00D8DB33 /* NSException+Catch.m in Sources */,
 				B684592F25C93FBF00DC17B6 /* AppStateRestorationManager.swift in Sources */,
-				4B67853F2AA7C726008A5004 /* DailyPixel.swift in Sources */,
 				B66260E629ACAE4B00E9E3EE /* NavigationHotkeyHandler.swift in Sources */,
 				EA0BA3A9272217E6002A0B6C /* ClickToLoadUserScript.swift in Sources */,
 				AAA892EA250A4CEF005B37B2 /* WindowControllersManager.swift in Sources */,
+				56BA1E822BAC506F001CF69F /* SSLErrorPageUserScript.swift in Sources */,
 				85C5991B27D10CF000E605B2 /* FireAnimationView.swift in Sources */,
 				B6B4D1CA2B0C8C9200C26286 /* FirefoxCompatibilityPreferences.swift in Sources */,
 				AA6197C4276B314D008396F0 /* FaviconUrlReference.swift in Sources */,
@@ -12778,14 +11277,12 @@
 				AAD86E52267A0DFF005C11BE /* UpdateController.swift in Sources */,
 				85A0118225AF60E700FA6A0C /* FindInPageModel.swift in Sources */,
 				7BA7CC4E2AD11F6F0042E5CE /* NetworkProtectionIPCTunnelController.swift in Sources */,
+				9F9C49FD2BC7E9830099738D /* BookmarkAllTabsDialogViewModel.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 */,
 				4B9DB0292A983B24000927DB /* WaitlistStorage.swift in Sources */,
-				B6A9E45326142B070067D1B9 /* Pixel.swift in Sources */,
-				B6A9E47726146A570067D1B9 /* PixelEvent.swift in Sources */,
 				AA2CB1352587C29500AA6FBE /* TabBarFooter.swift in Sources */,
 				EEC111E6294D06290086524F /* JSAlertViewModel.swift in Sources */,
 				4BE5336C286912D40019DBFD /* BookmarksBarCollectionViewItem.swift in Sources */,
@@ -12797,7 +11294,9 @@
 				AA75A0AE26F3500C0086B667 /* PrivacyIconViewModel.swift in Sources */,
 				4BB99D0126FE191E001E4761 /* ChromiumBookmarksReader.swift in Sources */,
 				B6C0B23426E71BCD0031CB7F /* Downloads.xcdatamodeld in Sources */,
+				9FBD84732BB3E15D00220859 /* InstallationAttributionPixelHandler.swift in Sources */,
 				AAE8B110258A456C00E81239 /* TabPreviewViewController.swift in Sources */,
+				B6F1B02A2BCE675C005E863C /* NetworkProtectionControllerTabExtension.swift in Sources */,
 				B6C8CAA72AD010DD0060E1CD /* YandexDataImporter.swift in Sources */,
 				EE66666F2B56EDE4001D898D /* VPNLocationsHostingViewController.swift in Sources */,
 				37CC53EC27E8A4D10028713D /* PreferencesDataClearingView.swift in Sources */,
@@ -12821,10 +11320,12 @@
 				4B37EE5F2B4CFC3C00A89A61 /* HomePageRemoteMessagingStorage.swift in Sources */,
 				4B9DB0472A983B24000927DB /* WaitlistRootView.swift in Sources */,
 				31F28C5128C8EEC500119F70 /* YoutubeOverlayUserScript.swift in Sources */,
+				B6ABD0CA2BC03F610000EB69 /* SecurityScopedFileURLController.swift in Sources */,
 				B6040856274B830F00680351 /* DictionaryExtension.swift in Sources */,
 				B684592725C93C0500DC17B6 /* Publishers.NestedObjectChanges.swift in Sources */,
 				B6DA06E62913F39400225DE2 /* MenuItemSelectors.swift in Sources */,
 				85589E9A27BFE3C30038AD11 /* FaviconView.swift in Sources */,
+				021EA0802BD2A9D500772C9A /* TabsPreferences.swift in Sources */,
 				85707F2C276A364E00DC0649 /* OnboardingFlow.swift in Sources */,
 				4BE65480271FCD4D008D1D63 /* PasswordManagementLoginModel.swift in Sources */,
 				AA9FF95B24A1EFC20039E328 /* TabViewModel.swift in Sources */,
@@ -12845,13 +11346,14 @@
 				B69B503C2726A12500758A2B /* StatisticsStore.swift in Sources */,
 				3158B14A2B0BF74300AF130C /* DataBrokerProtectionDebugMenu.swift in Sources */,
 				4BBDEE9128FC14760092FAA6 /* BWInstallationService.swift in Sources */,
+				7B4D8A212BDA857300852966 /* VPNOperationErrorRecorder.swift in Sources */,
 				859F30642A72A7BB00C20372 /* BookmarksBarPromptPopover.swift in Sources */,
-				4B4D60CA2A0C849600BCD287 /* NetworkProtectionInvitePresenter.swift in Sources */,
 				B693955426F04BEC0015B914 /* ColorView.swift in Sources */,
 				AA5C1DD3285A217F0089850C /* RecentlyClosedCacheItem.swift in Sources */,
 				B6BBF17427475B15004F850E /* PopupBlockedPopover.swift in Sources */,
 				8589063A267BCD8E00D23B0D /* SaveCredentialsPopover.swift in Sources */,
 				987799F32999993C005D8EB6 /* LegacyBookmarksStoreMigration.swift in Sources */,
+				B6E3E5582BBFD51400A41922 /* PreviewViewController.swift in Sources */,
 				4B379C1527BD91E3008A968E /* QuartzIdleStateProvider.swift in Sources */,
 				37F19A6728E1B43200740DC6 /* DuckPlayerPreferences.swift in Sources */,
 				1D01A3D42B88CF7700FE8150 /* AccessibilityPreferences.swift in Sources */,
@@ -12866,6 +11368,7 @@
 				B693955726F04BEC0015B914 /* MouseOverButton.swift in Sources */,
 				AA61C0D02722159B00E6B681 /* FireInfoViewController.swift in Sources */,
 				9D9AE8692AA76CDC0026E7DC /* LoginItem+NetworkProtection.swift in Sources */,
+				9F9C49F92BC7BC970099738D /* BookmarkAllTabsDialogView.swift in Sources */,
 				B64C85422694590B0048FEBE /* PermissionButton.swift in Sources */,
 				AAA0CC472533833C0079BC96 /* MoreOptionsMenu.swift in Sources */,
 				B64C84E32692DC9F0048FEBE /* PermissionAuthorizationViewController.swift in Sources */,
@@ -12883,12 +11386,12 @@
 				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 */,
 				B602E81D2A1E25B1006D261F /* NEOnDemandRuleExtension.swift in Sources */,
+				C1372EF42BBC5BAD003F8793 /* SecureTextField.swift in Sources */,
 				4B9292D12667123700AD2C21 /* BookmarkTableRowView.swift in Sources */,
 				85589E9427BFE1E70038AD11 /* FavoritesView.swift in Sources */,
 				85AC7ADB27BD628400FFB69B /* HomePage.swift in Sources */,
@@ -12902,6 +11405,8 @@
 				85F0FF1327CFAB04001C7C6E /* RecentlyVisitedView.swift in Sources */,
 				AA7EB6DF27E7C57D00036718 /* MouseOverAnimationButton.swift in Sources */,
 				AA7412B724D1687000D22FE0 /* TabBarScrollView.swift in Sources */,
+				1E559BB12BBCA9F1002B4AF6 /* RedirectNavigationResponder.swift in Sources */,
+				9F33445E2BBFA77F0040CBEB /* BookmarksBarVisibilityManager.swift in Sources */,
 				4B9292D92667124B00AD2C21 /* BookmarkListTreeControllerDataSource.swift in Sources */,
 				14D9B8FB24F7E089000D4D13 /* AddressBarViewController.swift in Sources */,
 				B65536A62685B82B00085A79 /* Permissions.swift in Sources */,
@@ -12921,10 +11426,10 @@
 				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 */,
+				BDA7647C2BC497BE00D0400C /* DefaultVPNLocationFormatter.swift in Sources */,
 				3158B1592B0BF76400AF130C /* DataBrokerProtectionFeatureDisabler.swift in Sources */,
 				B655124829A79465009BFE1C /* NavigationActionExtension.swift in Sources */,
 				9FA173EB2B7B232200EE4E6E /* AddEditBookmarkDialogView.swift in Sources */,
@@ -12940,6 +11445,7 @@
 				B6A9E46B2614618A0067D1B9 /* OperatingSystemVersionExtension.swift in Sources */,
 				4BDFA4AE27BF19E500648192 /* ToggleableScrollView.swift in Sources */,
 				1D36F4242A3B85C50052B527 /* TabCleanupPreparer.swift in Sources */,
+				B6ABD0CE2BC042CE0000EB69 /* NSURL+sandboxExtensionRetainCount.m in Sources */,
 				4B4D60DF2A0C875F00BCD287 /* NetworkProtectionOptionKeyExtension.swift in Sources */,
 				85AC3AEF25D5CE9800C7D2AA /* UserScripts.swift in Sources */,
 				B643BF1427ABF772000BACEC /* NSWorkspaceExtension.swift in Sources */,
@@ -12954,11 +11460,12 @@
 				F41D174125CB131900472416 /* NSColorExtension.swift in Sources */,
 				AAC5E4F625D6BF2C007F5990 /* AddressBarButtonsViewController.swift in Sources */,
 				B6F9BDE42B45CD1900677B33 /* ModalView.swift in Sources */,
+				F18826842BBEE31700D9AC4F /* PixelKit+Assertion.swift in Sources */,
 				1D2DC0072901679C008083A1 /* BWError.swift in Sources */,
-				B68C92C42750EF76002AC6B0 /* PixelDataRecord.swift in Sources */,
 				853014D625E671A000FB8205 /* PageObserverUserScript.swift in Sources */,
 				B677FC4F2B06376B0099EB04 /* ReportFeedbackView.swift in Sources */,
-				B642738227B65BAC0005DFD1 /* SecureVaultErrorReporter.swift in Sources */,
+				B642738227B65BAC0005DFD1 /* SecureVaultReporter.swift in Sources */,
+				9F9C4A012BC7F36D0099738D /* BookmarkAllTabsDialogCoordinatorViewModel.swift in Sources */,
 				4B139AFD26B60BD800894F82 /* NSImageExtensions.swift in Sources */,
 				B62B48392ADE46FC000DECE5 /* Application.swift in Sources */,
 				4B9DB02C2A983B24000927DB /* WaitlistKeychainStorage.swift in Sources */,
@@ -12980,6 +11487,7 @@
 				1DDD3EC02B84F5D5004CBF2B /* PreferencesCookiePopupProtectionView.swift in Sources */,
 				B693955026F04BEB0015B914 /* ShadowView.swift in Sources */,
 				AA3D531D27A2F58F00074EC1 /* FeedbackSender.swift in Sources */,
+				B6E3E5502BBFCDEE00A41922 /* OpenDownloadsCellView.swift in Sources */,
 				B6BDDA012942389000F68088 /* TabExtensions.swift in Sources */,
 				AA7412B224D0B3AC00D22FE0 /* TabBarViewItem.swift in Sources */,
 				856C98D52570116900A22F1F /* NSWindow+Toast.swift in Sources */,
@@ -12994,8 +11502,9 @@
 				37FD78112A29EBD100B36DB1 /* SyncErrorHandler.swift in Sources */,
 				AA8EDF2424923E980071C2E8 /* URLExtension.swift in Sources */,
 				B634DBDF293C8F7F00C3C99E /* Tab+UIDelegate.swift in Sources */,
-				4BE0DF06267819A1006337B7 /* NSStoryboardExtension.swift in Sources */,
+				B6F1B02E2BCE6B47005E863C /* TunnelControllerProvider.swift in Sources */,
 				37AFCE8127DA2CA600471A10 /* PreferencesViewController.swift in Sources */,
+				31A83FB52BE28D7D00F74E67 /* UserText+DBP.swift in Sources */,
 				4B02198A25E05FAC00ED7DEA /* FireproofDomains.swift in Sources */,
 				4B677442255DBEEA00025BD8 /* Database.swift in Sources */,
 				1DDC85032B83903E00670238 /* PreferencesWebTrackingProtectionView.swift in Sources */,
@@ -13036,13 +11545,14 @@
 				B67C6C472654C643006C872E /* FileManagerExtensionTests.swift in Sources */,
 				4BD57C042AC112DF00B580EE /* NetworkProtectionRemoteMessagingTests.swift in Sources */,
 				B69B50482726C5C200758A2B /* StatisticsLoaderTests.swift in Sources */,
+				56BA1E872BAC8239001CF69F /* SSLErrorPageUserScriptTests.swift in Sources */,
 				142879DA24CE1179005419BB /* SuggestionViewModelTests.swift in Sources */,
 				4B9292BC2667103100AD2C21 /* BookmarkSidebarTreeControllerTests.swift in Sources */,
 				4B9DB05A2A983B55000927DB /* MockWaitlistRequest.swift in Sources */,
 				37D2377C287EBDA300BCE03B /* TabIndexTests.swift in Sources */,
 				37534CA52811987D002621E7 /* AdjacentItemEnumeratorTests.swift in Sources */,
-				B6DA44232616CABC00DD1EC2 /* PixelArgumentsTests.swift in Sources */,
 				56B234BF2A84EFD200F2A1CC /* NavigationBarUrlExtensionsTests.swift in Sources */,
+				9FAD623A2BCFDB32007F3A65 /* WebsiteInfoHelpers.swift in Sources */,
 				C13909F42B85FD79001626ED /* AutofillDeleteAllPasswordsExecutorTests.swift in Sources */,
 				37534C9E28104D9B002621E7 /* TabLazyLoaderTests.swift in Sources */,
 				B6619EF62B10DFF700CD9186 /* InstructionsFormatParserTests.swift in Sources */,
@@ -13052,6 +11562,7 @@
 				4B9292BD2667103100AD2C21 /* BookmarkOutlineViewDataSourceTests.swift in Sources */,
 				C17CA7B22B9B5317008EC3C1 /* MockAutofillPopoverPresenter.swift in Sources */,
 				4BF6961D28BE911100D402D4 /* RecentlyVisitedSiteModelTests.swift in Sources */,
+				9FA5A0A92BC900FC00153786 /* BookmarkAllTabsDialogViewModelTests.swift in Sources */,
 				B6619F062B17138D00CD9186 /* DataImportSourceViewModelTests.swift in Sources */,
 				4BBF0917282DD6EF00EE1418 /* TemporaryFileHandlerTests.swift in Sources */,
 				B6A5A27925B93FFF00AA7ADA /* StateRestorationManagerTests.swift in Sources */,
@@ -13064,7 +11575,6 @@
 				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 */,
@@ -13081,6 +11591,7 @@
 				AAC9C01C24CB594C00AD1325 /* TabViewModelTests.swift in Sources */,
 				567DA93F29E8045D008AC5EE /* MockEmailStorage.swift in Sources */,
 				37CD54B727F1B28A00F1F7B9 /* DefaultBrowserPreferencesTests.swift in Sources */,
+				9F3344622BBFBDA40040CBEB /* BookmarksBarVisibilityManagerTests.swift in Sources */,
 				028904202A7B25380028369C /* AppConfigurationURLProviderTests.swift in Sources */,
 				B65349AA265CF45000DCC645 /* DispatchQueueExtensionsTests.swift in Sources */,
 				858A798A26A9B35E00A75A42 /* PasswordManagementItemModelTests.swift in Sources */,
@@ -13100,6 +11611,7 @@
 				858A798826A99DBE00A75A42 /* PasswordManagementItemListModelTests.swift in Sources */,
 				566B196529CDB828007E38F4 /* CapturingOptionsButtonMenuDelegate.swift in Sources */,
 				4B8AD0B127A86D9200AE44D6 /* WKWebsiteDataStoreExtensionTests.swift in Sources */,
+				9FA5A0B02BC9039200153786 /* BookmarkFolderStoreMock.swift in Sources */,
 				B69B50472726C5C200758A2B /* VariantManagerTests.swift in Sources */,
 				8546DE6225C03056000CA5E1 /* UserAgentTests.swift in Sources */,
 				9F26060B2B85C20A00819292 /* AddEditBookmarkDialogViewModelTests.swift in Sources */,
@@ -13116,16 +11628,18 @@
 				85AC3B4925DAC9BD00C7D2AA /* ConfigurationStorageTests.swift in Sources */,
 				9F180D122B69C665000D695F /* DownloadsTabExtensionMock.swift in Sources */,
 				AA91F83927076F1900771A0D /* PrivacyIconViewModelTests.swift in Sources */,
+				9F9C49F62BC786790099738D /* MoreOptionsMenu+BookmarksTests.swift in Sources */,
 				4B723E0726B0003E00E14D75 /* CSVImporterTests.swift in Sources */,
 				4BCF15EC2ABB9AF80083F6DF /* NetworkProtectionRemoteMessageTests.swift in Sources */,
 				B62EB47C25BAD3BB005745C6 /* WKWebViewPrivateMethodsAvailabilityTests.swift in Sources */,
+				9F0FFFBB2BCCAEC2007C87DD /* AddEditBookmarkFolderDialogViewModelMock.swift in Sources */,
 				4BBC16A527C488C900E00A38 /* DeviceAuthenticatorTests.swift in Sources */,
 				4B3F641E27A8D3BD00E0C118 /* BrowserProfileTests.swift in Sources */,
 				B6106BA026A7BE0B0013B453 /* PermissionManagerTests.swift in Sources */,
 				4B59CC8C290083240058F2F6 /* ConnectBitwardenViewModelTests.swift in Sources */,
 				B68412202B6A30680092F66A /* StringExtensionTests.swift in Sources */,
-				B662D3D92755D7AD0035D4D6 /* PixelStoreTests.swift in Sources */,
 				B6106BB526A809E60013B453 /* GeolocationProviderTests.swift in Sources */,
+				BDA764912BC4E57200D0400C /* MockVPNLocationFormatter.swift in Sources */,
 				B6E6BA232BA2EDDE008AA7E1 /* FileReadResult.swift in Sources */,
 				B6A5A2A025B96E8300AA7ADA /* AppStateChangePublisherTests.swift in Sources */,
 				B63ED0E326B3E7FA00A9DAD1 /* CLLocationManagerMock.swift in Sources */,
@@ -13138,7 +11652,6 @@
 				AA0F3DB7261A566C0077F2D9 /* SuggestionLoadingMock.swift in Sources */,
 				B6E6BA162BA2CF5F008AA7E1 /* SandboxTestToolNotifications.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 */,
@@ -13151,6 +11664,7 @@
 				142879DC24CE1185005419BB /* SuggestionContainerViewModelTests.swift in Sources */,
 				566B195D29CDB692007E38F4 /* MoreOptionsMenuTests.swift in Sources */,
 				AA0877B826D5160D00B05660 /* SafariVersionReaderTests.swift in Sources */,
+				31DC2F222BD6DE6C001354EF /* DataBrokerPrerequisitesStatusVerifierTests.swift in Sources */,
 				B69B50452726C5C200758A2B /* AtbParserTests.swift in Sources */,
 				1D8C2FED2B70F5D0005E4BBD /* MockViewSnapshotRenderer.swift in Sources */,
 				B6106BAF26A7C6180013B453 /* PermissionStoreMock.swift in Sources */,
@@ -13164,11 +11678,14 @@
 				AAE39D1B24F44885008EF28B /* TabCollectionViewModelDelegateMock.swift in Sources */,
 				9F0A2CF82B96A58600C5B8C0 /* BaseBookmarkEntityTests.swift in Sources */,
 				373A1AAA283ED86C00586521 /* BookmarksHTMLReaderTests.swift in Sources */,
+				560C3FFC2BC9911000F589CE /* PermanentSurveyManagerTests.swift in Sources */,
 				317295D42AF058D3002C3206 /* MockWaitlistFeatureSetupHandler.swift in Sources */,
+				9FBD84772BB3E54200220859 /* InstallationAttributionPixelHandlerTests.swift in Sources */,
 				AA9C363025518CA9004B1BA3 /* FireTests.swift in Sources */,
 				B6106BB126A7D8720013B453 /* PermissionStoreTests.swift in Sources */,
 				4BF4951826C08395000547B8 /* ThirdPartyBrowserTests.swift in Sources */,
 				4B98D27C28D960DD003C2B6F /* FirefoxFaviconsReaderTests.swift in Sources */,
+				9F0FFFBE2BCCAF1F007C87DD /* BookmarkAllTabsDialogViewModelMock.swift in Sources */,
 				B60C6F7E29B1B41D007BFAA8 /* TestRunHelperInitializer.m in Sources */,
 				37479F152891BC8300302FE2 /* TabCollectionViewModelTests+WithoutPinnedTabsManager.swift in Sources */,
 				AA63745424C9BF9A00AB2AC4 /* SuggestionContainerTests.swift in Sources */,
@@ -13181,6 +11698,7 @@
 				B6AA64732994B43300D99CD6 /* FutureExtensionTests.swift in Sources */,
 				B603975329C1FFAE00902A34 /* ExpectedNavigationExtension.swift in Sources */,
 				EA1E52B52798CF98002EC53C /* ClickToLoadModelTests.swift in Sources */,
+				56BA1E802BAB2E43001CF69F /* ErrorPageTabExtensionTest.swift in Sources */,
 				B603975029C1FF5F00902A34 /* TestsURLExtension.swift in Sources */,
 				B6A5A27E25B9403E00AA7ADA /* FileStoreMock.swift in Sources */,
 				56534DED29DF252C00121467 /* CapturingDefaultBrowserProvider.swift in Sources */,
@@ -13197,13 +11715,13 @@
 				C1E961EB2B879E79001760E1 /* MockAutofillActionPresenter.swift in Sources */,
 				4BA1A6FE258C5C1300F6F690 /* EncryptedValueTransformerTests.swift in Sources */,
 				85F69B3C25EDE81F00978E59 /* URLExtensionTests.swift in Sources */,
-				B6DA44112616C0FC00DD1EC2 /* PixelTests.swift in Sources */,
 				4B9292BA2667103100AD2C21 /* BookmarkNodePathTests.swift in Sources */,
 				562532A02BC069180034D316 /* ZoomPopoverViewModelTests.swift in Sources */,
 				4B9292C02667103100AD2C21 /* BookmarkManagedObjectTests.swift in Sources */,
 				373A1AB228451ED400586521 /* BookmarksHTMLImporterTests.swift in Sources */,
 				4B723E0626B0003E00E14D75 /* CSVParserTests.swift in Sources */,
 				B60C6F8429B1BAD3007BFAA8 /* FileManagerTempDirReplacement.swift in Sources */,
+				BDA7648D2BC4E4EF00D0400C /* DefaultVPNLocationFormatterTests.swift in Sources */,
 				85F487B5276A8F2E003CE668 /* OnboardingTests.swift in Sources */,
 				B626A7642992506A00053070 /* SerpHeadersNavigationResponderTests.swift in Sources */,
 				AA652CCE25DD9071009059CC /* BookmarkListTests.swift in Sources */,
@@ -13220,7 +11738,9 @@
 				AABAF59C260A7D130085060C /* FaviconManagerMock.swift in Sources */,
 				1DFAB5222A8983DE00A0F7F6 /* SetExtensionTests.swift in Sources */,
 				4BF6962028BEEE8B00D402D4 /* LocalPinningManagerTests.swift in Sources */,
+				9F0FFFB82BCCAE9C007C87DD /* AddEditBookmarkDialogViewModelMock.swift in Sources */,
 				AAEC74B82642E43800C2EFBC /* HistoryStoreTests.swift in Sources */,
+				9FAD623D2BD09DE5007F3A65 /* WebsiteInfoTests.swift in Sources */,
 				9F180D0F2B69C553000D695F /* Tab+WKUIDelegateTests.swift in Sources */,
 				4BA1A6E6258C270800F6F690 /* EncryptionKeyGeneratorTests.swift in Sources */,
 				B6106BB326A7F4AA0013B453 /* GeolocationServiceMock.swift in Sources */,
@@ -13229,6 +11749,7 @@
 				4BBF09232830812900EE1418 /* FileSystemDSL.swift in Sources */,
 				4B9DB05C2A983B55000927DB /* WaitlistViewModelTests.swift in Sources */,
 				1D1C36E329FAE8DA001FA40C /* FaviconManagerTests.swift in Sources */,
+				9F0FFFB42BCCAE37007C87DD /* BookmarkAllTabsDialogCoordinatorViewModelTests.swift in Sources */,
 				4B723E0526B0003E00E14D75 /* DataImportMocks.swift in Sources */,
 				4B70C00227B0793D000386ED /* CrashReportTests.swift in Sources */,
 				B6656E0D2B29C733008798A1 /* FileImportViewLocalizationTests.swift in Sources */,
@@ -13241,14 +11762,16 @@
 				B610F2EB27AA8E4500FCEBE9 /* ContentBlockingUpdatingTests.swift in Sources */,
 				4BA1A6F6258C4F9600F6F690 /* EncryptionMocks.swift in Sources */,
 				3767190028E58513003A2A15 /* DuckPlayerURLExtensionTests.swift in Sources */,
+				9FBD847A2BB3EC3300220859 /* MockAttributionOriginProvider.swift in Sources */,
 				4B2975992828285900187C4E /* FirefoxKeyReaderTests.swift in Sources */,
 				B698E5042908011E00A746A8 /* AppKitPrivateMethodsAvailabilityTests.swift in Sources */,
 				56D145EE29E6DAD900E3488A /* DataImportProviderTests.swift in Sources */,
 				4BB99D0F26FE1A84001E4761 /* ChromiumBookmarksReaderTests.swift in Sources */,
-				4BC2621D293996410087A482 /* PixelEventTests.swift in Sources */,
 				1D9FDEB72B9B5D150040B78C /* SearchPreferencesTests.swift in Sources */,
+				021EA0842BD6E01A00772C9A /* TabsPreferencesTests.swift in Sources */,
 				1D12F2E2298BC660009A65FD /* InternalUserDeciderStoreMock.swift in Sources */,
 				4BB99D1026FE1A84001E4761 /* FirefoxBookmarksReaderTests.swift in Sources */,
+				9FBD84702BB3DD8400220859 /* MockAttributionsPixelHandler.swift in Sources */,
 				4B117F7D276C0CB5002F3D8C /* LocalStatisticsStoreTests.swift in Sources */,
 				AAEC74B42642C69300C2EFBC /* HistoryCoordinatorTests.swift in Sources */,
 				378205F62837CBA800D1D4AA /* SavedStateMock.swift in Sources */,
@@ -13259,8 +11782,10 @@
 				AA9C362825518C44004B1BA3 /* WebsiteDataStoreMock.swift in Sources */,
 				857E44652A9F70F300ED77A7 /* CampaignVariantTests.swift in Sources */,
 				3776582D27F71652009A6B35 /* WebsiteBreakageReportTests.swift in Sources */,
+				9FBD84562BB3ACFD00220859 /* AttributionOriginFileProviderTests.swift in Sources */,
 				31E163BA293A56F400963C10 /* BrokenSiteReportingReferenceTests.swift in Sources */,
 				1D9FDEC32B9B63C90040B78C /* DataClearingPreferencesTests.swift in Sources */,
+				9F8D57322BCCCB9A00AEA660 /* UserDefaultsBookmarkFoldersStoreTests.swift in Sources */,
 				4B723E0826B0003E00E14D75 /* MockSecureVault.swift in Sources */,
 				37CD54B527F1AC1300F1F7B9 /* PreferencesSidebarModelTests.swift in Sources */,
 				B6CA4824298CDC2E0067ECCE /* AdClickAttributionTabExtensionTests.swift in Sources */,
@@ -13298,7 +11823,10 @@
 				B6E6BA062BA1FE10008AA7E1 /* NSApplicationExtension.swift in Sources */,
 				B6E6B9F62BA1FD90008AA7E1 /* SandboxTestTool.swift in Sources */,
 				B6E6BA252BA2EDDE008AA7E1 /* FileReadResult.swift in Sources */,
+				B6EECB322BC40A1400B3CB77 /* FileManagerExtension.swift in Sources */,
+				B6EECB302BC3FA5A00B3CB77 /* SecurityScopedFileURLController.swift in Sources */,
 				B6E6BA052BA1FE09008AA7E1 /* URLExtension.swift in Sources */,
+				B6EECB312BC3FAB100B3CB77 /* NSURL+sandboxExtensionRetainCount.m in Sources */,
 				B6E6BA202BA2E462008AA7E1 /* CollectionExtension.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -13314,11 +11842,6 @@
 /* End PBXSourcesBuildPhase section */
 
 /* Begin PBXTargetDependency section */
-		31C6E9AB2B0C07A30086DC30 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = 9D9AE8B22AAA39A70026E7DC /* DuckDuckGoDBPBackgroundAgent */;
-			targetProxy = 31C6E9AA2B0C07A30086DC30 /* PBXContainerItemProxy */;
-		};
 		31C6E9AD2B0C07BA0086DC30 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			target = 9D9AE8B22AAA39A70026E7DC /* DuckDuckGoDBPBackgroundAgent */;
@@ -13355,10 +11878,6 @@
 			isa = PBXTargetDependency;
 			productRef = 4B5F14FD2A1529230060320F /* InputFilesChecker */;
 		};
-		4B9579262AC7AE700062CA31 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			productRef = 4B5F14FB2A15291D0060320F /* InputFilesChecker */;
-		};
 		4BA7C4DF2B3F6F4900AFE511 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			target = 4B4D603C2A0B290200BCD287 /* NetworkProtectionAppExtension */;
@@ -13389,50 +11908,6 @@
 			target = 4B2537592A11BE7300610219 /* NetworkProtectionSystemExtension */;
 			targetProxy = 7BEC18302AD5DA3300D30536 /* PBXContainerItemProxy */;
 		};
-		B6080B9D2B20AF7700B418EF /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			productRef = B6F997BA2B8F353F00476735 /* SwiftLintPlugin */;
-		};
-		B6080B9F2B20AF7B00B418EF /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			productRef = B6F997BA2B8F353F00476735 /* SwiftLintPlugin */;
-		};
-		B6080BA12B20AF7F00B418EF /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			productRef = B6F997BA2B8F353F00476735 /* SwiftLintPlugin */;
-		};
-		B6080BA32B20AF8300B418EF /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			productRef = B6F997BA2B8F353F00476735 /* SwiftLintPlugin */;
-		};
-		B6080BA52B20AF8800B418EF /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			productRef = B6F997BA2B8F353F00476735 /* SwiftLintPlugin */;
-		};
-		B6080BA92B20AF8F00B418EF /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			productRef = B6F997BA2B8F353F00476735 /* SwiftLintPlugin */;
-		};
-		B6080BAB2B20AF9200B418EF /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			productRef = B6F997BA2B8F353F00476735 /* SwiftLintPlugin */;
-		};
-		B69D06142A4C0AC50032D14D /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			productRef = B6F997BA2B8F353F00476735 /* SwiftLintPlugin */;
-		};
-		B69D06162A4C0ACD0032D14D /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			productRef = B6F997BA2B8F353F00476735 /* SwiftLintPlugin */;
-		};
-		B69D061A2A4C0AD80032D14D /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			productRef = B6F997BA2B8F353F00476735 /* SwiftLintPlugin */;
-		};
-		B69D061C2A4C0BC10032D14D /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			productRef = B6F997BA2B8F353F00476735 /* SwiftLintPlugin */;
-		};
 		B6AEB5552BA3042300781A09 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			target = B6E6B9F22BA1FD90008AA7E1 /* sandbox-test-tool */;
@@ -13463,22 +11938,6 @@
 			target = B6EC37E729B5DA2A001ACE79 /* tests-server */;
 			targetProxy = B6EC37F329B5DA94001ACE79 /* PBXContainerItemProxy */;
 		};
-		B6F997BB2B8F353F00476735 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			productRef = B6F997BA2B8F353F00476735 /* SwiftLintPlugin */;
-		};
-		B6F997BD2B8F35EF00476735 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			productRef = B6F997BC2B8F35EF00476735 /* SwiftLintPlugin */;
-		};
-		B6F997BF2B8F35F400476735 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			productRef = B6F997BE2B8F35F400476735 /* SwiftLintPlugin */;
-		};
-		B6F997C12B8F35F800476735 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			productRef = B6F997C02B8F35F800476735 /* SwiftLintPlugin */;
-		};
 		EE02D41E2BB460B500DBE6B3 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			target = B6EC37E729B5DA2A001ACE79 /* tests-server */;
@@ -13792,34 +12251,6 @@
 			};
 			name = Review;
 		};
-		4B957C3D2AC7AE700062CA31 /* Debug */ = {
-			isa = XCBuildConfiguration;
-			baseConfigurationReference = 4B957C432AC7AF190062CA31 /* DuckDuckGoPrivacyPro.xcconfig */;
-			buildSettings = {
-			};
-			name = Debug;
-		};
-		4B957C3E2AC7AE700062CA31 /* CI */ = {
-			isa = XCBuildConfiguration;
-			baseConfigurationReference = 4B957C432AC7AF190062CA31 /* DuckDuckGoPrivacyPro.xcconfig */;
-			buildSettings = {
-			};
-			name = CI;
-		};
-		4B957C3F2AC7AE700062CA31 /* Release */ = {
-			isa = XCBuildConfiguration;
-			baseConfigurationReference = 4B957C432AC7AF190062CA31 /* DuckDuckGoPrivacyPro.xcconfig */;
-			buildSettings = {
-			};
-			name = Release;
-		};
-		4B957C402AC7AE700062CA31 /* Review */ = {
-			isa = XCBuildConfiguration;
-			baseConfigurationReference = 4B957C432AC7AF190062CA31 /* DuckDuckGoPrivacyPro.xcconfig */;
-			buildSettings = {
-			};
-			name = Review;
-		};
 		565E46E62B2725DD0013AC2A /* Debug */ = {
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 376113C52B29BCD600E794BB /* SyncE2EUITests.xcconfig */;
@@ -14199,17 +12630,6 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
-		4B957C3C2AC7AE700062CA31 /* Build configuration list for PBXNativeTarget "DuckDuckGo Privacy Pro" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				4B957C3D2AC7AE700062CA31 /* Debug */,
-				4B957C3E2AC7AE700062CA31 /* CI */,
-				4B957C3F2AC7AE700062CA31 /* Release */,
-				4B957C402AC7AE700062CA31 /* Review */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
 		565E46E52B2725DD0013AC2A /* Build configuration list for PBXNativeTarget "SyncE2EUITests" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
@@ -14347,28 +12767,20 @@
 				version = 3.1.4000;
 			};
 		};
-		4B95792A2AC7AE700062CA31 /* XCRemoteSwiftPackageReference "Sparkle" */ = {
+		3FFD51CF7C19ACBDB9687474 /* XCRemoteSwiftPackageReference "BrowserServicesKit" */ = {
 			isa = XCRemoteSwiftPackageReference;
-			repositoryURL = "https://github.com/sparkle-project/Sparkle.git";
+			repositoryURL = "https://github.com/duckduckgo/BrowserServicesKit";
 			requirement = {
 				kind = exactVersion;
-				version = 2.4.2;
+				version = 140.0.3;
 			};
 		};
-		4B95792C2AC7AE700062CA31 /* XCRemoteSwiftPackageReference "BrowserServicesKit" */ = {
+		4311906792B7676CE9535D76 /* XCRemoteSwiftPackageReference "BrowserServicesKit" */ = {
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/duckduckgo/BrowserServicesKit";
 			requirement = {
 				kind = revision;
-				revision = ffdf1872798f23de073586d4b609b349093a0755;
-			};
-		};
-		4B9579392AC7AE700062CA31 /* XCRemoteSwiftPackageReference "OpenSSL-XCFramework" */ = {
-			isa = XCRemoteSwiftPackageReference;
-			repositoryURL = "https://github.com/duckduckgo/OpenSSL-XCFramework";
-			requirement = {
-				kind = exactVersion;
-				version = 3.1.2000;
+				revision = c06709ba8a586f6a40190bacaaaaa96b2d55e540;
 			};
 		};
 		9807F643278CA16F00E1547B /* XCRemoteSwiftPackageReference "BrowserServicesKit" */ = {
@@ -14376,7 +12788,7 @@
 			repositoryURL = "https://github.com/duckduckgo/BrowserServicesKit";
 			requirement = {
 				kind = exactVersion;
-				version = 132.0.1;
+				version = 144.0.0;
 			};
 		};
 		9FF521422BAA8FF300B9819B /* XCRemoteSwiftPackageReference "lottie-spm" */ = {
@@ -14392,7 +12804,7 @@
 			repositoryURL = "https://github.com/sparkle-project/Sparkle.git";
 			requirement = {
 				kind = exactVersion;
-				version = 2.5.2;
+				version = 2.6.0;
 			};
 		};
 		B65CD8C92B316DF100A595BB /* XCRemoteSwiftPackageReference "swift-snapshot-testing" */ = {
@@ -14424,7 +12836,7 @@
 			repositoryURL = "https://github.com/duckduckgo/apple-toolbox.git";
 			requirement = {
 				kind = exactVersion;
-				version = 2.0.0;
+				version = 3.1.1;
 			};
 		};
 		F1D43AF12B98E47800BAB743 /* XCRemoteSwiftPackageReference "BareBonesBrowser" */ = {
@@ -14435,17 +12847,21 @@
 				version = 0.1.0;
 			};
 		};
+		FAE06B199CA1F209B55B34E9 /* XCRemoteSwiftPackageReference "BrowserServicesKit" */ = {
+			isa = XCRemoteSwiftPackageReference;
+			repositoryURL = "https://github.com/duckduckgo/BrowserServicesKit";
+			requirement = {
+				kind = exactVersion;
+				version = 137.0.0;
+			};
+		};
 /* End XCRemoteSwiftPackageReference section */
 
 /* Begin XCSwiftPackageProductDependency section */
-		1E0068AC2B1673BB00BBF43B /* SubscriptionUI */ = {
-			isa = XCSwiftPackageProductDependency;
-			productName = SubscriptionUI;
-		};
-		1E21F8E22B73E48600FB272E /* Subscription */ = {
+		08D4923DC968236E22E373E2 /* Crashes */ = {
 			isa = XCSwiftPackageProductDependency;
-			package = 9807F643278CA16F00E1547B /* XCRemoteSwiftPackageReference "BrowserServicesKit" */;
-			productName = Subscription;
+			package = FAE06B199CA1F209B55B34E9 /* XCRemoteSwiftPackageReference "BrowserServicesKit" */;
+			productName = Crashes;
 		};
 		1E950E3E2912A10D0051A99B /* ContentBlocking */ = {
 			isa = XCSwiftPackageProductDependency;
@@ -14475,10 +12891,6 @@
 			isa = XCSwiftPackageProductDependency;
 			productName = DataBrokerProtection;
 		};
-		3143C8782B0D1F3D00382627 /* DataBrokerProtection */ = {
-			isa = XCSwiftPackageProductDependency;
-			productName = DataBrokerProtection;
-		};
 		315A023E2B6421AE00BFA577 /* Networking */ = {
 			isa = XCSwiftPackageProductDependency;
 			package = 9807F643278CA16F00E1547B /* XCRemoteSwiftPackageReference "BrowserServicesKit" */;
@@ -14490,7 +12902,6 @@
 		};
 		3706FA6B293F65D500E42796 /* TrackerRadarKit */ = {
 			isa = XCSwiftPackageProductDependency;
-			package = 3706FA6C293F65D500E42796 /* XCRemoteSwiftPackageReference "TrackerRadarKit" */;
 			productName = TrackerRadarKit;
 		};
 		3706FA71293F65D500E42796 /* BrowserServicesKit */ = {
@@ -14538,11 +12949,6 @@
 			package = 9807F643278CA16F00E1547B /* XCRemoteSwiftPackageReference "BrowserServicesKit" */;
 			productName = TestUtils;
 		};
-		372217832B33380E00B8E9C2 /* TestUtils */ = {
-			isa = XCSwiftPackageProductDependency;
-			package = 9807F643278CA16F00E1547B /* XCRemoteSwiftPackageReference "BrowserServicesKit" */;
-			productName = TestUtils;
-		};
 		37269EFA2B332F9E005E8E46 /* Common */ = {
 			isa = XCSwiftPackageProductDependency;
 			package = 9807F643278CA16F00E1547B /* XCRemoteSwiftPackageReference "BrowserServicesKit" */;
@@ -14563,11 +12969,6 @@
 			package = 9807F643278CA16F00E1547B /* XCRemoteSwiftPackageReference "BrowserServicesKit" */;
 			productName = Common;
 		};
-		37269F022B332FD8005E8E46 /* Common */ = {
-			isa = XCSwiftPackageProductDependency;
-			package = 9807F643278CA16F00E1547B /* XCRemoteSwiftPackageReference "BrowserServicesKit" */;
-			productName = Common;
-		};
 		37269F042B3332C2005E8E46 /* Common */ = {
 			isa = XCSwiftPackageProductDependency;
 			package = 9807F643278CA16F00E1547B /* XCRemoteSwiftPackageReference "BrowserServicesKit" */;
@@ -14583,18 +12984,10 @@
 			package = 9807F643278CA16F00E1547B /* XCRemoteSwiftPackageReference "BrowserServicesKit" */;
 			productName = DDGSync;
 		};
-		373FB4B02B4D6C42004C88D6 /* PreferencesViews */ = {
-			isa = XCSwiftPackageProductDependency;
-			productName = PreferencesViews;
-		};
 		373FB4B22B4D6C4B004C88D6 /* PreferencesViews */ = {
 			isa = XCSwiftPackageProductDependency;
 			productName = PreferencesViews;
 		};
-		373FB4B42B4D6C57004C88D6 /* PreferencesViews */ = {
-			isa = XCSwiftPackageProductDependency;
-			productName = PreferencesViews;
-		};
 		378F44E329B4BDE900899924 /* SwiftUIExtensions */ = {
 			isa = XCSwiftPackageProductDependency;
 			productName = SwiftUIExtensions;
@@ -14631,10 +13024,16 @@
 			package = 9807F643278CA16F00E1547B /* XCRemoteSwiftPackageReference "BrowserServicesKit" */;
 			productName = Navigation;
 		};
-		4B2537762A11BFE100610219 /* PixelKit */ = {
+		4B1EFF1B2BD71EEF007CC84F /* PixelKit */ = {
 			isa = XCSwiftPackageProductDependency;
+			package = 9807F643278CA16F00E1547B /* XCRemoteSwiftPackageReference "BrowserServicesKit" */;
 			productName = PixelKit;
 		};
+		4B1EFF202BD72189007CC84F /* Networking */ = {
+			isa = XCSwiftPackageProductDependency;
+			package = 9807F643278CA16F00E1547B /* XCRemoteSwiftPackageReference "BrowserServicesKit" */;
+			productName = Networking;
+		};
 		4B2D062B2A11C0E100DE1F49 /* Networking */ = {
 			isa = XCSwiftPackageProductDependency;
 			package = 9807F643278CA16F00E1547B /* XCRemoteSwiftPackageReference "BrowserServicesKit" */;
@@ -14656,10 +13055,6 @@
 			isa = XCSwiftPackageProductDependency;
 			productName = NetworkProtection;
 		};
-		4B4D60972A0B2A5C00BCD287 /* PixelKit */ = {
-			isa = XCSwiftPackageProductDependency;
-			productName = PixelKit;
-		};
 		4B4D60AE2A0C837F00BCD287 /* Networking */ = {
 			isa = XCSwiftPackageProductDependency;
 			package = 9807F643278CA16F00E1547B /* XCRemoteSwiftPackageReference "BrowserServicesKit" */;
@@ -14677,95 +13072,6 @@
 			isa = XCSwiftPackageProductDependency;
 			productName = "plugin:InputFilesChecker";
 		};
-		4B81AD342B29512B00706C96 /* PixelKitTestingUtilities */ = {
-			isa = XCSwiftPackageProductDependency;
-			productName = PixelKitTestingUtilities;
-		};
-		4B81AD362B29513100706C96 /* PixelKitTestingUtilities */ = {
-			isa = XCSwiftPackageProductDependency;
-			productName = PixelKitTestingUtilities;
-		};
-		4B9579292AC7AE700062CA31 /* Sparkle */ = {
-			isa = XCSwiftPackageProductDependency;
-			package = 4B95792A2AC7AE700062CA31 /* XCRemoteSwiftPackageReference "Sparkle" */;
-			productName = Sparkle;
-		};
-		4B95792B2AC7AE700062CA31 /* BrowserServicesKit */ = {
-			isa = XCSwiftPackageProductDependency;
-			package = 4B95792C2AC7AE700062CA31 /* XCRemoteSwiftPackageReference "BrowserServicesKit" */;
-			productName = BrowserServicesKit;
-		};
-		4B95792E2AC7AE700062CA31 /* ContentBlocking */ = {
-			isa = XCSwiftPackageProductDependency;
-			package = 4B95792C2AC7AE700062CA31 /* XCRemoteSwiftPackageReference "BrowserServicesKit" */;
-			productName = ContentBlocking;
-		};
-		4B95792F2AC7AE700062CA31 /* PrivacyDashboard */ = {
-			isa = XCSwiftPackageProductDependency;
-			package = 4B95792C2AC7AE700062CA31 /* XCRemoteSwiftPackageReference "BrowserServicesKit" */;
-			productName = PrivacyDashboard;
-		};
-		4B9579302AC7AE700062CA31 /* UserScript */ = {
-			isa = XCSwiftPackageProductDependency;
-			package = 4B95792C2AC7AE700062CA31 /* XCRemoteSwiftPackageReference "BrowserServicesKit" */;
-			productName = UserScript;
-		};
-		4B9579312AC7AE700062CA31 /* Persistence */ = {
-			isa = XCSwiftPackageProductDependency;
-			package = 4B95792C2AC7AE700062CA31 /* XCRemoteSwiftPackageReference "BrowserServicesKit" */;
-			productName = Persistence;
-		};
-		4B9579322AC7AE700062CA31 /* Configuration */ = {
-			isa = XCSwiftPackageProductDependency;
-			package = 4B95792C2AC7AE700062CA31 /* XCRemoteSwiftPackageReference "BrowserServicesKit" */;
-			productName = Configuration;
-		};
-		4B9579332AC7AE700062CA31 /* Navigation */ = {
-			isa = XCSwiftPackageProductDependency;
-			package = 4B95792C2AC7AE700062CA31 /* XCRemoteSwiftPackageReference "BrowserServicesKit" */;
-			productName = Navigation;
-		};
-		4B9579342AC7AE700062CA31 /* Bookmarks */ = {
-			isa = XCSwiftPackageProductDependency;
-			package = 4B95792C2AC7AE700062CA31 /* XCRemoteSwiftPackageReference "BrowserServicesKit" */;
-			productName = Bookmarks;
-		};
-		4B9579352AC7AE700062CA31 /* DDGSync */ = {
-			isa = XCSwiftPackageProductDependency;
-			package = 4B95792C2AC7AE700062CA31 /* XCRemoteSwiftPackageReference "BrowserServicesKit" */;
-			productName = DDGSync;
-		};
-		4B9579362AC7AE700062CA31 /* SyncUI */ = {
-			isa = XCSwiftPackageProductDependency;
-			productName = SyncUI;
-		};
-		4B9579372AC7AE700062CA31 /* SwiftUIExtensions */ = {
-			isa = XCSwiftPackageProductDependency;
-			productName = SwiftUIExtensions;
-		};
-		4B9579382AC7AE700062CA31 /* OpenSSL */ = {
-			isa = XCSwiftPackageProductDependency;
-			package = 4B9579392AC7AE700062CA31 /* XCRemoteSwiftPackageReference "OpenSSL-XCFramework" */;
-			productName = OpenSSL;
-		};
-		4B95793C2AC7AE700062CA31 /* SyncDataProviders */ = {
-			isa = XCSwiftPackageProductDependency;
-			package = 4B95792C2AC7AE700062CA31 /* XCRemoteSwiftPackageReference "BrowserServicesKit" */;
-			productName = SyncDataProviders;
-		};
-		4B95793D2AC7AE700062CA31 /* NetworkProtectionUI */ = {
-			isa = XCSwiftPackageProductDependency;
-			productName = NetworkProtectionUI;
-		};
-		4B95793E2AC7AE700062CA31 /* NetworkProtection */ = {
-			isa = XCSwiftPackageProductDependency;
-			package = 4B95792C2AC7AE700062CA31 /* XCRemoteSwiftPackageReference "BrowserServicesKit" */;
-			productName = NetworkProtection;
-		};
-		4B95793F2AC7AE700062CA31 /* LoginItems */ = {
-			isa = XCSwiftPackageProductDependency;
-			productName = LoginItems;
-		};
 		4BA7C4DC2B3F64E500AFE511 /* LoginItems */ = {
 			isa = XCSwiftPackageProductDependency;
 			productName = LoginItems;
@@ -14797,6 +13103,11 @@
 			package = 9807F643278CA16F00E1547B /* XCRemoteSwiftPackageReference "BrowserServicesKit" */;
 			productName = NetworkProtection;
 		};
+		537FC71EA5115A983FAF3170 /* Crashes */ = {
+			isa = XCSwiftPackageProductDependency;
+			package = 4311906792B7676CE9535D76 /* XCRemoteSwiftPackageReference "BrowserServicesKit" */;
+			productName = Crashes;
+		};
 		7B00997C2B6508B700FE7C31 /* NetworkProtectionProxy */ = {
 			isa = XCSwiftPackageProductDependency;
 			productName = NetworkProtectionProxy;
@@ -14817,23 +13128,11 @@
 			isa = XCSwiftPackageProductDependency;
 			productName = NetworkProtectionIPC;
 		};
-		7B31FD8F2AD1257B0086AA24 /* NetworkProtectionIPC */ = {
-			isa = XCSwiftPackageProductDependency;
-			productName = NetworkProtectionIPC;
-		};
 		7B37C7A42BAA32A50062546A /* Subscription */ = {
 			isa = XCSwiftPackageProductDependency;
 			package = 9807F643278CA16F00E1547B /* XCRemoteSwiftPackageReference "BrowserServicesKit" */;
 			productName = Subscription;
 		};
-		7B5DD6992AE51FFA001DE99C /* PixelKit */ = {
-			isa = XCSwiftPackageProductDependency;
-			productName = PixelKit;
-		};
-		7B5F9A742AE2BE4E002AEBC0 /* PixelKit */ = {
-			isa = XCSwiftPackageProductDependency;
-			productName = PixelKit;
-		};
 		7B624F162BA25C1F00A6C544 /* NetworkProtectionUI */ = {
 			isa = XCSwiftPackageProductDependency;
 			productName = NetworkProtectionUI;
@@ -14843,14 +13142,6 @@
 			package = 9807F643278CA16F00E1547B /* XCRemoteSwiftPackageReference "BrowserServicesKit" */;
 			productName = Networking;
 		};
-		7B8C083B2AE1268E00F4C67F /* PixelKit */ = {
-			isa = XCSwiftPackageProductDependency;
-			productName = PixelKit;
-		};
-		7B94E1642B7ED95100E32B96 /* NetworkProtectionProxy */ = {
-			isa = XCSwiftPackageProductDependency;
-			productName = NetworkProtectionProxy;
-		};
 		7B97CD582B7E0B57004FEF43 /* NetworkProtectionProxy */ = {
 			isa = XCSwiftPackageProductDependency;
 			productName = NetworkProtectionProxy;
@@ -14860,10 +13151,6 @@
 			package = 9807F643278CA16F00E1547B /* XCRemoteSwiftPackageReference "BrowserServicesKit" */;
 			productName = Common;
 		};
-		7B97CD612B7E0C4B004FEF43 /* PixelKit */ = {
-			isa = XCSwiftPackageProductDependency;
-			productName = PixelKit;
-		};
 		7BA076BA2B65D61400D7FB72 /* NetworkProtectionProxy */ = {
 			isa = XCSwiftPackageProductDependency;
 			productName = NetworkProtectionProxy;
@@ -14882,10 +13169,6 @@
 			package = 9807F643278CA16F00E1547B /* XCRemoteSwiftPackageReference "BrowserServicesKit" */;
 			productName = Networking;
 		};
-		7BBD44272AD730A400D0A064 /* PixelKit */ = {
-			isa = XCSwiftPackageProductDependency;
-			productName = PixelKit;
-		};
 		7BBE2B7A2B61663C00697445 /* NetworkProtectionProxy */ = {
 			isa = XCSwiftPackageProductDependency;
 			productName = NetworkProtectionProxy;
@@ -14906,14 +13189,6 @@
 			isa = XCSwiftPackageProductDependency;
 			productName = NetworkProtectionUI;
 		};
-		7BFCB74D2ADE7E1A00DA3EA7 /* PixelKit */ = {
-			isa = XCSwiftPackageProductDependency;
-			productName = PixelKit;
-		};
-		7BFCB74F2ADE7E2300DA3EA7 /* PixelKit */ = {
-			isa = XCSwiftPackageProductDependency;
-			productName = PixelKit;
-		};
 		85D44B852BA08D29001B4AB5 /* Suggestions */ = {
 			isa = XCSwiftPackageProductDependency;
 			package = 9807F643278CA16F00E1547B /* XCRemoteSwiftPackageReference "BrowserServicesKit" */;
@@ -14924,11 +13199,6 @@
 			package = 9807F643278CA16F00E1547B /* XCRemoteSwiftPackageReference "BrowserServicesKit" */;
 			productName = Suggestions;
 		};
-		85D44B892BA08D3B001B4AB5 /* Suggestions */ = {
-			isa = XCSwiftPackageProductDependency;
-			package = 9807F643278CA16F00E1547B /* XCRemoteSwiftPackageReference "BrowserServicesKit" */;
-			productName = Suggestions;
-		};
 		85E2BBCD2B8F534000DBEC7A /* History */ = {
 			isa = XCSwiftPackageProductDependency;
 			package = 9807F643278CA16F00E1547B /* XCRemoteSwiftPackageReference "BrowserServicesKit" */;
@@ -14939,11 +13209,6 @@
 			package = 9807F643278CA16F00E1547B /* XCRemoteSwiftPackageReference "BrowserServicesKit" */;
 			productName = History;
 		};
-		85E2BBD12B8F536F00DBEC7A /* History */ = {
-			isa = XCSwiftPackageProductDependency;
-			package = 9807F643278CA16F00E1547B /* XCRemoteSwiftPackageReference "BrowserServicesKit" */;
-			productName = History;
-		};
 		9807F644278CA16F00E1547B /* BrowserServicesKit */ = {
 			isa = XCSwiftPackageProductDependency;
 			package = 9807F643278CA16F00E1547B /* XCRemoteSwiftPackageReference "BrowserServicesKit" */;
@@ -14964,14 +13229,6 @@
 			package = 9807F643278CA16F00E1547B /* XCRemoteSwiftPackageReference "BrowserServicesKit" */;
 			productName = Persistence;
 		};
-		9D6983F82AC773C3002C02FC /* PixelKit */ = {
-			isa = XCSwiftPackageProductDependency;
-			productName = PixelKit;
-		};
-		9D6983FA2AC773C8002C02FC /* PixelKit */ = {
-			isa = XCSwiftPackageProductDependency;
-			productName = PixelKit;
-		};
 		9D9AE8F82AAA3AD00026E7DC /* DataBrokerProtection */ = {
 			isa = XCSwiftPackageProductDependency;
 			productName = DataBrokerProtection;
@@ -14980,10 +13237,6 @@
 			isa = XCSwiftPackageProductDependency;
 			productName = DataBrokerProtection;
 		};
-		9DB6E7232AA0DC5800A17F3C /* LoginItems */ = {
-			isa = XCSwiftPackageProductDependency;
-			productName = LoginItems;
-		};
 		9DC70B192AA1FA5B005A844B /* LoginItems */ = {
 			isa = XCSwiftPackageProductDependency;
 			productName = LoginItems;
@@ -15003,11 +13256,6 @@
 			package = 9FF521422BAA8FF300B9819B /* XCRemoteSwiftPackageReference "lottie-spm" */;
 			productName = Lottie;
 		};
-		9FF521492BAA90C400B9819B /* Lottie */ = {
-			isa = XCSwiftPackageProductDependency;
-			package = 9FF521422BAA8FF300B9819B /* XCRemoteSwiftPackageReference "lottie-spm" */;
-			productName = Lottie;
-		};
 		AA06B6B62672AF8100F541C5 /* Sparkle */ = {
 			isa = XCSwiftPackageProductDependency;
 			package = AA06B6B52672AF8100F541C5 /* XCRemoteSwiftPackageReference "Sparkle" */;
@@ -15083,31 +13331,26 @@
 			package = 9807F643278CA16F00E1547B /* XCRemoteSwiftPackageReference "BrowserServicesKit" */;
 			productName = Configuration;
 		};
-		B6F997BA2B8F353F00476735 /* SwiftLintPlugin */ = {
-			isa = XCSwiftPackageProductDependency;
-			package = B6F997B92B8F352500476735 /* XCRemoteSwiftPackageReference "apple-toolbox" */;
-			productName = "plugin:SwiftLintPlugin";
-		};
-		B6F997BC2B8F35EF00476735 /* SwiftLintPlugin */ = {
-			isa = XCSwiftPackageProductDependency;
-			package = B6F997B92B8F352500476735 /* XCRemoteSwiftPackageReference "apple-toolbox" */;
-			productName = "plugin:SwiftLintPlugin";
-		};
-		B6F997BE2B8F35F400476735 /* SwiftLintPlugin */ = {
+		BDADBDC82BD2BC2200421B9B /* Lottie */ = {
 			isa = XCSwiftPackageProductDependency;
-			package = B6F997B92B8F352500476735 /* XCRemoteSwiftPackageReference "apple-toolbox" */;
-			productName = "plugin:SwiftLintPlugin";
+			package = 9FF521422BAA8FF300B9819B /* XCRemoteSwiftPackageReference "lottie-spm" */;
+			productName = Lottie;
 		};
-		B6F997C02B8F35F800476735 /* SwiftLintPlugin */ = {
+		BDADBDCA2BD2BC2800421B9B /* Lottie */ = {
 			isa = XCSwiftPackageProductDependency;
-			package = B6F997B92B8F352500476735 /* XCRemoteSwiftPackageReference "apple-toolbox" */;
-			productName = "plugin:SwiftLintPlugin";
+			package = 9FF521422BAA8FF300B9819B /* XCRemoteSwiftPackageReference "lottie-spm" */;
+			productName = Lottie;
 		};
 		CBC83E3529B63D380008E19C /* Configuration */ = {
 			isa = XCSwiftPackageProductDependency;
 			package = 9807F643278CA16F00E1547B /* XCRemoteSwiftPackageReference "BrowserServicesKit" */;
 			productName = Configuration;
 		};
+		DC3F73D49B2D44464AFEFCD8 /* Subscription */ = {
+			isa = XCSwiftPackageProductDependency;
+			package = 3FFD51CF7C19ACBDB9687474 /* XCRemoteSwiftPackageReference "BrowserServicesKit" */;
+			productName = Subscription;
+		};
 		EE02D41F2BB460C000DBE6B3 /* BrowserServicesKit */ = {
 			isa = XCSwiftPackageProductDependency;
 			package = 9807F643278CA16F00E1547B /* XCRemoteSwiftPackageReference "BrowserServicesKit" */;
@@ -15143,6 +13386,61 @@
 			package = 9807F643278CA16F00E1547B /* XCRemoteSwiftPackageReference "BrowserServicesKit" */;
 			productName = NetworkProtection;
 		};
+		F116A7C22BD1924B00F3FCF7 /* PixelKitTestingUtilities */ = {
+			isa = XCSwiftPackageProductDependency;
+			package = 9807F643278CA16F00E1547B /* XCRemoteSwiftPackageReference "BrowserServicesKit" */;
+			productName = PixelKitTestingUtilities;
+		};
+		F116A7C62BD1925500F3FCF7 /* PixelKitTestingUtilities */ = {
+			isa = XCSwiftPackageProductDependency;
+			package = 9807F643278CA16F00E1547B /* XCRemoteSwiftPackageReference "BrowserServicesKit" */;
+			productName = PixelKitTestingUtilities;
+		};
+		F116A7C82BD1929000F3FCF7 /* PixelKitTestingUtilities */ = {
+			isa = XCSwiftPackageProductDependency;
+			package = 9807F643278CA16F00E1547B /* XCRemoteSwiftPackageReference "BrowserServicesKit" */;
+			productName = PixelKitTestingUtilities;
+		};
+		F198C7112BD18A28000BF24D /* PixelKit */ = {
+			isa = XCSwiftPackageProductDependency;
+			package = 9807F643278CA16F00E1547B /* XCRemoteSwiftPackageReference "BrowserServicesKit" */;
+			productName = PixelKit;
+		};
+		F198C7132BD18A30000BF24D /* PixelKit */ = {
+			isa = XCSwiftPackageProductDependency;
+			package = 9807F643278CA16F00E1547B /* XCRemoteSwiftPackageReference "BrowserServicesKit" */;
+			productName = PixelKit;
+		};
+		F198C7152BD18A44000BF24D /* PixelKit */ = {
+			isa = XCSwiftPackageProductDependency;
+			package = 9807F643278CA16F00E1547B /* XCRemoteSwiftPackageReference "BrowserServicesKit" */;
+			productName = PixelKit;
+		};
+		F198C7172BD18A4C000BF24D /* PixelKit */ = {
+			isa = XCSwiftPackageProductDependency;
+			package = 9807F643278CA16F00E1547B /* XCRemoteSwiftPackageReference "BrowserServicesKit" */;
+			productName = PixelKit;
+		};
+		F198C7192BD18A5B000BF24D /* PixelKit */ = {
+			isa = XCSwiftPackageProductDependency;
+			package = 9807F643278CA16F00E1547B /* XCRemoteSwiftPackageReference "BrowserServicesKit" */;
+			productName = PixelKit;
+		};
+		F198C71B2BD18A61000BF24D /* PixelKit */ = {
+			isa = XCSwiftPackageProductDependency;
+			package = 9807F643278CA16F00E1547B /* XCRemoteSwiftPackageReference "BrowserServicesKit" */;
+			productName = PixelKit;
+		};
+		F198C71D2BD18D88000BF24D /* SwiftLintTool */ = {
+			isa = XCSwiftPackageProductDependency;
+			package = B6F997B92B8F352500476735 /* XCRemoteSwiftPackageReference "apple-toolbox" */;
+			productName = SwiftLintTool;
+		};
+		F198C71F2BD18D92000BF24D /* SwiftLintTool */ = {
+			isa = XCSwiftPackageProductDependency;
+			package = B6F997B92B8F352500476735 /* XCRemoteSwiftPackageReference "apple-toolbox" */;
+			productName = SwiftLintTool;
+		};
 		F1D43AF22B98E47800BAB743 /* BareBonesBrowserKit */ = {
 			isa = XCSwiftPackageProductDependency;
 			package = F1D43AF12B98E47800BAB743 /* XCRemoteSwiftPackageReference "BareBonesBrowser" */;
@@ -15153,10 +13451,9 @@
 			package = F1D43AF12B98E47800BAB743 /* XCRemoteSwiftPackageReference "BareBonesBrowser" */;
 			productName = BareBonesBrowserKit;
 		};
-		F1D43AF62B98E48F00BAB743 /* BareBonesBrowserKit */ = {
+		F1DF95E62BD188B60045E591 /* LoginItems */ = {
 			isa = XCSwiftPackageProductDependency;
-			package = F1D43AF12B98E47800BAB743 /* XCRemoteSwiftPackageReference "BareBonesBrowser" */;
-			productName = BareBonesBrowserKit;
+			productName = LoginItems;
 		};
 /* End XCSwiftPackageProductDependency section */
 
diff --git a/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
index cb0773b436..41fa2b0e67 100644
--- a/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
+++ b/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -5,8 +5,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/duckduckgo/apple-toolbox.git",
       "state" : {
-        "revision" : "d51beaf1736013b530576ace13a16d6d1a63742c",
-        "version" : "2.0.0"
+        "revision" : "ab53ca41e9044a20eab7e53249526fadcf9acc9f",
+        "version" : "3.1.1"
       }
     },
     {
@@ -32,8 +32,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/duckduckgo/BrowserServicesKit",
       "state" : {
-        "revision" : "73f68ee1c0dda3cd4a0b0cc3cc38a6cc7e605829",
-        "version" : "132.0.1"
+        "revision" : "9906b9464f6f12e94f3cc62456b5b5a9c1a43db8",
+        "version" : "144.0.0"
       }
     },
     {
@@ -41,8 +41,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/duckduckgo/content-scope-scripts",
       "state" : {
-        "revision" : "62d5dc3d02f6a8347dc5f0b52162a0107d38b74c",
-        "version" : "5.8.0"
+        "revision" : "1bb3bc5eb565735051f342a87b5405d4374876c7",
+        "version" : "5.12.0"
       }
     },
     {
@@ -50,8 +50,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/duckduckgo/duckduckgo-autofill.git",
       "state" : {
-        "revision" : "6493e296934bf09277c03df45f11f4619711cb24",
-        "version" : "10.2.0"
+        "revision" : "6053999d6af384a716ab0ce7205dbab5d70ed1b3",
+        "version" : "11.0.1"
       }
     },
     {
@@ -95,8 +95,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/duckduckgo/privacy-dashboard",
       "state" : {
-        "revision" : "620921fea14569eb00745cb5a44890d5890d99ec",
-        "version" : "3.4.0"
+        "revision" : "14b13d0c3db38f471ce4ba1ecb502ee1986c84d7",
+        "version" : "3.5.0"
       }
     },
     {
@@ -113,14 +113,14 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/sparkle-project/Sparkle.git",
       "state" : {
-        "revision" : "47d3d90aee3c52b6f61d04ceae426e607df62347",
-        "version" : "2.5.2"
+        "revision" : "0a4caaf7a81eea2cece651ef4b17331fa0634dff",
+        "version" : "2.6.0"
       }
     },
     {
       "identity" : "swift-argument-parser",
       "kind" : "remoteSourceControl",
-      "location" : "https://github.com/apple/swift-argument-parser",
+      "location" : "https://github.com/apple/swift-argument-parser.git",
       "state" : {
         "revision" : "46989693916f56d1186bd59ac15124caef896560",
         "version" : "1.3.1"
@@ -138,7 +138,7 @@
     {
       "identity" : "swift-syntax",
       "kind" : "remoteSourceControl",
-      "location" : "https://github.com/apple/swift-syntax.git",
+      "location" : "https://github.com/apple/swift-syntax",
       "state" : {
         "revision" : "64889f0c732f210a935a0ad7cda38f77f876262d",
         "version" : "509.1.1"
@@ -167,8 +167,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/duckduckgo/TrackerRadarKit",
       "state" : {
-        "revision" : "a6b7ba151d9dc6684484f3785293875ec01cc1ff",
-        "version" : "1.2.2"
+        "revision" : "6c84fd19139414fc0edbf9673ade06e532a564f0",
+        "version" : "2.0.0"
       }
     },
     {
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 14f7550826..e343e06df9 100644
--- a/DuckDuckGo.xcodeproj/xcshareddata/xcschemes/DuckDuckGo Privacy Browser App Store.xcscheme	
+++ b/DuckDuckGo.xcodeproj/xcshareddata/xcschemes/DuckDuckGo Privacy Browser App Store.xcscheme	
@@ -157,16 +157,6 @@
                ReferencedContainer = "container:LocalPackages/SyncUI">
             </BuildableReference>
          </TestableReference>
-         <TestableReference
-            skipped = "NO">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "PixelKitTests"
-               BuildableName = "PixelKitTests"
-               BlueprintName = "PixelKitTests"
-               ReferencedContainer = "container:LocalPackages/PixelKit">
-            </BuildableReference>
-         </TestableReference>
          <TestableReference
             skipped = "NO">
             <BuildableReference
diff --git a/DuckDuckGo.xcodeproj/xcshareddata/xcschemes/DuckDuckGo Privacy Browser.xcscheme b/DuckDuckGo.xcodeproj/xcshareddata/xcschemes/DuckDuckGo Privacy Browser.xcscheme
index d683d41f9e..7198d6f122 100644
--- a/DuckDuckGo.xcodeproj/xcshareddata/xcschemes/DuckDuckGo Privacy Browser.xcscheme	
+++ b/DuckDuckGo.xcodeproj/xcshareddata/xcschemes/DuckDuckGo Privacy Browser.xcscheme	
@@ -69,6 +69,7 @@
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES"
+      language = "en"
       codeCoverageEnabled = "YES">
       <PreActions>
          <ExecutionAction
@@ -114,6 +115,9 @@
                <Test
                   Identifier = "CBRCompileTimeReporterTests">
                </Test>
+               <Test
+                  Identifier = "PixelExperimentTests">
+               </Test>
                <Test
                   Identifier = "PixelStoreTests/testWhenValuesAreAddedThenCallbacksAreCalled()">
                </Test>
@@ -126,6 +130,9 @@
                <Test
                   Identifier = "StatisticsLoaderTests/testWhenRefreshRetentionAtbIsPerformedForNavigationThenAppRetentionAtbRequested()">
                </Test>
+               <Test
+                  Identifier = "TabSnapshotExtensionTests/testWhenSnapshotIsRestored_ThenRenderingIsSkippedAfterLoading()">
+               </Test>
                <Test
                   Identifier = "WindowManagerStateRestorationTests/testWindowManagerStateRestoration()">
                </Test>
@@ -181,16 +188,6 @@
                ReferencedContainer = "container:LocalPackages/NetworkProtectionMac">
             </BuildableReference>
          </TestableReference>
-         <TestableReference
-            skipped = "NO">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "PixelKitTests"
-               BuildableName = "PixelKitTests"
-               BlueprintName = "PixelKitTests"
-               ReferencedContainer = "container:LocalPackages/PixelKit">
-            </BuildableReference>
-         </TestableReference>
          <TestableReference
             skipped = "NO">
             <BuildableReference
diff --git a/DuckDuckGo.xcodeproj/xcshareddata/xcschemes/UI Tests.xcscheme b/DuckDuckGo.xcodeproj/xcshareddata/xcschemes/UI Tests.xcscheme
index ce215006ce..3c5d6efd81 100644
--- a/DuckDuckGo.xcodeproj/xcshareddata/xcschemes/UI Tests.xcscheme	
+++ b/DuckDuckGo.xcodeproj/xcshareddata/xcschemes/UI Tests.xcscheme	
@@ -23,17 +23,16 @@
       </BuildActionEntries>
    </BuildAction>
    <TestAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      shouldAutocreateTestPlan = "YES">
+      buildConfiguration = "Review"
+      selectedDebuggerIdentifier = ""
+      selectedLauncherIdentifier = "Xcode.IDEFoundation.Launcher.PosixSpawn"
+      shouldUseLaunchSchemeArgsEnv = "YES">
       <PreActions>
          <ExecutionAction
             ActionType = "Xcode.IDEStandardExecutionActionsCore.ExecutionActionType.ShellScriptAction">
             <ActionContent
                title = "Run Script"
-               scriptText = "killall tests-server&#10;# integration tests resources dir&#10;pushd &quot;${METAL_LIBRARY_OUTPUT_DIR}&quot;&#10;&quot;${BUILT_PRODUCTS_DIR}/tests-server&quot; &amp;&#10;popd&#10;">
+               scriptText = "&quot;${PROJECT_DIR}/clean-app.sh&quot; review&#10;defaults write com.duckduckgo.macos.browser.review moveToApplicationsFolderAlertSuppress 1&#10;killall tests-server&#10;# integration tests resources dir&#10;pushd &quot;${METAL_LIBRARY_OUTPUT_DIR}&quot;&#10;&quot;${BUILT_PRODUCTS_DIR}/tests-server&quot; &amp;&#10;popd&#10;">
                <EnvironmentBuildable>
                   <BuildableReference
                      BuildableIdentifier = "primary"
@@ -55,6 +54,12 @@
             </ActionContent>
          </ExecutionAction>
       </PostActions>
+      <TestPlans>
+         <TestPlanReference
+            reference = "container:UITests/UI Tests.xctestplan"
+            default = "YES">
+         </TestPlanReference>
+      </TestPlans>
       <Testables>
          <TestableReference
             skipped = "NO">
@@ -65,6 +70,11 @@
                BlueprintName = "UI Tests"
                ReferencedContainer = "container:DuckDuckGo.xcodeproj">
             </BuildableReference>
+            <SkippedTests>
+               <Test
+                  Identifier = "PermissionsTests">
+               </Test>
+            </SkippedTests>
          </TestableReference>
       </Testables>
    </TestAction>
diff --git a/DuckDuckGo/Application/AppDelegate.swift b/DuckDuckGo/Application/AppDelegate.swift
index 1ee442cfe3..2f93c17ac4 100644
--- a/DuckDuckGo/Application/AppDelegate.swift
+++ b/DuckDuckGo/Application/AppDelegate.swift
@@ -23,8 +23,10 @@ import Combine
 import Common
 import Configuration
 import CoreData
+import Crashes
 import DDGSync
 import History
+import MetricKit
 import Networking
 import Persistence
 import PixelKit
@@ -33,13 +35,8 @@ import SyncDataProviders
 import UserNotifications
 import Lottie
 
-#if NETWORK_PROTECTION
 import NetworkProtection
-#endif
-
-#if SUBSCRIPTION
 import Subscription
-#endif
 
 @MainActor
 final class AppDelegate: NSObject, NSApplicationDelegate {
@@ -66,12 +63,18 @@ final class AppDelegate: NSObject, NSApplicationDelegate {
 
     let fileStore: FileStore
 
+#if APPSTORE
+    private let crashCollection = CrashCollection(platform: .macOSAppStore, log: .default)
+#else
+    private let crashReporter = CrashReporter()
+#endif
+
     private(set) var stateRestorationManager: AppStateRestorationManager!
     private var grammarFeaturesManager = GrammarFeaturesManager()
-    private let crashReporter = CrashReporter()
     let internalUserDecider: InternalUserDecider
     let featureFlagger: FeatureFlagger
     private var appIconChanger: AppIconChanger!
+    private var autoClearHandler: AutoClearHandler!
 
     private(set) var syncDataProviders: SyncDataProviders!
     private(set) var syncService: DDGSyncing?
@@ -82,12 +85,10 @@ final class AppDelegate: NSObject, NSApplicationDelegate {
     let bookmarksManager = LocalBookmarkManager.shared
     var privacyDashboardWindow: NSWindow?
 
-#if NETWORK_PROTECTION && SUBSCRIPTION
     // Needs to be lazy as indirectly depends on AppDelegate
     private lazy var networkProtectionSubscriptionEventHandler = NetworkProtectionSubscriptionEventHandler()
-#endif
 
-#if DBP && SUBSCRIPTION
+#if DBP
     private let dataBrokerProtectionSubscriptionEventHandler = DataBrokerProtectionSubscriptionEventHandler()
 #endif
 
@@ -97,6 +98,13 @@ final class AppDelegate: NSObject, NSApplicationDelegate {
     var updateController: UpdateController!
 #endif
 
+    @UserDefaultsWrapper(key: .firstLaunchDate, defaultValue: Date.monthAgo)
+    static var firstLaunchDate: Date
+
+    static var isNewUser: Bool {
+        return firstLaunchDate >= Date.weekAgo
+    }
+
     // swiftlint:disable:next function_body_length
     override init() {
         do {
@@ -111,22 +119,16 @@ final class AppDelegate: NSObject, NSApplicationDelegate {
         internalUserDecider = DefaultInternalUserDecider(store: internalUserDeciderStore)
 
         if NSApplication.runType.requiresEnvironment {
-#if DEBUG
-            Pixel.setUp(dryRun: true)
-            Self.setUpPixelKit(dryRun: true)
-#else
-            Pixel.setUp()
-            Self.setUpPixelKit(dryRun: false)
-#endif
+            Self.configurePixelKit()
 
             Database.shared.loadStore { _, error in
                 guard let error = error else { return }
 
                 switch error {
                 case CoreDataDatabase.Error.containerLocationCouldNotBePrepared(let underlyingError):
-                    Pixel.fire(.debug(event: .dbContainerInitializationError, error: underlyingError))
+                    PixelKit.fire(DebugEvent(GeneralPixel.dbContainerInitializationError(error: underlyingError)))
                 default:
-                    Pixel.fire(.debug(event: .dbInitializationError, error: error))
+                    PixelKit.fire(DebugEvent(GeneralPixel.dbInitializationError(error: error)))
                 }
 
                 // Give Pixel a chance to be sent, but not too long
@@ -135,12 +137,7 @@ final class AppDelegate: NSObject, NSApplicationDelegate {
             }
 
             let preMigrationErrorHandling = EventMapping<BookmarkFormFactorFavoritesMigration.MigrationErrors> { _, error, _, _ in
-                if let error = error {
-                    Pixel.fire(.debug(event: .bookmarksCouldNotLoadDatabase, error: error))
-                } else {
-                    Pixel.fire(.debug(event: .bookmarksCouldNotLoadDatabase))
-                }
-
+                PixelKit.fire(DebugEvent(GeneralPixel.bookmarksCouldNotLoadDatabase(error: error)))
                 Thread.sleep(forTimeInterval: 1)
                 fatalError("Could not create Bookmarks database stack: \(error?.localizedDescription ?? "err")")
             }
@@ -154,12 +151,7 @@ final class AppDelegate: NSObject, NSApplicationDelegate {
 
             BookmarkDatabase.shared.db.loadStore { context, error in
                 guard let context = context else {
-                    if let error = error {
-                        Pixel.fire(.debug(event: .bookmarksCouldNotLoadDatabase, error: error))
-                    } else {
-                        Pixel.fire(.debug(event: .bookmarksCouldNotLoadDatabase))
-                    }
-
+                    PixelKit.fire(DebugEvent(GeneralPixel.bookmarksCouldNotLoadDatabase(error: error)))
                     Thread.sleep(forTimeInterval: 1)
                     fatalError("Could not create Bookmarks database stack: \(error?.localizedDescription ?? "err")")
                 }
@@ -181,15 +173,23 @@ final class AppDelegate: NSObject, NSApplicationDelegate {
         AppPrivacyFeatures.shared = AppPrivacyFeatures(contentBlocking: AppContentBlocking(internalUserDecider: internalUserDecider), database: Database.shared)
 #endif
 
-        featureFlagger = DefaultFeatureFlagger(internalUserDecider: internalUserDecider,
-                                               privacyConfig: AppPrivacyFeatures.shared.contentBlocking.privacyConfigurationManager.privacyConfig)
+        featureFlagger = DefaultFeatureFlagger(
+            internalUserDecider: internalUserDecider,
+            privacyConfigManager: AppPrivacyFeatures.shared.contentBlocking.privacyConfigurationManager
+        )
 
-#if SUBSCRIPTION
     #if APPSTORE || !STRIPE
         SubscriptionPurchaseEnvironment.current = .appStore
     #else
         SubscriptionPurchaseEnvironment.current = .stripe
     #endif
+    }
+
+    static func configurePixelKit() {
+#if DEBUG
+            Self.setUpPixelKit(dryRun: true)
+#else
+            Self.setUpPixelKit(dryRun: false)
 #endif
     }
 
@@ -222,6 +222,12 @@ final class AppDelegate: NSObject, NSApplicationDelegate {
 
         PrivacyFeatures.httpsUpgrade.loadDataAsync()
         bookmarksManager.loadBookmarks()
+
+        // Force use of .mainThread to prevent high WindowServer Usage
+        // Pending Fix with newer Lottie versions
+        // https://app.asana.com/0/1177771139624306/1207024603216659/f
+        LottieConfiguration.shared.renderingEngine = .mainThread
+
         if case .normal = NSApp.runType {
             FaviconManager.shared.loadFavicons()
         }
@@ -230,11 +236,12 @@ final class AppDelegate: NSObject, NSApplicationDelegate {
         _ = RecentlyClosedCoordinator.shared
 
         // Clean up previous experiment
-        if PixelExperiment.allocatedCohortDoesNotMatchCurrentCohorts {
-            PixelExperiment.cleanup()
-        }
+//        if PixelExperiment.allocatedCohortDoesNotMatchCurrentCohorts { // Re-implement https://app.asana.com/0/0/1207002879349166/f
+//            PixelExperiment.cleanup()
+//        }
+
         if LocalStatisticsStore().atb == nil {
-            Pixel.firstLaunchDate = Date()
+            AppDelegate.firstLaunchDate = Date()
             // MARK: Enable pixel experiments here
         }
         AtbAndVariantCleanup.cleanup()
@@ -247,7 +254,6 @@ final class AppDelegate: NSObject, NSApplicationDelegate {
 
         startupSync()
 
-#if SUBSCRIPTION
         let defaultEnvironment = SubscriptionPurchaseEnvironment.ServiceEnvironment.default
 
         let currentEnvironment = UserDefaultsWrapper(key: .subscriptionEnvironment,
@@ -261,7 +267,6 @@ final class AppDelegate: NSObject, NSApplicationDelegate {
                 _ = await accountManager.fetchEntitlements(cachePolicy: .reloadIgnoringLocalCacheData)
             }
         }
-#endif
 
         if [.normal, .uiTests].contains(NSApp.runType) {
             stateRestorationManager.applicationDidFinishLaunching()
@@ -278,7 +283,19 @@ final class AppDelegate: NSObject, NSApplicationDelegate {
 
         applyPreferredTheme()
 
+#if APPSTORE
+        crashCollection.start { pixelParameters, payloads, completion in
+            pixelParameters.forEach { _ in PixelKit.fire(GeneralPixel.crash) }
+            guard let lastPayload = payloads.last else {
+                return
+            }
+            DispatchQueue.main.async {
+                CrashReportPromptPresenter().showPrompt(for: lastPayload, userDidAllowToReport: completion)
+            }
+        }
+#else
         crashReporter.checkForNewReports()
+#endif
 
         urlEventHandler.applicationDidFinishLaunching()
 
@@ -287,16 +304,12 @@ final class AppDelegate: NSObject, NSApplicationDelegate {
 
         UserDefaultsWrapper<Any>.clearRemovedKeys()
 
-#if NETWORK_PROTECTION && SUBSCRIPTION
         networkProtectionSubscriptionEventHandler.registerForSubscriptionAccountManagerEvents()
-#endif
 
-#if NETWORK_PROTECTION
         NetworkProtectionAppEvents().applicationDidFinishLaunching()
         UNUserNotificationCenter.current().delegate = self
-#endif
 
-#if DBP && SUBSCRIPTION
+#if DBP
         dataBrokerProtectionSubscriptionEventHandler.registerForSubscriptionAccountManagerEvents()
 #endif
 
@@ -304,9 +317,7 @@ final class AppDelegate: NSObject, NSApplicationDelegate {
         DataBrokerProtectionAppEvents().applicationDidFinishLaunching()
 #endif
 
-#if SUBSCRIPTION
-
-#endif
+        setUpAutoClearHandler()
     }
 
     func applicationDidBecomeActive(_ notification: Notification) {
@@ -315,13 +326,7 @@ final class AppDelegate: NSObject, NSApplicationDelegate {
         syncService?.initializeIfNeeded()
         syncService?.scheduler.notifyAppLifecycleEvent()
 
-#if NETWORK_PROTECTION
-        NetworkProtectionWaitlist().fetchNetworkProtectionInviteCodeIfAvailable { _ in
-            // Do nothing when code fetching fails, as the app will try again later
-        }
-
         NetworkProtectionAppEvents().applicationDidBecomeActive()
-#endif
 
 #if DBP
         DataBrokerProtectionAppEvents().applicationDidBecomeActive()
@@ -346,6 +351,11 @@ final class AppDelegate: NSObject, NSApplicationDelegate {
         }
         stateRestorationManager?.applicationWillTerminate()
 
+        // Handling of "Burn on quit"
+        if let terminationReply = autoClearHandler.handleAppTermination() {
+            return terminationReply
+        }
+
         return .terminateNow
     }
 
@@ -372,7 +382,6 @@ final class AppDelegate: NSObject, NSApplicationDelegate {
     }
 
     private static func setUpPixelKit(dryRun: Bool) {
-#if NETWORK_PROTECTION
 #if APPSTORE
         let source = "browser-appstore"
 #else
@@ -383,7 +392,6 @@ final class AppDelegate: NSObject, NSApplicationDelegate {
                        appVersion: AppVersion.shared.versionNumber,
                        source: source,
                        defaultHeaders: [:],
-                       log: .networkProtectionPixel,
                        defaults: .netP) { (pixelName: String, headers: [String: String], parameters: [String: String], _, _, onComplete: @escaping PixelKit.CompletionBlock) in
 
             let url = URL.pixelUrl(forPixelNamed: pixelName)
@@ -395,7 +403,6 @@ final class AppDelegate: NSObject, NSApplicationDelegate {
                 onComplete(error == nil, error)
             }
         }
-#endif
     }
 
     // MARK: - Sync
@@ -442,9 +449,9 @@ final class AppDelegate: NSObject, NSApplicationDelegate {
             .filter { $0 }
             .asVoid()
             .sink { [weak syncService] in
-                Pixel.fire(.syncDaily, limitTo: .dailyFirst)
+                PixelKit.fire(GeneralPixel.syncDaily, frequency: .daily)
                 syncService?.syncDailyStats.sendStatsIfNeeded(handler: { params in
-                    Pixel.fire(.syncSuccessRateDaily, withAdditionalParameters: params)
+                    PixelKit.fire(GeneralPixel.syncSuccessRateDaily, withAdditionalParameters: params)
                 })
             }
 
@@ -525,9 +532,9 @@ final class AppDelegate: NSObject, NSApplicationDelegate {
     }
 
     private func emailDidSignInNotification(_ notification: Notification) {
-        Pixel.fire(.emailEnabled)
-        if Pixel.isNewUser {
-            Pixel.fire(.emailEnabledInitial, limitTo: .initial)
+        PixelKit.fire(GeneralPixel.emailEnabled)
+        if AppDelegate.isNewUser {
+            PixelKit.fire(GeneralPixel.emailEnabledInitial, frequency: .legacyInitial)
         }
 
         if let object = notification.object as? EmailManager, let emailManager = syncDataProviders.settingsAdapter.emailManager, object !== emailManager {
@@ -536,22 +543,31 @@ final class AppDelegate: NSObject, NSApplicationDelegate {
     }
 
     private func emailDidSignOutNotification(_ notification: Notification) {
-        Pixel.fire(.emailDisabled)
+        PixelKit.fire(GeneralPixel.emailDisabled)
         if let object = notification.object as? EmailManager, let emailManager = syncDataProviders.settingsAdapter.emailManager, object !== emailManager {
             syncService?.scheduler.notifyDataChanged()
         }
     }
 
     @objc private func dataImportCompleteNotification(_ notification: Notification) {
-        if Pixel.isNewUser {
-            Pixel.fire(.importDataInitial, limitTo: .initial)
+        if AppDelegate.isNewUser {
+            PixelKit.fire(GeneralPixel.importDataInitial, frequency: .legacyInitial)
+        }
+    }
+
+    private func setUpAutoClearHandler() {
+        autoClearHandler = AutoClearHandler(preferences: .shared,
+                                            fireViewModel: FireCoordinator.fireViewModel,
+                                            stateRestorationManager: stateRestorationManager)
+        autoClearHandler.handleAppLaunch()
+        autoClearHandler.onAutoClearCompleted = {
+            NSApplication.shared.reply(toApplicationShouldTerminate: true)
         }
     }
 
 }
 
 func updateSubscriptionStatus() {
-#if SUBSCRIPTION
     Task {
         let accountManager = AccountManager(subscriptionAppGroup: Bundle.main.appGroup(bundle: .subs))
 
@@ -559,17 +575,14 @@ func updateSubscriptionStatus() {
 
         if case .success(let subscription) = await SubscriptionService.getSubscription(accessToken: token, cachePolicy: .reloadIgnoringLocalCacheData) {
             if subscription.isActive {
-                DailyPixel.fire(pixel: .privacyProSubscriptionActive, frequency: .dailyOnly)
+                PixelKit.fire(PrivacyProPixel.privacyProSubscriptionActive, frequency: .daily)
             }
         }
 
         _ = await accountManager.fetchEntitlements(cachePolicy: .reloadIgnoringLocalCacheData)
     }
-#endif
 }
 
-#if NETWORK_PROTECTION || DBP
-
 extension AppDelegate: UNUserNotificationCenterDelegate {
 
     func userNotificationCenter(_ center: UNUserNotificationCenter,
@@ -583,15 +596,6 @@ extension AppDelegate: UNUserNotificationCenterDelegate {
                                 withCompletionHandler completionHandler: @escaping () -> Void) {
         if response.actionIdentifier == UNNotificationDefaultActionIdentifier {
 
-#if NETWORK_PROTECTION
-            if response.notification.request.identifier == NetworkProtectionWaitlist.notificationIdentifier {
-                if NetworkProtectionWaitlist().readyToAcceptTermsAndConditions {
-                    DailyPixel.fire(pixel: .networkProtectionWaitlistNotificationTapped, frequency: .dailyAndCount)
-                    NetworkProtectionWaitlistViewControllerPresenter.show()
-                }
-            }
-#endif
-
 #if DBP
             if response.notification.request.identifier == DataBrokerProtectionWaitlist.notificationIdentifier {
                 DataBrokerProtectionAppEvents().handleWaitlistInvitedNotification(source: .localPush)
@@ -603,5 +607,3 @@ extension AppDelegate: UNUserNotificationCenterDelegate {
     }
 
 }
-
-#endif
diff --git a/DuckDuckGo/Application/AutoClearHandler.swift b/DuckDuckGo/Application/AutoClearHandler.swift
new file mode 100644
index 0000000000..f1044dae5f
--- /dev/null
+++ b/DuckDuckGo/Application/AutoClearHandler.swift
@@ -0,0 +1,125 @@
+//
+//  AutoClearHandler.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
+
+final class AutoClearHandler {
+
+    private let preferences: DataClearingPreferences
+    private let fireViewModel: FireViewModel
+    private let stateRestorationManager: AppStateRestorationManager
+
+    init(preferences: DataClearingPreferences,
+         fireViewModel: FireViewModel,
+         stateRestorationManager: AppStateRestorationManager) {
+        self.preferences = preferences
+        self.fireViewModel = fireViewModel
+        self.stateRestorationManager = stateRestorationManager
+    }
+
+    @MainActor
+    func handleAppLaunch() {
+        burnOnStartIfNeeded()
+        restoreTabsIfNeeded()
+        resetTheCorrectTerminationFlag()
+    }
+
+    var onAutoClearCompleted: (() -> Void)?
+
+    @MainActor
+    func handleAppTermination() -> NSApplication.TerminateReply? {
+        guard preferences.isAutoClearEnabled else { return nil }
+
+        if preferences.isWarnBeforeClearingEnabled {
+            switch confirmAutoClear() {
+            case .alertFirstButtonReturn:
+                // Clear and Quit
+                performAutoClear()
+                return .terminateLater
+            case .alertSecondButtonReturn:
+                // Quit without Clearing Data
+                appTerminationHandledCorrectly = true
+                restoreTabsOnStartup = true
+                return .terminateNow
+            default:
+                // Cancel
+                return .terminateCancel
+            }
+        }
+
+        performAutoClear()
+        return .terminateLater
+    }
+
+    func resetTheCorrectTerminationFlag() {
+        appTerminationHandledCorrectly = false
+    }
+
+    // MARK: - Private
+
+    private func confirmAutoClear() -> NSApplication.ModalResponse {
+        let alert = NSAlert.autoClearAlert()
+        let response = alert.runModal()
+        return response
+    }
+
+    @MainActor
+    private func performAutoClear() {
+        fireViewModel.fire.burnAll { [weak self] in
+            self?.appTerminationHandledCorrectly = true
+            self?.onAutoClearCompleted?()
+        }
+    }
+
+    // MARK: - Burn On Start
+    // Burning on quit wasn't successful
+
+    @UserDefaultsWrapper(key: .appTerminationHandledCorrectly, defaultValue: false)
+    private var appTerminationHandledCorrectly: Bool
+
+    @MainActor
+    @discardableResult
+    func burnOnStartIfNeeded() -> Bool {
+        let shouldBurnOnStart = preferences.isAutoClearEnabled && !appTerminationHandledCorrectly
+        guard shouldBurnOnStart else { return false }
+
+        fireViewModel.fire.burnAll()
+        return true
+    }
+
+    // MARK: - Burn without Clearing Data
+
+    @UserDefaultsWrapper(key: .restoreTabsOnStartup, defaultValue: false)
+    private var restoreTabsOnStartup: Bool
+
+    @MainActor
+    @discardableResult
+    func restoreTabsIfNeeded() -> Bool {
+        let isAutoClearEnabled = preferences.isAutoClearEnabled
+        let restoreTabsOnStartup = restoreTabsOnStartup
+        self.restoreTabsOnStartup = false
+        if isAutoClearEnabled && restoreTabsOnStartup {
+            stateRestorationManager.restoreLastSessionState(interactive: false)
+            return true
+        }
+
+        return false
+    }
+
+}
diff --git a/DuckDuckGo/Application/URLEventHandler.swift b/DuckDuckGo/Application/URLEventHandler.swift
index 7ae97a807f..003cf5500b 100644
--- a/DuckDuckGo/Application/URLEventHandler.swift
+++ b/DuckDuckGo/Application/URLEventHandler.swift
@@ -19,10 +19,9 @@
 import Common
 import Foundation
 import AppKit
+import PixelKit
 
-#if NETWORK_PROTECTION
 import NetworkProtectionUI
-#endif
 
 #if DBP
 import DataBrokerProtection
@@ -63,15 +62,15 @@ final class URLEventHandler {
     @objc func handleUrlEvent(event: NSAppleEventDescriptor, reply: NSAppleEventDescriptor) {
         guard let stringValue = event.paramDescriptor(forKeyword: keyDirectObject)?.stringValue else {
             os_log("UrlEventListener: unable to determine path", type: .error)
-            Pixel.fire(.debug(event: .appOpenURLFailed,
-                              error: NSError(domain: "CouldNotGetPath", code: -1, userInfo: nil)))
+            let error = NSError(domain: "CouldNotGetPath", code: -1, userInfo: nil)
+            PixelKit.fire(DebugEvent(GeneralPixel.appOpenURLFailed, error: error))
             return
         }
 
         guard let url = URL.makeURL(from: stringValue) else {
             os_log("UrlEventListener: failed to construct URL from path %s", type: .error, stringValue)
-            Pixel.fire(.debug(event: .appOpenURLFailed,
-                              error: NSError(domain: "CouldNotConstructURL", code: -1, userInfo: nil)))
+            let error = NSError(domain: "CouldNotConstructURL", code: -1, userInfo: nil)
+            PixelKit.fire(DebugEvent(GeneralPixel.appOpenURLFailed, error: error))
             return
         }
 
@@ -104,11 +103,9 @@ final class URLEventHandler {
     }
 
     private static func openURL(_ url: URL) {
-#if NETWORK_PROTECTION
         if url.scheme?.isNetworkProtectionScheme == true {
             handleNetworkProtectionURL(url)
         }
-#endif
 
 #if DBP
         if url.scheme?.isDataBrokerProtectionScheme == true {
@@ -131,18 +128,12 @@ final class URLEventHandler {
             return
         }
 
-#if NETWORK_PROTECTION || DBP
         if url.scheme?.isNetworkProtectionScheme == false && url.scheme?.isDataBrokerProtectionScheme == false {
             WaitlistModalDismisser.dismissWaitlistModalViewControllerIfNecessary(url)
             WindowControllersManager.shared.show(url: url, source: .appOpenUrl, newTab: true)
         }
-#else
-        WindowControllersManager.shared.show(url: url, source: .appOpenUrl, newTab: true)
-#endif
     }
 
-#if NETWORK_PROTECTION
-
     /// Handles NetP URLs
     ///
     private static func handleNetworkProtectionURL(_ url: URL) {
@@ -155,14 +146,14 @@ final class URLEventHandler {
             WindowControllersManager.shared.showPreferencesTab(withSelectedPane: .vpn)
         case AppLaunchCommand.shareFeedback.launchURL:
             WindowControllersManager.shared.showShareFeedbackModal()
+        case AppLaunchCommand.justOpen.launchURL:
+            WindowControllersManager.shared.showMainWindow()
         case AppLaunchCommand.showVPNLocations.launchURL:
             WindowControllersManager.shared.showPreferencesTab(withSelectedPane: .vpn)
             WindowControllersManager.shared.showLocationPickerSheet()
-#if SUBSCRIPTION
         case AppLaunchCommand.showPrivacyPro.launchURL:
             WindowControllersManager.shared.showTab(with: .subscription(.subscriptionPurchase))
-            Pixel.fire(.privacyProOfferScreenImpression)
-#endif
+            PixelKit.fire(PrivacyProPixel.privacyProOfferScreenImpression)
 #if !APPSTORE && !DEBUG
         case AppLaunchCommand.moveAppToApplications.launchURL:
             // this should be run after NSApplication.shared is set
@@ -173,8 +164,6 @@ final class URLEventHandler {
         }
     }
 
-#endif
-
 #if DBP
     /// Handles DBP URLs
     ///
diff --git a/DuckDuckGo/Application/UpdateController.swift b/DuckDuckGo/Application/UpdateController.swift
index 13fcacd30d..56f8d5c0fb 100644
--- a/DuckDuckGo/Application/UpdateController.swift
+++ b/DuckDuckGo/Application/UpdateController.swift
@@ -21,6 +21,7 @@ import Combine
 import Sparkle
 import BrowserServicesKit
 import SwiftUIExtensions
+import PixelKit
 
 #if SPARKLE
 
@@ -107,7 +108,7 @@ extension UpdateController: SPUUpdaterDelegate {
             return
         }
 
-        Pixel.fire(.debug(event: .updaterAborted, error: error))
+        PixelKit.fire(DebugEvent(GeneralPixel.updaterAborted, error: error))
     }
 
     func updater(_ updater: SPUUpdater,
@@ -116,11 +117,11 @@ extension UpdateController: SPUUpdaterDelegate {
                  state: SPUUserUpdateState) {
         switch choice {
         case .skip:
-            Pixel.fire(.debug(event: .userSelectedToSkipUpdate))
+            PixelKit.fire(DebugEvent(GeneralPixel.userSelectedToSkipUpdate))
         case .install:
-            Pixel.fire(.debug(event: .userSelectedToInstallUpdate))
+            PixelKit.fire(DebugEvent(GeneralPixel.userSelectedToInstallUpdate))
         case .dismiss:
-            Pixel.fire(.debug(event: .userSelectedToDismissUpdate))
+            PixelKit.fire(DebugEvent(GeneralPixel.userSelectedToDismissUpdate))
         @unknown default:
             break
         }
diff --git a/DuckDuckGo/Assets.xcassets/Images/BurnAlert.imageset/Burn-Original-large.pdf b/DuckDuckGo/Assets.xcassets/Images/BurnAlert.imageset/Burn-Original-large.pdf
deleted file mode 100644
index 2208d56068..0000000000
Binary files a/DuckDuckGo/Assets.xcassets/Images/BurnAlert.imageset/Burn-Original-large.pdf and /dev/null differ
diff --git a/DuckDuckGo/Assets.xcassets/Images/BurnAlert.imageset/Contents.json b/DuckDuckGo/Assets.xcassets/Images/BurnAlert.imageset/Contents.json
index 48111f0d3f..3f5be128a3 100644
--- a/DuckDuckGo/Assets.xcassets/Images/BurnAlert.imageset/Contents.json
+++ b/DuckDuckGo/Assets.xcassets/Images/BurnAlert.imageset/Contents.json
@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "Burn-Original-large.pdf",
+      "filename" : "Fire-96x96.pdf",
       "idiom" : "universal"
     }
   ],
diff --git a/DuckDuckGo/Assets.xcassets/Images/BurnAlert.imageset/Fire-96x96.pdf b/DuckDuckGo/Assets.xcassets/Images/BurnAlert.imageset/Fire-96x96.pdf
new file mode 100644
index 0000000000..297359ff71
Binary files /dev/null and b/DuckDuckGo/Assets.xcassets/Images/BurnAlert.imageset/Fire-96x96.pdf differ
diff --git a/DuckDuckGo/Assets.xcassets/Images/Chevron-Right-12.imageset/Chevron-Right-12-light.svg b/DuckDuckGo/Assets.xcassets/Images/Chevron-Right-12.imageset/Chevron-Right-12-light.svg
new file mode 100644
index 0000000000..2b4a602355
--- /dev/null
+++ b/DuckDuckGo/Assets.xcassets/Images/Chevron-Right-12.imageset/Chevron-Right-12-light.svg
@@ -0,0 +1,10 @@
+<svg width="13" height="12" viewBox="0 0 13 12" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_2211_6459)">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M3.71967 11.7891C3.42678 11.5079 3.42678 11.0521 3.71967 10.7709L8.68934 6L3.71967 1.22912C3.42678 0.94794 3.42678 0.492061 3.71967 0.210884C4.01256 -0.0702944 4.48744 -0.0702944 4.78033 0.210884L10.2803 5.49088C10.5732 5.77206 10.5732 6.22794 10.2803 6.50912L4.78033 11.7891C4.48744 12.0703 4.01256 12.0703 3.71967 11.7891Z" fill="white" fill-opacity="0.42"/>
+</g>
+<defs>
+<clipPath id="clip0_2211_6459">
+<rect width="12" height="12" fill="white" transform="translate(0.5)"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/DuckDuckGo/Assets.xcassets/Images/Chevron-Right-12.imageset/Chevron-Right-12.svg b/DuckDuckGo/Assets.xcassets/Images/Chevron-Right-12.imageset/Chevron-Right-12.svg
new file mode 100644
index 0000000000..4faab69801
--- /dev/null
+++ b/DuckDuckGo/Assets.xcassets/Images/Chevron-Right-12.imageset/Chevron-Right-12.svg
@@ -0,0 +1,10 @@
+<svg width="13" height="12" viewBox="0 0 13 12" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_2211_6459)">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M3.71967 11.7891C3.42678 11.5079 3.42678 11.0521 3.71967 10.7709L8.68934 6L3.71967 1.22912C3.42678 0.94794 3.42678 0.492061 3.71967 0.210884C4.01256 -0.0702944 4.48744 -0.0702944 4.78033 0.210884L10.2803 5.49088C10.5732 5.77206 10.5732 6.22794 10.2803 6.50912L4.78033 11.7891C4.48744 12.0703 4.01256 12.0703 3.71967 11.7891Z" fill="black" fill-opacity="0.42"/>
+</g>
+<defs>
+<clipPath id="clip0_2211_6459">
+<rect width="12" height="12" fill="white" transform="translate(0.5)"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/DuckDuckGo/Assets.xcassets/Images/NetworkProtectionWaitlist/NetworkProtectionAvailableButton.imageset/Contents.json b/DuckDuckGo/Assets.xcassets/Images/Chevron-Right-12.imageset/Contents.json
similarity index 75%
rename from DuckDuckGo/Assets.xcassets/Images/NetworkProtectionWaitlist/NetworkProtectionAvailableButton.imageset/Contents.json
rename to DuckDuckGo/Assets.xcassets/Images/Chevron-Right-12.imageset/Contents.json
index 89e4996541..7fea6d5282 100644
--- a/DuckDuckGo/Assets.xcassets/Images/NetworkProtectionWaitlist/NetworkProtectionAvailableButton.imageset/Contents.json
+++ b/DuckDuckGo/Assets.xcassets/Images/Chevron-Right-12.imageset/Contents.json
@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "Toolbar Button.pdf",
+      "filename" : "Chevron-Right-12.svg",
       "idiom" : "universal"
     },
     {
@@ -11,7 +11,7 @@
           "value" : "dark"
         }
       ],
-      "filename" : "Toolbar Button 1.pdf",
+      "filename" : "Chevron-Right-12-light.svg",
       "idiom" : "universal"
     }
   ],
diff --git a/DuckDuckGo/Assets.xcassets/Images/DataBrokerProtectionWaitlist/Contents.json b/DuckDuckGo/Assets.xcassets/Images/DataBrokerProtection/Contents.json
similarity index 100%
rename from DuckDuckGo/Assets.xcassets/Images/DataBrokerProtectionWaitlist/Contents.json
rename to DuckDuckGo/Assets.xcassets/Images/DataBrokerProtection/Contents.json
diff --git a/DuckDuckGo/Assets.xcassets/Images/DataBrokerProtectionWaitlist/DBP-Icon.imageset/Contents.json b/DuckDuckGo/Assets.xcassets/Images/DataBrokerProtection/DBP-Icon.imageset/Contents.json
similarity index 100%
rename from DuckDuckGo/Assets.xcassets/Images/DataBrokerProtectionWaitlist/DBP-Icon.imageset/Contents.json
rename to DuckDuckGo/Assets.xcassets/Images/DataBrokerProtection/DBP-Icon.imageset/Contents.json
diff --git a/DuckDuckGo/Assets.xcassets/Images/DataBrokerProtectionWaitlist/DBP-Icon.imageset/DBP-Icon.pdf b/DuckDuckGo/Assets.xcassets/Images/DataBrokerProtection/DBP-Icon.imageset/DBP-Icon.pdf
similarity index 100%
rename from DuckDuckGo/Assets.xcassets/Images/DataBrokerProtectionWaitlist/DBP-Icon.imageset/DBP-Icon.pdf
rename to DuckDuckGo/Assets.xcassets/Images/DataBrokerProtection/DBP-Icon.imageset/DBP-Icon.pdf
diff --git a/DuckDuckGo/Assets.xcassets/Images/DataBrokerProtectionWaitlist/DBP-Information-Remover.imageset/Contents.json b/DuckDuckGo/Assets.xcassets/Images/DataBrokerProtection/DBP-Information-Remover.imageset/Contents.json
similarity index 100%
rename from DuckDuckGo/Assets.xcassets/Images/DataBrokerProtectionWaitlist/DBP-Information-Remover.imageset/Contents.json
rename to DuckDuckGo/Assets.xcassets/Images/DataBrokerProtection/DBP-Information-Remover.imageset/Contents.json
diff --git a/DuckDuckGo/Assets.xcassets/Images/DataBrokerProtectionWaitlist/DBP-Information-Remover.imageset/DBP-Information-Remover.svg b/DuckDuckGo/Assets.xcassets/Images/DataBrokerProtection/DBP-Information-Remover.imageset/DBP-Information-Remover.svg
similarity index 100%
rename from DuckDuckGo/Assets.xcassets/Images/DataBrokerProtectionWaitlist/DBP-Information-Remover.imageset/DBP-Information-Remover.svg
rename to DuckDuckGo/Assets.xcassets/Images/DataBrokerProtection/DBP-Information-Remover.imageset/DBP-Information-Remover.svg
diff --git a/DuckDuckGo/Assets.xcassets/Images/NetworkProtectionWaitlist/Rocket-16.imageset/Contents.json b/DuckDuckGo/Assets.xcassets/Images/DataBrokerProtection/dbp-error-info.imageset/Contents.json
similarity index 63%
rename from DuckDuckGo/Assets.xcassets/Images/NetworkProtectionWaitlist/Rocket-16.imageset/Contents.json
rename to DuckDuckGo/Assets.xcassets/Images/DataBrokerProtection/dbp-error-info.imageset/Contents.json
index b23b52c784..9869fe984d 100644
--- a/DuckDuckGo/Assets.xcassets/Images/NetworkProtectionWaitlist/Rocket-16.imageset/Contents.json
+++ b/DuckDuckGo/Assets.xcassets/Images/DataBrokerProtection/dbp-error-info.imageset/Contents.json
@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "Rocket-16.pdf",
+      "filename" : "dbp-error-info.pdf",
       "idiom" : "universal"
     }
   ],
@@ -10,6 +10,6 @@
     "version" : 1
   },
   "properties" : {
-    "template-rendering-intent" : "template"
+    "template-rendering-intent" : "original"
   }
 }
diff --git a/DuckDuckGo/Assets.xcassets/Images/DataBrokerProtection/dbp-error-info.imageset/dbp-error-info.pdf b/DuckDuckGo/Assets.xcassets/Images/DataBrokerProtection/dbp-error-info.imageset/dbp-error-info.pdf
new file mode 100644
index 0000000000..c9486753e5
Binary files /dev/null and b/DuckDuckGo/Assets.xcassets/Images/DataBrokerProtection/dbp-error-info.imageset/dbp-error-info.pdf differ
diff --git a/DuckDuckGo/Assets.xcassets/Images/Error.imageset/Contents.json b/DuckDuckGo/Assets.xcassets/Images/Error.imageset/Contents.json
index c8ff07440c..98276ca193 100644
--- a/DuckDuckGo/Assets.xcassets/Images/Error.imageset/Contents.json
+++ b/DuckDuckGo/Assets.xcassets/Images/Error.imageset/Contents.json
@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "Error.pdf",
+      "filename" : "Exclamation-Recolorable-16.pdf",
       "idiom" : "universal"
     }
   ],
diff --git a/DuckDuckGo/Assets.xcassets/Images/Error.imageset/Error.pdf b/DuckDuckGo/Assets.xcassets/Images/Error.imageset/Exclamation-Recolorable-16.pdf
similarity index 50%
rename from DuckDuckGo/Assets.xcassets/Images/Error.imageset/Error.pdf
rename to DuckDuckGo/Assets.xcassets/Images/Error.imageset/Exclamation-Recolorable-16.pdf
index f8efeca609..4f4f2518c4 100644
Binary files a/DuckDuckGo/Assets.xcassets/Images/Error.imageset/Error.pdf and b/DuckDuckGo/Assets.xcassets/Images/Error.imageset/Exclamation-Recolorable-16.pdf differ
diff --git a/DuckDuckGo/Assets.xcassets/Images/NetworkProtectionWaitlist/Shield-16.imageset/Contents.json b/DuckDuckGo/Assets.xcassets/Images/Identity-Theft-Restoration-Multicolor-16.imageset/Contents.json
similarity index 56%
rename from DuckDuckGo/Assets.xcassets/Images/NetworkProtectionWaitlist/Shield-16.imageset/Contents.json
rename to DuckDuckGo/Assets.xcassets/Images/Identity-Theft-Restoration-Multicolor-16.imageset/Contents.json
index 510acba745..c878d4b14f 100644
--- a/DuckDuckGo/Assets.xcassets/Images/NetworkProtectionWaitlist/Shield-16.imageset/Contents.json
+++ b/DuckDuckGo/Assets.xcassets/Images/Identity-Theft-Restoration-Multicolor-16.imageset/Contents.json
@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "Shield-16.pdf",
+      "filename" : "Identity-Theft-Restoration-Multicolor-16.pdf",
       "idiom" : "universal"
     }
   ],
@@ -10,6 +10,6 @@
     "version" : 1
   },
   "properties" : {
-    "template-rendering-intent" : "template"
+    "preserves-vector-representation" : true
   }
 }
diff --git a/DuckDuckGo/Assets.xcassets/Images/Identity-Theft-Restoration-Multicolor-16.imageset/Identity-Theft-Restoration-Multicolor-16.pdf b/DuckDuckGo/Assets.xcassets/Images/Identity-Theft-Restoration-Multicolor-16.imageset/Identity-Theft-Restoration-Multicolor-16.pdf
new file mode 100644
index 0000000000..30563fa583
Binary files /dev/null and b/DuckDuckGo/Assets.xcassets/Images/Identity-Theft-Restoration-Multicolor-16.imageset/Identity-Theft-Restoration-Multicolor-16.pdf differ
diff --git a/DuckDuckGo/Assets.xcassets/Images/NetworkProtectionWaitlist/Card-16.imageset/Card-16.pdf b/DuckDuckGo/Assets.xcassets/Images/NetworkProtectionWaitlist/Card-16.imageset/Card-16.pdf
deleted file mode 100644
index ead0016185..0000000000
Binary files a/DuckDuckGo/Assets.xcassets/Images/NetworkProtectionWaitlist/Card-16.imageset/Card-16.pdf and /dev/null differ
diff --git a/DuckDuckGo/Assets.xcassets/Images/NetworkProtectionWaitlist/NetworkProtectionAvailableButton.imageset/Toolbar Button 1.pdf b/DuckDuckGo/Assets.xcassets/Images/NetworkProtectionWaitlist/NetworkProtectionAvailableButton.imageset/Toolbar Button 1.pdf
deleted file mode 100644
index 6fca4a04e3..0000000000
Binary files a/DuckDuckGo/Assets.xcassets/Images/NetworkProtectionWaitlist/NetworkProtectionAvailableButton.imageset/Toolbar Button 1.pdf and /dev/null differ
diff --git a/DuckDuckGo/Assets.xcassets/Images/NetworkProtectionWaitlist/NetworkProtectionAvailableButton.imageset/Toolbar Button.pdf b/DuckDuckGo/Assets.xcassets/Images/NetworkProtectionWaitlist/NetworkProtectionAvailableButton.imageset/Toolbar Button.pdf
deleted file mode 100644
index 04826a0a10..0000000000
Binary files a/DuckDuckGo/Assets.xcassets/Images/NetworkProtectionWaitlist/NetworkProtectionAvailableButton.imageset/Toolbar Button.pdf and /dev/null differ
diff --git a/DuckDuckGo/Assets.xcassets/Images/NetworkProtectionWaitlist/Rocket-16.imageset/Rocket-16.pdf b/DuckDuckGo/Assets.xcassets/Images/NetworkProtectionWaitlist/Rocket-16.imageset/Rocket-16.pdf
deleted file mode 100644
index c7dd245c4f..0000000000
Binary files a/DuckDuckGo/Assets.xcassets/Images/NetworkProtectionWaitlist/Rocket-16.imageset/Rocket-16.pdf and /dev/null differ
diff --git a/DuckDuckGo/Assets.xcassets/Images/NetworkProtectionWaitlist/Shield-16.imageset/Shield-16.pdf b/DuckDuckGo/Assets.xcassets/Images/NetworkProtectionWaitlist/Shield-16.imageset/Shield-16.pdf
deleted file mode 100644
index 677edb434b..0000000000
Binary files a/DuckDuckGo/Assets.xcassets/Images/NetworkProtectionWaitlist/Shield-16.imageset/Shield-16.pdf and /dev/null differ
diff --git a/DuckDuckGo/Assets.xcassets/Images/PersonalInformationRemoval-Multicolor-16.imageset/Contents.json b/DuckDuckGo/Assets.xcassets/Images/PersonalInformationRemoval-Multicolor-16.imageset/Contents.json
new file mode 100644
index 0000000000..a30ef3d53e
--- /dev/null
+++ b/DuckDuckGo/Assets.xcassets/Images/PersonalInformationRemoval-Multicolor-16.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "PersonalInformationRemoval-Multicolor-16.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/DuckDuckGo/Assets.xcassets/Images/PersonalInformationRemoval-Multicolor-16.imageset/PersonalInformationRemoval-Multicolor-16.pdf b/DuckDuckGo/Assets.xcassets/Images/PersonalInformationRemoval-Multicolor-16.imageset/PersonalInformationRemoval-Multicolor-16.pdf
new file mode 100644
index 0000000000..fbabea4523
Binary files /dev/null and b/DuckDuckGo/Assets.xcassets/Images/PersonalInformationRemoval-Multicolor-16.imageset/PersonalInformationRemoval-Multicolor-16.pdf differ
diff --git a/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/Resources/Assets.xcassets/Icons/VPN-128.imageset/Contents.json b/DuckDuckGo/Assets.xcassets/Images/Red-Alert-Circle-16.imageset/Contents.json
similarity index 70%
rename from LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/Resources/Assets.xcassets/Icons/VPN-128.imageset/Contents.json
rename to DuckDuckGo/Assets.xcassets/Images/Red-Alert-Circle-16.imageset/Contents.json
index 86f2574f00..ca57c1c377 100644
--- a/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/Resources/Assets.xcassets/Icons/VPN-128.imageset/Contents.json
+++ b/DuckDuckGo/Assets.xcassets/Images/Red-Alert-Circle-16.imageset/Contents.json
@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "Network-Protetion-VPN-128.pdf",
+      "filename" : "Red-Alert-Circle-16.svg",
       "idiom" : "universal"
     }
   ],
diff --git a/DuckDuckGo/Assets.xcassets/Images/Red-Alert-Circle-16.imageset/Red-Alert-Circle-16.svg b/DuckDuckGo/Assets.xcassets/Images/Red-Alert-Circle-16.imageset/Red-Alert-Circle-16.svg
new file mode 100644
index 0000000000..5de49b6b87
--- /dev/null
+++ b/DuckDuckGo/Assets.xcassets/Images/Red-Alert-Circle-16.imageset/Red-Alert-Circle-16.svg
@@ -0,0 +1,17 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_4179_15953)">
+<g clip-path="url(#clip1_4179_15953)">
+<path d="M16 8C16 12.4183 12.4183 16 8 16C3.58172 16 0 12.4183 0 8C0 3.58172 3.58172 0 8 0C12.4183 0 16 3.58172 16 8Z" fill="#EE1025"/>
+<path d="M8.00065 2.76367C7.26194 2.76367 6.68632 3.40425 6.76502 4.13876L7.34983 9.59701C7.38547 9.92961 7.66615 10.1818 8.00065 10.1818C8.33515 10.1818 8.61583 9.92961 8.65147 9.59701L9.23628 4.13876C9.31498 3.40425 8.73937 2.76367 8.00065 2.76367Z" fill="white"/>
+<path d="M8.00069 13.4545C8.60318 13.4545 9.09159 12.9661 9.09159 12.3636C9.09159 11.7611 8.60318 11.2727 8.00069 11.2727C7.3982 11.2727 6.90978 11.7611 6.90978 12.3636C6.90978 12.9661 7.3982 13.4545 8.00069 13.4545Z" fill="white"/>
+</g>
+</g>
+<defs>
+<clipPath id="clip0_4179_15953">
+<rect width="16" height="16" fill="white"/>
+</clipPath>
+<clipPath id="clip1_4179_15953">
+<rect width="16" height="16" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/Resources/Assets.xcassets/Icons/VPN-Disabled-128.imageset/Contents.json b/DuckDuckGo/Assets.xcassets/Images/Settings-Multicolor-16.imageset/Contents.json
similarity index 66%
rename from LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/Resources/Assets.xcassets/Icons/VPN-Disabled-128.imageset/Contents.json
rename to DuckDuckGo/Assets.xcassets/Images/Settings-Multicolor-16.imageset/Contents.json
index 20e5eff4ab..d4b2052646 100644
--- a/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/Resources/Assets.xcassets/Icons/VPN-Disabled-128.imageset/Contents.json
+++ b/DuckDuckGo/Assets.xcassets/Images/Settings-Multicolor-16.imageset/Contents.json
@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "Network-Protetion-VPN-Disabled-128.pdf",
+      "filename" : "Settings-Multicolor-16.pdf",
       "idiom" : "universal"
     }
   ],
diff --git a/DuckDuckGo/Assets.xcassets/Images/Settings-Multicolor-16.imageset/Settings-Multicolor-16.pdf b/DuckDuckGo/Assets.xcassets/Images/Settings-Multicolor-16.imageset/Settings-Multicolor-16.pdf
new file mode 100644
index 0000000000..b3b41002c2
Binary files /dev/null and b/DuckDuckGo/Assets.xcassets/Images/Settings-Multicolor-16.imageset/Settings-Multicolor-16.pdf differ
diff --git a/DuckDuckGo/Assets.xcassets/Images/Skipped.imageset/Contents.json b/DuckDuckGo/Assets.xcassets/Images/Skipped.imageset/Contents.json
new file mode 100644
index 0000000000..89a905405a
--- /dev/null
+++ b/DuckDuckGo/Assets.xcassets/Images/Skipped.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "Jump-Recolorable-16.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/DuckDuckGo/Assets.xcassets/Images/Skipped.imageset/Jump-Recolorable-16.pdf b/DuckDuckGo/Assets.xcassets/Images/Skipped.imageset/Jump-Recolorable-16.pdf
new file mode 100644
index 0000000000..f0c7598cc8
Binary files /dev/null and b/DuckDuckGo/Assets.xcassets/Images/Skipped.imageset/Jump-Recolorable-16.pdf differ
diff --git a/DuckDuckGo/Assets.xcassets/Images/SuccessCheckmark.imageset/Check-Recolorable-16.pdf b/DuckDuckGo/Assets.xcassets/Images/SuccessCheckmark.imageset/Check-Recolorable-16.pdf
new file mode 100644
index 0000000000..719cb643de
Binary files /dev/null and b/DuckDuckGo/Assets.xcassets/Images/SuccessCheckmark.imageset/Check-Recolorable-16.pdf differ
diff --git a/DuckDuckGo/Assets.xcassets/Images/SuccessCheckmark.imageset/Contents.json b/DuckDuckGo/Assets.xcassets/Images/SuccessCheckmark.imageset/Contents.json
index 09a818b90b..07d8227e97 100644
--- a/DuckDuckGo/Assets.xcassets/Images/SuccessCheckmark.imageset/Contents.json
+++ b/DuckDuckGo/Assets.xcassets/Images/SuccessCheckmark.imageset/Contents.json
@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "SuccessCheckmark.pdf",
+      "filename" : "Check-Recolorable-16.pdf",
       "idiom" : "universal"
     }
   ],
diff --git a/DuckDuckGo/Assets.xcassets/Images/SuccessCheckmark.imageset/SuccessCheckmark.pdf b/DuckDuckGo/Assets.xcassets/Images/SuccessCheckmark.imageset/SuccessCheckmark.pdf
deleted file mode 100644
index bb50d381fa..0000000000
Binary files a/DuckDuckGo/Assets.xcassets/Images/SuccessCheckmark.imageset/SuccessCheckmark.pdf and /dev/null differ
diff --git a/DuckDuckGo/Autoconsent/AutoconsentUserScript.swift b/DuckDuckGo/Autoconsent/AutoconsentUserScript.swift
index c43f7dc27c..2000073692 100644
--- a/DuckDuckGo/Autoconsent/AutoconsentUserScript.swift
+++ b/DuckDuckGo/Autoconsent/AutoconsentUserScript.swift
@@ -202,7 +202,7 @@ extension AutoconsentUserScript {
             return
         }
 
-        guard [.http, .https].contains(url.navigationalScheme) else {
+        guard url.navigationalScheme?.isHypertextScheme == true else {
             // ignore special schemes
             os_log("Ignoring special URL scheme: %s", log: .autoconsent, type: .debug, messageData.url)
             replyHandler([ "type": "ok" ], nil) // this is just to prevent a Promise rejection
diff --git a/DuckDuckGo/Autoconsent/autoconsent-bundle.js b/DuckDuckGo/Autoconsent/autoconsent-bundle.js
index db02dcc60b..85e242339a 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-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)}}();
+!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_KLARO_OPEN_POPUP:()=>{klaro.show(void 0,!0)},EVAL_KLARO_TRY_API_OPT_OUT:()=>{if(window.klaro&&"function"==typeof klaro.show&&"function"==typeof klaro.getManager)try{return klaro.getManager().changeAll(!1),klaro.getManager().saveAndApplyConsents(),!0}catch(e){return console.warn(e),!1}return!1},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||(e.checked="moove_gdpr_strict_cookies"===e.name||"moove_gdpr_strict_cookies"===e.id)}))||!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:!0,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!!await this.mainWorldEval("EVAL_KLARO_TRY_API_OPT_OUT")||(!!this.click(".klaro .cn-decline")||(await this.mainWorldEval("EVAL_KLARO_OPEN_POPUP"),!!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)}},class extends p{constructor(){super(...arguments),this.name="tumblr-com",this.runContext={urlPattern:"^https://(www\\.)?tumblr\\.com/"}}get hasSelfTest(){return!1}get isIntermediate(){return!1}get isCosmetic(){return!1}get prehideSelectors(){return["#cmp-app-container"]}async detectCmp(){return this.elementExists("#cmp-app-container")}async detectPopup(){return this.elementVisible("#cmp-app-container","any")}async optOut(){let e=document.querySelector("#cmp-app-container iframe"),t=e.contentDocument?.querySelector(".cmp-components-button.is-secondary");return!!t&&(t.click(),await h((()=>!!document.querySelector("#cmp-app-container iframe").contentDocument?.querySelector(".cmp__dialog input")),5,500),e=document.querySelector("#cmp-app-container iframe"),t=e.contentDocument?.querySelector(".cmp-components-button.is-secondary"),!!t&&(t.click(),!0))}async optIn(){const e=document.querySelector("#cmp-app-container iframe").contentDocument.querySelector(".cmp-components-button.is-primary");return!!e&&(e.click(),!0)}}];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="cookie-policy"]'},{waitFor:'div[role="dialog"] button[role=switch]'},{click:'div[role="dialog"] button:nth-child(2):not([role])'},{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 opt-out",prehideSelectors:['[aria-describedby="cookieconsent:desc"].cc-type-opt-out'],detectCmp:[{exists:'[aria-describedby="cookieconsent:desc"].cc-type-opt-out'}],detectPopup:[{visible:'[aria-describedby="cookieconsent:desc"].cc-type-opt-out'}],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 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:[{if:{exists:"#cookiescript_reject"},then:[{wait:100},{click:"#cookiescript_reject"}],else:[{click:"#cookiescript_manage"},{waitForVisible:".cookiescript_fsd_main"},{waitForThenClick:"#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:"Ensighten ensModal",prehideSelectors:[".ensModal"],detectCmp:[{exists:".ensModal"}],detectPopup:[{visible:".ensModal"}],optIn:[{waitForThenClick:"#modalAcceptButton"}],optOut:[{waitForThenClick:".ensCheckbox:checked",all:!0},{waitForThenClick:"#ensSave"}]},{name:"Ensighten ensNotifyBanner",prehideSelectors:["#ensNotifyBanner"],detectCmp:[{exists:"#ensNotifyBanner"}],detectPopup:[{visible:"#ensNotifyBanner"}],optIn:[{waitForThenClick:"#ensCloseBanner"}],optOut:[{waitForThenClick:"#ensRejectAll,#rejectAll,#ensRejectBanner"}]},{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:not(.moove-gdpr-info-bar-hidden)"}],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",runContext:{urlPattern:"^https://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)"},{if:{exists:"div.b-cookies-informer__switchers"},then:[{click:"div.b-cookies-informer__switchers input:not([disabled])",all:!0},{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:[".consent__wrapper"],runContext:{urlPattern:"^https://www\\.strato\\.de/"},detectCmp:[{exists:".consent"}],detectPopup:[{visible:".consent"}],optIn:[{click:"button.consentAgree"}],optOut:[{click:"button.consentSettings"},{waitForThenClick:"button#consentSubmit"}]},{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 #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:"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.filter((e=>e.prehideSelectors&&e.checkRunContext())).reduce(((e,t)=>[...e,...t.prehideSelectors]),["#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/AutofillActionBuilder.swift b/DuckDuckGo/Autofill/AutofillActionBuilder.swift
index de48f8d6b3..cbf46a19e2 100644
--- a/DuckDuckGo/Autofill/AutofillActionBuilder.swift
+++ b/DuckDuckGo/Autofill/AutofillActionBuilder.swift
@@ -35,7 +35,7 @@ extension AutofillActionBuilder {
 struct AutofillDeleteAllPasswordsBuilder: AutofillActionBuilder {
     @MainActor
     func buildExecutor() -> AutofillActionExecutor? {
-        guard let secureVault = try? AutofillSecureVaultFactory.makeVault(errorReporter: SecureVaultErrorReporter.shared),
+        guard let secureVault = try? AutofillSecureVaultFactory.makeVault(reporter: SecureVaultReporter.shared),
         let syncService = NSApp.delegateTyped.syncService else { return nil }
 
         return AutofillDeleteAllPasswordsExecutor(userAuthenticator: DeviceAuthenticator.shared,
diff --git a/DuckDuckGo/Autofill/AutofillActionExecutor.swift b/DuckDuckGo/Autofill/AutofillActionExecutor.swift
index f574c7e974..cbdc445d1f 100644
--- a/DuckDuckGo/Autofill/AutofillActionExecutor.swift
+++ b/DuckDuckGo/Autofill/AutofillActionExecutor.swift
@@ -20,6 +20,7 @@ import Foundation
 import BrowserServicesKit
 import DDGSync
 import AppKit
+import PixelKit
 
 /// Conforming types provide an `execute` method which performs some action on autofill types (e.g delete all passwords)
 protocol AutofillActionExecutor {
@@ -68,7 +69,7 @@ struct AutofillDeleteAllPasswordsExecutor: AutofillActionExecutor {
                 syncService.scheduler.notifyDataChanged()
                 onSuccess?()
             } catch {
-                Pixel.fire(.debug(event: .secureVaultError, error: error))
+                PixelKit.fire(DebugEvent(GeneralPixel.secureVaultError(error: error)))
             }
 
             return
diff --git a/DuckDuckGo/Autofill/ContentOverlayViewController.swift b/DuckDuckGo/Autofill/ContentOverlayViewController.swift
index d90b35f71d..63a6a88368 100644
--- a/DuckDuckGo/Autofill/ContentOverlayViewController.swift
+++ b/DuckDuckGo/Autofill/ContentOverlayViewController.swift
@@ -22,6 +22,7 @@ import Combine
 import BrowserServicesKit
 import SecureStorage
 import Autofill
+import PixelKit
 
 @MainActor
 public final class ContentOverlayViewController: NSViewController, EmailManagerRequestDelegate {
@@ -191,7 +192,7 @@ public final class ContentOverlayViewController: NSViewController, EmailManagerR
             parameters["keychain_operation"] = "save"
         }
 
-        Pixel.fire(.debug(event: .emailAutofillKeychainError, error: error), withAdditionalParameters: parameters)
+        PixelKit.fire(DebugEvent(GeneralPixel.emailAutofillKeychainError), withAdditionalParameters: parameters)
     }
 
     private enum Constants {
@@ -294,7 +295,7 @@ extension ContentOverlayViewController: SecureVaultManagerDelegate {
     }
 
     public func secureVaultManager(_: SecureVaultManager, didAutofill type: AutofillType, withObjectId objectId: String) {
-        Pixel.fire(.formAutofilled(kind: type.formAutofillKind))
+        PixelKit.fire(GeneralPixel.formAutofilled(kind: type.formAutofillKind))
 
         if type.formAutofillKind == .password &&
             passwordManagerCoordinator.isEnabled {
@@ -308,8 +309,12 @@ extension ContentOverlayViewController: SecureVaultManagerDelegate {
         }
     }
 
-    public func secureVaultInitFailed(_ error: SecureStorageError) {
-        SecureVaultErrorReporter.shared.secureVaultInitFailed(error)
+    public func secureVaultError(_ error: SecureStorageError) {
+        SecureVaultReporter.shared.secureVaultError(error)
+    }
+
+    public func secureVaultKeyStoreEvent(_ event: SecureStorageKeyStoreEvent) {
+        SecureVaultReporter.shared.secureVaultKeyStoreEvent(event)
     }
 
     public func secureVaultManager(_: BrowserServicesKit.SecureVaultManager, didReceivePixel pixel: AutofillUserScript.JSPixel) {
@@ -320,9 +325,9 @@ extension ContentOverlayViewController: SecureVaultManagerDelegate {
 
             self.emailManager.updateLastUseDate()
 
-            Pixel.fire(.jsPixel(pixel), withAdditionalParameters: pixelParameters)
+            PixelKit.fire(GeneralPixel.jsPixel(pixel), withAdditionalParameters: pixelParameters)
         } else {
-            Pixel.fire(.jsPixel(pixel), withAdditionalParameters: pixel.pixelParameters)
+            PixelKit.fire(GeneralPixel.jsPixel(pixel), withAdditionalParameters: pixel.pixelParameters)
         }
     }
 
diff --git a/DuckDuckGo/Bookmarks/Extensions/Bookmarks+Tab.swift b/DuckDuckGo/Bookmarks/Extensions/Bookmarks+Tab.swift
index 82e5748c72..78c60f30ea 100644
--- a/DuckDuckGo/Bookmarks/Extensions/Bookmarks+Tab.swift
+++ b/DuckDuckGo/Bookmarks/Extensions/Bookmarks+Tab.swift
@@ -22,7 +22,7 @@ extension Tab {
 
     @MainActor
     static func withContentOfBookmark(folder: BookmarkFolder, burnerMode: BurnerMode) -> [Tab] {
-        folder.children.compactMap { entity in
+        folder.children.compactMap { entity -> Tab? in
             guard let url = (entity as? Bookmark)?.urlObject else { return nil }
             return Tab(content: .url(url, source: .bookmark), shouldLoadInBackground: true, burnerMode: burnerMode)
         }
diff --git a/DuckDuckGo/Bookmarks/Legacy/LegacyBookmarkStore.swift b/DuckDuckGo/Bookmarks/Legacy/LegacyBookmarkStore.swift
index 9634ca221f..ebfc15be43 100644
--- a/DuckDuckGo/Bookmarks/Legacy/LegacyBookmarkStore.swift
+++ b/DuckDuckGo/Bookmarks/Legacy/LegacyBookmarkStore.swift
@@ -19,6 +19,7 @@
 import Foundation
 import CoreData
 import Cocoa
+import PixelKit
 
 fileprivate extension UUID {
 
@@ -171,7 +172,7 @@ extension LegacyBookmarkStore {
 
             try context.save()
         } catch {
-            Pixel.fire(.debug(event: .bookmarksStoreRootFolderMigrationFailed, error: error))
+            PixelKit.fire(DebugEvent(GeneralPixel.bookmarksStoreRootFolderMigrationFailed, error: error))
         }
     }
 
@@ -211,7 +212,7 @@ extension LegacyBookmarkStore {
             // 4. Save the migration:
             try context.save()
         } catch {
-            Pixel.fire(.debug(event: .bookmarksStoreRootFolderMigrationFailed, error: error))
+            PixelKit.fire(DebugEvent(GeneralPixel.bookmarksStoreRootFolderMigrationFailed, error: error))
         }
     }
 }
diff --git a/DuckDuckGo/Bookmarks/Legacy/LegacyBookmarksStoreMigration.swift b/DuckDuckGo/Bookmarks/Legacy/LegacyBookmarksStoreMigration.swift
index c5ecef1b7c..734275e1c5 100644
--- a/DuckDuckGo/Bookmarks/Legacy/LegacyBookmarksStoreMigration.swift
+++ b/DuckDuckGo/Bookmarks/Legacy/LegacyBookmarksStoreMigration.swift
@@ -20,6 +20,7 @@ import Foundation
 import CoreData
 import Bookmarks
 import Persistence
+import PixelKit
 
 public class LegacyBookmarksStoreMigration {
 
@@ -55,7 +56,7 @@ public class LegacyBookmarksStoreMigration {
         guard BookmarkUtils.fetchRootFolder(destination) == nil else {
             // There should be no data left as migration has been done already
             if !bookmarkRoots.isEmpty {
-                Pixel.fire(.debug(event: .bookmarksMigrationAlreadyPerformed))
+                PixelKit.fire(DebugEvent(GeneralPixel.bookmarksMigrationAlreadyPerformed))
 
                 cleanupOldData(in: source)
             }
@@ -72,9 +73,9 @@ public class LegacyBookmarksStoreMigration {
               let newFavoritesRoot = BookmarkUtils.fetchLegacyFavoritesFolder(destination) else {
 
             if bookmarkRoots.isEmpty {
-                Pixel.fire(.debug(event: .bookmarksCouldNotPrepareDatabase))
+                PixelKit.fire(DebugEvent(GeneralPixel.bookmarksCouldNotPrepareDatabase))
             } else {
-                Pixel.fire(.debug(event: .bookmarksMigrationCouldNotPrepareDatabase))
+                PixelKit.fire(DebugEvent(GeneralPixel.bookmarksMigrationCouldNotPrepareDatabase))
             }
 
             Thread.sleep(forTimeInterval: 2)
@@ -157,7 +158,7 @@ public class LegacyBookmarksStoreMigration {
         }
 
         do {
-            try destination.save(onErrorFire: .bookmarksMigrationFailed)
+            try destination.save(onErrorFire: GeneralPixel.bookmarksMigrationFailed)
 
             cleanupOldData(in: source)
         } catch {
@@ -165,7 +166,7 @@ public class LegacyBookmarksStoreMigration {
 
             BookmarkUtils.prepareLegacyFoldersStructure(in: destination)
             do {
-                try destination.save(onErrorFire: .bookmarksMigrationCouldNotPrepareDatabaseOnFailedMigration)
+                try destination.save(onErrorFire: GeneralPixel.bookmarksMigrationCouldNotPrepareDatabaseOnFailedMigration)
             } catch {
                 Thread.sleep(forTimeInterval: 2)
                 fatalError("Could not write to Bookmarks DB")
@@ -181,7 +182,7 @@ public class LegacyBookmarksStoreMigration {
         allObjects.forEach { context.delete($0) }
 
         if context.hasChanges {
-            try? context.save(onErrorFire: .bookmarksMigrationCouldNotRemoveOldStore)
+            try? context.save(onErrorFire: GeneralPixel.bookmarksMigrationCouldNotRemoveOldStore)
         }
     }
 
diff --git a/DuckDuckGo/Bookmarks/Model/BookmarkManager.swift b/DuckDuckGo/Bookmarks/Model/BookmarkManager.swift
index b3172da78e..1220f5eabb 100644
--- a/DuckDuckGo/Bookmarks/Model/BookmarkManager.swift
+++ b/DuckDuckGo/Bookmarks/Model/BookmarkManager.swift
@@ -28,8 +28,10 @@ protocol BookmarkManager: AnyObject {
     func allHosts() -> Set<String>
     func getBookmark(for url: URL) -> Bookmark?
     func getBookmark(forUrl url: String) -> Bookmark?
+    func getBookmarkFolder(withId id: String) -> BookmarkFolder?
     @discardableResult func makeBookmark(for url: URL, title: String, isFavorite: Bool) -> Bookmark?
     @discardableResult func makeBookmark(for url: URL, title: String, isFavorite: Bool, index: Int?, parent: BookmarkFolder?) -> Bookmark?
+    func makeBookmarks(for websitesInfo: [WebsiteInfo], inNewFolderNamed folderName: String, withinParentFolder parent: ParentFolderType)
     func makeFolder(for title: String, parent: BookmarkFolder?, completion: @escaping (BookmarkFolder) -> Void)
     func remove(bookmark: Bookmark)
     func remove(folder: BookmarkFolder)
@@ -46,7 +48,6 @@ protocol BookmarkManager: AnyObject {
     func move(objectUUIDs: [String], toIndex: Int?, withinParentFolder: ParentFolderType, completion: @escaping (Error?) -> Void)
     func moveFavorites(with objectUUIDs: [String], toIndex: Int?, completion: @escaping (Error?) -> Void)
     func importBookmarks(_ bookmarks: ImportedBookmarks, source: BookmarkImportSource) -> BookmarksImportSummary
-
     func handleFavoritesAfterDisablingSync()
 
     // Wrapper definition in a protocol is not supported yet
@@ -138,6 +139,10 @@ final class LocalBookmarkManager: BookmarkManager {
         return list?[url]
     }
 
+    func getBookmarkFolder(withId id: String) -> BookmarkFolder? {
+        bookmarkStore.bookmarkFolder(withId: id)
+    }
+
     @discardableResult func makeBookmark(for url: URL, title: String, isFavorite: Bool) -> Bookmark? {
         makeBookmark(for: url, title: title, isFavorite: isFavorite, index: nil, parent: nil)
     }
@@ -167,6 +172,12 @@ final class LocalBookmarkManager: BookmarkManager {
         return bookmark
     }
 
+    func makeBookmarks(for websitesInfo: [WebsiteInfo], inNewFolderNamed folderName: String, withinParentFolder parent: ParentFolderType) {
+        bookmarkStore.saveBookmarks(for: websitesInfo, inNewFolderNamed: folderName, withinParentFolder: parent)
+        loadBookmarks()
+        requestSync()
+    }
+
     func remove(bookmark: Bookmark) {
         guard list != nil else { return }
         guard let latestBookmark = getBookmark(forUrl: bookmark.url) else {
diff --git a/DuckDuckGo/Bookmarks/Model/BookmarksCleanupErrorHandling.swift b/DuckDuckGo/Bookmarks/Model/BookmarksCleanupErrorHandling.swift
index 815dc8ecf9..467af32bbd 100644
--- a/DuckDuckGo/Bookmarks/Model/BookmarksCleanupErrorHandling.swift
+++ b/DuckDuckGo/Bookmarks/Model/BookmarksCleanupErrorHandling.swift
@@ -20,18 +20,19 @@ import Foundation
 import Bookmarks
 import Common
 import Persistence
+import PixelKit
 
 public class BookmarksCleanupErrorHandling: EventMapping<BookmarksCleanupError> {
 
     public init() {
         super.init { event, _, _, _ in
             if event.cleanupError is BookmarksCleanupCancelledError {
-                Pixel.fire(.debug(event: .bookmarksCleanupAttemptedWhileSyncWasEnabled))
+                PixelKit.fire(DebugEvent(GeneralPixel.bookmarksCleanupAttemptedWhileSyncWasEnabled))
             } else {
                 let processedErrors = CoreDataErrorsParser.parse(error: event.cleanupError as NSError)
                 let params = processedErrors.errorPixelParameters
 
-                Pixel.fire(.debug(event: .bookmarksCleanupFailed, error: event.cleanupError), withAdditionalParameters: params)
+                PixelKit.fire(DebugEvent(GeneralPixel.bookmarksCleanupFailed, error: event.cleanupError), withAdditionalParameters: params)
             }
         }
     }
diff --git a/DuckDuckGo/Bookmarks/Model/WebsiteInfo.swift b/DuckDuckGo/Bookmarks/Model/WebsiteInfo.swift
index fc393b256d..a4d146abd7 100644
--- a/DuckDuckGo/Bookmarks/Model/WebsiteInfo.swift
+++ b/DuckDuckGo/Bookmarks/Model/WebsiteInfo.swift
@@ -18,15 +18,17 @@
 
 import Foundation
 
-struct WebsiteInfo {
+struct WebsiteInfo: Equatable {
     let url: URL
-    let title: String?
+    /// Returns the title of the website if available, otherwise returns the domain of the URL.
+    /// If both title and and domain are nil, it returns the absolute string representation of the URL.
+    let title: String
 
     init?(_ tab: Tab) {
         guard case let .url(url, _, _) = tab.content else {
             return nil
         }
         self.url = url
-        self.title = tab.title
+        self.title = tab.title ?? url.host ?? url.absoluteString
     }
 }
diff --git a/DuckDuckGo/Bookmarks/Services/BookmarkStore.swift b/DuckDuckGo/Bookmarks/Services/BookmarkStore.swift
index 3466d1a7fa..8c8f4a6d06 100644
--- a/DuckDuckGo/Bookmarks/Services/BookmarkStore.swift
+++ b/DuckDuckGo/Bookmarks/Services/BookmarkStore.swift
@@ -48,9 +48,11 @@ protocol BookmarkStore {
 
     func loadAll(type: BookmarkStoreFetchPredicateType, completion: @escaping ([BaseBookmarkEntity]?, Error?) -> Void)
     func save(bookmark: Bookmark, parent: BookmarkFolder?, index: Int?, completion: @escaping (Bool, Error?) -> Void)
+    func saveBookmarks(for websitesInfo: [WebsiteInfo], inNewFolderNamed folderName: String, withinParentFolder parent: ParentFolderType)
     func save(folder: BookmarkFolder, parent: BookmarkFolder?, completion: @escaping (Bool, Error?) -> Void)
     func remove(objectsWithUUIDs: [String], completion: @escaping (Bool, Error?) -> Void)
     func update(bookmark: Bookmark)
+    func bookmarkFolder(withId id: String) -> BookmarkFolder?
     func update(folder: BookmarkFolder)
     func update(folder: BookmarkFolder, andMoveToParent parent: ParentFolderType)
     func add(objectsWithUUIDs: [String], to parent: BookmarkFolder?, completion: @escaping (Error?) -> Void)
@@ -59,6 +61,5 @@ protocol BookmarkStore {
     func move(objectUUIDs: [String], toIndex: Int?, withinParentFolder: ParentFolderType, completion: @escaping (Error?) -> Void)
     func moveFavorites(with objectUUIDs: [String], toIndex: Int?, completion: @escaping (Error?) -> Void)
     func importBookmarks(_ bookmarks: ImportedBookmarks, source: BookmarkImportSource) -> BookmarksImportSummary
-
     func handleFavoritesAfterDisablingSync()
 }
diff --git a/DuckDuckGo/Bookmarks/Services/BookmarkStoreMock.swift b/DuckDuckGo/Bookmarks/Services/BookmarkStoreMock.swift
index 2ab57158a9..003ba7bb59 100644
--- a/DuckDuckGo/Bookmarks/Services/BookmarkStoreMock.swift
+++ b/DuckDuckGo/Bookmarks/Services/BookmarkStoreMock.swift
@@ -104,6 +104,15 @@ public final class BookmarkStoreMock: BookmarkStore {
         capturedBookmark = bookmark
     }
 
+    var bookmarkFolderWithIdCalled = false
+    var capturedFolderId: String?
+    var bookmarkFolder: BookmarkFolder?
+    func bookmarkFolder(withId id: String) -> BookmarkFolder? {
+        bookmarkFolderWithIdCalled = true
+        capturedFolderId = id
+        return bookmarkFolder
+    }
+
     var updateFolderCalled = false
     func update(folder: BookmarkFolder) {
         updateFolderCalled = true
@@ -133,6 +142,16 @@ public final class BookmarkStoreMock: BookmarkStore {
         return BookmarksImportSummary(successful: 0, duplicates: 0, failed: 0)
     }
 
+    var saveBookmarksInNewFolderNamedCalled = false
+    var capturedWebsitesInfo: [WebsiteInfo]?
+    var capturedNewFolderName: String?
+    func saveBookmarks(for websitesInfo: [WebsiteInfo], inNewFolderNamed folderName: String, withinParentFolder parent: ParentFolderType) {
+        saveBookmarksInNewFolderNamedCalled = true
+        capturedWebsitesInfo = websitesInfo
+        capturedNewFolderName = folderName
+        capturedParentFolderType = parent
+    }
+
     var canMoveObjectWithUUIDCalled = false
     func canMoveObjectWithUUID(objectUUID uuid: String, to parent: BookmarkFolder) -> Bool {
         canMoveObjectWithUUIDCalled = true
diff --git a/DuckDuckGo/Bookmarks/Services/ContextualMenu.swift b/DuckDuckGo/Bookmarks/Services/ContextualMenu.swift
index f79e265d96..eb77fd956f 100644
--- a/DuckDuckGo/Bookmarks/Services/ContextualMenu.swift
+++ b/DuckDuckGo/Bookmarks/Services/ContextualMenu.swift
@@ -163,11 +163,15 @@ private extension ContextualMenu {
     static func addBookmarkToFavoritesMenuItem(isFavorite: Bool, bookmark: Bookmark?) -> NSMenuItem {
         let title = isFavorite ? UserText.removeFromFavorites : UserText.addToFavorites
         return menuItem(title, #selector(BookmarkMenuItemSelectors.toggleBookmarkAsFavorite(_:)), bookmark)
+            .withAccessibilityIdentifier(isFavorite == false ? "ContextualMenu.addBookmarkToFavoritesMenuItem" :
+                "ContextualMenu.removeBookmarkFromFavoritesMenuItem")
     }
 
     static func addBookmarksToFavoritesMenuItem(bookmarks: [Bookmark], allFavorites: Bool) -> NSMenuItem {
         let title = allFavorites ? UserText.removeFromFavorites : UserText.addToFavorites
+        let accessibilityValue = allFavorites ? "Favorited" : "Unfavorited"
         return menuItem(title, #selector(BookmarkMenuItemSelectors.toggleBookmarkAsFavorite(_:)), bookmarks)
+            .withAccessibilityIdentifier("ContextualMenu.addBookmarksToFavoritesMenuItem").withAccessibilityValue(accessibilityValue)
     }
 
     static func editBookmarkMenuItem(bookmark: Bookmark?) -> NSMenuItem {
@@ -180,6 +184,7 @@ private extension ContextualMenu {
 
     static func deleteBookmarkMenuItem(bookmark: Bookmark?) -> NSMenuItem {
         menuItem(UserText.bookmarksBarContextMenuDelete, #selector(BookmarkMenuItemSelectors.deleteBookmark(_:)), bookmark)
+            .withAccessibilityIdentifier("ContextualMenu.deleteBookmark")
     }
 
     static func moveToEndMenuItem(entity: BaseBookmarkEntity?, parent: BookmarkFolder?) -> NSMenuItem {
diff --git a/DuckDuckGo/Bookmarks/Services/LocalBookmarkStore.swift b/DuckDuckGo/Bookmarks/Services/LocalBookmarkStore.swift
index e2be507a44..d8cdf7773f 100644
--- a/DuckDuckGo/Bookmarks/Services/LocalBookmarkStore.swift
+++ b/DuckDuckGo/Bookmarks/Services/LocalBookmarkStore.swift
@@ -65,6 +65,7 @@ final class LocalBookmarkStore: BookmarkStore {
         case missingRoot
         case missingFavoritesRoot
         case saveLoopError(Error?)
+        case badModelMapping
     }
 
     private(set) var favoritesDisplayMode: FavoritesDisplayMode
@@ -199,10 +200,10 @@ final class LocalBookmarkStore: BookmarkStore {
 
                 var params = processedErrors.errorPixelParameters
                 params[PixelKit.Parameters.errorSource] = source
-                Pixel.fire(.debug(event: .bookmarksSaveFailed, error: error),
+                PixelKit.fire(DebugEvent(GeneralPixel.bookmarksSaveFailed, error: error),
                            withAdditionalParameters: params)
             } else {
-                Pixel.fire(.debug(event: .bookmarksSaveFailed, error: localError),
+                PixelKit.fire(DebugEvent(GeneralPixel.bookmarksSaveFailed, error: localError),
                            withAdditionalParameters: [PixelKit.Parameters.errorSource: source])
             }
         } else {
@@ -211,7 +212,7 @@ final class LocalBookmarkStore: BookmarkStore {
 
             var params = processedErrors.errorPixelParameters
             params[PixelKit.Parameters.errorSource] = source
-            Pixel.fire(.debug(event: .bookmarksSaveFailed, error: error),
+            PixelKit.fire(DebugEvent(GeneralPixel.bookmarksSaveFailed, error: error),
                        withAdditionalParameters: params)
         }
     }
@@ -228,7 +229,7 @@ final class LocalBookmarkStore: BookmarkStore {
                 )
 
                 if context.hasChanges {
-                    try context.save(onErrorFire: .bookmarksMigrationCouldNotPrepareMultipleFavoriteFolders)
+                    try context.save(onErrorFire: GeneralPixel.bookmarksMigrationCouldNotPrepareMultipleFavoriteFolders)
                 }
             } catch {
                 Thread.sleep(forTimeInterval: 1)
@@ -310,7 +311,7 @@ final class LocalBookmarkStore: BookmarkStore {
             } else if let root = bookmarksRoot(in: context) {
                 parentEntity = root
             } else {
-                Pixel.fire(.debug(event: .missingParent))
+                PixelKit.fire(DebugEvent(GeneralPixel.missingParent))
                 throw BookmarkStoreError.missingParent
             }
 
@@ -339,6 +340,23 @@ final class LocalBookmarkStore: BookmarkStore {
         })
     }
 
+    func saveBookmarks(for websitesInfo: [WebsiteInfo], inNewFolderNamed folderName: String, withinParentFolder parent: ParentFolderType) {
+        do {
+            try applyChangesAndSave { context in
+                // Fetch Parent folder
+                let parentFolder = try bookmarkEntity(for: parent, in: context)
+                // Create new Folder for all bookmarks
+                let newFolderMO = BookmarkEntity.makeFolder(title: folderName, parent: parentFolder, context: context)
+                // Save the bookmarks
+                websitesInfo.forEach { info in
+                    _ = BookmarkEntity.makeBookmark(title: info.title, url: info.url.absoluteString, parent: newFolderMO, context: context)
+                }
+            }
+        } catch {
+            commonOnSaveErrorHandler(error)
+        }
+    }
+
     func remove(objectsWithUUIDs identifiers: [String], completion: @escaping (Bool, Error?) -> Void) {
 
         applyChangesAndSave(changes: { [weak self] context in
@@ -390,6 +408,38 @@ final class LocalBookmarkStore: BookmarkStore {
         }
     }
 
+    func bookmarkFolder(withId id: String) -> BookmarkFolder? {
+        let context = makeContext()
+
+        var bookmarkFolderToReturn: BookmarkFolder?
+        let favoritesDisplayMode = self.favoritesDisplayMode
+
+        context.performAndWait {
+            let folderFetchRequest = BaseBookmarkEntity.singleEntity(with: id)
+            do {
+                let folderFetchRequestResult = try context.fetch(folderFetchRequest)
+                guard let bookmarkFolderManagedObject = folderFetchRequestResult.first else { return }
+
+                guard let bookmarkFolder = BaseBookmarkEntity.from(
+                    managedObject: bookmarkFolderManagedObject,
+                    parentFolderUUID: bookmarkFolderManagedObject.parent?.uuid,
+                    favoritesDisplayMode: favoritesDisplayMode
+                ) as? BookmarkFolder
+                else {
+                    throw BookmarkStoreError.badModelMapping
+                }
+                bookmarkFolderToReturn = bookmarkFolder
+
+            } catch BookmarkStoreError.badModelMapping {
+                os_log("Failed to map BookmarkEntity to BookmarkFolder, with error: %s", log: .bookmarks, type: .error)
+            } catch {
+                os_log("Failed to fetch last saved folder for bookmarks all tabs, with error: %s", log: .bookmarks, type: .error, error.localizedDescription)
+            }
+        }
+
+        return bookmarkFolderToReturn
+    }
+
     func update(folder: BookmarkFolder) {
         do {
             _ = try applyChangesAndSave(changes: { [weak self] context in
@@ -506,7 +556,7 @@ final class LocalBookmarkStore: BookmarkStore {
             } else if let root = self.bookmarksRoot(in: context) {
                 parentEntity = root
             } else {
-                Pixel.fire(.debug(event: .missingParent))
+                PixelKit.fire(DebugEvent(GeneralPixel.missingParent))
                 throw BookmarkStoreError.missingParent
             }
 
@@ -605,21 +655,37 @@ final class LocalBookmarkStore: BookmarkStore {
                currentInsertionIndex > objectIndex {
                 adjustedInsertionIndex -= 1
             }
+            let nextInsertionIndex = adjustedInsertionIndex + 1
 
             bookmarkManagedObject.parent = nil
 
             // Removing the bookmark from its current parent may have removed it from the collection it is about to be added to, so re-check
             // the bounds before adding it back.
             if adjustedInsertionIndex < newParentFolder.childrenArray.count {
-                newParentFolder.insertIntoChildren(bookmarkManagedObject, at: adjustedInsertionIndex)
+                // Handle stubs
+                let allChildren = (newParentFolder.children?.array as? [BookmarkEntity]) ?? []
+                if newParentFolder.childrenArray.count != allChildren.count {
+                    var correctedIndex = 0
+
+                    while adjustedInsertionIndex > 0 && correctedIndex < allChildren.count {
+                        if allChildren[correctedIndex].isStub == false {
+                            adjustedInsertionIndex -= 1
+                        }
+                        correctedIndex += 1
+                    }
+                    newParentFolder.insertIntoChildren(bookmarkManagedObject, at: correctedIndex)
+                } else {
+                    newParentFolder.insertIntoChildren(bookmarkManagedObject, at: adjustedInsertionIndex)
+                }
             } else {
                 newParentFolder.addToChildren(bookmarkManagedObject)
             }
 
-            currentInsertionIndex = adjustedInsertionIndex + 1
+            currentInsertionIndex = nextInsertionIndex
         }
     }
 
+    // swiftlint:disable:next function_body_length
     func moveFavorites(with objectUUIDs: [String], toIndex index: Int?, completion: @escaping (Error?) -> Void) {
 
         applyChangesAndSave(changes: { [weak self] context in
@@ -642,27 +708,45 @@ final class LocalBookmarkStore: BookmarkStore {
                 return (try? context.fetch(entityFetchRequest))?.first
             }
 
-            if let index = index, index < (displayedFavoritesFolder.favorites?.count ?? 0) {
+            if let index = index, index < displayedFavoritesFolder.favoritesArray.count {
                 var currentInsertionIndex = max(index, 0)
 
                 for bookmarkManagedObject in bookmarkManagedObjects {
                     var adjustedInsertionIndex = currentInsertionIndex
 
-                    if let currentIndex = displayedFavoritesFolder.favorites?.index(of: bookmarkManagedObject),
+                    if let currentIndex = displayedFavoritesFolder.favoritesArray.firstIndex(of: bookmarkManagedObject),
                        currentInsertionIndex > currentIndex {
                         adjustedInsertionIndex -= 1
                     }
+                    let nextInsertionIndex = adjustedInsertionIndex + 1
 
                     bookmarkManagedObject.removeFromFavorites(with: favoritesDisplayMode)
-                    if adjustedInsertionIndex < (displayedFavoritesFolder.favorites?.count ?? 0) {
-                        bookmarkManagedObject.addToFavorites(insertAt: adjustedInsertionIndex,
-                                                             favoritesRoot: displayedFavoritesFolder)
-                        bookmarkManagedObject.addToFavorites(folders: favoritesFoldersWithoutDisplayed)
+
+                    if adjustedInsertionIndex < displayedFavoritesFolder.favoritesArray.count {
+                        // Handle stubs
+                        let allChildren = (displayedFavoritesFolder.favorites?.array as? [BookmarkEntity]) ?? []
+                        if displayedFavoritesFolder.favoritesArray.count != allChildren.count {
+                            var correctedIndex = 0
+
+                            while adjustedInsertionIndex > 0 && correctedIndex < allChildren.count {
+                                if allChildren[correctedIndex].isStub == false {
+                                    adjustedInsertionIndex -= 1
+                                }
+                                correctedIndex += 1
+                            }
+                            bookmarkManagedObject.addToFavorites(insertAt: correctedIndex,
+                                                                 favoritesRoot: displayedFavoritesFolder)
+                            bookmarkManagedObject.addToFavorites(folders: favoritesFoldersWithoutDisplayed)
+                        } else {
+                            bookmarkManagedObject.addToFavorites(insertAt: adjustedInsertionIndex,
+                                                                 favoritesRoot: displayedFavoritesFolder)
+                            bookmarkManagedObject.addToFavorites(folders: favoritesFoldersWithoutDisplayed)
+                        }
                     } else {
                         bookmarkManagedObject.addToFavorites(folders: favoritesFolders)
                     }
 
-                    currentInsertionIndex = adjustedInsertionIndex + 1
+                    currentInsertionIndex = nextInsertionIndex
                 }
             } else {
                 for bookmarkManagedObject in bookmarkManagedObjects {
@@ -720,7 +804,7 @@ final class LocalBookmarkStore: BookmarkStore {
             let processedErrors = CoreDataErrorsParser.parse(error: error)
 
             if NSApp.runType.requiresEnvironment {
-                Pixel.fire(.debug(event: .bookmarksSaveFailedOnImport, error: error),
+                PixelKit.fire(DebugEvent(GeneralPixel.bookmarksSaveFailedOnImport, error: error),
                            withAdditionalParameters: processedErrors.errorPixelParameters)
                 assertionFailure("LocalBookmarkStore: Saving of context failed, error: \(error.localizedDescription)")
             }
@@ -856,7 +940,7 @@ final class LocalBookmarkStore: BookmarkStore {
             }
 
             if deletedEntityCount > 0 {
-                Pixel.fire(.debug(event: .removedInvalidBookmarkManagedObjects))
+                PixelKit.fire(DebugEvent(GeneralPixel.removedInvalidBookmarkManagedObjects))
             }
         } onError: { [weak self] error in
             self?.commonOnSaveErrorHandler(error)
@@ -904,7 +988,7 @@ final class LocalBookmarkStore: BookmarkStore {
             let nsError = error as NSError
             let processedErrors = CoreDataErrorsParser.parse(error: nsError)
             let params = processedErrors.errorPixelParameters
-            Pixel.fire(.debug(event: .favoritesCleanupFailed, error: error), withAdditionalParameters: params)
+            PixelKit.fire(DebugEvent(GeneralPixel.favoritesCleanupFailed, error: error), withAdditionalParameters: params)
         } onDidSave: {}
     }
 
@@ -998,32 +1082,38 @@ private extension LocalBookmarkStore {
     }
 
     func move(entities: [BookmarkEntity], toIndex index: Int?, withinParentFolderType type: ParentFolderType, in context: NSManagedObjectContext) throws {
+        let newParentFolder = try bookmarkEntity(for: type, in: context)
+
+        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)
+            }
+        }
+    }
+
+    func bookmarkEntity(for parentFolderType: ParentFolderType, in context: NSManagedObjectContext) throws -> BookmarkEntity {
         guard let rootFolder = bookmarksRoot(in: context) else {
             throw BookmarkStoreError.missingRoot
         }
 
-        let newParentFolder: BookmarkEntity
+        let parentFolder: BookmarkEntity
 
-        switch type {
-        case .root: newParentFolder = rootFolder
-        case .parent(let newParentUUID):
-            let bookmarksFetchRequest = BaseBookmarkEntity.singleEntity(with: newParentUUID)
+        switch parentFolderType {
+        case .root:
+            parentFolder = rootFolder
+        case let .parent(parentUUID):
+            let bookmarksFetchRequest = BaseBookmarkEntity.singleEntity(with: parentUUID)
 
             if let fetchedParent = try context.fetch(bookmarksFetchRequest).first, fetchedParent.isFolder {
-                newParentFolder = fetchedParent
+                parentFolder = 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)
-            }
-        }
+        return parentFolder
     }
 
 }
@@ -1041,6 +1131,7 @@ extension LocalBookmarkStore.BookmarkStoreError: CustomNSError {
         case .missingRoot: return 7
         case .missingFavoritesRoot: return 8
         case .saveLoopError: return 9
+        case .badModelMapping: return 10
         }
     }
 
diff --git a/DuckDuckGo/Bookmarks/Services/UserDefaultsBookmarkFoldersStore.swift b/DuckDuckGo/Bookmarks/Services/UserDefaultsBookmarkFoldersStore.swift
new file mode 100644
index 0000000000..7fb3187329
--- /dev/null
+++ b/DuckDuckGo/Bookmarks/Services/UserDefaultsBookmarkFoldersStore.swift
@@ -0,0 +1,48 @@
+//
+//  UserDefaultsBookmarkFoldersStore.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
+
+/// A type used to provide the ID of the folder where all tabs were last saved.
+protocol BookmarkFoldersStore: AnyObject {
+    /// The ID of the folder where all bookmarks from the last session were saved.
+    var lastBookmarkAllTabsFolderIdUsed: String? { get set }
+}
+
+final class UserDefaultsBookmarkFoldersStore: BookmarkFoldersStore {
+
+    enum Keys {
+        static let bookmarkAllTabsFolderUsedKey = "bookmarks.all-tabs.last-used-folder"
+    }
+
+    private let userDefaults: UserDefaults
+
+    init(userDefaults: UserDefaults = .standard) {
+        self.userDefaults = userDefaults
+    }
+
+    var lastBookmarkAllTabsFolderIdUsed: String? {
+        get {
+            userDefaults.string(forKey: Keys.bookmarkAllTabsFolderUsedKey)
+        }
+        set {
+            userDefaults.set(newValue, forKey: Keys.bookmarkAllTabsFolderUsedKey)
+        }
+    }
+
+}
diff --git a/DuckDuckGo/Bookmarks/View/AddBookmarkFolderPopoverView.swift b/DuckDuckGo/Bookmarks/View/AddBookmarkFolderPopoverView.swift
index f15465df36..8ce41c17f2 100644
--- a/DuckDuckGo/Bookmarks/View/AddBookmarkFolderPopoverView.swift
+++ b/DuckDuckGo/Bookmarks/View/AddBookmarkFolderPopoverView.swift
@@ -36,7 +36,6 @@ struct AddBookmarkFolderPopoverView: ModalView {
             isDefaultActionDisabled: model.isDefaultActionButtonDisabled,
             defaultAction: { _ in model.addFolder() }
         )
-        .padding(.vertical, 16.0)
         .font(.system(size: 13))
         .frame(width: 320)
     }
diff --git a/DuckDuckGo/Bookmarks/View/AddBookmarkPopoverView.swift b/DuckDuckGo/Bookmarks/View/AddBookmarkPopoverView.swift
index fba84b44bc..1faa240398 100644
--- a/DuckDuckGo/Bookmarks/View/AddBookmarkPopoverView.swift
+++ b/DuckDuckGo/Bookmarks/View/AddBookmarkPopoverView.swift
@@ -55,7 +55,6 @@ struct AddBookmarkPopoverView: View {
             isDefaultActionDisabled: model.isDefaultActionButtonDisabled,
             defaultAction: model.doneButtonAction
         )
-        .padding(.vertical, 16.0)
         .font(.system(size: 13))
         .frame(width: 320)
     }
diff --git a/DuckDuckGo/Bookmarks/View/BookmarkManagementDetailViewController.swift b/DuckDuckGo/Bookmarks/View/BookmarkManagementDetailViewController.swift
index ecc643b33d..837af92acd 100644
--- a/DuckDuckGo/Bookmarks/View/BookmarkManagementDetailViewController.swift
+++ b/DuckDuckGo/Bookmarks/View/BookmarkManagementDetailViewController.swift
@@ -603,7 +603,7 @@ extension BookmarkManagementDetailViewController: NSMenuDelegate {
         }
 
         // 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  {
+        if tableView.selectedRowIndexes.contains(row), tableView.selectedRowIndexes.count > 1 {
             return ContextualMenu.menu(for: self.selectedItems())
         }
 
diff --git a/DuckDuckGo/Bookmarks/View/BookmarkManagementSidebarViewController.swift b/DuckDuckGo/Bookmarks/View/BookmarkManagementSidebarViewController.swift
index 53e502383b..f567a9f124 100644
--- a/DuckDuckGo/Bookmarks/View/BookmarkManagementSidebarViewController.swift
+++ b/DuckDuckGo/Bookmarks/View/BookmarkManagementSidebarViewController.swift
@@ -89,6 +89,7 @@ final class BookmarkManagementSidebarViewController: NSViewController {
         tabSwitcherButton.menu = NSMenu {
             for content in Tab.TabContent.displayableTabTypes {
                 NSMenuItem(title: content.title!, representedObject: content)
+                    .withAccessibilityIdentifier("BookmarkManagementSidebarViewController.\(content.title!)")
             }
         }
 
diff --git a/DuckDuckGo/Bookmarks/View/BookmarkOutlineCellView.swift b/DuckDuckGo/Bookmarks/View/BookmarkOutlineCellView.swift
index 603849bbbf..813e1ff8ec 100644
--- a/DuckDuckGo/Bookmarks/View/BookmarkOutlineCellView.swift
+++ b/DuckDuckGo/Bookmarks/View/BookmarkOutlineCellView.swift
@@ -40,6 +40,8 @@ final class BookmarkOutlineCellView: NSTableCellView {
 
     init(identifier: NSUserInterfaceItemIdentifier) {
         super.init(frame: .zero)
+        self.identifier = identifier
+
         setupUI()
     }
 
@@ -82,6 +84,7 @@ final class BookmarkOutlineCellView: NSTableCellView {
         faviconImageView.imageScaling = .scaleProportionallyDown
         faviconImageView.wantsLayer = true
         faviconImageView.layer?.cornerRadius = 2.0
+        faviconImageView.setAccessibilityIdentifier("BookmarkOutlineCellView.favIconImageView")
 
         titleLabel.translatesAutoresizingMaskIntoConstraints = false
         titleLabel.isEditable = false
diff --git a/DuckDuckGo/Bookmarks/View/BookmarkTableCellView.swift b/DuckDuckGo/Bookmarks/View/BookmarkTableCellView.swift
index 8bfdc3c4fb..3a3d3ea0d9 100644
--- a/DuckDuckGo/Bookmarks/View/BookmarkTableCellView.swift
+++ b/DuckDuckGo/Bookmarks/View/BookmarkTableCellView.swift
@@ -129,6 +129,7 @@ final class BookmarkTableCellView: NSTableCellView {
         menuButton.translatesAutoresizingMaskIntoConstraints = false
         menuButton.isBordered = false
         menuButton.isHidden = true
+        menuButton.setAccessibilityIdentifier("BookmarkTableCellView.menuButton")
     }
 
     private func setupLayout() {
@@ -209,11 +210,14 @@ final class BookmarkTableCellView: NSTableCellView {
 
         faviconImageView.image = bookmark.favicon(.small) ?? .bookmarkDefaultFavicon
 
+        faviconImageView.setAccessibilityIdentifier("BookmarkTableCellView.favIconImageView")
         if bookmark.isFavorite {
             accessoryImageView.isHidden = false
         }
 
         accessoryImageView.image = bookmark.isFavorite ? .favoriteFilledBorder : nil
+        accessoryImageView.setAccessibilityIdentifier("BookmarkTableCellView.accessoryImageView")
+        accessoryImageView.setAccessibilityValue(bookmark.isFavorite ? "Favorited" : "Unfavorited")
         titleLabel.stringValue = bookmark.title
         primaryTitleLabelValue = bookmark.title
         tertiaryTitleLabelValue = bookmark.url
diff --git a/DuckDuckGo/Bookmarks/View/Dialog/AddEditBookmarkDialogView.swift b/DuckDuckGo/Bookmarks/View/Dialog/AddEditBookmarkDialogView.swift
index 2c0256bba4..78cdc6efcd 100644
--- a/DuckDuckGo/Bookmarks/View/Dialog/AddEditBookmarkDialogView.swift
+++ b/DuckDuckGo/Bookmarks/View/Dialog/AddEditBookmarkDialogView.swift
@@ -55,7 +55,7 @@ struct AddEditBookmarkDialogView: ModalView {
             isDefaultActionDisabled: viewModel.bookmarkModel.isDefaultActionDisabled,
             defaultAction: viewModel.bookmarkModel.addOrSave
         )
-        .frame(width: 448, height: 288)
+        .frame(width: 448)
     }
 
     private var addFolderView: some View {
diff --git a/DuckDuckGo/Bookmarks/View/Dialog/BookmarkAllTabsDialogView.swift b/DuckDuckGo/Bookmarks/View/Dialog/BookmarkAllTabsDialogView.swift
new file mode 100644
index 0000000000..ad920b10c6
--- /dev/null
+++ b/DuckDuckGo/Bookmarks/View/Dialog/BookmarkAllTabsDialogView.swift
@@ -0,0 +1,141 @@
+//
+//  BookmarkAllTabsDialogView.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 BookmarkAllTabsDialogView: ModalView {
+    @ObservedObject private var viewModel: BookmarkAllTabsDialogCoordinatorViewModel<BookmarkAllTabsDialogViewModel, AddEditBookmarkFolderDialogViewModel>
+
+    init(viewModel: BookmarkAllTabsDialogCoordinatorViewModel<BookmarkAllTabsDialogViewModel, AddEditBookmarkFolderDialogViewModel>) {
+        self.viewModel = viewModel
+    }
+
+    var body: some View {
+        Group {
+            switch viewModel.viewState {
+            case .bookmarkAllTabs:
+                bookmarkAllTabsView
+            case .addFolder:
+                addFolderView
+            }
+        }
+        .font(.system(size: 13))
+    }
+
+    private var bookmarkAllTabsView: some View {
+        BookmarkDialogContainerView(
+            title: viewModel.bookmarkModel.title,
+            middleSection: {
+                Text(viewModel.bookmarkModel.educationalMessage)
+                    .multilineText()
+                    .multilineTextAlignment(.leading)
+                    .foregroundColor(.secondary)
+                    .font(.system(size: 11))
+                BookmarkDialogStackedContentView(
+                    .init(
+                        title: UserText.Bookmarks.Dialog.Field.folderName,
+                        content: TextField("", text: $viewModel.bookmarkModel.folderName)
+                            .focusedOnAppear()
+                            .textFieldStyle(RoundedBorderTextFieldStyle())
+                            .font(.system(size: 14))
+                    ),
+                    .init(
+                        title: UserText.Bookmarks.Dialog.Field.location,
+                        content: BookmarkDialogFolderManagementView(
+                            folders: viewModel.bookmarkModel.folders,
+                            selectedFolder: $viewModel.bookmarkModel.selectedFolder,
+                            onActionButton: viewModel.addFolderAction
+                        )
+                    )
+                )
+            },
+            bottomSection: {
+                BookmarkDialogButtonsView(
+                    viewState: .init(.compressed),
+                    otherButtonAction: .init(
+                        title: viewModel.bookmarkModel.cancelActionTitle,
+                        isDisabled: viewModel.bookmarkModel.isOtherActionDisabled,
+                        action: viewModel.bookmarkModel.cancel
+                    ),
+                    defaultButtonAction: .init(
+                        title: viewModel.bookmarkModel.defaultActionTitle,
+                        keyboardShortCut: .defaultAction,
+                        isDisabled: viewModel.bookmarkModel.isDefaultActionDisabled,
+                        action: viewModel.bookmarkModel.addOrSave
+                    )
+                )
+            }
+
+        )
+        .frame(width: 448)
+    }
+
+    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)
+    }
+}
+
+#if DEBUG
+#Preview("Bookmark All Tabs - Light") {
+    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()
+    let websitesInfo: [WebsiteInfo] = [
+        .init(.init(content: .url(URL.duckDuckGo, credential: nil, source: .ui)))!,
+        .init(.init(content: .url(URL.duckDuckGoEmail, credential: nil, source: .ui)))!,
+    ]
+
+    return BookmarksDialogViewFactory.makeBookmarkAllOpenTabsView(websitesInfo: websitesInfo, bookmarkManager: bookmarkManager)
+        .preferredColorScheme(.light)
+}
+
+#Preview("Bookmark All Tabs - Dark") {
+    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()
+    let websitesInfo: [WebsiteInfo] = [
+        .init(.init(content: .url(URL.duckDuckGo, credential: nil, source: .ui)))!,
+        .init(.init(content: .url(URL.duckDuckGoEmail, credential: nil, source: .ui)))!,
+    ]
+
+    return BookmarksDialogViewFactory.makeBookmarkAllOpenTabsView(websitesInfo: websitesInfo, bookmarkManager: bookmarkManager)
+        .preferredColorScheme(.dark)
+}
+#endif
diff --git a/DuckDuckGo/Bookmarks/View/Dialog/BookmarkDialogButtonsView.swift b/DuckDuckGo/Bookmarks/View/Dialog/BookmarkDialogButtonsView.swift
index d55f6dd34f..80e9320dc2 100644
--- a/DuckDuckGo/Bookmarks/View/Dialog/BookmarkDialogButtonsView.swift
+++ b/DuckDuckGo/Bookmarks/View/Dialog/BookmarkDialogButtonsView.swift
@@ -40,7 +40,7 @@ struct BookmarkDialogButtonsView: View {
                 Spacer()
             }
 
-            actionButton(action: otherButtonAction, viewState: viewState)
+            actionButton(action: otherButtonAction, viewState: viewState).accessibilityIdentifier("BookmarkDialogButtonsView.otherButton")
 
             actionButton(action: defaultButtonAction, viewState: viewState).accessibilityIdentifier("BookmarkDialogButtonsView.defaultButton")
         }
diff --git a/DuckDuckGo/Bookmarks/View/Dialog/BookmarkDialogContainerView.swift b/DuckDuckGo/Bookmarks/View/Dialog/BookmarkDialogContainerView.swift
index ea49712abb..120869ea4f 100644
--- a/DuckDuckGo/Bookmarks/View/Dialog/BookmarkDialogContainerView.swift
+++ b/DuckDuckGo/Bookmarks/View/Dialog/BookmarkDialogContainerView.swift
@@ -42,9 +42,13 @@ struct BookmarkDialogContainerView<Content: View, Buttons: View>: View {
                 Text(title)
                     .foregroundColor(.primary)
                     .fontWeight(.semibold)
+                    .padding(.top, 20)
             },
             center: middleSection,
-            bottom: bottomSection
+            bottom: {
+                bottomSection()
+                    .padding(.bottom, 16.0)
+            }
         )
     }
 }
diff --git a/DuckDuckGo/Bookmarks/View/Dialog/BookmarksDialogViewFactory.swift b/DuckDuckGo/Bookmarks/View/Dialog/BookmarksDialogViewFactory.swift
index b29b50bbbb..3bff7ff4af 100644
--- a/DuckDuckGo/Bookmarks/View/Dialog/BookmarksDialogViewFactory.swift
+++ b/DuckDuckGo/Bookmarks/View/Dialog/BookmarksDialogViewFactory.swift
@@ -80,6 +80,18 @@ enum BookmarksDialogViewFactory {
         return makeAddEditBookmarkDialogView(viewModel: viewModel, bookmarkManager: bookmarkManager)
     }
 
+    /// Creates an instance of AddEditBookmarkDialogView for adding Bookmarks for all the open Tabs.
+    /// - Parameters:
+    ///   - websitesInfo: A list of websites to add as bookmarks.
+    ///   - bookmarkManager: An instance of `BookmarkManager`. This should be used for `#previews` only.
+    /// - Returns: An instance of BookmarkAllTabsDialogView
+    static func makeBookmarkAllOpenTabsView(websitesInfo: [WebsiteInfo], bookmarkManager: LocalBookmarkManager = .shared) -> BookmarkAllTabsDialogView {
+        let addFolderViewModel = AddEditBookmarkFolderDialogViewModel(mode: .add(parentFolder: nil), bookmarkManager: bookmarkManager)
+        let bookmarkAllTabsViewModel = BookmarkAllTabsDialogViewModel(websites: websitesInfo, foldersStore: UserDefaultsBookmarkFoldersStore(), bookmarkManager: bookmarkManager)
+        let viewModel = BookmarkAllTabsDialogCoordinatorViewModel(bookmarkModel: bookmarkAllTabsViewModel, folderModel: addFolderViewModel)
+        return BookmarkAllTabsDialogView(viewModel: viewModel)
+    }
+
 }
 
 private extension BookmarksDialogViewFactory {
diff --git a/DuckDuckGo/Bookmarks/ViewModel/AddEditBookmarkFolderDialogViewModel.swift b/DuckDuckGo/Bookmarks/ViewModel/AddEditBookmarkFolderDialogViewModel.swift
index 62c1e0356c..48815ebc8d 100644
--- a/DuckDuckGo/Bookmarks/ViewModel/AddEditBookmarkFolderDialogViewModel.swift
+++ b/DuckDuckGo/Bookmarks/ViewModel/AddEditBookmarkFolderDialogViewModel.swift
@@ -42,8 +42,9 @@ final class AddEditBookmarkFolderDialogViewModel: BookmarkFolderDialogEditing {
 
     @Published var folderName: String
     @Published var selectedFolder: BookmarkFolder?
+    @Published private(set) var folders: [FolderViewModel]
 
-    let folders: [FolderViewModel]
+    private var folderCancellable: AnyCancellable?
 
     var title: String {
         mode.title
@@ -77,14 +78,20 @@ final class AddEditBookmarkFolderDialogViewModel: BookmarkFolderDialogEditing {
         folderName = mode.folderName
         folders = .init(bookmarkManager.list)
         selectedFolder = mode.parentFolder
+
+        bind()
     }
 
     func cancel(dismiss: () -> Void) {
+        reset()
         dismiss()
     }
 
     func addOrSave(dismiss: () -> Void) {
-        defer { dismiss() }
+        defer {
+            reset()
+            dismiss()
+        }
 
         guard !folderName.isEmpty else {
             assertionFailure("folderName is empty, button should be disabled")
@@ -110,6 +117,14 @@ final class AddEditBookmarkFolderDialogViewModel: BookmarkFolderDialogEditing {
 
 private extension AddEditBookmarkFolderDialogViewModel {
 
+    func bind() {
+        folderCancellable = bookmarkManager.listPublisher
+            .receive(on: DispatchQueue.main)
+            .sink(receiveValue: { [weak self] bookmarkList in
+                self?.folders = .init(bookmarkList)
+            })
+    }
+
     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 {
@@ -129,6 +144,10 @@ private extension AddEditBookmarkFolderDialogViewModel {
         }
     }
 
+    func reset() {
+        self.folderName = ""
+    }
+
 }
 
 // MARK: - AddEditBookmarkFolderDialogViewModel.Mode
diff --git a/DuckDuckGo/Bookmarks/ViewModel/BookmarkAllTabsDialogCoordinatorViewModel.swift b/DuckDuckGo/Bookmarks/ViewModel/BookmarkAllTabsDialogCoordinatorViewModel.swift
new file mode 100644
index 0000000000..975c8811b6
--- /dev/null
+++ b/DuckDuckGo/Bookmarks/ViewModel/BookmarkAllTabsDialogCoordinatorViewModel.swift
@@ -0,0 +1,74 @@
+//
+//  BookmarkAllTabsDialogCoordinatorViewModel.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 BookmarkAllTabsDialogCoordinatorViewModel<BookmarkViewModel: BookmarkAllTabsDialogEditing, 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 = .bookmarkAllTabs
+        bind()
+    }
+
+    func dismissAction() {
+        viewState = .bookmarkAllTabs
+    }
+
+    func addFolderAction() {
+        folderModel.selectedFolder = bookmarkModel.selectedFolder
+        viewState = .addFolder
+    }
+
+    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 BookmarkAllTabsDialogCoordinatorViewModel {
+    enum ViewState {
+        case bookmarkAllTabs
+        case addFolder
+    }
+}
diff --git a/DuckDuckGo/Bookmarks/ViewModel/BookmarkAllTabsDialogViewModel.swift b/DuckDuckGo/Bookmarks/ViewModel/BookmarkAllTabsDialogViewModel.swift
new file mode 100644
index 0000000000..daf6018403
--- /dev/null
+++ b/DuckDuckGo/Bookmarks/ViewModel/BookmarkAllTabsDialogViewModel.swift
@@ -0,0 +1,127 @@
+//
+//  BookmarkAllTabsDialogViewModel.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 BookmarkAllTabsDialogEditing: BookmarksDialogViewModel {
+    var folderName: String { get set }
+    var educationalMessage: String { get }
+    var folderNameFieldTitle: String { get }
+    var locationFieldTitle: String { get }
+}
+
+final class BookmarkAllTabsDialogViewModel: BookmarkAllTabsDialogEditing {
+    private static let dateFormatter: ISO8601DateFormatter = {
+        let formatter = ISO8601DateFormatter()
+        formatter.formatOptions = [.withFullDate, .withDashSeparatorInDate]
+        return formatter
+    }()
+
+    private let websites: [WebsiteInfo]
+    private let foldersStore: BookmarkFoldersStore
+    private let bookmarkManager: BookmarkManager
+
+    private var folderCancellable: AnyCancellable?
+
+    @Published private(set) var folders: [FolderViewModel]
+    @Published var selectedFolder: BookmarkFolder?
+    @Published var folderName: String
+
+    var title: String {
+        String(format: UserText.Bookmarks.Dialog.Title.bookmarkOpenTabs, websites.count)
+    }
+    let cancelActionTitle = UserText.cancel
+    let defaultActionTitle = UserText.Bookmarks.Dialog.Action.addAllBookmarks
+    let educationalMessage = UserText.Bookmarks.Dialog.Message.bookmarkOpenTabsEducational
+    let folderNameFieldTitle = UserText.Bookmarks.Dialog.Field.folderName
+    let locationFieldTitle = UserText.Bookmarks.Dialog.Field.location
+    let isOtherActionDisabled = false
+
+    var isDefaultActionDisabled: Bool {
+        folderName.trimmingWhitespace().isEmpty
+    }
+
+    init(
+        websites: [WebsiteInfo],
+        foldersStore: BookmarkFoldersStore,
+        bookmarkManager: BookmarkManager = LocalBookmarkManager.shared,
+        dateFormatterConfigurationProvider: () -> DateFormatterConfiguration = DateFormatterConfiguration.defaultConfiguration
+    ) {
+        self.websites = websites
+        self.foldersStore = foldersStore
+        self.bookmarkManager = bookmarkManager
+
+        folders = .init(bookmarkManager.list)
+        selectedFolder = foldersStore.lastBookmarkAllTabsFolderIdUsed.flatMap(bookmarkManager.getBookmarkFolder(withId:))
+        folderName = Self.folderName(configuration: dateFormatterConfigurationProvider(), websitesNumber: websites.count)
+        bind()
+    }
+
+    func cancel(dismiss: () -> Void) {
+        dismiss()
+    }
+
+    func addOrSave(dismiss: () -> Void) {
+        // Save last used folder
+        foldersStore.lastBookmarkAllTabsFolderIdUsed = selectedFolder?.id
+
+        // Save all bookmarks
+        let parentFolder: ParentFolderType = selectedFolder.flatMap { .parent(uuid: $0.id) } ?? .root
+        bookmarkManager.makeBookmarks(for: websites, inNewFolderNamed: folderName, withinParentFolder: parentFolder)
+
+        // Dismiss the view
+        dismiss()
+    }
+}
+
+// MARK: - Private
+
+private extension BookmarkAllTabsDialogViewModel {
+
+    static func folderName(configuration: DateFormatterConfiguration, websitesNumber: Int) -> String {
+        Self.dateFormatter.timeZone = configuration.timeZone
+        let dateString = Self.dateFormatter.string(from: configuration.date)
+        return String(format: UserText.Bookmarks.Dialog.Value.folderName, dateString, websitesNumber)
+    }
+
+    func bind() {
+        folderCancellable = bookmarkManager.listPublisher
+            .receive(on: DispatchQueue.main)
+            .sink(receiveValue: { [weak self] bookmarkList in
+                self?.folders = .init(bookmarkList)
+            })
+    }
+
+}
+
+// MARK: - DateConfiguration
+
+extension BookmarkAllTabsDialogViewModel {
+
+    struct DateFormatterConfiguration {
+        let date: Date
+        let timeZone: TimeZone
+
+        static func defaultConfiguration() -> DateFormatterConfiguration {
+            .init(date: Date(), timeZone: .current)
+        }
+    }
+
+}
diff --git a/DuckDuckGo/BookmarksBar/BookmarksBarVisibilityManager.swift b/DuckDuckGo/BookmarksBar/BookmarksBarVisibilityManager.swift
new file mode 100644
index 0000000000..9e837b1a47
--- /dev/null
+++ b/DuckDuckGo/BookmarksBar/BookmarksBarVisibilityManager.swift
@@ -0,0 +1,96 @@
+//
+//  BookmarksBarVisibilityManager.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
+
+/// Decides if the BookmarksBar should be visible based on the Tab.Content and Appearance preferences.
+final class BookmarksBarVisibilityManager {
+    private var bookmarkBarVisibilityCancellable: AnyCancellable?
+    private var bookmarkContentCancellable: AnyCancellable?
+
+    /// A published value indicating the visibility of the bookmarks bar.
+    /// Returns`true` if the bookmarks bar is visible; otherwise, `false`.
+    @Published var isBookmarksBarVisible: Bool = false
+
+    private let selectedTabPublisher: AnyPublisher<TabViewModel?, Never>
+    private let preferences: AppearancePreferences
+
+    /// Create an instance given the specified `TabViewModel` publisher and `AppearancePreferences`.
+    /// - Parameters:
+    ///   - selectedTabPublisher: A publisher that returns the selected Tab view model.
+    ///   - preferences: The `AppearancePreferences` to read the bookmarks appearance preferences from.
+    init(selectedTabPublisher: AnyPublisher<TabViewModel?, Never>, preferences: AppearancePreferences = .shared) {
+        self.selectedTabPublisher = selectedTabPublisher
+        self.preferences = preferences
+        bind()
+    }
+
+}
+
+// MARK: - Private
+
+private extension BookmarksBarVisibilityManager {
+
+    func bind() {
+        let bookmarksBarVisibilityPublisher = NotificationCenter.default
+            .publisher(for: AppearancePreferences.Notifications.showBookmarksBarSettingChanged)
+
+        let bookmarksBarAppearancePublisher = NotificationCenter.default
+            .publisher(for: AppearancePreferences.Notifications.bookmarksBarSettingAppearanceChanged)
+
+        let bookmarksBarNotificationsPublisher = Publishers.Merge(bookmarksBarVisibilityPublisher, bookmarksBarAppearancePublisher)
+            .map { _ in () } // Map To Void, we're not interested in the notification itself
+            .prepend(()) // Start with a value so combineLatest can fire
+
+        // Every time the user select a tab or the Appeareance preference changes check if bookmarks bar should be visible or not.
+        // For the selected Tab we should also check if the Tab content changes as it can switch from empty to url if the user loads a web page.
+        bookmarkBarVisibilityCancellable = bookmarksBarNotificationsPublisher
+            .combineLatest(selectedTabPublisher)
+            .compactMap { _, selectedTab -> TabViewModel? in
+                guard let selectedTab else { return nil }
+                return selectedTab
+            }
+            .flatMap { tabViewModel in
+                // Subscribe to the selected tab content.
+                // When a tab is empty and the bookmarksBar should show only on empty Tabs it should disappear when we load a website.
+                tabViewModel.tab.$content.eraseToAnyPublisher()
+            }
+            .sink(receiveValue: { [weak self] tabContent in
+                guard let self = self else { return }
+                self.updateBookmarksBar(content: tabContent, preferences: self.preferences)
+            })
+    }
+
+    func updateBookmarksBar(content: Tab.TabContent, preferences: AppearancePreferences) {
+        // If visibility should be off, set visibility off and exit
+        guard preferences.showBookmarksBar else {
+            isBookmarksBarVisible = false
+            return
+        }
+
+        // If visibility is on check Appearance
+        switch preferences.bookmarksBarAppearance {
+        case .newTabOnly:
+            isBookmarksBarVisible = content.isEmpty
+        case .alwaysOn:
+            isBookmarksBarVisible = true
+        }
+    }
+
+}
diff --git a/DuckDuckGo/BookmarksBar/View/BookmarksBarViewController.swift b/DuckDuckGo/BookmarksBar/View/BookmarksBarViewController.swift
index e298a6335e..b927a05751 100644
--- a/DuckDuckGo/BookmarksBar/View/BookmarksBarViewController.swift
+++ b/DuckDuckGo/BookmarksBar/View/BookmarksBarViewController.swift
@@ -82,6 +82,7 @@ final class BookmarksBarViewController: NSViewController {
         bookmarksBarCollectionView.collectionViewLayout = createCenteredCollectionViewLayout()
 
         view.postsFrameChangedNotifications = true
+        bookmarksBarCollectionView.setAccessibilityIdentifier("BookmarksBarViewController.bookmarksBarCollectionView")
     }
 
     private func addContextMenu() {
diff --git a/DuckDuckGo/Common/Database/Database.swift b/DuckDuckGo/Common/Database/Database.swift
index 10e116d3a7..dee8aef2d8 100644
--- a/DuckDuckGo/Common/Database/Database.swift
+++ b/DuckDuckGo/Common/Database/Database.swift
@@ -21,6 +21,7 @@ import BrowserServicesKit
 import CoreData
 import Foundation
 import Persistence
+import PixelKit
 
 final class Database {
 
@@ -100,7 +101,7 @@ final class Database {
         // Fire the pixel once a day at max
         if lastPixelSentAt < Date.daysAgo(1) {
             lastDatabaseFactoryFailurePixelDate = Date()
-            Pixel.fire(.debug(event: .dbMakeDatabaseError, error: error))
+            PixelKit.fire(DebugEvent(GeneralPixel.dbMakeDatabaseError(error: error)))
         }
     }
 }
@@ -185,14 +186,14 @@ extension NSManagedObjectModel {
 
 extension NSManagedObjectContext {
 
-    func save(onErrorFire event: Pixel.Event.Debug) throws {
+    func save(onErrorFire event: PixelKitEventV2) throws {
         do {
             try save()
         } catch {
             let nsError = error as NSError
             let processedErrors = CoreDataErrorsParser.parse(error: nsError)
 
-            Pixel.fire(.debug(event: event, error: error),
+            PixelKit.fire(DebugEvent(event, error: error),
                        withAdditionalParameters: processedErrors.errorPixelParameters)
 
             throw error
diff --git a/DuckDuckGo/Common/Extensions/BundleExtension.swift b/DuckDuckGo/Common/Extensions/BundleExtension.swift
index b3c7a629f5..28133debd8 100644
--- a/DuckDuckGo/Common/Extensions/BundleExtension.swift
+++ b/DuckDuckGo/Common/Extensions/BundleExtension.swift
@@ -26,6 +26,8 @@ extension Bundle {
         static let buildNumber = kCFBundleVersionKey as String
         static let versionNumber = "CFBundleShortVersionString"
         static let displayName = "CFBundleDisplayName"
+        static let documentTypes = "CFBundleDocumentTypes"
+        static let typeExtensions = "CFBundleTypeExtensions"
         static let vpnMenuAgentBundleId = "AGENT_BUNDLE_ID"
         static let vpnMenuAgentProductName = "AGENT_PRODUCT_NAME"
 
@@ -115,6 +117,14 @@ extension Bundle {
         return path.hasPrefix(applicationsPath)
     }
 
+    var documentTypes: [[String: Any]] {
+        infoDictionary?[Keys.documentTypes] as? [[String: Any]] ?? []
+    }
+
+    var fileTypeExtensions: Set<String> {
+        documentTypes.reduce(into: []) { $0.formUnion($1[Keys.typeExtensions] as? [String] ?? []) }
+    }
+
 }
 
 enum BundleGroup {
diff --git a/DuckDuckGo/Common/Extensions/FileManagerExtension.swift b/DuckDuckGo/Common/Extensions/FileManagerExtension.swift
index c524d39c8c..b7e767fece 100644
--- a/DuckDuckGo/Common/Extensions/FileManagerExtension.swift
+++ b/DuckDuckGo/Common/Extensions/FileManagerExtension.swift
@@ -101,4 +101,16 @@ extension FileManager {
         return resolvedUrl.path.hasPrefix(trashUrl.path)
     }
 
+    /// Check if location pointed by the URL is writable by writing an empty data to it and removing the file if write succeeds
+    /// - Throws error if writing to the location fails
+    func checkWritability(_ url: URL) throws {
+        if fileExists(atPath: url.path), isWritableFile(atPath: url.path) {
+            return // we can write
+        } else {
+            // either we can‘t write or there‘s no file at the url – try writing throwing access error if no permission
+            try Data().write(to: url)
+            try removeItem(at: url)
+        }
+    }
+
 }
diff --git a/DuckDuckGo/Common/Extensions/NSAlertExtension.swift b/DuckDuckGo/Common/Extensions/NSAlertExtension.swift
index 554ce896e5..017389de08 100644
--- a/DuckDuckGo/Common/Extensions/NSAlertExtension.swift
+++ b/DuckDuckGo/Common/Extensions/NSAlertExtension.swift
@@ -137,15 +137,6 @@ extension NSAlert {
         return alert
     }
 
-    static func noAccessToSelectedFolder() -> NSAlert {
-        let alert = NSAlert()
-        alert.messageText = UserText.noAccessToSelectedFolderHeader
-        alert.informativeText = UserText.noAccessToSelectedFolder
-        alert.alertStyle = .warning
-        alert.addButton(withTitle: UserText.cancel)
-        return alert
-    }
-
     static func disableEmailProtection() -> NSAlert {
         let alert = NSAlert()
         alert.messageText = UserText.disableEmailProtectionTitle
@@ -224,6 +215,37 @@ extension NSAlert {
         return alert
     }
 
+    static func autoClearAlert() -> NSAlert {
+        let alert = NSAlert()
+        alert.messageText = UserText.warnBeforeQuitDialogHeader
+        alert.alertStyle = .warning
+        alert.icon = .burnAlert
+        alert.addButton(withTitle: UserText.clearAndQuit)
+        alert.addButton(withTitle: UserText.quitWithoutClearing)
+        alert.addButton(withTitle: UserText.cancel)
+
+        let checkbox = NSButton(checkboxWithTitle: UserText.warnBeforeQuitDialogCheckboxMessage,
+                                target: DataClearingPreferences.shared,
+                                action: #selector(DataClearingPreferences.toggleWarnBeforeClearing))
+        checkbox.state = DataClearingPreferences.shared.isWarnBeforeClearingEnabled ? .on : .off
+        checkbox.lineBreakMode = .byWordWrapping
+        checkbox.translatesAutoresizingMaskIntoConstraints = false
+
+        // Create a container view for the checkbox with custom padding
+        let containerView = NSView(frame: NSRect(x: 0, y: 0, width: 240, height: 25))
+        containerView.addSubview(checkbox)
+
+        NSLayoutConstraint.activate([
+            checkbox.centerXAnchor.constraint(equalTo: containerView.centerXAnchor),
+            checkbox.centerYAnchor.constraint(equalTo: containerView.centerYAnchor, constant: -10), // Slightly up for better visual alignment
+            checkbox.widthAnchor.constraint(lessThanOrEqualTo: containerView.widthAnchor)
+        ])
+
+        alert.accessoryView = containerView
+
+        return alert
+    }
+
     @discardableResult
     func runModal() async -> NSApplication.ModalResponse {
         await withCheckedContinuation { continuation in
diff --git a/DuckDuckGo/Common/Extensions/NSAttributedStringExtension.swift b/DuckDuckGo/Common/Extensions/NSAttributedStringExtension.swift
index 01f2d1c255..58a1cd7fb0 100644
--- a/DuckDuckGo/Common/Extensions/NSAttributedStringExtension.swift
+++ b/DuckDuckGo/Common/Extensions/NSAttributedStringExtension.swift
@@ -18,6 +18,7 @@
 
 import AppKit
 
+typealias NSAttributedStringBuilder = ArrayBuilder<NSAttributedString>
 extension NSAttributedString {
 
     /// These values come from Figma.  Click on the text in Figma and choose Code > iOS to see the values.
@@ -31,6 +32,31 @@ extension NSAttributedString {
         ])
     }
 
+    convenience init(image: NSImage, rect: CGRect) {
+        let attachment = NSTextAttachment()
+        attachment.image = image
+        attachment.bounds = rect
+        self.init(attachment: attachment)
+    }
+
+    convenience init(@NSAttributedStringBuilder components: () -> [NSAttributedString]) {
+        let components = components()
+        guard !components.isEmpty else {
+            self.init()
+            return
+        }
+        guard components.count > 1 else {
+            self.init(attributedString: components[0])
+            return
+        }
+        let result = NSMutableAttributedString(attributedString: components[0])
+        for component in components[1...] {
+            result.append(component)
+        }
+
+        self.init(attributedString: result)
+    }
+
 }
 
 extension NSMutableAttributedString {
@@ -48,12 +74,3 @@ extension NSMutableAttributedString {
     }
 
 }
-
-extension NSTextAttachment {
-    func setImageHeight(height: CGFloat, offset: CGPoint = .zero) {
-        guard let image = image else { return }
-        let ratio = image.size.width / image.size.height
-
-        bounds = CGRect(x: bounds.origin.x + offset.x, y: bounds.origin.y + offset.y, width: ratio * height, height: height)
-    }
-}
diff --git a/DuckDuckGo/Common/Extensions/NSMenuItemExtension.swift b/DuckDuckGo/Common/Extensions/NSMenuItemExtension.swift
index b3f0870252..dfe76b5092 100644
--- a/DuckDuckGo/Common/Extensions/NSMenuItemExtension.swift
+++ b/DuckDuckGo/Common/Extensions/NSMenuItemExtension.swift
@@ -110,6 +110,11 @@ extension NSMenuItem {
         return self
     }
 
+    func withAccessibilityValue(_ accessibilityValue: String) -> NSMenuItem {
+        self.setAccessibilityValue(accessibilityValue)
+        return self
+    }
+
     @discardableResult
     func withImage(_ image: NSImage?) -> NSMenuItem {
         self.image = image
diff --git a/DuckDuckGo/Common/Extensions/NSPointExtension.swift b/DuckDuckGo/Common/Extensions/NSPointExtension.swift
index 18bfbf0c2e..594cea0de4 100644
--- a/DuckDuckGo/Common/Extensions/NSPointExtension.swift
+++ b/DuckDuckGo/Common/Extensions/NSPointExtension.swift
@@ -20,6 +20,12 @@ import Foundation
 
 extension NSPoint {
 
+    func distance(to point: NSPoint) -> CGFloat {
+        let deltaX = self.x - point.x
+        let deltaY = self.y - point.y
+        return sqrt(deltaX * deltaX + deltaY * deltaY)
+    }
+
     func isNearRect(_ rect: NSRect, allowedDistance: CGFloat) -> Bool {
         let expandedRect = rect.insetBy(dx: -allowedDistance, dy: -allowedDistance)
         return expandedRect.contains(self)
diff --git a/DuckDuckGo/Common/Extensions/NSViewExtension.swift b/DuckDuckGo/Common/Extensions/NSViewExtension.swift
index b82095c1f0..333dce57cf 100644
--- a/DuckDuckGo/Common/Extensions/NSViewExtension.swift
+++ b/DuckDuckGo/Common/Extensions/NSViewExtension.swift
@@ -79,6 +79,11 @@ extension NSView {
         return self
     }
 
+    var isShown: Bool {
+        get { !isHidden }
+        set { isHidden = !newValue }
+    }
+
     func makeMeFirstResponder() {
         guard let window = window else {
             os_log("%s: Window not available", type: .error, className)
diff --git a/DuckDuckGo/Common/Extensions/StringExtension.swift b/DuckDuckGo/Common/Extensions/StringExtension.swift
index eeb8e5bedb..6128d9906a 100644
--- a/DuckDuckGo/Common/Extensions/StringExtension.swift
+++ b/DuckDuckGo/Common/Extensions/StringExtension.swift
@@ -71,6 +71,10 @@ extension String {
         return result
     }
 
+    func replacingInvalidFileNameCharacters(with replacement: String = "_") -> String {
+        replacingOccurrences(of: "[~#@*+%{}<>\\[\\]|\"\\_^\\/:\\\\]", with: replacement, options: .regularExpression)
+    }
+
     init(_ staticString: StaticString) {
         self = staticString.withUTF8Buffer {
             String(decoding: $0, as: UTF8.self)
diff --git a/DuckDuckGo/Common/Extensions/URLExtension.swift b/DuckDuckGo/Common/Extensions/URLExtension.swift
index 4c68d32b01..07683d29cc 100644
--- a/DuckDuckGo/Common/Extensions/URLExtension.swift
+++ b/DuckDuckGo/Common/Extensions/URLExtension.swift
@@ -24,11 +24,17 @@ import Foundation
 extension URL.NavigationalScheme {
 
     static let duck = URL.NavigationalScheme(rawValue: "duck")
+    static let javascript = URL.NavigationalScheme(rawValue: "javascript")
 
     static var validSchemes: [URL.NavigationalScheme] {
         return [.http, .https, .file]
     }
 
+    /// HTTP or HTTPS
+    var isHypertextScheme: Bool {
+        Self.hypertextSchemes.contains(self)
+    }
+
 }
 
 extension URL {
@@ -136,12 +142,16 @@ extension URL {
     // base url for Error Page Alternate HTML loaded into Web View
     static let error = URL(string: "duck://error")!
 
-    static let dataBrokerProtection = URL(string: "duck://dbp")!
+    static let dataBrokerProtection = URL(string: "duck://personal-information-removal")!
 
 #if !SANDBOX_TEST_TOOL
     static func settingsPane(_ pane: PreferencePaneIdentifier) -> URL {
         return settings.appendingPathComponent(pane.rawValue)
     }
+
+    var isSettingsURL: Bool {
+        isChild(of: .settings) && (pathComponents.isEmpty || PreferencePaneIdentifier(url: self) != nil)
+    }
 #endif
 
     enum Invalid {
@@ -278,6 +288,14 @@ extension URL {
         return string
     }
 
+    func hostAndPort() -> String? {
+        guard let host else { return nil }
+
+        guard let port = port else { return host }
+
+        return "\(host):\(port)"
+    }
+
 #if !SANDBOX_TEST_TOOL
     func toString(forUserInput input: String, decodePunycode: Bool = true) -> String {
         let hasInputScheme = input.hasOrIsPrefix(of: self.separatedScheme ?? "")
@@ -323,7 +341,7 @@ extension URL {
     }
 
     var isExternalSchemeLink: Bool {
-        return !["https", "http", "about", "file", "blob", "data", "ftp"].contains(scheme)
+        return ![.https, .http, .about, .file, .blob, .data, .ftp, .javascript].contains(navigationalScheme)
     }
 
     // MARK: - DuckDuckGo
@@ -373,6 +391,10 @@ extension URL {
         return URL(string: "https://duckduckgo.com/privacy")!
     }
 
+    static var privacyPro: URL {
+        return URL(string: "https://duckduckgo.com/pro")!
+    }
+
     static var duckDuckGoEmail = URL(string: "https://duckduckgo.com/email-protection")!
     static var duckDuckGoEmailLogin = URL(string: "https://duckduckgo.com/email")!
 
@@ -391,6 +413,10 @@ extension URL {
         return false
     }
 
+    var isEmailProtection: Bool {
+        self.isChild(of: .duckDuckGoEmailLogin) || self == .duckDuckGoEmail
+    }
+
     enum DuckDuckGoParameters: String {
         case search = "q"
         case ia
@@ -465,10 +491,63 @@ extension URL {
 
     }
 
+    var isFileHidden: Bool {
+        get throws {
+            try self.resourceValues(forKeys: [.isHiddenKey]).isHidden ?? false
+        }
+    }
+
+    var isDirectory: Bool {
+        var isDirectory: ObjCBool = false
+        guard isFileURL,
+              FileManager.default.fileExists(atPath: path, isDirectory: &isDirectory) else { return false }
+        return isDirectory.boolValue
+    }
+
+    mutating func setFileHidden(_ hidden: Bool) throws {
+        var resourceValues = URLResourceValues()
+        resourceValues.isHidden = true
+        try setResourceValues(resourceValues)
+    }
+
+    /// Check if location pointed by the URL is writable
+    /// - Note: if there‘s no file at the URL, it will try to create a file and then remove it
+    func isWritableLocation() -> Bool {
+        do {
+            try FileManager.default.checkWritability(self)
+            return true
+        } catch {
+            return false
+        }
+    }
+
+#if DEBUG && APPSTORE
+    /// sandbox extension URL access should be stopped after SecurityScopedFileURLController is deallocated - this function validates it and breaks if the file is still writable
+    func ensureUrlIsNotWritable(or handler: () -> Void) {
+        let fm = FileManager.default
+        // is the URL ~/Downloads?
+        if self.resolvingSymlinksInPath() == fm.urls(for: .downloadsDirectory, in: .userDomainMask).first!.resolvingSymlinksInPath() {
+            assert(isWritableLocation())
+            return
+        }
+        // is parent directory writable (e.g. ~/Downloads)?
+        if fm.isWritableFile(atPath: self.deletingLastPathComponent().path)
+            // trashed files are still accessible for some reason even after stopping access
+            || fm.isInTrash(self)
+            // other file is being saved at the same URL
+            || NSURL.activeSecurityScopedUrlUsages.contains(where: { $0.url !== self as NSURL && $0.url == self as NSURL })
+            || !isWritableLocation() { return }
+
+        handler()
+    }
+#endif
+
     // MARK: - System Settings
 
     static var fullDiskAccess = URL(string: "x-apple.systempreferences:com.apple.preference.security?Privacy_AllFiles")!
 
+    static var touchIDAndPassword = URL(string: "x-apple.systempreferences:com.apple.preferences.password")!
+
     // MARK: - Blob URLs
 
     var isBlobURL: Bool {
@@ -481,7 +560,7 @@ extension URL {
         return false
     }
 
-    func stripUnsupportedCredentials() -> String {
+    func strippingUnsupportedCredentials() -> String {
         if self.absoluteString.firstIndex(of: "@") != nil {
             let authPattern = "([^:]+):\\/\\/[^\\/]*@"
             let strippedURL = self.absoluteString.replacingOccurrences(of: authPattern, with: "$1://", options: .regularExpression)
@@ -491,10 +570,15 @@ extension URL {
         return self.absoluteString
     }
 
-    public func isChild(of url: URL) -> Bool {
-        var components = URLComponents(string: url.absoluteString)
-        components?.query = nil
-
-        return self.absoluteString.hasPrefix(components?.url?.absoluteString ?? url.absoluteString)
+    public func isChild(of parentURL: URL) -> Bool {
+        if scheme == parentURL.scheme,
+           port == parentURL.port,
+           let parentURLHost = parentURL.host,
+           self.isPart(ofDomain: parentURLHost),
+           pathComponents.starts(with: parentURL.pathComponents) {
+            return true
+        } else {
+            return false
+        }
     }
 }
diff --git a/DuckDuckGo/Common/Extensions/WKWebView+Private.h b/DuckDuckGo/Common/Extensions/WKWebView+Private.h
index b5e8c44d99..daa465149f 100644
--- a/DuckDuckGo/Common/Extensions/WKWebView+Private.h
+++ b/DuckDuckGo/Common/Extensions/WKWebView+Private.h
@@ -63,8 +63,6 @@ typedef NS_OPTIONS(NSUInteger, _WKFindOptions) {
 
 - (void)_stopMediaCapture API_AVAILABLE(macos(10.15.4), ios(13.4));
 - (void)_stopAllMediaPlayback;
-- (_WKMediaMutedState)_mediaMutedState API_AVAILABLE(macos(11.0), ios(14.0));;
-- (void)_setPageMuted:(_WKMediaMutedState)mutedState API_AVAILABLE(macos(10.13), ios(11.0));
 
 @end
 
diff --git a/DuckDuckGo/Common/Extensions/WKWebViewExtension.swift b/DuckDuckGo/Common/Extensions/WKWebViewExtension.swift
index fcd19de900..5f7a7b316c 100644
--- a/DuckDuckGo/Common/Extensions/WKWebViewExtension.swift
+++ b/DuckDuckGo/Common/Extensions/WKWebViewExtension.swift
@@ -32,7 +32,17 @@ extension WKWebView {
     enum AudioState {
         case muted
         case unmuted
-        case notSupported
+
+        init(wkMediaMutedState: _WKMediaMutedState) {
+            self = wkMediaMutedState.contains(.audioMuted) ? .muted : .unmuted
+        }
+
+        mutating func toggle() {
+            self = switch self {
+            case .muted: .unmuted
+            case .unmuted: .muted
+            }
+        }
     }
 
     enum CaptureState {
@@ -114,96 +124,84 @@ extension WKWebView {
         return .active
     }
 
-#if !APPSTORE
-    private func setMediaCaptureMuted(_ muted: Bool) {
-        guard self.responds(to: #selector(WKWebView._setPageMuted(_:))) else {
-            assertionFailure("WKWebView does not respond to selector _stopMediaCapture")
-            return
+    @objc dynamic var mediaMutedState: _WKMediaMutedState {
+        get {
+            // swizzle the method to call `_mediaMutedState` without performSelector: usage
+            guard Self.swizzleMediaMutedStateOnce else { return [] }
+            return self.mediaMutedState // call the original
         }
-        let mutedState: _WKMediaMutedState = {
-            guard self.responds(to: #selector(WKWebView._mediaMutedState)) else { return [] }
-            return self._mediaMutedState()
-        }()
-        var newState = mutedState
-        if muted {
-            newState.insert(.captureDevicesMuted)
-        } else {
-            newState.remove(.captureDevicesMuted)
+        set {
+            // swizzle the method to call `_setPageMuted:` without performSelector: usage (as there‘s a non-object argument to pass)
+            guard Self.swizzleSetPageMutedOnce else { return }
+            self.mediaMutedState = newValue // call the original
         }
-        guard newState != mutedState else { return }
-        self._setPageMuted(newState)
     }
-#endif
 
-    func muteOrUnmute() {
-#if !APPSTORE
-        guard self.responds(to: #selector(WKWebView._setPageMuted(_:))) else {
-            assertionFailure("WKWebView does not respond to selector _stopMediaCapture")
-            return
+    static private let swizzleMediaMutedStateOnce: Bool = {
+        guard let originalMethod = class_getInstanceMethod(WKWebView.self, Selector.mediaMutedState),
+              let swizzledMethod = class_getInstanceMethod(WKWebView.self, #selector(getter: mediaMutedState)) else {
+            assertionFailure("WKWebView does not respond to selector _mediaMutedState")
+            return false
         }
-        let mutedState: _WKMediaMutedState = {
-            guard self.responds(to: #selector(WKWebView._mediaMutedState)) else { return [] }
-            return self._mediaMutedState()
-        }()
-        var newState = mutedState
-
-        if newState == .audioMuted {
-            newState.remove(.audioMuted)
-        } else {
-            newState.insert(.audioMuted)
+        method_exchangeImplementations(originalMethod, swizzledMethod)
+        return true
+    }()
+
+    static private let swizzleSetPageMutedOnce: Bool = {
+        guard let originalMethod = class_getInstanceMethod(WKWebView.self, Selector.setPageMuted),
+              let swizzledMethod = class_getInstanceMethod(WKWebView.self, #selector(setter: mediaMutedState)) else {
+            assertionFailure("WKWebView does not respond to selector _setPageMuted:")
+            return false
         }
-        guard newState != mutedState else { return }
-        self._setPageMuted(newState)
-#endif
-    }
+        method_exchangeImplementations(originalMethod, swizzledMethod)
+        return true
+    }()
 
     /// Returns the audio state of the WKWebView.
     ///
     /// - Returns: `muted` if the web view is muted
     ///            `unmuted` if the web view is unmuted
-    ///            `notSupported` if the web view does not support fetching the current audio state
-    func audioState() -> AudioState {
-#if APPSTORE
-        return .notSupported
-#else
-        guard self.responds(to: #selector(WKWebView._mediaMutedState)) else {
-            assertionFailure("WKWebView does not respond to selector _mediaMutedState")
-            return .notSupported
+    var audioState: AudioState {
+        get {
+            AudioState(wkMediaMutedState: mediaMutedState)
+        }
+        set {
+            switch newValue {
+            case .muted:
+                self.mediaMutedState.insert(.audioMuted)
+            case .unmuted:
+                self.mediaMutedState.remove(.audioMuted)
+            }
         }
-
-        let mutedState = self._mediaMutedState()
-
-        return mutedState.contains(.audioMuted) ? .muted : .unmuted
-#endif
     }
 
     func stopMediaCapture() {
-        guard #available(macOS 12.0, *) else {
 #if !APPSTORE
+        guard #available(macOS 12.0, *) else {
             guard self.responds(to: #selector(_stopMediaCapture)) else {
                 assertionFailure("WKWebView does not respond to _stopMediaCapture")
                 return
             }
             self._stopMediaCapture()
-#endif
             return
         }
+#endif
 
         setCameraCaptureState(.none)
         setMicrophoneCaptureState(.none)
     }
 
     func stopAllMediaPlayback() {
-        guard #available(macOS 12.0, *) else {
 #if !APPSTORE
+        guard #available(macOS 12.0, *) else {
             guard self.responds(to: #selector(_stopAllMediaPlayback)) else {
                 assertionFailure("WKWebView does not respond to _stopAllMediaPlayback")
                 return
             }
             self._stopAllMediaPlayback()
             return
-#endif
         }
+#endif
         pauseAllMediaPlayback()
     }
 
@@ -212,20 +210,26 @@ extension WKWebView {
             switch permission {
             case .camera:
                 guard #available(macOS 12.0, *) else {
-#if !APPSTORE
-                    self.setMediaCaptureMuted(muted)
-#endif
+                    if muted {
+                        self.mediaMutedState.insert(.captureDevicesMuted)
+                    } else {
+                        self.mediaMutedState.remove(.captureDevicesMuted)
+                    }
                     return
                 }
+
                 self.setCameraCaptureState(muted ? .muted : .active, completionHandler: {})
 
             case .microphone:
                 guard #available(macOS 12.0, *) else {
-#if !APPSTORE
-                    self.setMediaCaptureMuted(muted)
-#endif
+                    if muted {
+                        self.mediaMutedState.insert(.captureDevicesMuted)
+                    } else {
+                        self.mediaMutedState.remove(.captureDevicesMuted)
+                    }
                     return
                 }
+
                 self.setMicrophoneCaptureState(muted ? .muted : .active, completionHandler: {})
             case .geolocation:
                 self.configuration.processPool.geolocationProvider?.isPaused = muted
@@ -360,6 +364,8 @@ extension WKWebView {
         static let fullScreenPlaceholderView = NSSelectorFromString("_fullScreenPlaceholderView")
         static let printOperationWithPrintInfoForFrame = NSSelectorFromString("_printOperationWithPrintInfo:forFrame:")
         static let loadAlternateHTMLString = NSSelectorFromString("_loadAlternateHTMLString:baseURL:forUnreachableURL:")
+        static let mediaMutedState = NSSelectorFromString("_mediaMutedState")
+        static let setPageMuted = NSSelectorFromString("_setPageMuted:")
     }
 
 }
diff --git a/DuckDuckGo/Common/FileSystem/FileStore.swift b/DuckDuckGo/Common/FileSystem/FileStore.swift
index 99b03e5a01..22dc52c7d1 100644
--- a/DuckDuckGo/Common/FileSystem/FileStore.swift
+++ b/DuckDuckGo/Common/FileSystem/FileStore.swift
@@ -18,6 +18,7 @@
 
 import Foundation
 import CryptoKit
+import PixelKit
 
 protocol FileStore {
     func persist(_ data: Data, url: URL) -> Bool
@@ -57,7 +58,7 @@ final class EncryptedFileStore: FileStore {
 
             return true
         } catch {
-            Pixel.fire(.debug(event: .fileStoreWriteFailed, error: error),
+            PixelKit.fire(DebugEvent(GeneralPixel.fileStoreWriteFailed, error: error),
                        withAdditionalParameters: ["config": url.lastPathComponent])
             return false
         }
diff --git a/DuckDuckGo/Common/Localizables/UserText+DBP.swift b/DuckDuckGo/Common/Localizables/UserText+DBP.swift
new file mode 100644
index 0000000000..65590075e0
--- /dev/null
+++ b/DuckDuckGo/Common/Localizables/UserText+DBP.swift
@@ -0,0 +1,86 @@
+//
+//  UserText+DBP.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
+
+#if DBP
+// MARK: - Data Broker Protection Waitlist
+extension UserText {
+    // "data-broker-protection.privacy-policy.title" - Privacy Policy title for Personal Information Removal
+    static let dataBrokerProtectionPrivacyPolicyTitle = "Privacy Policy"
+    // "data-broker-protection.waitlist.notification.title" - Title for Personal Information Removal waitlist notification
+    static let dataBrokerProtectionWaitlistNotificationTitle = "Personal Information Removal beta is ready!"
+    // "data-broker-protection.waitlist.notification.text" - Title for Personal Information Removal waitlist notification
+    static let dataBrokerProtectionWaitlistNotificationText = "Open your invite"
+    // "data-broker-protection.waitlist.join.title" - Title for Personal Information Removal join waitlist screen
+    static let dataBrokerProtectionWaitlistJoinTitle = "Personal Information Removal Beta"
+    // "data-broker-protection.waitlist.join.subtitle.1" - First subtitle for Personal Information Removal join waitlist screen
+    static let dataBrokerProtectionWaitlistJoinSubtitle1 = "Automatically scan and remove your data from 17+ sites that sell personal information with DuckDuckGo’s Personal Information Removal."
+    // "data-broker-protection.waitlist.joined.title" - Title for Personal Information Removal joined waitlist screen
+    static let dataBrokerProtectionWaitlistJoinedTitle = "You’re on the list!"
+    // "data-broker-protection.waitlist.joined.with-notifications.subtitle.1" - Subtitle 1 for Personal Information Removal joined waitlist screen when notifications are enabled
+    static let dataBrokerProtectionWaitlistJoinedWithNotificationsSubtitle1 = "New invites are sent every few days, on a first come, first served basis."
+    // "data-broker-protection.waitlist.joined.with-notifications.subtitle.2" - Subtitle 2 for Personal Information Removal joined waitlist screen when notifications are enabled
+    static let dataBrokerProtectionWaitlistJoinedWithNotificationsSubtitle2 = "We’ll notify you when your invite is ready."
+    // "data-broker-protection.waitlist.enable-notifications" - Enable notifications prompt for Personal Information Removal joined waitlist screen
+    static let dataBrokerProtectionWaitlistEnableNotifications = "Want to get a notification when your Personal Information Removal invite is ready?"
+    // "data-broker-protection.waitlist.invited.title" - Title for Personal Information Removal invited screen
+    static let dataBrokerProtectionWaitlistInvitedTitle = "You’re invited to try\nPersonal Information Removal beta!"
+    // "data-broker-protection.waitlist.invited.subtitle" - Subtitle for Personal Information Removal invited screen
+    static let dataBrokerProtectionWaitlistInvitedSubtitle = "Automatically find and remove your personal information – such as your name and address – from 17+ sites that store and sell it, reducing the risk of identity theft and spam."
+    // "data-broker-protection.waitlist.enable.title" - Title for Personal Information Removal enable screen
+    static let dataBrokerProtectionWaitlistEnableTitle = "Let’s get started"
+    // "data-broker-protection.waitlist.enable.subtitle" - Subtitle for Personal Information Removal enable screen
+    static let dataBrokerProtectionWaitlistEnableSubtitle = "We’ll need your name, address and the year you were born in order to find your personal information on data broker sites\n\nThis info is stored securely on your device, and is never sent to DuckDuckGo."
+    // "data-broker-protection.waitlist.availability-disclaimer" - Availability disclaimer for Personal Information Removal join waitlist screen
+    static let dataBrokerProtectionWaitlistAvailabilityDisclaimer = "Personal Information Removal is free during the beta.\nJoin the waitlist and we'll notify you when ready."
+    // "data-broker-protection.waitlist.button.close" - Close button for Personal Information Removal join waitlist screen
+    static let dataBrokerProtectionWaitlistButtonClose = "Close"
+    // "data-broker-protection.waitlist.button.done" - Close button for Personal Information Removal joined waitlist screen
+    static let dataBrokerProtectionWaitlistButtonDone = "Done"
+    // "data-broker-protection.waitlist.button.dismiss" - Dismiss button for Personal Information Removal join waitlist screen
+    static let dataBrokerProtectionWaitlistButtonDismiss = "Dismiss"
+    // "data-broker-protection.waitlist.button.cancel" - Cancel button for Personal Information Removal join waitlist screen
+    static let dataBrokerProtectionWaitlistButtonCancel = "Cancel"
+    // "data-broker-protection.waitlist.button.no-thanks" - No Thanks button for Personal Information Removal joined waitlist screen
+    static let dataBrokerProtectionWaitlistButtonNoThanks = "No Thanks"
+    // "data-broker-protection.waitlist.button.get-started" - Get Started button for Personal Information Removal joined waitlist screen
+    static let dataBrokerProtectionWaitlistButtonGetStarted = "Get Started"
+    // "data-broker-protection.waitlist.button.got-it" - Get started button for Personal Information Removal joined waitlist screen
+    static let dataBrokerProtectionWaitlistButtonGotIt = "Get started"
+    // "data-broker-protection.waitlist.button.enable-notifications" - Enable Notifications button for Personal Information Removal joined waitlist screen
+    static let dataBrokerProtectionWaitlistButtonEnableNotifications = "Enable Notifications"
+    // "data-broker-protection.waitlist.button.join-waitlist" - Join Waitlist button for Personal Information Removal join waitlist screen
+    static let dataBrokerProtectionWaitlistButtonJoinWaitlist = "Join the Waitlist"
+    // "data-broker-protection.waitlist.button.agree-and-continue" - Agree and Continue button for Personal Information Removal join waitlist screen
+    static let dataBrokerProtectionWaitlistButtonAgreeAndContinue = "Agree and Continue"
+}
+
+// MARK: - DBP Error pages
+extension UserText {
+    static let dbpErrorPageBadPathTitle = NotLocalizedString("dbp.errorpage.bad.path.title", value: "Move DuckDuckGo App to Applications", comment: "Title for Personal Information Removal bad path error screen")
+    static let dbpErrorPageBadPathMessage = NotLocalizedString("dbp.errorpage.bad.path.message", value: "To use Personal Information Removal, the DuckDuckGo app needs to be in the Applications folder on your Mac. You can move the app yourself and restart the browser, or we can do it for you.", comment: "Message for Personal Information Removal bad path error screen")
+    static let dbpErrorPageBadPathCTA = NotLocalizedString("dbp.errorpage.bad.path.cta", value: "Move App for Me...", comment: "Call to action for moving the app to the Applications folder")
+
+    static let dbpErrorPageNoPermissionTitle = NotLocalizedString("dbp.errorpage.no.permission.title", value: "Change System Setting", comment: "Title for error screen when there is no permission")
+    static let dbpErrorPageNoPermissionMessage = NotLocalizedString("dbp.errorpage.no.permission.message", value: "Open System Settings and allow DuckDuckGo Personal Information Removal to run in the background.", comment: "Message for error screen when there is no permission")
+    static let dbpErrorPageNoPermissionCTA = NotLocalizedString("dbp.errorpage.no.permission.cta", value: "Open System Settings...", comment: "Call to action for opening system settings")
+}
+
+#endif
diff --git a/DuckDuckGo/Common/Localizables/UserText+NetworkProtection.swift b/DuckDuckGo/Common/Localizables/UserText+NetworkProtection.swift
index 69d36bb228..d908735e23 100644
--- a/DuckDuckGo/Common/Localizables/UserText+NetworkProtection.swift
+++ b/DuckDuckGo/Common/Localizables/UserText+NetworkProtection.swift
@@ -42,8 +42,8 @@ extension UserText {
     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 VPN status view that's shown in the navigation bar
-    static let networkProtectionNavBarStatusViewShareFeedback = "Send VPN Feedback…"
+    // "network.protection.navbar.status.view.share.feedback" - Menu item for 'Share VPN Feedback' in the VPN status view that's shown in the navigation bar
+    static let networkProtectionNavBarStatusViewShareFeedback = "Share 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
@@ -67,163 +67,11 @@ 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 the VPN"
+    static let networkProtectionPleaseReboot = "VPN update available. Restart your Mac to reconnect."
 }
 
-// MARK: - VPN Waitlist
-
-extension UserText {
-
-    // "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 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 VPN joined waitlist screen
-    static let networkProtectionWaitlistJoinedTitle = "You’re on the list!"
-    // "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 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 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 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 VPN invited screen
-    static let networkProtectionWaitlistInvitedSection1Title = "Full-device coverage"
-    // "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 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 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 VPN invited screen
-    static let networkProtectionWaitlistInvitedSection3Title = "Strict no-logging policy"
-    // "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 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 VPN join waitlist screen
-    static let networkProtectionWaitlistAvailabilityDisclaimer = "DuckDuckGo VPN is free to use during the beta."
-
-    // "network-protection.waitlist.button.close" - Close button for VPN join waitlist screen
-    static let networkProtectionWaitlistButtonClose = "Close"
-    // "network-protection.waitlist.button.done" - Close button for VPN joined waitlist screen
-    static let networkProtectionWaitlistButtonDone = "Done"
-    // "network-protection.waitlist.button.dismiss" - Dismiss button for VPN join waitlist screen
-    static let networkProtectionWaitlistButtonDismiss = "Dismiss"
-    // "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 VPN joined waitlist screen
-    static let networkProtectionWaitlistButtonNoThanks = "No Thanks"
-    // "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 VPN joined waitlist screen
-    static let networkProtectionWaitlistButtonGotIt = "Got It"
-    // "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 VPN join waitlist screen
-    static let networkProtectionWaitlistButtonJoinWaitlist = "Join the Waitlist"
-    // "network-protection.waitlist.button.agree-and-continue" - Agree and Continue button for VPN join waitlist screen
-    static let networkProtectionWaitlistButtonAgreeAndContinue = "Agree and Continue"
-}
-
-// MARK: - VPN Terms of Service
-
 extension UserText {
 
-    // "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 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 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 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 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 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 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 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 VPN
-    static let networkProtectionPrivacyPolicySection4Title = "We use dedicated servers for all VPN traffic."
-    // "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 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 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 VPN
-    static let networkProtectionTermsOfServiceTitle = "Terms of Service"
-
-    // "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 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 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 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 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 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 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 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 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 VPN
-    static let networkProtectionTermsOfServiceSection5Title = "We may terminate access at any time."
-    // "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 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 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 VPN
-    static let networkProtectionTermsOfServiceSection7Title = "We are continually updating the service."
-    // "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 VPN
-    static let networkProtectionTermsOfServiceSection8Title = "We need your feedback."
-    // "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
     // "vpn.feedback-form.title" - Title for each screen of the VPN feedback form
     static let vpnFeedbackFormTitle = "Help Improve the DuckDuckGo VPN"
@@ -299,7 +147,7 @@ extension UserText {
     // "vpn.location.description.nearest" - Nearest city setting description
     static let vpnLocationNearest = "Nearest"
     // "vpn.location.description.nearest.available" - Nearest available location setting description
-    static let vpnLocationNearestAvailable = "Nearest available"
+    static let vpnLocationNearestAvailable = "Nearest Location"
     // "vpn.location.nearest.available.title" - Subtitle underneath the nearest available vpn location preference text.
     static let vpnLocationNearestAvailableSubtitle = "Automatically connect to the nearest server we can find."
 
@@ -330,61 +178,16 @@ extension UserText {
     static let uninstallVPNAlertTitle = "Are you sure you want to uninstall the VPN?"
     // "vpn.uninstall.alert.informative.text" - Informative text for the alert that comes up when the user decides to uninstall our VPN
     static let uninstallVPNInformativeText = "Uninstalling the DuckDuckGo VPN will disconnect the VPN and remove it from your device."
-}
 
-#if DBP
-// MARK: - Data Broker Protection Waitlist
-extension UserText {
-    // "data-broker-protection.privacy-policy.title" - Privacy Policy title for Personal Information Removal
-    static let dataBrokerProtectionPrivacyPolicyTitle = "Privacy Policy"
-    // "data-broker-protection.waitlist.notification.title" - Title for Personal Information Removal waitlist notification
-    static let dataBrokerProtectionWaitlistNotificationTitle = "Personal Information Removal beta is ready!"
-    // "data-broker-protection.waitlist.notification.text" - Title for Personal Information Removal waitlist notification
-    static let dataBrokerProtectionWaitlistNotificationText = "Open your invite"
-    // "data-broker-protection.waitlist.join.title" - Title for Personal Information Removal join waitlist screen
-    static let dataBrokerProtectionWaitlistJoinTitle = "Personal Information Removal Beta"
-    // "data-broker-protection.waitlist.join.subtitle.1" - First subtitle for Personal Information Removal join waitlist screen
-    static let dataBrokerProtectionWaitlistJoinSubtitle1 = "Automatically scan and remove your data from 17+ sites that sell personal information with DuckDuckGo’s Personal Information Removal."
-    // "data-broker-protection.waitlist.joined.title" - Title for Personal Information Removal joined waitlist screen
-    static let dataBrokerProtectionWaitlistJoinedTitle = "You’re on the list!"
-    // "data-broker-protection.waitlist.joined.with-notifications.subtitle.1" - Subtitle 1 for Personal Information Removal joined waitlist screen when notifications are enabled
-    static let dataBrokerProtectionWaitlistJoinedWithNotificationsSubtitle1 = "New invites are sent every few days, on a first come, first served basis."
-    // "data-broker-protection.waitlist.joined.with-notifications.subtitle.2" - Subtitle 2 for Personal Information Removal joined waitlist screen when notifications are enabled
-    static let dataBrokerProtectionWaitlistJoinedWithNotificationsSubtitle2 = "We’ll notify you when your invite is ready."
-    // "data-broker-protection.waitlist.enable-notifications" - Enable notifications prompt for Personal Information Removal joined waitlist screen
-    static let dataBrokerProtectionWaitlistEnableNotifications = "Want to get a notification when your Personal Information Removal invite is ready?"
-    // "data-broker-protection.waitlist.invited.title" - Title for Personal Information Removal invited screen
-    static let dataBrokerProtectionWaitlistInvitedTitle = "You’re invited to try\nPersonal Information Removal beta!"
-    // "data-broker-protection.waitlist.invited.subtitle" - Subtitle for Personal Information Removal invited screen
-    static let dataBrokerProtectionWaitlistInvitedSubtitle = "Automatically find and remove your personal information – such as your name and address – from 17+ sites that store and sell it, reducing the risk of identity theft and spam."
-    // "data-broker-protection.waitlist.enable.title" - Title for Personal Information Removal enable screen
-    static let dataBrokerProtectionWaitlistEnableTitle = "Let’s get started"
-    // "data-broker-protection.waitlist.enable.subtitle" - Subtitle for Personal Information Removal enable screen
-    static let dataBrokerProtectionWaitlistEnableSubtitle = "We’ll need your name, address and the year you were born in order to find your personal information on data broker sites\n\nThis info is stored securely on your device, and is never sent to DuckDuckGo."
-    // "data-broker-protection.waitlist.availability-disclaimer" - Availability disclaimer for Personal Information Removal join waitlist screen
-    static let dataBrokerProtectionWaitlistAvailabilityDisclaimer = "Personal Information Removal is free during the beta.\nJoin the waitlist and we'll notify you when ready."
-    // "data-broker-protection.waitlist.button.close" - Close button for Personal Information Removal join waitlist screen
-    static let dataBrokerProtectionWaitlistButtonClose = "Close"
-    // "data-broker-protection.waitlist.button.done" - Close button for Personal Information Removal joined waitlist screen
-    static let dataBrokerProtectionWaitlistButtonDone = "Done"
-    // "data-broker-protection.waitlist.button.dismiss" - Dismiss button for Personal Information Removal join waitlist screen
-    static let dataBrokerProtectionWaitlistButtonDismiss = "Dismiss"
-    // "data-broker-protection.waitlist.button.cancel" - Cancel button for Personal Information Removal join waitlist screen
-    static let dataBrokerProtectionWaitlistButtonCancel = "Cancel"
-    // "data-broker-protection.waitlist.button.no-thanks" - No Thanks button for Personal Information Removal joined waitlist screen
-    static let dataBrokerProtectionWaitlistButtonNoThanks = "No Thanks"
-    // "data-broker-protection.waitlist.button.get-started" - Get Started button for Personal Information Removal joined waitlist screen
-    static let dataBrokerProtectionWaitlistButtonGetStarted = "Get Started"
-    // "data-broker-protection.waitlist.button.got-it" - Get started button for Personal Information Removal joined waitlist screen
-    static let dataBrokerProtectionWaitlistButtonGotIt = "Get started"
-    // "data-broker-protection.waitlist.button.enable-notifications" - Enable Notifications button for Personal Information Removal joined waitlist screen
-    static let dataBrokerProtectionWaitlistButtonEnableNotifications = "Enable Notifications"
-    // "data-broker-protection.waitlist.button.join-waitlist" - Join Waitlist button for Personal Information Removal join waitlist screen
-    static let dataBrokerProtectionWaitlistButtonJoinWaitlist = "Join the Waitlist"
-    // "data-broker-protection.waitlist.button.agree-and-continue" - Agree and Continue button for Personal Information Removal join waitlist screen
-    static let dataBrokerProtectionWaitlistButtonAgreeAndContinue = "Agree and Continue"
+    // MARK: - VPN Screen
+    // "network.protection.vpn.location.nearest" - Description of the location type in the VPN status view
+    static let netPVPNLocationNearest = "(Nearest)"
+
+    // "network.protection.vpn.location.subtitle.formatted.city.and.country" - Subtitle for the preferred location item that formats a city and country. E.g Chicago, United States
+    static func netPVPNSettingsLocationSubtitleFormattedCityAndCountry(city: String, country: String) -> String {
+        return "\(city), \(country)"
+    }
 }
-#endif
 
 // MARK: - Thank You Modals
 
diff --git a/DuckDuckGo/Common/Localizables/UserText.swift b/DuckDuckGo/Common/Localizables/UserText.swift
index 5f17e7d9b2..b6c361c836 100644
--- a/DuckDuckGo/Common/Localizables/UserText.swift
+++ b/DuckDuckGo/Common/Localizables/UserText.swift
@@ -53,6 +53,8 @@ struct UserText {
     static let pasteAndGo = NSLocalizedString("paste.and.go", value: "Paste & Go", comment: "Paste & Go button")
     static let pasteAndSearch = NSLocalizedString("paste.and.search", value: "Paste & Search", comment: "Paste & Search button")
     static let clear = NSLocalizedString("clear", value: "Clear", comment: "Clear button")
+    static let clearAndQuit = NSLocalizedString("clear.and.quit", value: "Clear and Quit", comment: "Button to clear data and quit the application")
+    static let quitWithoutClearing = NSLocalizedString("quit.without.clearing", value: "Quit Without Clearing", comment: "Button to quit the application without clearing data")
     static let `continue` = NSLocalizedString("`continue`", value: "Continue", comment: "Continue button")
     static let bookmarkDialogAdd = NSLocalizedString("bookmark.dialog.add", value: "Add", comment: "Button to confim a bookmark creation")
     static let newFolderDialogAdd = NSLocalizedString("folder.dialog.add", value: "Add", comment: "Button to confim a bookmark folder creation")
@@ -66,54 +68,54 @@ struct UserText {
     }
 
     // MARK: - Main Menu -> DuckDuckGo
-    static let mainMenuAppPreferences = NSLocalizedString("main-menu.app.preferences" ,value:"Preferences…", comment: "Main Menu DuckDuckGo item")
-    static let mainMenuAppServices = NSLocalizedString("main-menu.app.services", value:"Services", comment: "Main Menu DuckDuckGo item")
-    static let mainMenuAppCheckforUpdates = NSLocalizedString("main-menu.app.check-for-updates", value:"Check for Updates…", comment: "Main Menu DuckDuckGo item")
-    static let mainMenuAppHideDuckDuckGo = NSLocalizedString("main-menu.app.hide-duck-duck-go", value:"Hide DuckDuckGo", comment: "Main Menu DuckDuckGo item")
-    static let mainMenuAppHideOthers = NSLocalizedString("main-menu.app.hide-others", value:"Hide Others", comment: "Main Menu DuckDuckGo item")
-    static let mainMenuAppShowAll = NSLocalizedString("main-menu.app.show-all", value:"Show All", comment: "Main Menu DuckDuckGo item")
-    static let mainMenuAppQuitDuckDuckGo = NSLocalizedString("main-menu.app.quit-duck-duck-go", value:"Quit DuckDuckGo", comment: "Main Menu DuckDuckGo item")
+    static let mainMenuAppPreferences = NSLocalizedString("main-menu.app.preferences", value: "Preferences…", comment: "Main Menu DuckDuckGo item")
+    static let mainMenuAppServices = NSLocalizedString("main-menu.app.services", value: "Services", comment: "Main Menu DuckDuckGo item")
+    static let mainMenuAppCheckforUpdates = NSLocalizedString("main-menu.app.check-for-updates", value: "Check for Updates…", comment: "Main Menu DuckDuckGo item")
+    static let mainMenuAppHideDuckDuckGo = NSLocalizedString("main-menu.app.hide-duck-duck-go", value: "Hide DuckDuckGo", comment: "Main Menu DuckDuckGo item")
+    static let mainMenuAppHideOthers = NSLocalizedString("main-menu.app.hide-others", value: "Hide Others", comment: "Main Menu DuckDuckGo item")
+    static let mainMenuAppShowAll = NSLocalizedString("main-menu.app.show-all", value: "Show All", comment: "Main Menu DuckDuckGo item")
+    static let mainMenuAppQuitDuckDuckGo = NSLocalizedString("main-menu.app.quit-duck-duck-go", value: "Quit DuckDuckGo", comment: "Main Menu DuckDuckGo item")
 
     // MARK: - Main Menu -> -File
-    static let mainMenuFile = NSLocalizedString("main-menu.file", value:"File", comment: "Main Menu File")
-    static let mainMenuFileNewTab = NSLocalizedString("main-menu.file.new-tab", value:"New Tab", comment: "Main Menu File item")
-    static let mainMenuFileOpenLocation = NSLocalizedString("main-menu.file.open-location", value:"Open Location…", comment: "Main Menu File item- Menu option that allows the user to connect to an address (type an address) on click the address bar of the browser is selected and the user can type.")
-    static let mainMenuFileCloseWindow = NSLocalizedString("main-menu.file.close-window", value:"Close Window", comment: "Main Menu File item")
-    static let mainMenuFileCloseAllWindows = NSLocalizedString("main-menu.file.close-all-windows", value:"Close All Windows", comment: "Main Menu File item")
-    static let mainMenuFileSaveAs = NSLocalizedString("main-menu.file.save-as", value:"Save As…", comment: "Main Menu File item")
-    static let mainMenuFileImportBookmarksandPasswords = NSLocalizedString("main-menu.file.import-bookmarks-and-passwords", value:"Import Bookmarks and Passwords…", comment: "Main Menu File item")
-    static let mainMenuFileExport = NSLocalizedString("main-menu.file.export", value:"Export", comment: "Main Menu File item")
-    static let mainMenuFileExportPasswords = NSLocalizedString("main-menu.file.export-passwords", value:"Passwords…", comment: "Main Menu File-Export item")
-    static let mainMenuFileExportBookmarks = NSLocalizedString("main-menu.file.export-bookmarks", value:"Bookmarks…", comment: "Main Menu File-Export item")
+    static let mainMenuFile = NSLocalizedString("main-menu.file", value: "File", comment: "Main Menu File")
+    static let mainMenuFileNewTab = NSLocalizedString("main-menu.file.new-tab", value: "New Tab", comment: "Main Menu File item")
+    static let mainMenuFileOpenLocation = NSLocalizedString("main-menu.file.open-location", value: "Open Location…", comment: "Main Menu File item- Menu option that allows the user to connect to an address (type an address) on click the address bar of the browser is selected and the user can type.")
+    static let mainMenuFileCloseWindow = NSLocalizedString("main-menu.file.close-window", value: "Close Window", comment: "Main Menu File item")
+    static let mainMenuFileCloseAllWindows = NSLocalizedString("main-menu.file.close-all-windows", value: "Close All Windows", comment: "Main Menu File item")
+    static let mainMenuFileSaveAs = NSLocalizedString("main-menu.file.save-as", value: "Save As…", comment: "Main Menu File item")
+    static let mainMenuFileImportBookmarksandPasswords = NSLocalizedString("main-menu.file.import-bookmarks-and-passwords", value: "Import Bookmarks and Passwords…", comment: "Main Menu File item")
+    static let mainMenuFileExport = NSLocalizedString("main-menu.file.export", value: "Export", comment: "Main Menu File item")
+    static let mainMenuFileExportPasswords = NSLocalizedString("main-menu.file.export-passwords", value: "Passwords…", comment: "Main Menu File-Export item")
+    static let mainMenuFileExportBookmarks = NSLocalizedString("main-menu.file.export-bookmarks", value: "Bookmarks…", comment: "Main Menu File-Export item")
 
     // MARK: - Main Menu -> Edit
-    static let mainMenuEdit = NSLocalizedString("main-menu.edit", value:"Edit", comment: "Main Menu Edit")
-    static let mainMenuEditUndo = NSLocalizedString("main-menu.edit.undo", value:"Undo", comment: "Main Menu Edit item")
-    static let mainMenuEditRedo = NSLocalizedString("main-menu.edit.redo", value:"Redo", comment: "Main Menu Edit item")
-    static let mainMenuEditCut = NSLocalizedString("main-menu.edit.cut", value:"Cut", comment: "Main Menu Edit item")
-    static let mainMenuEditCopy = NSLocalizedString("main-menu.edit.copy", value:"Copy", comment: "Main Menu Edit item")
-    static let mainMenuEditPaste = NSLocalizedString("main-menu.edit.paste", value:"Paste", comment: "Main Menu Edit item")
-    static let mainMenuEditPasteAndMatchStyle = NSLocalizedString("main-menu.edit.paste-and-match-style", value:"Paste and Match Style", comment: "Main Menu Edit item - Action that allows the user to paste copy into a target document and the target document's style will be retained (instead of the source style)")
-    static let mainMenuEditDelete = NSLocalizedString("main-menu.edit.delete", value:"Delete", comment: "Main Menu Edit item")
-    static let mainMenuEditSelectAll = NSLocalizedString("main-menu.edit.select-all", value:"Select All", comment: "Main Menu Edit item")
-
-    static let mainMenuEditFind = NSLocalizedString("main-menu.edit.find", value:"Find", comment: "Main Menu Edit item")
+    static let mainMenuEdit = NSLocalizedString("main-menu.edit", value: "Edit", comment: "Main Menu Edit")
+    static let mainMenuEditUndo = NSLocalizedString("main-menu.edit.undo", value: "Undo", comment: "Main Menu Edit item")
+    static let mainMenuEditRedo = NSLocalizedString("main-menu.edit.redo", value: "Redo", comment: "Main Menu Edit item")
+    static let mainMenuEditCut = NSLocalizedString("main-menu.edit.cut", value: "Cut", comment: "Main Menu Edit item")
+    static let mainMenuEditCopy = NSLocalizedString("main-menu.edit.copy", value: "Copy", comment: "Main Menu Edit item")
+    static let mainMenuEditPaste = NSLocalizedString("main-menu.edit.paste", value: "Paste", comment: "Main Menu Edit item")
+    static let mainMenuEditPasteAndMatchStyle = NSLocalizedString("main-menu.edit.paste-and-match-style", value: "Paste and Match Style", comment: "Main Menu Edit item - Action that allows the user to paste copy into a target document and the target document's style will be retained (instead of the source style)")
+    static let mainMenuEditDelete = NSLocalizedString("main-menu.edit.delete", value: "Delete", comment: "Main Menu Edit item")
+    static let mainMenuEditSelectAll = NSLocalizedString("main-menu.edit.select-all", value: "Select All", comment: "Main Menu Edit item")
+
+    static let mainMenuEditFind = NSLocalizedString("main-menu.edit.find", value: "Find", comment: "Main Menu Edit item")
 
     // MARK: Main Menu -> Edit -> Find
-    static let mainMenuEditFindFindNext = NSLocalizedString("main-menu.edit.find.find-next", value:"Find Next", comment: "Main Menu Edit-Find item")
-    static let mainMenuEditFindFindPrevious = NSLocalizedString("main-menu.edit.find.find-previous", value:"Find Previous", comment: "Main Menu Edit-Find item")
-    static let mainMenuEditFindHideFind = NSLocalizedString("main-menu.edit.find.hide-find", value:"Hide Find", comment: "Main Menu Edit-Find item")
+    static let mainMenuEditFindFindNext = NSLocalizedString("main-menu.edit.find.find-next", value: "Find Next", comment: "Main Menu Edit-Find item")
+    static let mainMenuEditFindFindPrevious = NSLocalizedString("main-menu.edit.find.find-previous", value: "Find Previous", comment: "Main Menu Edit-Find item")
+    static let mainMenuEditFindHideFind = NSLocalizedString("main-menu.edit.find.hide-find", value: "Hide Find", comment: "Main Menu Edit-Find item")
 
     static let mainMenuEditSpellingandGrammar = NSLocalizedString("main-menu.edit.edit-spelling-and-grammar", value: "Spelling and Grammar", comment: "Main Menu Edit item")
 
     // MARK: Main Menu -> Edit -> Spellingand
-    static let mainMenuEditSpellingandShowSpellingandGrammar = NSLocalizedString("main-menu.edit.spelling-and.show-spelling-and-grammar", value:"Show Spelling and Grammar", comment: "Main Menu Edit-Spellingand item")
-    static let mainMenuEditSpellingandCheckDocumentNow = NSLocalizedString("main-menu.edit.spelling-and.check-document-now", value:"Check Document Now", comment: "Main Menu Edit-Spellingand item")
-    static let mainMenuEditSpellingandCheckSpellingWhileTyping = NSLocalizedString("main-menu.edit.spelling-and.check-spelling-while-typing", value:"Check Spelling While Typing", comment: "Main Menu Edit-Spellingand item")
-    static let mainMenuEditSpellingandCheckGrammarWithSpelling = NSLocalizedString("main-menu.edit.spelling-and.check-grammar-with-spelling", value:"Check Grammar With Spelling", comment: "Main Menu Edit-Spellingand item")
-    static let mainMenuEditSpellingandCorrectSpellingAutomatically = NSLocalizedString("main-menu.edit.spelling-and.correct-spelling-automatically", value:"Correct Spelling Automatically", comment: "Main Menu Edit-Spellingand item")
+    static let mainMenuEditSpellingandShowSpellingandGrammar = NSLocalizedString("main-menu.edit.spelling-and.show-spelling-and-grammar", value: "Show Spelling and Grammar", comment: "Main Menu Edit-Spellingand item")
+    static let mainMenuEditSpellingandCheckDocumentNow = NSLocalizedString("main-menu.edit.spelling-and.check-document-now", value: "Check Document Now", comment: "Main Menu Edit-Spellingand item")
+    static let mainMenuEditSpellingandCheckSpellingWhileTyping = NSLocalizedString("main-menu.edit.spelling-and.check-spelling-while-typing", value: "Check Spelling While Typing", comment: "Main Menu Edit-Spellingand item")
+    static let mainMenuEditSpellingandCheckGrammarWithSpelling = NSLocalizedString("main-menu.edit.spelling-and.check-grammar-with-spelling", value: "Check Grammar With Spelling", comment: "Main Menu Edit-Spellingand item")
+    static let mainMenuEditSpellingandCorrectSpellingAutomatically = NSLocalizedString("main-menu.edit.spelling-and.correct-spelling-automatically", value: "Correct Spelling Automatically", comment: "Main Menu Edit-Spellingand item")
 
-    static let mainMenuEditSubstitutions = NSLocalizedString("main-menu.edit.subsitutions", value:"Substitutions", comment: "Main Menu Edit item")
+    static let mainMenuEditSubstitutions = NSLocalizedString("main-menu.edit.subsitutions", value: "Substitutions", comment: "Main Menu Edit item")
 // TODO: Done till here
     // MARK: Main Menu -> Edit -> Substitutions
     static let mainMenuEditSubstitutionsShowSubstitutions = NSLocalizedString("Show Substitutions", comment: "Main Menu Edit-Substitutions item")
@@ -143,7 +145,7 @@ struct UserText {
     static let mainMenuViewReloadPage = NSLocalizedString("Reload Page", comment: "Main Menu View item")
     static let mainMenuViewHome = NSLocalizedString("Home", comment: "Main Menu View item")
     static let mainMenuHomeButton = NSLocalizedString("Home Button", comment: "Main Menu > View > Home Button item")
-        
+
     static func mainMenuHomeButtonMode(for position: HomeButtonPosition) -> String {
         switch position {
         case .hidden:
@@ -154,7 +156,7 @@ struct UserText {
             return NSLocalizedString("main.menu.home.button.mode.right", value: "Show Right of the Reload Button", comment: "Main Menu > View > Home Button > right position item")
         }
     }
-    
+
     static let mainMenuViewShowAutofillShortcut = NSLocalizedString("Show Autofill Shortcut", comment: "Main Menu View item")
     static let mainMenuViewShowBookmarksShortcut = NSLocalizedString("Show Bookmarks Shortcut", comment: "Main Menu View item")
     static let mainMenuViewShowDownloadsShortcut = NSLocalizedString("Show Downloads Shortcut", comment: "Main Menu View item")
@@ -202,6 +204,8 @@ struct UserText {
     static let muteTab = NSLocalizedString("mute.tab", value: "Mute Tab", comment: "Menu item. Mute tab")
     static let unmuteTab = NSLocalizedString("unmute.tab", value: "Unmute Tab", comment: "Menu item. Unmute tab")
     static let closeOtherTabs = NSLocalizedString("close.other.tabs", value: "Close Other Tabs", comment: "Menu item")
+    static let closeAllOtherTabs = NSLocalizedString("close.all.other.tabs", value: "Close All Other Tabs", comment: "Menu item")
+    static let closeTabsToTheLeft = NSLocalizedString("close.tabs.to.the.left", value: "Close Tabs to the Left", comment: "Menu item")
     static let closeTabsToTheRight = NSLocalizedString("close.tabs.to.the.right", value: "Close Tabs to the Right", comment: "Menu item")
     static let openInNewTab = NSLocalizedString("open.in.new.tab", value: "Open in New Tab", comment: "Menu item that opens the link in a new tab")
     static let openInNewWindow = NSLocalizedString("open.in.new.window", value: "Open in New Window", comment: "Menu item that opens the link in a new window")
@@ -212,13 +216,50 @@ struct UserText {
     static let addFolder = NSLocalizedString("menu.add.folder", value: "Add Folder…", comment: "Menu item to add a folder")
 
     static let tabHomeTitle = NSLocalizedString("tab.home.title", value: "New Tab", comment: "Tab home title")
+    static let tabUntitledTitle = NSLocalizedString("tab.empty.title", value: "Untitled", comment: "Title for an empty tab without a title")
     static let tabPreferencesTitle = NSLocalizedString("tab.preferences.title", value: "Settings", comment: "Tab preferences title")
     static let tabBookmarksTitle = NSLocalizedString("tab.bookmarks.title", value: "Bookmarks", comment: "Tab bookmarks title")
     static let tabOnboardingTitle = NSLocalizedString("tab.onboarding.title", value: "Welcome", comment: "Tab onboarding title")
+
+    // MARK: Error Pages
     static let tabErrorTitle = NSLocalizedString("tab.error.title", value: "Failed to open page", comment: "Tab error title")
     static let errorPageHeader = NSLocalizedString("page.error.header", value: "DuckDuckGo can’t load this page.", comment: "Error page heading text")
     static let webProcessCrashPageHeader = NSLocalizedString("page.crash.header", value: "This webpage has crashed.", comment: "Error page heading text shown when a Web Page process had crashed")
     static let webProcessCrashPageMessage = NSLocalizedString("page.crash.message", value: "Try reloading the page or come back later.", comment: "Error page message text shown when a Web Page process had crashed")
+    static let sslErrorPageHeader = NSLocalizedString("ssl.error.page.header", value: "Warning: This site may be insecure", comment: "Title shown in an error page that warn users of security risks on a website due to SSL issues")
+    static let sslErrorPageTabTitle = NSLocalizedString("ssl.error.page.tab.title", value: "Warning: Site May Be Insecure", comment: "Title shown in an error page tab that warn users of security risks on a website due to SSL issues")
+    static func sslErrorPageBody(_ domain: String) -> String {
+        let localized = NSLocalizedString("ssl.error.page.body",
+                                          value: "The certificate for this site is invalid. You might be connecting to a server that is pretending to be %1$@ which could put your confidential information at risk.",
+                                          comment: "Error description shown in an error page that warns users of security risks on a website due to SSL issues. %1$@ represent the site domain.")
+        return String(format: localized, domain)
+    }
+    static let sslErrorPageAdvancedButton = NSLocalizedString("ssl.error.page.advanced.button", value: "Advanced…", comment: "Button shown in an error page that warns users of security risks on a website due to SSL issues. The buttons allows the user to see advanced options on click.")
+    static let sslErrorPageLeaveSiteButton = NSLocalizedString("ssl.error.page.leave.site.button", value: "Leave This Site", comment: "Button shown in an error page that warns users of security risks on a website due to SSL issues. The buttons allows the user to leave the website and navigate to previous page.")
+    static let sslErrorPageVisitSiteButton = NSLocalizedString("ssl.error.page.visit.site.button", value: "Accept Risk and Visit Site", comment: "Button shown in an error page that warns users of security risks on a website due to SSL issues. The buttons allows the user to visit the website anyway despite the risks.")
+    static let sslErrorAdvancedInfoTitle = NSLocalizedString("ssl.error.page.advanced.info.title", value: "DuckDuckGo warns you when a website has an invalid certificate.", comment: "Title of the Advanced info section shown in an error page that warns users of security risks on a website due to SSL issues.")
+    static let sslErrorAdvancedInfoBodyWrongHost = NSLocalizedString("ssl.error.page.advanced.info.body.wrong.host", value: "It’s possible that the website is misconfigured or that an attacker has compromised your connection.", comment: "Body of the text of the Advanced info shown in an error page that warns users of security risks on a website due to SSL issues.")
+    static let sslErrorAdvancedInfoBodyExpired = NSLocalizedString("ssl.error.page.advanced.info.body.expired", value: "It’s possible that the website is misconfigured, that an attacker has compromised your connection, or that your system clock is incorrect.", comment: "Body of the text of the Advanced info shown in an error page that warns users of security risks on a website due to SSL issues.")
+    static func sslErrorCertificateExpiredMessage(_ domain: String) -> String {
+        let localized = NSLocalizedString("ssl.error.certificate.expired.message",
+                                          value: "The security certificate for %1$@ is expired.",
+                                          comment: "Describes an SSL error where a website's security certificate is expired. '%1$@' is a placeholder for the website's domain.")
+        return String(format: localized, domain)
+    }
+    static func sslErrorCertificateWrongHostMessage(_ domain: String, eTldPlus1: String) -> String {
+        let localized = NSLocalizedString("ssl.error.wrong.host.message",
+                                          value: "The security certificate for %1$@ does not match *.%2$@.",
+                                          comment: "Explains an SSL error when a site's certificate doesn't match its domain. '%1$@' is the site's domain.")
+        return String(format: localized, domain, eTldPlus1)
+    }
+    static func sslErrorCertificateSelfSignedMessage(_ domain: String) -> String {
+        let localized = NSLocalizedString("ssl.error.self.signed.message",
+                                          value: "The security certificate for %1$@ is not trusted by your device's operating system.",
+                                          comment: "Warns the user that the site's security certificate is self-signed and not trusted. '%1$@' is the site's domain.")
+        return String(format: localized, domain)
+    }
+
+
 
     static let openSystemPreferences = NSLocalizedString("open.preferences", value: "Open System Preferences", comment: "Open System Preferences (to re-enable permission for the App) (up to and including macOS 12")
     static let openSystemSettings = NSLocalizedString("open.settings", value: "Open System Settings…", comment: "This string represents a prompt or button label prompting the user to open system settings")
@@ -355,7 +396,7 @@ struct UserText {
     static let restartBitwarden = NSLocalizedString("restart.bitwarden", value: "Restart Bitwarden", comment: "Button to restart Bitwarden application")
     static let restartBitwardenInfo = NSLocalizedString("restart.bitwarden.info", value: "Bitwarden is not responding. Please restart it to initiate the communication again", comment: "This string represents a message informing the user that Bitwarden is not responding and prompts them to restart the application to initiate communication again.")
 
-    static let autofillViewContentButton = NSLocalizedString("autofill.view-autofill-content",  value: "View Autofill Content…", comment: "View Autofill Content Button name in the autofill settings")
+    static let autofillViewContentButton = NSLocalizedString("autofill.view-autofill-content", value: "View Autofill Content…", comment: "View Autofill Content Button name in the autofill settings")
     static let autofillAskToSave = NSLocalizedString("autofill.ask-to-save", value: "Save and Autofill", comment: "Autofill settings section title")
     static let autofillAskToSaveExplanation = NSLocalizedString("autofill.ask-to-save.explanation", value: "Receive prompts to save new information and autofill online forms.", comment: "Description of Autofill autosaving feature - used in settings")
     static let autofillUsernamesAndPasswords = NSLocalizedString("autofill.usernames-and-passwords", value: "Usernames and passwords", comment: "Autofill autosaved data type")
@@ -364,14 +405,14 @@ struct UserText {
     static let autofillExcludedSites = NSLocalizedString("autofill.excluded-sites", value: "Excluded Sites", comment: "Autofill settings section title")
     static let autofillExcludedSitesExplanation = NSLocalizedString("autofill.excluded-sites.explanation", value: "Websites you selected to never ask to save your password.", comment: "Subtitle providing additional information about the excluded sites section")
     static let autofillExcludedSitesReset = NSLocalizedString("autofill.excluded-sites.reset", value: "Reset", comment: "Button title allowing users to reset their list of excluded sites")
-    static let autofillExcludedSitesResetActionTitle = NSLocalizedString("autofill.excluded-sites.reset.action.title", value:"Reset Excluded Sites?", comment: "Alert title")
-    static let autofillExcludedSitesResetActionMessage = NSLocalizedString("autofill.excluded-sites.reset.action.message", value:"If you reset excluded sites, you will be prompted to save your password next time you sign in to any of these sites.", comment: "Alert title")
+    static let autofillExcludedSitesResetActionTitle = NSLocalizedString("autofill.excluded-sites.reset.action.title", value: "Reset Excluded Sites?", comment: "Alert title")
+    static let autofillExcludedSitesResetActionMessage = NSLocalizedString("autofill.excluded-sites.reset.action.message", value: "If you reset excluded sites, you will be prompted to save your password next time you sign in to any of these sites.", comment: "Alert title")
     static let autofillAutoLock = NSLocalizedString("autofill.auto-lock", value: "Auto-lock", comment: "Autofill settings section title")
     static let autofillLockWhenIdle = NSLocalizedString("autofill.lock-when-idle", value: "Lock autofill after computer is idle for", comment: "Autofill auto-lock setting")
     static let autofillNeverLock = NSLocalizedString("autofill.never-lock", value: "Never lock autofill", comment: "Autofill auto-lock setting")
     static let autofillNeverLockWarning = NSLocalizedString("autofill.never-lock-warning", value: "If not locked, anyone with access to your device will be able to use and modify your autofill data. For security purposes, credit card form fill always requires authentication.", comment: "Autofill disabled auto-lock warning")
     static let autolockLocksFormFill = NSLocalizedString("autofill.autolock-locks-form-filling", value: "Also lock password form fill", comment: "Lock form filling when auto-lock is active text")
-    
+
     static let downloadsLocation = NSLocalizedString("downloads.location", value: "Location", comment: "Downloads directory location")
     static let downloadsAlwaysAsk = NSLocalizedString("downloads.always-ask", value: "Always ask where to save files", comment: "Downloads preferences checkbox")
     static let downloadsChangeDirectory = NSLocalizedString("downloads.change", value: "Change…", comment: "Change downloads directory button")
@@ -428,7 +469,8 @@ struct UserText {
     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 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 bookmarkThisPage = NSLocalizedString("bookmark.this.page", value: "Bookmark This Page…", comment: "Menu item for bookmarking current page")
+    static let bookmarkAllTabs = NSLocalizedString("bookmark.all.tabs", value: "Bookmark All Tabs…", comment: "Menu item for bookmarking all the open tabs")
     static let bookmarksShowToolbarPanel = NSLocalizedString("bookmarks.show-toolbar-panel", value: "Open Bookmarks Panel", comment: "Menu item for opening the bookmarks panel")
     static let bookmarksManageBookmarks = NSLocalizedString("bookmarks.manage-bookmarks", value: "Manage Bookmarks", comment: "Menu item for opening the bookmarks management interface")
     static let bookmarkImportedFromFolder = NSLocalizedString("bookmarks.imported.from.folder", value: "Imported from", comment: "Name of the folder the imported bookmarks are saved into")
@@ -519,7 +561,7 @@ struct UserText {
 
     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 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")
     static let syncCredentialsPausedAlertTitle = NSLocalizedString("alert.sync-credentials-paused-title", value: "Passwords Sync is Paused", comment: "Title for alert shown when sync credentials paused for too many items")
@@ -556,7 +598,7 @@ struct UserText {
     static let onStartup = NSLocalizedString("preferences.on-startup", value: "On Startup", comment: "Name of the preferences section related to app startup")
     static let reopenAllWindowsFromLastSession = NSLocalizedString("preferences.reopen-windows", value: "Reopen all windows from last session", comment: "Option to control session restoration")
     static let showHomePage = NSLocalizedString("preferences.show-home", value: "Open a new window", comment: "Option to control session startup")
-    
+
     static let homePage = NSLocalizedString("preferences-homepage.title", value: "Homepage", comment: "Title for Homepage section in settings")
     static let homePageDescription = NSLocalizedString("preferences-homepage.description", value: "When navigating home or opening new windows.", comment: "Homepage behavior description")
     static let newTab = NSLocalizedString("preferences-homepage-newTab", value: "New Tab page", comment: "Option to open a new tab")
@@ -566,6 +608,20 @@ struct UserText {
     static let setHomePage = NSLocalizedString("preferences-homepage-set-homePage", value: "Set Homepage", comment: "Set Homepage dialog title")
     static let addressLabel = NSLocalizedString("preferences-homepage-address", value: "Address:", comment: "Homepage address field label")
 
+    static let tabs = NSLocalizedString("preferences-tabs.title", value: "Tabs", comment: "Title for tabs section in settings")
+    static let preferNewTabsToWindows = NSLocalizedString("preferences-tabs.prefer.new.tabs.to.windows", value: "Open links in new tabs instead of new windows whenever possible", comment: "Option to prefer opening new tabs instead of windows when opening links")
+    static let switchToNewTabWhenOpened = NSLocalizedString("preferences-tabs.switch.tab.when.opened", value: "When opening links, switch to the new tab or window immediately", comment: "Option to switch to a new tab/window when it is opened")
+    static let newTabPositionTitle = NSLocalizedString("preferences-tabs.new.tab.position.title", value: "When creating a new tab", comment: "Title for new tab positioning")
+
+    static func newTabPositionMode(for position: NewTabPosition) -> String {
+        switch position {
+        case .atEnd:
+            return NSLocalizedString("context.menu.new.tab.mode.at.end", value: "Add to the right of other tabs", comment: "Preferences > Tabs > At end of list")
+        case .nextToCurrent:
+            return NSLocalizedString("context.menu.new.tab.mode.next.to.current", value: "Add to the right of the current tab", comment: "Preferences > Tabs > Next to current tab")
+        }
+    }
+
     static func homeButtonMode(for position: HomeButtonPosition) -> String {
         switch position {
         case .hidden:
@@ -603,7 +659,6 @@ struct UserText {
     static let aboutUnsupportedDeviceInfo2Part4 = "of DuckDuckGo. You can also keep using your current version of the browser, but it will not receive further updates."
     static let unsupportedDeviceInfoAlertHeader = NSLocalizedString("unsupported.device.info.alert.header", value: "Your version of macOS is no longer supported.", comment: "his string represents the header for an alert informing the user that their version of macOS is no longer supported")
 
-
     static func moreAt(url: String) -> String {
         let localized = NSLocalizedString("preferences.about.more-at", value: "More at %@", comment: "Link to the about page")
         return String(format: localized, url)
@@ -636,6 +691,13 @@ struct UserText {
         String(format: NSLocalizedString("import.logins.select-csv-file.source", value: "Select %@ CSV File…", comment: "Button text for selecting a CSV file exported from (LastPass or Bitwarden or 1Password - %@)"), source.importSourceName)
     }
 
+    static func importNoDataBookmarksSubtitle(from source: DataImport.Source) -> String {
+        String(format: NSLocalizedString("import.nodata.bookmarks.subtitle", value: "If you have %@ bookmarks, try importing them manually instead.", comment: "Data import error subtitle: suggestion to import Bookmarks manually by selecting a CSV or HTML file. The placeholder here represents the source browser, e.g Firefox."), source.importSourceName)
+    }
+    static func importNoDataPasswordsSubtitle(from source: DataImport.Source) -> String {
+        String(format: NSLocalizedString("import.nodata.passwords.subtitle", value: "If you have %@ passwords, try importing them manually instead.", comment: "Data import error subtitle: suggestion to import passwords manually by selecting a CSV or HTML file. The placeholder here represents the source browser, e.g Firefox."), source.importSourceName)
+    }
+
     static let importLoginsPasswords = NSLocalizedString("import.logins.passwords", value: "Passwords", comment: "Title text for the Passwords import option")
 
     static let importBookmarksButtonTitle = NSLocalizedString("bookmarks.import.button.title", value: "Import", comment: "Button text to open bookmark import dialog")
@@ -825,6 +887,9 @@ struct UserText {
     static let bitwardenError = NSLocalizedString("bitwarden.error", value: "Unable to find or connect to Bitwarden", comment: "This message appears when the application is unable to find or connect to Bitwarden, indicating a connection issue.")
     static let bitwardenNotInstalled = NSLocalizedString("bitwarden.not.installed", value: "Bitwarden app is not installed", comment: "")
     static let bitwardenOldVersion = NSLocalizedString("bitwarden.old.version", value: "Please update Bitwarden to the latest version", comment: "Message that warns user they need to update their password manager Bitwarden app vesion")
+    static let bitwardenIncompatible = NSLocalizedString("bitwarden.incompatible", value: "The following Bitwarden versions are incompatible with DuckDuckGo: v2024.3.0, v2024.3.2, v2024.4.0, v2024.4.1. Please revert to an older version by following these steps:", comment: "Message that warns user that specific Bitwarden app vesions are not compatible with this app")
+    static let bitwardenIncompatibleStep1 = NSLocalizedString("bitwarden.incompatible.step.1", value: "Download v2014.2.1", comment: "First step to downgrade Bitwarden")
+    static let bitwardenIncompatibleStep2 = NSLocalizedString("bitwarden.incompatible.step.2", value: "2. Open the downloaded DMG file and drag the Bitwarden application to\nthe /Applications folder.", comment: "Second step to downgrade Bitwarden")
     static let bitwardenIntegrationNotApproved = NSLocalizedString("bitwarden.integration.not.approved", value: "Integration with DuckDuckGo is not approved in Bitwarden app", comment: "While the user tries to connect the DuckDuckGo Browser to password manager Bitwarden This message indicates that the integration with DuckDuckGo has not been approved in the Bitwarden app.")
     static let bitwardenMissingHandshake = NSLocalizedString("bitwarden.missing.handshake", value: "Missing handshake", comment: "While the user tries to connect the DuckDuckGo Browser to password manager Bitwarden This message indicates a missing handshake (a way for two devices or systems to say hello to each other and agree to communicate or exchange information).")
     static let bitwardenWaitingForHandshake = NSLocalizedString("bitwarden.waiting.for.handshake", value: "Waiting for the handshake approval in Bitwarden app", comment: "While the user tries to connect the DuckDuckGo Browser to password manager Bitwarden This message indicates the system is waiting for the handshake (a way for two devices or systems to say hello to each other and agree to communicate or exchange information).")
@@ -873,9 +938,9 @@ struct UserText {
     // MARK: - Tooltips
 
     static let autofillShortcutTooltip = NSLocalizedString("tooltip.autofill.shortcut", value: "Autofill", comment: "Tooltip for the autofill shortcut")
-    
+
     static let homeButtonTooltip = NSLocalizedString("tooltip.home.button", value: "Home", comment: "Tooltip for the home button")
-    
+
     static let bookmarksShortcutTooltip = NSLocalizedString("tooltip.bookmarks.shortcut", value: "Bookmarks", comment: "Tooltip for the bookmarks shortcut")
     static let downloadsShortcutTooltip = NSLocalizedString("tooltip.downloads.shortcut", value: "Downloads", comment: "Tooltip for the downloads shortcut")
 
@@ -915,6 +980,9 @@ struct UserText {
     static let showPasswordTooltip = NSLocalizedString("autofill.show-password", value: "Show password", comment: "Tooltip for the Autofill panel's Show Password button")
     static let hidePasswordTooltip = NSLocalizedString("autofill.hide-password", value: "Hide password", comment: "Tooltip for the Autofill panel's Hide Password button")
 
+    static let autofillShowCardCvvTooltip = NSLocalizedString("autofill.show-card-cvv", value: "Show CVV", comment: "Tooltip for the Autofill panel's Show CVV button")
+    static let autofillHideCardCvvTooltip = NSLocalizedString("autofill.hide-card-cvv", value: "Hide CVV", comment: "Tooltip for the Autofill panel's Hide CVV button")
+
     static let databaseFactoryFailedMessage = NSLocalizedString("database.factory.failed.message", value: "There was an error initializing the database", comment: "Alert title when we fail to init database")
     static let databaseFactoryFailedInformative = NSLocalizedString("database.factory.failed.information", value: "Restart your Mac and try again", comment: "Info to restart macOS after database init failure")
 
@@ -929,17 +997,16 @@ struct UserText {
         let localized = NSLocalizedString("autofill.popover.password-manager-connected-to-user", value: "Connected to user %@", comment: "Label describing what user is connected to the password manager")
         return String(format: localized, user)
     }
-    
+
     static func passwordManagerAutosavePopoverText(domain: String) -> String {
         let localized = NSLocalizedString("autofill.popover.autosave.text", value: "Password saved for %@", comment: "Text confirming a password has been saved for the %@ domain")
         return String(format: localized, domain)
     }
-    
+
     static let passwordManagerAutosaveButtonText = NSLocalizedString("autofill.popover.autosave.button.text",
                                                                       value: "View",
                                                                       comment: "Button to view the recently autosaved password")
 
-
     static func openPasswordManagerButton(managerName: String) -> String {
         let localized = NSLocalizedString("autofill.popover.open-password-manager", value: "Open %@", comment: "Open password manager button")
         return String(format: localized, managerName)
@@ -947,7 +1014,7 @@ struct UserText {
 
     static let passwordManagerLockedStatus = NSLocalizedString("autofill.manager.status.locked", value: "Locked", comment: "Locked status for password manager")
     static let passwordManagerUnlockedStatus = NSLocalizedString("autofill.manager.status.unlocked", value: "Unlocked", comment: "Unlocked status for password manager")
-    
+
     static func alertTitle(from domain: String) -> String {
         let localized = NSLocalizedString("alert.title", value: "A message from %@", comment: "Title formatted with presenting domain")
         return String(format: localized, domain)
@@ -966,8 +1033,6 @@ struct UserText {
         }
     }
 
-    static let noAccessToSelectedFolderHeader = NSLocalizedString("no.access.to.selected.folder.header", value: "DuckDuckGo needs permission to access selected folder", comment: "Header of the alert dialog informing user about failed download")
-    static let noAccessToSelectedFolder = NSLocalizedString("no.access.to.selected.folder", value: "Grant access to the location of download.", comment: "Alert presented to user if the app doesn't have rights to access selected folder")
     static let cannotOpenFileAlertHeader = NSLocalizedString("cannot.open.file.alert.header", value: "Cannot Open File", comment: "Header of the alert dialog informing user it is not possible to open the file")
     static let cannotOpenFileAlertInformative = NSLocalizedString("cannot.open.file.alert.informative", value: "The App Store version of DuckDuckGo can only access local files if you drag-and-drop them into a browser window.\n\n To navigate local files using the address bar, please download DuckDuckGo directly from https://duckduckgo.com/mac.", comment: "Informative of the alert dialog informing user it is not possible to open the file")
 
@@ -987,23 +1052,17 @@ 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: "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: "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: "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")
@@ -1024,7 +1083,6 @@ struct UserText {
     // "tab.dbp.title" - Tab data broker protection title
     static let tabDataBrokerProtectionTitle = "Personal Information Removal"
 
-
     // Bookmarks bar prompt
     static let bookmarksBarPromptTitle = NSLocalizedString("bookmarks.bar.prompt.title", value: "Show Bookmarks Bar?", comment: "Title for bookmarks bar prompt")
     static let bookmarksBarPromptMessage = NSLocalizedString("bookmarks.bar.prompt.message", value: "Show the Bookmarks Bar for quick access to your new bookmarks.", comment: "Message show for bookmarks bar prompt")
@@ -1037,6 +1095,17 @@ struct UserText {
     static let fireproofCheckboxTitle = NSLocalizedString("fireproof.checkbox.title", value: "Ask to Fireproof websites when signing in", comment: "Fireproof settings checkbox title")
     static let fireproofExplanation = NSLocalizedString("fireproof.explanation", value: "When you Fireproof a site, cookies won't be erased and you'll stay signed in, even after using the Fire Button.", comment: "Fireproofing mechanism explanation")
     static let manageFireproofSites = NSLocalizedString("fireproof.manage-sites", value: "Manage Fireproof Sites…", comment: "Fireproof settings button caption")
+    static let autoClear = NSLocalizedString("auto.clear", value: "Auto-Clear", comment: "Header of a section in Settings. The setting configures clearing data automatically after quitting the app.")
+    static let automaticallyClearData = NSLocalizedString("automatically.clear.data", value: "Automatically clear tabs and browsing data when DuckDuckGo quits", comment: "Label after the checkbox in Settings which configures clearing data automatically after quitting the app.")
+    static let warnBeforeQuit = NSLocalizedString("warn.before.quit", value: "Warn me that tabs and data will be cleared when quitting", comment: "Label after the checkbox in Settings which configures a warning before clearing data on the application termination.")
+    static let warnBeforeQuitDialogHeader = NSLocalizedString("warn.before.quit.dialog.header", value: "Clear tabs and browsing data and quit DuckDuckGo?", comment: "A header of warning before clearing data on the application termination.")
+    static let warnBeforeQuitDialogCheckboxMessage = NSLocalizedString("warn.before.quit.dialog.checkbox.message", value: "Warn me every time", comment: "A label after checkbox to configure the warning before clearing data on the application termination.")
+    static let disableAutoClearToEnableSessionRestore = NSLocalizedString("disable.auto.clear.to.enable.session.restore",
+                                                                          value: "Disable auto-clear on quit to turn on session restore.",
+                                                                          comment: "Information label in Settings. It tells user that to enable session restoration setting they have to disable burn on quit. Auto-Clear should match the string with 'auto.clear' key")
+    static let showDataClearingSettings = NSLocalizedString("show.data.clearing.settings",
+                                                            value: "Open Data Clearing Settings",
+                                                            comment: "Button in Settings. It navigates user to Data Clearing Settings. The Data Clearing string should match the string with the preferences.data-clearing key")
 
     // MARK: Crash Report
     static let crashReportTitle = NSLocalizedString("crash-report.title", value: "DuckDuckGo Privacy Browser quit unexpectedly.", comment: "Title of the dialog where the user can send a crash report")
@@ -1053,7 +1122,7 @@ struct UserText {
     static let downloadsOpenWebsiteItem = NSLocalizedString("downloads.open-website.item", value: "Open Originating Website", comment: "Contextual menu item in downloads manager to open the downloaded file originating website")
     static let downloadsRemoveFromListItem = NSLocalizedString("downloads.remove-from-list.item", value: "Remove from List", comment: "Contextual menu item in downloads manager to remove the given downloaded from the list of downloaded files")
     static let downloadsStopItem = NSLocalizedString("downloads.stop.item", value: "Stop", comment: "Contextual menu item in downloads manager to stop the download")
-    static let downloadsRestartItem = NSLocalizedString("downloads.restart.item", value: "Stop", comment: "Contextual menu item in downloads manager to restart the download")
+    static let downloadsRestartItem = restartDownloadToolTip
     static let downloadsClearAllItem = NSLocalizedString("downloads.clear-all.item", value: "Clear All", comment: "Contextual menu item in downloads manager to clear all downloaded items from the list")
     static let downloadsNoRecentDownload = NSLocalizedString("downloads.no-recent-downloads", value: "No recent downloads", comment: "Label in the downloads manager that shows that there are no recently downloaded items")
     static let downloadsOpenDownloadsFolder = NSLocalizedString("downloads.open-downloads-folder", value: "Open Downloads Folder", comment: "Button in the downloads manager that allows the user to open the downloads folder")
@@ -1066,20 +1135,28 @@ struct UserText {
                 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")
+                static let bookmarkOpenTabs = NSLocalizedString("bookmarks.dialog.allTabs.title.add", value: "Bookmark Open Tabs (%d)", comment: "Title of dialog to bookmark all open tabs. E.g. 'Bookmark Open Tabs (42)'")
+            }
+            enum Message {
+                static let bookmarkOpenTabsEducational = NSLocalizedString("bookmarks.dialog.allTabs.message.add", value: "These bookmarks will be saved in a new folder:", comment: "Bookmark creation for all open tabs dialog title")
             }
             enum Field {
                 static let name = NSLocalizedString("bookmarks.dialog.field.name", value: "Name", comment: "Name field label for Bookmark or Folder")
                 static let url = NSLocalizedString("bookmarks.dialog.field.url", value: "URL", comment: "URL field label for Bookmar")
                 static let location = NSLocalizedString("bookmarks.dialog.field.location", value: "Location", comment: "Location field label for Bookmark folder")
+                static let folderName = NSLocalizedString("bookmarks.dialog.field.folderName", value: "Folder Name", comment: "Folder name field label for Bookmarks folder")
+            }
+            enum Value {
+                static let folderName = NSLocalizedString("bookmarks.dialog.field.folderName.value", value: "%@ - Tabs (%d)", comment: "The suggested name of the folder that will contain the bookmark tabs. Eg. 2024-02-12 - Tabs (42)")
             }
             enum Action {
                 static let addBookmark = NSLocalizedString("bookmarks.dialog.action.addBookmark", value: "Add Bookmark", comment: "CTA title for adding a Bookmark")
                 static let addFolder = NSLocalizedString("bookmarks.dialog.action.addFolder", value: "Add Folder", comment: "CTA title for adding a Folder")
+                static let addAllBookmarks = NSLocalizedString("bookmarks.dialog.action.addAllBookmarks", value: "Save Bookmarks", comment: "CTA title for saving multiple Bookmarks at once")
             }
         }
     }
 
-#if SUBSCRIPTION
     // Key: "subscription.menu.item"
     // Comment: "Title for Subscription item in the options menu"
     static let subscriptionOptionsMenuItem = "Privacy Pro"
@@ -1101,5 +1178,5 @@ struct UserText {
     // Key: "subscription.progress.view.completing.purchase"
     // Comment: "Progress view title when completing the purchase"
     static let completingPurchaseTitle = "Completing purchase..."
-#endif
+
 }
diff --git a/DuckDuckGo/Common/Logging/Logging.swift b/DuckDuckGo/Common/Logging/Logging.swift
index de04f91cb7..3740e0e223 100644
--- a/DuckDuckGo/Common/Logging/Logging.swift
+++ b/DuckDuckGo/Common/Logging/Logging.swift
@@ -140,3 +140,45 @@ func logOrAssertionFailure(_ message: String) {
     os_log("%{public}s", type: .error, message)
 #endif
 }
+
+#if DEBUG
+
+func breakByRaisingSigInt(_ description: String, file: StaticString = #file, line: Int = #line) {
+    let fileLine = "\(("\(file)" as NSString).lastPathComponent):\(line)"
+    os_log("""
+
+
+    ------------------------------------------------------------------------------------------------------
+        BREAK at %s:
+    ------------------------------------------------------------------------------------------------------
+
+    %s
+
+        Hit Continue (^⌘Y) to continue program execution
+    ------------------------------------------------------------------------------------------------------
+
+    """, type: .debug, fileLine, description.components(separatedBy: "\n").map { "    " + $0.trimmingWhitespace() }.joined(separator: "\n"))
+    raise(SIGINT)
+}
+
+// get symbol from stack trace for a caller of a calling method
+func callingSymbol() -> String {
+    let stackTrace = Thread.callStackSymbols
+    // find `callingSymbol` itself or dispatch_once_callout
+    var callingSymbolIdx = stackTrace.firstIndex(where: { $0.contains("_dispatch_once_callout") })
+    ?? stackTrace.firstIndex(where: { $0.contains("callingSymbol") })!
+    // procedure calling `callingSymbol`
+    callingSymbolIdx += 1
+
+    var symbolName: String
+    repeat {
+        // caller for the procedure
+        callingSymbolIdx += 1
+        let line = stackTrace[callingSymbolIdx].replacingOccurrences(of: Bundle.main.executableURL!.lastPathComponent, with: "DDG")
+        symbolName = String(line.split(separator: " ", maxSplits: 3)[3]).components(separatedBy: " + ")[0]
+    } while stackTrace[callingSymbolIdx - 1].contains(symbolName.dropping(suffix: "To")) // skip objc wrappers
+
+    return symbolName
+}
+
+#endif
diff --git a/DuckDuckGo/Common/Utilities/CertificateTrustEvaluator.swift b/DuckDuckGo/Common/Utilities/CertificateTrustEvaluator.swift
new file mode 100644
index 0000000000..63ea3638cd
--- /dev/null
+++ b/DuckDuckGo/Common/Utilities/CertificateTrustEvaluator.swift
@@ -0,0 +1,32 @@
+//
+//  CertificateTrustEvaluator.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 CertificateTrustEvaluating {
+    func evaluateCertificateTrust(trust: SecTrust?) async -> Bool?
+}
+
+struct CertificateTrustEvaluator: CertificateTrustEvaluating {
+    func evaluateCertificateTrust(trust: SecTrust?) async -> Bool? {
+        var error: CFError?
+        guard let trust = trust else { return nil }
+        let result = SecTrustEvaluateWithError(trust, &error)
+        return result
+    }
+}
diff --git a/DuckDuckGo/Common/Utilities/UserDefaultsWrapper.swift b/DuckDuckGo/Common/Utilities/UserDefaultsWrapper.swift
index 3d01e96108..43e1401a2f 100644
--- a/DuckDuckGo/Common/Utilities/UserDefaultsWrapper.swift
+++ b/DuckDuckGo/Common/Utilities/UserDefaultsWrapper.swift
@@ -55,6 +55,8 @@ public struct UserDefaultsWrapper<T> {
         case grammarCheckEnabledOnce = "grammar.check.enabled.once"
 
         case loginDetectionEnabled = "fireproofing.login-detection-enabled"
+        case autoClearEnabled = "preferences.auto-clear-enabled"
+        case warnBeforeClearingEnabled = "preferences.warn-before-clearing-enabled"
         case gpcEnabled = "preferences.gpc-enabled"
         case selectedDownloadLocationKey = "preferences.download-location"
         case lastUsedCustomDownloadLocation = "preferences.custom-last-used-download-location"
@@ -78,6 +80,8 @@ public struct UserDefaultsWrapper<T> {
         case lastCrashReportCheckDate = "last.crash.report.check.date"
 
         case fireInfoPresentedOnce = "fire.info.presented.once"
+        case appTerminationHandledCorrectly = "app.termination.handled.correctly"
+        case restoreTabsOnStartup = "restore.tabs.on.startup"
 
         case restorePreviousSession = "preferences.startup.restore-previous-session"
         case launchToCustomHomePage = "preferences.startup.launch-to-custom-home-page"
@@ -85,6 +89,9 @@ public struct UserDefaultsWrapper<T> {
         case currentThemeName = "com.duckduckgo.macos.currentThemeNameKey"
         case showFullURL = "preferences.appearance.show-full-url"
         case showAutocompleteSuggestions = "preferences.appearance.show-autocomplete-suggestions"
+        case preferNewTabsToWindows = "preferences.tabs.prefer-new-tabs-to-windows"
+        case switchToNewTabWhenOpened = "preferences.tabs.switch-to-new-tab-when-opened"
+        case newTabPosition = "preferences.tabs.new-tab-position"
         case defaultPageZoom = "preferences.appearance.default-page-zoom"
         case websitePageZoom = "preferences.appearance.website-page-zoom"
         case bookmarksBarAppearance = "preferences.appearance.bookmarks-bar"
@@ -112,11 +119,8 @@ public struct UserDefaultsWrapper<T> {
         case homePageShowImport = "home.page.show.import"
         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 homePageShowSurveyDay14 = "home.page.show.survey.14"
+        case homePageUserInSurveyShare = "home.page.user.in.survey.share"
+        case homePageShowPermanentSurvey = "home.page.show.import.permanent.survey"
         case homePageShowPageTitles = "home.page.show.page.titles"
         case homePageShowRecentlyVisited = "home.page.show.recently.visited"
         case homePageContinueSetUpImport = "home.page.continue.set.up.import"
diff --git a/DuckDuckGo/Common/View/AppKit/CircularProgressView.swift b/DuckDuckGo/Common/View/AppKit/CircularProgressView.swift
index 204d950546..3e1190a9e9 100644
--- a/DuckDuckGo/Common/View/AppKit/CircularProgressView.swift
+++ b/DuckDuckGo/Common/View/AppKit/CircularProgressView.swift
@@ -164,6 +164,14 @@ final class CircularProgressView: NSView {
         guard !isBackgroundAnimating || !animated else {
             // will call `updateProgressState` on animation completion
             completion(false)
+            // if background animation is in progress but 1.0 was received before
+            // the `progress = nil` update – complete the progress animation
+            // before hiding
+            if progress == nil && oldValue == 1.0, animated,
+               // shouldn‘t be already animating to 100%
+               progressLayer.strokeStart != 0.0 {
+                updateProgress(from: 0, to: 1, animated: animated) { _ in }
+            }
             return
         }
 
@@ -177,7 +185,7 @@ final class CircularProgressView: NSView {
                 completion(true)
             }
         case (true, true):
-            updateProgress(oldValue: oldValue, animated: animated, completion: completion)
+            updateProgress(from: oldValue, to: progress, animated: animated, completion: completion)
         case (false, false):
             backgroundLayer.removeAllAnimations()
             progressLayer.removeAllAnimations()
@@ -216,17 +224,16 @@ final class CircularProgressView: NSView {
         }
     }
 
-    private func updateProgress(oldValue: Double?, animated: Bool, completion: @escaping (Bool) -> Void) {
+    private func updateProgress(from oldValue: Double?, to progress: Double?, animated: Bool, completion: @escaping (Bool) -> Void) {
         guard let progress else {
             assertionFailure("Unexpected flow")
             completion(false)
             return
         }
-        let currentStrokeStart = (progressLayer.presentation() ?? progressLayer).strokeStart
+        let currentStrokeStart = progressLayer.currentStrokeStart
         let newStrokeStart = 1.0 - (progress >= 0.0
                                     ? CGFloat(progress)
                                     : max(Constants.indeterminateProgressValue, min(0.9, 1.0 - currentStrokeStart)))
-
         guard animated else {
             progressLayer.strokeStart = newStrokeStart
 
@@ -274,7 +281,7 @@ final class CircularProgressView: NSView {
         guard let progress, progress == value else { return }
 
         if let oldValue, oldValue < 0, value != progress, animated {
-            updateProgress(oldValue: value, animated: animated) { _ in }
+            updateProgress(from: value, to: progress, animated: animated) { _ in }
             return
         }
 
@@ -356,7 +363,7 @@ final class CircularProgressView: NSView {
             progressLayer.add(progressEndAnimation, forKey: #keyPath(CAShapeLayer.strokeEnd))
 
             let progressAnimation = CABasicAnimation(keyPath: #keyPath(CAShapeLayer.strokeStart))
-            let currentStrokeStart = (progressLayer.presentation() ?? progressLayer).strokeStart
+            let currentStrokeStart = progressLayer.currentStrokeStart
 
             progressLayer.removeAnimation(forKey: #keyPath(CAShapeLayer.strokeStart))
             progressLayer.strokeStart = 0.0
@@ -375,6 +382,14 @@ final class CircularProgressView: NSView {
 
 private extension CAShapeLayer {
 
+    var currentStrokeStart: CGFloat {
+        if animation(forKey: #keyPath(CAShapeLayer.strokeStart)) != nil,
+           let presentation = self.presentation() {
+            return presentation.strokeStart
+        }
+        return strokeStart
+    }
+
     func configureCircle(radius: CGFloat, lineWidth: CGFloat) {
         self.bounds = CGRect(x: 0, y: 0, width: (radius + lineWidth) * 2, height: (radius + lineWidth) * 2)
 
@@ -530,14 +545,97 @@ struct CircularProgress: NSViewRepresentable {
                             perform {
                                 progress = 1
                             }
-                            perform {
-                                progress = nil
+                            Task {
+                                perform {
+                                    progress = nil
+                                }
                             }
                         }
                     } label: {
                         Text(verbatim: "0->1->nil").frame(width: 120)
                     }
 
+                    Button {
+                        Task {
+                            progress = nil
+                            perform {
+                                progress = 1
+                            }
+                            Task {
+                                perform {
+                                    progress = nil
+                                }
+                            }
+                        }
+                    } label: {
+                        Text(verbatim: "nil->1->nil").frame(width: 120)
+                    }
+
+                    Button {
+                        Task {
+                            progress = nil
+                            perform {
+                                progress = 1
+                            }
+                            Task {
+                                perform {
+                                    progress = nil
+                                }
+                                Task {
+                                    perform {
+                                        progress = 1
+                                    }
+                                    Task {
+                                        perform {
+                                            progress = nil
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    } label: {
+                        Text(verbatim: "nil->1->nil->1->nil").frame(width: 120)
+                    }
+
+                    Button {
+                        Task {
+                            progress = nil
+                            perform {
+                                progress = 1
+                            }
+                            Task {
+                                perform {
+                                    progress = nil
+                                }
+                                Task {
+                                    perform {
+                                        progress = nil
+                                    }
+                                }
+                            }
+                        }
+                    } label: {
+                        Text(verbatim: "nil->1->nil->nil").frame(width: 120)
+                    }
+
+                    Button {
+                        Task {
+                            progress = nil
+                            perform {
+                                progress = 0
+                            }
+                            try await Task.sleep(interval: 0.2)
+                            for p in [0.26, 0.64, 0.95, 1, nil] {
+                                perform {
+                                    progress = p
+                                }
+                                try await Task.sleep(interval: 0.001)
+                            }
+                        }
+                    } label: {
+                        Text(verbatim: "nil->0.2…1->nil").frame(width: 120)
+                    }
+
                     Button {
                         Task {
                             perform {
@@ -581,7 +679,7 @@ struct CircularProgress: NSViewRepresentable {
                         .background(Color.white)
                     Spacer()
                 }
-            }.frame(width: 600, height: 400)
+            }.frame(width: 600, height: 500)
         }
     }
     return ProgressPreview()
diff --git a/DuckDuckGo/Common/View/AppKit/LoadingProgressView.swift b/DuckDuckGo/Common/View/AppKit/LoadingProgressView.swift
index 56f6b2de2b..9c444e511b 100644
--- a/DuckDuckGo/Common/View/AppKit/LoadingProgressView.swift
+++ b/DuckDuckGo/Common/View/AppKit/LoadingProgressView.swift
@@ -31,7 +31,7 @@ final class LoadingProgressView: NSView, CAAnimationDelegate {
     private var targetProgress: Double = 0.0
     private var targetTime: CFTimeInterval = 0.0
 
-    var isShown: Bool {
+    var isProgressShown: Bool {
         progressMask.opacity == 1.0
     }
 
diff --git a/DuckDuckGo/Common/View/AppKit/PreviewViewController.swift b/DuckDuckGo/Common/View/AppKit/PreviewViewController.swift
new file mode 100644
index 0000000000..d62feef70b
--- /dev/null
+++ b/DuckDuckGo/Common/View/AppKit/PreviewViewController.swift
@@ -0,0 +1,77 @@
+//
+//  PreviewViewController.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
+
+@resultBuilder
+struct NSViewBuilder {
+    static func buildBlock(_ component: NSView) -> NSView {
+        return component
+    }
+}
+
+#if DEBUG
+/// Used to preview an NSView using Xcode #Preview macro
+/// Usage:
+/// ```
+/// @available(macOS 14.0, *)
+/// #Preview {
+///     PreviewViewController(showWindowTitle: false /*hide preview window title*/, adjustWindowFrame: true /*set the window size to the view size*/) {
+///         MyNSView()
+///     }
+/// }
+/// ```
+@available(macOS 14.0, *)
+final class PreviewViewController: NSViewController {
+    let showWindowTitle: Bool
+    let adjustWindowFrame: Bool
+
+    init(showWindowTitle: Bool = true, adjustWindowFrame: Bool = false, @NSViewBuilder builder: () -> NSView) {
+        self.showWindowTitle = showWindowTitle
+        self.adjustWindowFrame = adjustWindowFrame
+        super.init(nibName: nil, bundle: nil)
+        self.view = builder()
+    }
+
+    required init?(coder: NSCoder) {
+        fatalError("\(Self.self): Bad initializer")
+    }
+
+    override func viewDidAppear() {
+        guard let window = view.window else { return }
+        if !showWindowTitle {
+            window.titlebarAppearsTransparent = true
+            window.titleVisibility = .hidden
+            window.styleMask = []
+        }
+        if adjustWindowFrame {
+            window.setFrame(NSRect(origin: .zero, size: view.bounds.size), display: true)
+        }
+    }
+
+}
+#else
+final class PreviewViewController: NSViewController {
+    init(showWindowTitle: Bool = true, adjustWindowFrame: Bool = false, @NSViewBuilder builder: () -> NSView) {
+        fatalError("only for DEBUG")
+    }
+    required init?(coder: NSCoder) {
+        fatalError("only for DEBUG")
+    }
+}
+#endif
diff --git a/DuckDuckGo/Common/View/SwiftUI/SecureTextField.swift b/DuckDuckGo/Common/View/SwiftUI/SecureTextField.swift
new file mode 100644
index 0000000000..c1359c8ce6
--- /dev/null
+++ b/DuckDuckGo/Common/View/SwiftUI/SecureTextField.swift
@@ -0,0 +1,90 @@
+//
+//  SecureTextField.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
+
+/// View which uses the provided `isVisible` property to display either a `TextField` or a `SecureField`
+struct SecureTextField: View {
+
+    @Binding var textValue: String
+    let isVisible: Bool
+    var bottomPadding: CGFloat = 0
+
+    var body: some View {
+        if isVisible {
+
+            TextField("", text: $textValue)
+                .textFieldStyle(RoundedBorderTextFieldStyle())
+                .padding(.bottom, bottomPadding)
+        } else {
+
+            SecureField("", text: $textValue)
+                .textFieldStyle(RoundedBorderTextFieldStyle())
+                .padding(.bottom, bottomPadding)
+        }
+    }
+}
+
+/// View which provides a Button styled to show/hide text with an action that toggles the provided `isVisible` property
+struct SecureTextFieldButton: View {
+
+    @Binding var isVisible: Bool
+    let toolTipHideText: String
+    let toolTipShowText: String
+
+    var body: some View {
+        Button {
+            isVisible = !isVisible
+        } label: {
+            Image(.secureEyeToggle)
+        }
+        .buttonStyle(PlainButtonStyle())
+        .tooltip(isVisible ? toolTipHideText : toolTipShowText)
+    }
+}
+
+/// View which uses the provided `isVisible` property to display either the provided `text` or a string of `•`
+struct HiddenText: View {
+
+    let isVisible: Bool
+    let text: String
+    let hiddenTextLength: Int
+
+    var body: some View {
+        if isVisible {
+            Text(text)
+        } else {
+            Text(text.isEmpty ? "" : String(repeating: "•", count: hiddenTextLength))
+        }
+    }
+}
+
+/// View which provides a Button styled to copy text which executes the provided `copyAction`
+struct CopyButton: View {
+
+    let copyAction: () -> Void
+
+    var body: some View {
+        Button {
+            copyAction()
+        } label: {
+            Image(.copy)
+        }
+        .buttonStyle(PlainButtonStyle())
+    }
+}
diff --git a/DuckDuckGo/Configuration/ConfigurationManager.swift b/DuckDuckGo/Configuration/ConfigurationManager.swift
index a64673dfc0..531fbe4985 100644
--- a/DuckDuckGo/Configuration/ConfigurationManager.swift
+++ b/DuckDuckGo/Configuration/ConfigurationManager.swift
@@ -22,6 +22,7 @@ import BrowserServicesKit
 import Configuration
 import Common
 import Networking
+import PixelKit
 
 @MainActor
 final class ConfigurationManager {
@@ -72,13 +73,13 @@ final class ConfigurationManager {
                                                     eventMapping: Self.configurationDebugEvents)
 
     private static let configurationDebugEvents = EventMapping<ConfigurationDebugEvents> { event, error, _, _ in
-        let domainEvent: Pixel.Event.Debug
+        let domainEvent: GeneralPixel
         switch event {
         case .invalidPayload(let configuration):
             domainEvent = .invalidPayload(configuration)
         }
 
-        Pixel.fire(.debug(event: domainEvent, error: error))
+        PixelKit.fire(DebugEvent(domainEvent, error: error))
     }
 
     func start() {
@@ -170,7 +171,7 @@ final class ConfigurationManager {
         }
 
         os_log("Failed to complete configuration update %@", log: .config, type: .error, error.localizedDescription)
-        Pixel.fire(.debug(event: .configurationFetchError, error: error))
+        PixelKit.fire(DebugEvent(GeneralPixel.configurationFetchError(error: error)))
         tryAgainSoon()
     }
 
diff --git a/DuckDuckGo/Configuration/ConfigurationStore.swift b/DuckDuckGo/Configuration/ConfigurationStore.swift
index 179e5addd7..fe58ca3df2 100644
--- a/DuckDuckGo/Configuration/ConfigurationStore.swift
+++ b/DuckDuckGo/Configuration/ConfigurationStore.swift
@@ -19,6 +19,7 @@
 import Common
 import Foundation
 import Configuration
+import PixelKit
 
 final class ConfigurationStore: ConfigurationStoring {
 
@@ -99,7 +100,7 @@ final class ConfigurationStore: ConfigurationStoring {
             let nserror = error as NSError
 
             if nserror.domain != NSCocoaErrorDomain || nserror.code != NSFileReadNoSuchFileError {
-                Pixel.fire(.debug(event: .trackerDataCouldNotBeLoaded, error: error))
+                PixelKit.fire(DebugEvent(GeneralPixel.trackerDataCouldNotBeLoaded, error: error))
             }
 
             return nil
diff --git a/DuckDuckGo/ContentBlocker/AppPrivacyConfigurationDataProvider.swift b/DuckDuckGo/ContentBlocker/AppPrivacyConfigurationDataProvider.swift
index 07639c0bb4..224457323d 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 = "\"8838582254dfa215a99ea4d38e04cd20\""
-        public static let embeddedDataSHA = "4851da5558dde2ec548d4e6ca4778e2040ad97c7edecf701de0e8ec907cb42bb"
+        public static let embeddedDataETag = "\"6cbc7738304e5eaef20e98417f412fc9\""
+        public static let embeddedDataSHA = "0fda36c6cb3a0f2bcd34562ad9d4bc8fe7dc2d21e029b87e323cb4992bfddb01"
     }
 
     var embeddedDataEtag: String {
diff --git a/DuckDuckGo/ContentBlocker/AppTrackerDataSetProvider.swift b/DuckDuckGo/ContentBlocker/AppTrackerDataSetProvider.swift
index 12d6d8fbbd..a182f36fd5 100644
--- a/DuckDuckGo/ContentBlocker/AppTrackerDataSetProvider.swift
+++ b/DuckDuckGo/ContentBlocker/AppTrackerDataSetProvider.swift
@@ -22,8 +22,8 @@ import BrowserServicesKit
 final class AppTrackerDataSetProvider: EmbeddedDataProvider {
 
     public struct Constants {
-        public static let embeddedDataETag = "\"07bd7f610e3fa234856abcc2b56ab10e\""
-        public static let embeddedDataSHA = "1d7ef8f4c5a717a5d82f43383e33290021358d6255db12b6fdd0928e28d123ee"
+        public static let embeddedDataETag = "\"ef8ebcc98d8abccca793c7e04422b160\""
+        public static let embeddedDataSHA = "e2e8e5e191df54227222fbb0545a7eb8634b1156a69182323981bb6aed2c639d"
     }
 
     var embeddedDataEtag: String {
diff --git a/DuckDuckGo/ContentBlocker/ContentBlocking.swift b/DuckDuckGo/ContentBlocker/ContentBlocking.swift
index 795f5ec581..d935081755 100644
--- a/DuckDuckGo/ContentBlocker/ContentBlocking.swift
+++ b/DuckDuckGo/ContentBlocker/ContentBlocking.swift
@@ -21,6 +21,7 @@ import WebKit
 import Combine
 import BrowserServicesKit
 import Common
+import PixelKit
 
 protocol ContentBlockingProtocol {
 
@@ -98,18 +99,18 @@ final class AppContentBlocking {
     }
 
     private let toggleProtectionsEvents = EventMapping<ToggleProtectionsCounterEvent> { event, _, parameters, _ in
-        let domainEvent: Pixel.Event
+        let domainEvent: GeneralPixel
         switch event {
         case .toggleProtectionsCounterDaily:
             domainEvent = .toggleProtectionsDailyCount
         }
-        Pixel.fire(domainEvent, withAdditionalParameters: parameters ?? [:])
+        PixelKit.fire(domainEvent, withAdditionalParameters: parameters ?? [:])
     }
 
     private static let debugEvents = EventMapping<ContentBlockerDebugEvents> { event, error, parameters, onComplete in
         guard NSApp.runType.requiresEnvironment else { return }
 
-        let domainEvent: Pixel.Event.Debug
+        let domainEvent: GeneralPixel
         switch event {
         case .trackerDataParseFailed:
             domainEvent = .trackerDataParseFailed
@@ -132,7 +133,7 @@ final class AppContentBlocking {
         case .contentBlockingCompilationFailed(let listName, let component):
             let defaultTDSListName = DefaultContentBlockerRulesListsSource.Constants.trackerDataSetRulesListName
 
-            let listType: Pixel.Event.CompileRulesListType
+            let listType: GeneralPixel.CompileRulesListType
             switch listName {
             case defaultTDSListName:
                 listType = .tds
@@ -154,13 +155,15 @@ final class AppContentBlocking {
             return
         }
 
-        Pixel.fire(.debug(event: domainEvent, error: error), withAdditionalParameters: parameters, onComplete: onComplete)
+        PixelKit.fire(DebugEvent(domainEvent, error: error), withAdditionalParameters: parameters) { _, error in
+            onComplete(error)
+        }
     }
 
     // MARK: - Ad Click Attribution
 
     let attributionEvents: EventMapping<AdClickAttributionEvents>? = .init { event, _, parameters, _ in
-        let domainEvent: Pixel.Event
+        let domainEvent: GeneralPixel
         switch event {
         case .adAttributionDetected:
             domainEvent = .adClickAttributionDetected
@@ -170,11 +173,11 @@ final class AppContentBlocking {
             domainEvent = .adClickAttributionPageLoads
         }
 
-        Pixel.fire(domainEvent, withAdditionalParameters: parameters ?? [:])
+        PixelKit.fire(domainEvent, withAdditionalParameters: parameters ?? [:])
     }
 
     let attributionDebugEvents: EventMapping<AdClickAttributionDebugEvents>? = .init { event, _, _, _ in
-        let domainEvent: Pixel.Event.Debug
+        let domainEvent: GeneralPixel
         switch event {
         case .adAttributionCompilationFailedForAttributedRulesList:
             domainEvent = .adAttributionCompilationFailedForAttributedRulesList
@@ -198,8 +201,7 @@ final class AppContentBlocking {
             domainEvent = .adAttributionLogicWrongVendorOnFailedCompilation
         }
 
-        Pixel.fire(.debug(event: domainEvent, error: nil),
-                   includeAppVersionParameter: false)
+        PixelKit.fire(DebugEvent(domainEvent), includeAppVersionParameter: false)
     }
 }
 
diff --git a/DuckDuckGo/ContentBlocker/Mocks/MockPrivacyConfiguration.swift b/DuckDuckGo/ContentBlocker/Mocks/MockPrivacyConfiguration.swift
index 60dc35a8e1..d18f6ce82f 100644
--- a/DuckDuckGo/ContentBlocker/Mocks/MockPrivacyConfiguration.swift
+++ b/DuckDuckGo/ContentBlocker/Mocks/MockPrivacyConfiguration.swift
@@ -61,7 +61,8 @@ final class MockPrivacyConfiguration: PrivacyConfiguration {
     func isUserUnprotected(domain: String?) -> Bool { false }
     func isTempUnprotected(domain: String?) -> Bool { false }
     func isInExceptionList(domain: String?, forFeature featureKey: PrivacyFeature) -> Bool { false }
-    func settings(for feature: PrivacyFeature) -> PrivacyConfigurationData.PrivacyFeature.FeatureSettings { featureSettings }
+    func settings(for feature: PrivacyFeature) -> PrivacyConfigurationData.PrivacyFeature.FeatureSettings {
+        featureSettings }
     func userEnabledProtection(forDomain: String) {}
     func userDisabledProtection(forDomain: String) {}
 }
diff --git a/DuckDuckGo/ContentBlocker/macos-config.json b/DuckDuckGo/ContentBlocker/macos-config.json
index 4ddf3a01ba..cce44b20c4 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": 1712071688011,
+    "version": 1714746648846,
     "features": {
         "adClickAttribution": {
             "readme": "https://help.duckduckgo.com/duckduckgo-help-pages/privacy/web-tracking-protections/#3rd-party-tracker-loading-protection",
@@ -74,12 +74,6 @@
                 {
                     "domain": "thehustle.co"
                 },
-                {
-                    "domain": "earth.google.com"
-                },
-                {
-                    "domain": "iscorp.com"
-                },
                 {
                     "domain": "marvel.com"
                 },
@@ -111,7 +105,7 @@
                 ]
             },
             "state": "enabled",
-            "hash": "51b76aa7b92d78ad52106b04ac809843"
+            "hash": "16c6e3fb43797e3ca13a9259569a9e4e"
         },
         "androidBrowserConfig": {
             "exceptions": [],
@@ -141,6 +135,9 @@
                 {
                     "domain": "ksta.de"
                 },
+                {
+                    "domain": "larazon.es"
+                },
                 {
                     "domain": "motherdenim.com"
                 },
@@ -286,10 +283,19 @@
                     "domain": "condell-ltd.com"
                 },
                 {
-                    "domain": "earth.google.com"
+                    "domain": "leefgemeenschapzilt.nl"
+                },
+                {
+                    "domain": "healthline.com"
+                },
+                {
+                    "domain": "sporthoj.com"
+                },
+                {
+                    "domain": "www.michelinman.com"
                 },
                 {
-                    "domain": "iscorp.com"
+                    "domain": "malmostadsteater.se"
                 },
                 {
                     "domain": "marvel.com"
@@ -302,23 +308,20 @@
                 "disabledCMPs": [
                     "generic-cosmetic",
                     "termsfeed3",
-                    "strato.de"
+                    "tarteaucitron.js"
                 ]
             },
             "state": "enabled",
-            "hash": "98e57a3eb872c9dfb4a019b90dc6c0ec"
+            "hash": "7096d80d39c6c9a98d98ff6bde5644e0"
         },
         "autofill": {
             "exceptions": [
                 {
                     "domain": "roll20.net"
-                },
-                {
-                    "domain": "rumble.com"
                 }
             ],
             "state": "enabled",
-            "hash": "5bb5c0fc0d462da4674e4ca07dbc9363"
+            "hash": "b1ae580a636957bcbe90d16aa92c40bd"
         },
         "clickToLoad": {
             "exceptions": [
@@ -922,12 +925,6 @@
                 {
                     "domain": "pocketbook.digital"
                 },
-                {
-                    "domain": "earth.google.com"
-                },
-                {
-                    "domain": "iscorp.com"
-                },
                 {
                     "domain": "marvel.com"
                 },
@@ -950,16 +947,10 @@
                 }
             },
             "state": "disabled",
-            "hash": "36e8971fa9bb204b78a5929a14a108dd"
+            "hash": "770f7ae0f752e976764771bccec352b2"
         },
         "clickToPlay": {
             "exceptions": [
-                {
-                    "domain": "earth.google.com"
-                },
-                {
-                    "domain": "iscorp.com"
-                },
                 {
                     "domain": "marvel.com"
                 },
@@ -977,7 +968,7 @@
                 }
             },
             "state": "enabled",
-            "hash": "f1b7de266435cd2e414f50deb2c9234a"
+            "hash": "2cff3d9b2df1ed9375f362848c8ed5f3"
         },
         "clientBrandHint": {
             "exceptions": [],
@@ -1008,12 +999,6 @@
                 {
                     "domain": "soranews24.com"
                 },
-                {
-                    "domain": "earth.google.com"
-                },
-                {
-                    "domain": "iscorp.com"
-                },
                 {
                     "domain": "marvel.com"
                 },
@@ -1021,7 +1006,7 @@
                     "domain": "sundancecatalog.com"
                 }
             ],
-            "hash": "e37447d42ee8194f185e35e40f577f41"
+            "hash": "593797946074a1f304add65e7543b9be"
         },
         "cookie": {
             "settings": {
@@ -1063,12 +1048,6 @@
                 {
                     "domain": "news.ti.com"
                 },
-                {
-                    "domain": "earth.google.com"
-                },
-                {
-                    "domain": "iscorp.com"
-                },
                 {
                     "domain": "marvel.com"
                 },
@@ -1077,7 +1056,7 @@
                 }
             ],
             "state": "disabled",
-            "hash": "37a27966915571085613911b47e6e2eb"
+            "hash": "7ade754b885238cd191f1a61b4eeb0b6"
         },
         "customUserAgent": {
             "settings": {
@@ -1096,7 +1075,7 @@
                         "reason": "https://github.com/duckduckgo/privacy-configuration/issues/667"
                     },
                     {
-                        "domain": "www.canva.com",
+                        "domain": "canva.com",
                         "reason": "https://github.com/duckduckgo/privacy-configuration/issues/1818"
                     },
                     {
@@ -1118,6 +1097,10 @@
                     {
                         "domain": "web.de",
                         "reason": "https://github.com/duckduckgo/privacy-configuration/issues/1931"
+                    },
+                    {
+                        "domain": "id.seb.se",
+                        "reason": "https://github.com/duckduckgo/privacy-configuration/issues/2025"
                     }
                 ],
                 "webViewDefault": [
@@ -1136,12 +1119,16 @@
                     {
                         "domain": "sas.dk",
                         "reason": "https://github.com/duckduckgo/privacy-configuration/issues/1347"
+                    },
+                    {
+                        "domain": "nationalmssociety.org",
+                        "reason": "https://github.com/duckduckgo/privacy-configuration/issues/1963"
                     }
                 ]
             },
             "exceptions": [],
             "state": "enabled",
-            "hash": "7edfa8344fd2577b31426130696d8b23"
+            "hash": "c52448ca8da413a93de9822cac039920"
         },
         "dbp": {
             "state": "enabled",
@@ -1184,7 +1171,9 @@
                             "videoElement": "#player video",
                             "videoElementContainer": "#player .html5-video-player",
                             "hoverExcluded": [],
-                            "clickExcluded": [],
+                            "clickExcluded": [
+                                "ytd-thumbnail-overlay-toggle-button-renderer"
+                            ],
                             "allowedEventTargets": [
                                 ".ytp-inline-preview-scrim",
                                 ".ytd-video-preview",
@@ -1231,19 +1220,13 @@
                 ]
             },
             "state": "enabled",
-            "hash": "ab2c73639ad75b2d6efb18f324230397"
+            "hash": "b685397a8317384bec3b8d7e8b7571bb"
         },
         "elementHiding": {
             "exceptions": [
                 {
                     "domain": "duckduckgo.com"
                 },
-                {
-                    "domain": "earth.google.com"
-                },
-                {
-                    "domain": "iscorp.com"
-                },
                 {
                     "domain": "marvel.com"
                 },
@@ -1915,6 +1898,14 @@
                             {
                                 "selector": ".proper-dynamic-insertion",
                                 "type": "closest-empty"
+                            },
+                            {
+                                "selector": ".Page-header-leaderboardAd",
+                                "type": "hide-empty"
+                            },
+                            {
+                                "selector": ".SovrnAd",
+                                "type": "hide-empty"
                             }
                         ]
                     },
@@ -2285,6 +2276,15 @@
                             }
                         ]
                     },
+                    {
+                        "domain": "doodle.com",
+                        "rules": [
+                            {
+                                "selector": "[data-testid*='ads-layout-placement']",
+                                "type": "hide"
+                            }
+                        ]
+                    },
                     {
                         "domain": "dpreview.com",
                         "rules": [
@@ -2365,6 +2365,23 @@
                             }
                         ]
                     },
+                    {
+                        "domain": "eurogamer.net",
+                        "rules": [
+                            {
+                                "selector": "#sticky_leaderboard",
+                                "type": "hide-empty"
+                            },
+                            {
+                                "selector": ".primis_wrapper",
+                                "type": "hide"
+                            },
+                            {
+                                "selector": ".autoad",
+                                "type": "hide-empty"
+                            }
+                        ]
+                    },
                     {
                         "domain": "examiner.com.au",
                         "rules": [
@@ -2843,6 +2860,27 @@
                             }
                         ]
                     },
+                    {
+                        "domain": "independent.co.uk",
+                        "rules": [
+                            {
+                                "selector": "#partners",
+                                "type": "hide-empty"
+                            },
+                            {
+                                "selector": "#top-banner-wrapper",
+                                "type": "hide-empty"
+                            },
+                            {
+                                "selector": "[data-mpu1=true]",
+                                "type": "hide-empty"
+                            },
+                            {
+                                "selector": "#stickyFooterRoot",
+                                "type": "hide"
+                            }
+                        ]
+                    },
                     {
                         "domain": "indiatimes.com",
                         "rules": [
@@ -3490,6 +3528,15 @@
                             }
                         ]
                     },
+                    {
+                        "domain": "realtor.com",
+                        "rules": [
+                            {
+                                "selector": ".ads_container",
+                                "type": "hide"
+                            }
+                        ]
+                    },
                     {
                         "domain": "reddit.com",
                         "rules": [
@@ -4018,6 +4065,15 @@
                             }
                         ]
                     },
+                    {
+                        "domain": "woot.com",
+                        "rules": [
+                            {
+                                "selector": "[data-test-ui*='advertisementLeaderboard']",
+                                "type": "hide-empty"
+                            }
+                        ]
+                    },
                     {
                         "domain": "wsj.com",
                         "rules": [
@@ -4218,20 +4274,23 @@
                                 "type": "override"
                             }
                         ]
+                    },
+                    {
+                        "domain": "wideopencountry.com",
+                        "rules": [
+                            {
+                                "selector": ".entry-ad",
+                                "type": "hide-empty"
+                            }
+                        ]
                     }
                 ]
             },
             "state": "enabled",
-            "hash": "10545dae34a5b5f2cc26c91976be5809"
+            "hash": "893bd7422971b3a7b4c6e02cdfc6332d"
         },
         "exceptionHandler": {
             "exceptions": [
-                {
-                    "domain": "earth.google.com"
-                },
-                {
-                    "domain": "iscorp.com"
-                },
                 {
                     "domain": "marvel.com"
                 },
@@ -4240,7 +4299,12 @@
                 }
             ],
             "state": "disabled",
-            "hash": "5e792dd491428702bc0104240fbce0ce"
+            "hash": "dc1b4fa301193a03ddcd4bdf7ee3e610"
+        },
+        "extendedOnboarding": {
+            "exceptions": [],
+            "state": "disabled",
+            "hash": "728493ef7a1488e4781656d3f9db84aa"
         },
         "fingerprintingAudio": {
             "state": "disabled",
@@ -4248,12 +4312,6 @@
                 {
                     "domain": "litebluesso.usps.gov"
                 },
-                {
-                    "domain": "earth.google.com"
-                },
-                {
-                    "domain": "iscorp.com"
-                },
                 {
                     "domain": "marvel.com"
                 },
@@ -4261,19 +4319,13 @@
                     "domain": "sundancecatalog.com"
                 }
             ],
-            "hash": "f25a8f2709e865c2bd743828c7ee2f77"
+            "hash": "2037fcd805ece181cfffc482f262941f"
         },
         "fingerprintingBattery": {
             "exceptions": [
                 {
                     "domain": "litebluesso.usps.gov"
                 },
-                {
-                    "domain": "earth.google.com"
-                },
-                {
-                    "domain": "iscorp.com"
-                },
                 {
                     "domain": "marvel.com"
                 },
@@ -4282,7 +4334,7 @@
                 }
             ],
             "state": "disabled",
-            "hash": "4085f1593faff2feac2093533b819a41"
+            "hash": "07ee708dc740aab3b1f048d9bb571dac"
         },
         "fingerprintingCanvas": {
             "settings": {
@@ -4373,12 +4425,6 @@
                 {
                     "domain": "godaddy.com"
                 },
-                {
-                    "domain": "earth.google.com"
-                },
-                {
-                    "domain": "iscorp.com"
-                },
                 {
                     "domain": "marvel.com"
                 },
@@ -4387,7 +4433,7 @@
                 }
             ],
             "state": "disabled",
-            "hash": "ea4c565bae27996f0d651300d757594c"
+            "hash": "d48bfb1151476f49970ffd3b1f778bf9"
         },
         "fingerprintingHardware": {
             "settings": {
@@ -4439,12 +4485,6 @@
                 {
                     "domain": "proton.me"
                 },
-                {
-                    "domain": "earth.google.com"
-                },
-                {
-                    "domain": "iscorp.com"
-                },
                 {
                     "domain": "marvel.com"
                 },
@@ -4486,7 +4526,7 @@
                 }
             ],
             "state": "enabled",
-            "hash": "37e16df501e3e68416a13f991b4e4147"
+            "hash": "aefca8e7a9a3d9b65370608dd639cd3f"
         },
         "fingerprintingScreenSize": {
             "settings": {
@@ -4526,12 +4566,6 @@
                 {
                     "domain": "secureserver.net"
                 },
-                {
-                    "domain": "earth.google.com"
-                },
-                {
-                    "domain": "iscorp.com"
-                },
                 {
                     "domain": "marvel.com"
                 },
@@ -4540,7 +4574,7 @@
                 }
             ],
             "state": "disabled",
-            "hash": "466b85680f138657de9bfd222c440887"
+            "hash": "eef4614273c28d50dd298a68ffbac309"
         },
         "fingerprintingTemporaryStorage": {
             "exceptions": [
@@ -4553,12 +4587,6 @@
                 {
                     "domain": "tattoogenius.art"
                 },
-                {
-                    "domain": "earth.google.com"
-                },
-                {
-                    "domain": "iscorp.com"
-                },
                 {
                     "domain": "marvel.com"
                 },
@@ -4567,16 +4595,10 @@
                 }
             ],
             "state": "disabled",
-            "hash": "f858697949c90842c450daee64a1dc30"
+            "hash": "2746e6cb6c773e80a36fda03618ef930"
         },
         "googleRejected": {
             "exceptions": [
-                {
-                    "domain": "earth.google.com"
-                },
-                {
-                    "domain": "iscorp.com"
-                },
                 {
                     "domain": "marvel.com"
                 },
@@ -4585,7 +4607,7 @@
                 }
             ],
             "state": "disabled",
-            "hash": "5e792dd491428702bc0104240fbce0ce"
+            "hash": "dc1b4fa301193a03ddcd4bdf7ee3e610"
         },
         "gpc": {
             "state": "enabled",
@@ -4602,6 +4624,9 @@
                 {
                     "domain": "crunchyroll.com"
                 },
+                {
+                    "domain": "espn.com"
+                },
                 {
                     "domain": "eventbrite.com"
                 },
@@ -4620,12 +4645,6 @@
                 {
                     "domain": "tirerack.com"
                 },
-                {
-                    "domain": "earth.google.com"
-                },
-                {
-                    "domain": "iscorp.com"
-                },
                 {
                     "domain": "marvel.com"
                 },
@@ -4642,7 +4661,7 @@
                     "privacy-test-pages.site"
                 ]
             },
-            "hash": "1a1373bcf16647d63220659fce650a83"
+            "hash": "05bddff3ae61a9536e38a6ef7d383eb3"
         },
         "harmfulApis": {
             "settings": {
@@ -4744,12 +4763,6 @@
                 "domains": []
             },
             "exceptions": [
-                {
-                    "domain": "earth.google.com"
-                },
-                {
-                    "domain": "iscorp.com"
-                },
                 {
                     "domain": "marvel.com"
                 },
@@ -4758,7 +4771,7 @@
                 }
             ],
             "state": "disabled",
-            "hash": "44d3e707cba3ee0a3578f52dc2ce2aa4"
+            "hash": "f29eae11500edcda80aa8b32b12869eb"
         },
         "history": {
             "state": "disabled",
@@ -4777,12 +4790,6 @@
                 {
                     "domain": "jp.square-enix.com"
                 },
-                {
-                    "domain": "earth.google.com"
-                },
-                {
-                    "domain": "iscorp.com"
-                },
                 {
                     "domain": "marvel.com"
                 },
@@ -4790,7 +4797,7 @@
                     "domain": "sundancecatalog.com"
                 }
             ],
-            "hash": "f772808ed34cc9ea8cbcbb7cdaf74429"
+            "hash": "ea2c4fc84f27eb3694acd9ccf1023e95"
         },
         "incontextSignup": {
             "exceptions": [],
@@ -4827,12 +4834,6 @@
         },
         "navigatorInterface": {
             "exceptions": [
-                {
-                    "domain": "earth.google.com"
-                },
-                {
-                    "domain": "iscorp.com"
-                },
                 {
                     "domain": "marvel.com"
                 },
@@ -4848,7 +4849,7 @@
                 ]
             },
             "state": "enabled",
-            "hash": "698de7b963d7d7942c5c5d1e986bb1b1"
+            "hash": "bb2ed420e76ecaf31a1f99decd370e55"
         },
         "networkProtection": {
             "state": "enabled",
@@ -4893,23 +4894,25 @@
             "exceptions": [],
             "state": "enabled",
             "settings": {
-                "surveyCardDay0": "enabled",
+                "surveyCardDay0": "disabled",
                 "surveyCardDay7": "disabled",
-                "surveyCardDay14": "enabled"
+                "surveyCardDay14": "disabled",
+                "permanentSurvey": {
+                    "state": "enabled",
+                    "localization": "disabled",
+                    "url": "https://selfserve.decipherinc.com/survey/selfserve/32ab/240404?list=2",
+                    "firstDay": 5,
+                    "lastDay": 8,
+                    "sharePercentage": 60
+                }
             },
-            "hash": "eb826d9079211f30d624211f44aed184"
+            "hash": "8a5c9011216219c6576ec362acb51fd0"
         },
         "nonTracking3pCookies": {
             "settings": {
                 "excludedCookieDomains": []
             },
             "exceptions": [
-                {
-                    "domain": "earth.google.com"
-                },
-                {
-                    "domain": "iscorp.com"
-                },
                 {
                     "domain": "marvel.com"
                 },
@@ -4918,17 +4921,11 @@
                 }
             ],
             "state": "disabled",
-            "hash": "841fa92b9728c9754f050662678f82c7"
+            "hash": "522e3e42e2612ac2811342d3f6754c5a"
         },
         "performanceMetrics": {
             "state": "enabled",
             "exceptions": [
-                {
-                    "domain": "earth.google.com"
-                },
-                {
-                    "domain": "iscorp.com"
-                },
                 {
                     "domain": "marvel.com"
                 },
@@ -4936,7 +4933,7 @@
                     "domain": "sundancecatalog.com"
                 }
             ],
-            "hash": "38558d5e7b231d4b27e7dd76814387a7"
+            "hash": "936f00970c108fd646f73d00b3f3f5b5"
         },
         "privacyDashboard": {
             "exceptions": [],
@@ -4948,25 +4945,38 @@
                     }
                 },
                 "toggleReports": {
-                    "state": "enabled",
-                    "rollout": {
-                        "steps": [
-                            {
-                                "percent": 5
-                            }
-                        ]
-                    }
+                    "state": "enabled"
                 }
             },
             "state": "enabled",
-            "hash": "f7cce63c16c142db4ff5764b542a6c52"
+            "hash": "66968d9b69520975185476473cc11824"
         },
         "privacyPro": {
             "state": "enabled",
             "exceptions": [],
             "features": {
                 "isLaunched": {
-                    "state": "disabled"
+                    "state": "enabled",
+                    "rollout": {
+                        "steps": [
+                            {
+                                "percent": 1
+                            },
+                            {
+                                "percent": 10
+                            },
+                            {
+                                "percent": 30
+                            },
+                            {
+                                "percent": 50
+                            },
+                            {
+                                "percent": 100
+                            }
+                        ]
+                    },
+                    "minSupportedVersion": "1.82.1"
                 },
                 "isLaunchedOverride": {
                     "state": "disabled"
@@ -4975,13 +4985,33 @@
                     "state": "enabled"
                 },
                 "isLaunchedStripe": {
-                    "state": "disabled"
+                    "state": "enabled",
+                    "rollout": {
+                        "steps": [
+                            {
+                                "percent": 1
+                            },
+                            {
+                                "percent": 10
+                            },
+                            {
+                                "percent": 30
+                            },
+                            {
+                                "percent": 50
+                            },
+                            {
+                                "percent": 100
+                            }
+                        ]
+                    },
+                    "minSupportedVersion": "1.82.1"
                 },
                 "allowPurchaseStripe": {
                     "state": "enabled"
                 }
             },
-            "hash": "c9153c5cc3b6b7eba024c6c597e15edb"
+            "hash": "1a10a68ea8885db0d1d9bab371c0f738"
         },
         "privacyProtectionsPopup": {
             "state": "disabled",
@@ -5008,12 +5038,6 @@
                 {
                     "domain": "xcelenergy.com"
                 },
-                {
-                    "domain": "earth.google.com"
-                },
-                {
-                    "domain": "iscorp.com"
-                },
                 {
                     "domain": "marvel.com"
                 },
@@ -5022,17 +5046,11 @@
                 }
             ],
             "state": "disabled",
-            "hash": "0d3df0f7c24ebde89d2dced4e2d34322"
+            "hash": "1cfe449de8a4fcb542757383d846c031"
         },
         "requestFilterer": {
             "state": "disabled",
             "exceptions": [
-                {
-                    "domain": "earth.google.com"
-                },
-                {
-                    "domain": "iscorp.com"
-                },
                 {
                     "domain": "marvel.com"
                 },
@@ -5043,17 +5061,11 @@
             "settings": {
                 "windowInMs": 0
             },
-            "hash": "0fff8017d8ea4b5609b8f5c110be1401"
+            "hash": "3218faa098a2e9da61447fb63e3a5ed9"
         },
         "runtimeChecks": {
             "state": "disabled",
             "exceptions": [
-                {
-                    "domain": "earth.google.com"
-                },
-                {
-                    "domain": "iscorp.com"
-                },
                 {
                     "domain": "marvel.com"
                 },
@@ -5062,16 +5074,10 @@
                 }
             ],
             "settings": {},
-            "hash": "800a19533c728bbec7e31e466f898268"
+            "hash": "ddb64344aa42e9593964f14b6de3d6df"
         },
         "serviceworkerInitiatedRequests": {
             "exceptions": [
-                {
-                    "domain": "earth.google.com"
-                },
-                {
-                    "domain": "iscorp.com"
-                },
                 {
                     "domain": "marvel.com"
                 },
@@ -5080,7 +5086,17 @@
                 }
             ],
             "state": "disabled",
-            "hash": "5e792dd491428702bc0104240fbce0ce"
+            "hash": "dc1b4fa301193a03ddcd4bdf7ee3e610"
+        },
+        "sslCertificates": {
+            "state": "enabled",
+            "exceptions": [],
+            "features": {
+                "allowBypass": {
+                    "state": "enabled"
+                }
+            },
+            "hash": "abe9584048f7f8157f71a14e7914cb1c"
         },
         "sync": {
             "state": "enabled",
@@ -5256,7 +5272,8 @@
                             {
                                 "rule": "static.adsafeprotected.com/iasPET.1.js",
                                 "domains": [
-                                    "corriere.it"
+                                    "corriere.it",
+                                    "independent.co.uk"
                                 ]
                             },
                             {
@@ -5366,6 +5383,7 @@
                                     "fattoincasadabenedetta.it",
                                     "inquirer.com",
                                     "thesurfersview.com",
+                                    "twitchy.com",
                                     "wildrivers.lostcoastoutpost.com"
                                 ]
                             },
@@ -5526,6 +5544,12 @@
                     },
                     "boldapps.net": {
                         "rules": [
+                            {
+                                "rule": "mc.boldapps.net/install_assets/bold.multicurrency.js",
+                                "domains": [
+                                    "<all>"
+                                ]
+                            },
                             {
                                 "rule": "option.boldapps.net/js/options.js",
                                 "domains": [
@@ -5826,6 +5850,16 @@
                             }
                         ]
                     },
+                    "curalate.com": {
+                        "rules": [
+                            {
+                                "rule": "edge.curalate.com/sites/",
+                                "domains": [
+                                    "<all>"
+                                ]
+                            }
+                        ]
+                    },
                     "cxense.com": {
                         "rules": [
                             {
@@ -5989,6 +6023,18 @@
                                     "sbs.com.au"
                                 ]
                             },
+                            {
+                                "rule": "https://googleads.g.doubleclick.net/ads/preferences/naioptout",
+                                "domains": [
+                                    "zojirushi.com"
+                                ]
+                            },
+                            {
+                                "rule": "www3.doubleclick.net",
+                                "domains": [
+                                    "scrolller.com"
+                                ]
+                            },
                             {
                                 "rule": "doubleclick.net",
                                 "domains": [
@@ -6012,11 +6058,7 @@
                             {
                                 "rule": "cdn.dynamicyield.com/api/",
                                 "domains": [
-                                    "asics.com",
-                                    "brooklinen.com",
-                                    "carters.com",
-                                    "otterbox.com",
-                                    "seatosummit.com"
+                                    "<all>"
                                 ]
                             }
                         ]
@@ -6145,6 +6187,24 @@
                     },
                     "facebook.com": {
                         "rules": [
+                            {
+                                "rule": "facebook.com/plugins/customer_chat/",
+                                "domains": [
+                                    "danibowman.com"
+                                ]
+                            },
+                            {
+                                "rule": "facebook.com/v6.0/plugins/customer_chat/",
+                                "domains": [
+                                    "danibowman.com"
+                                ]
+                            },
+                            {
+                                "rule": "facebook.com/v6.0/plugins/customerchat.php",
+                                "domains": [
+                                    "danibowman.com"
+                                ]
+                            },
                             {
                                 "rule": "facebook.com",
                                 "domains": [
@@ -6170,6 +6230,12 @@
                                     "nordicwellness.se"
                                 ]
                             },
+                            {
+                                "rule": "connect.facebook.net/en_US/sdk/xfbml.customerchat.js",
+                                "domains": [
+                                    "danibowman.com"
+                                ]
+                            },
                             {
                                 "rule": "connect.facebook.net/en_UK/sdk.js",
                                 "domains": [
@@ -6421,6 +6487,12 @@
                                 "domains": [
                                     "<all>"
                                 ]
+                            },
+                            {
+                                "rule": "marketingplatform.google.com/about/enterprise",
+                                "domains": [
+                                    "scrolller.com"
+                                ]
                             }
                         ]
                     },
@@ -6429,19 +6501,7 @@
                             {
                                 "rule": "imasdk.googleapis.com/js/sdkloader/ima3.js",
                                 "domains": [
-                                    "arkadium.com",
-                                    "bloomberg.com",
-                                    "cbssports.com",
-                                    "crunchyroll.com",
-                                    "gamak.tv",
-                                    "games.washingtonpost.com",
-                                    "metro.co.uk",
-                                    "nfl.com",
-                                    "pandora.com",
-                                    "paper-io.com",
-                                    "rawstory.com",
-                                    "usatoday.com",
-                                    "washingtonpost.com"
+                                    "<all>"
                                 ]
                             }
                         ]
@@ -6466,6 +6526,7 @@
                                     "daotranslate.com",
                                     "drakescans.com",
                                     "duden.de",
+                                    "edealinfo.com",
                                     "freetubetv.net",
                                     "hscprojects.com",
                                     "kits4beats.com",
@@ -6694,6 +6755,16 @@
                             }
                         ]
                     },
+                    "grow.me": {
+                        "rules": [
+                            {
+                                "rule": "grow.me/main.js",
+                                "domains": [
+                                    "budgetbytes.com"
+                                ]
+                            }
+                        ]
+                    },
                     "gstatic.com": {
                         "rules": [
                             {
@@ -6733,6 +6804,12 @@
                                 "domains": [
                                     "<all>"
                                 ]
+                            },
+                            {
+                                "rule": "api.hubspot.com/livechat-public/v1/message/public",
+                                "domains": [
+                                    "<all>"
+                                ]
                             }
                         ]
                     },
@@ -6920,6 +6997,7 @@
                             {
                                 "rule": "a.klaviyo.com/media/js/onsite/onsite.js",
                                 "domains": [
+                                    "bonescoffee.com",
                                     "tanglefree.com"
                                 ]
                             },
@@ -6928,7 +7006,8 @@
                                 "domains": [
                                     "andieswim.com",
                                     "footweartruth.com",
-                                    "kmail-lists.com"
+                                    "kmail-lists.com",
+                                    "usafacts.org"
                                 ]
                             }
                         ]
@@ -6959,6 +7038,16 @@
                             }
                         ]
                     },
+                    "litix.io": {
+                        "rules": [
+                            {
+                                "rule": "src.litix.io/videojs/",
+                                "domains": [
+                                    "<all>"
+                                ]
+                            }
+                        ]
+                    },
                     "loggly.com": {
                         "rules": [
                             {
@@ -7121,7 +7210,7 @@
                             {
                                 "rule": "connect.nosto.com/script/shopify/nosto.js",
                                 "domains": [
-                                    "oneill.com"
+                                    "<all>"
                                 ]
                             }
                         ]
@@ -7131,7 +7220,8 @@
                             {
                                 "rule": "npttech.com/advertising.js",
                                 "domains": [
-                                    "blick.ch"
+                                    "blick.ch",
+                                    "independent.co.uk"
                                 ]
                             }
                         ]
@@ -7170,6 +7260,12 @@
                                     "cigna.com"
                                 ]
                             },
+                            {
+                                "rule": "altriagroupinc.tt.omtrdc.net/rest/v1/delivery",
+                                "domains": [
+                                    "marlboro.com"
+                                ]
+                            },
                             {
                                 "rule": "omtrdc.net",
                                 "domains": [
@@ -7216,6 +7312,7 @@
                                     "abc.net.au",
                                     "emol.com",
                                     "oufc.co.uk",
+                                    "the-afc.com",
                                     "theposh.com"
                                 ]
                             }
@@ -7234,6 +7331,12 @@
                                 "domains": [
                                     "hgtv.com"
                                 ]
+                            },
+                            {
+                                "rule": "https://cdn.optimizely.com/js/271989291.js",
+                                "domains": [
+                                    "my.zipcar.com"
+                                ]
                             }
                         ]
                     },
@@ -7318,10 +7421,23 @@
                     "primis.tech": {
                         "rules": [
                             {
-                                "rule": "live.primis.tech/live/liveView.php",
+                                "rule": "video.primis.tech/",
+                                "domains": [
+                                    "wideopencountry.com"
+                                ]
+                            },
+                            {
+                                "rule": "live.primis.tech/content/omid/static/",
+                                "domains": [
+                                    "wideopencountry.com"
+                                ]
+                            },
+                            {
+                                "rule": "live.primis.tech/live/",
                                 "domains": [
                                     "belfastlive.co.uk",
-                                    "cornwalllive.com"
+                                    "cornwalllive.com",
+                                    "wideopencountry.com"
                                 ]
                             }
                         ]
@@ -7697,6 +7813,16 @@
                             }
                         ]
                     },
+                    "skimresources.com": {
+                        "rules": [
+                            {
+                                "rule": "go.skimresources.com/",
+                                "domains": [
+                                    "www.lotustalk.com"
+                                ]
+                            }
+                        ]
+                    },
                     "slickstream.com": {
                         "rules": [
                             {
@@ -7777,6 +7903,16 @@
                             }
                         ]
                     },
+                    "sundaysky.com": {
+                        "rules": [
+                            {
+                                "rule": "sundaysky.com",
+                                "domains": [
+                                    "bankofamerica.com"
+                                ]
+                            }
+                        ]
+                    },
                     "taboola.com": {
                         "rules": [
                             {
@@ -7930,6 +8066,12 @@
                                 "domains": [
                                     "winnipegfreepress.com"
                                 ]
+                            },
+                            {
+                                "rule": "platform.twitter.com/_next/static",
+                                "domains": [
+                                    "<all>"
+                                ]
                             }
                         ]
                     },
@@ -8196,12 +8338,6 @@
                 }
             },
             "exceptions": [
-                {
-                    "domain": "earth.google.com"
-                },
-                {
-                    "domain": "iscorp.com"
-                },
                 {
                     "domain": "marvel.com"
                 },
@@ -8209,7 +8345,7 @@
                     "domain": "sundancecatalog.com"
                 }
             ],
-            "hash": "adf596be88e8975a3cdcaaef3d24990d"
+            "hash": "8abdf819c66bc3e2391e900958ed0294"
         },
         "trackingCookies1p": {
             "settings": {
@@ -8219,12 +8355,6 @@
                 }
             },
             "exceptions": [
-                {
-                    "domain": "earth.google.com"
-                },
-                {
-                    "domain": "iscorp.com"
-                },
                 {
                     "domain": "marvel.com"
                 },
@@ -8233,19 +8363,13 @@
                 }
             ],
             "state": "disabled",
-            "hash": "4dddf681372a2aea9788090b13db6e6f"
+            "hash": "dab51f5ad2454727f8bc474cdd3da65b"
         },
         "trackingCookies3p": {
             "settings": {
                 "excludedCookieDomains": []
             },
             "exceptions": [
-                {
-                    "domain": "earth.google.com"
-                },
-                {
-                    "domain": "iscorp.com"
-                },
                 {
                     "domain": "marvel.com"
                 },
@@ -8254,19 +8378,13 @@
                 }
             ],
             "state": "disabled",
-            "hash": "841fa92b9728c9754f050662678f82c7"
+            "hash": "522e3e42e2612ac2811342d3f6754c5a"
         },
         "trackingParameters": {
             "exceptions": [
                 {
                     "domain": "axs.com"
                 },
-                {
-                    "domain": "earth.google.com"
-                },
-                {
-                    "domain": "iscorp.com"
-                },
                 {
                     "domain": "marvel.com"
                 },
@@ -8305,19 +8423,13 @@
             },
             "state": "enabled",
             "minSupportedVersion": "0.22.3",
-            "hash": "9a0282376084874f0245c421d6943841"
+            "hash": "44005192b6dba245e95de042fc224228"
         },
         "userAgentRotation": {
             "settings": {
                 "agentExcludePatterns": []
             },
             "exceptions": [
-                {
-                    "domain": "earth.google.com"
-                },
-                {
-                    "domain": "iscorp.com"
-                },
                 {
                     "domain": "marvel.com"
                 },
@@ -8326,7 +8438,7 @@
                 }
             ],
             "state": "disabled",
-            "hash": "f65d10dfdf6739feab99a08d42734747"
+            "hash": "e30277704ddbf20c14136baab08519c5"
         },
         "voiceSearch": {
             "exceptions": [],
@@ -8335,12 +8447,6 @@
         },
         "webCompat": {
             "exceptions": [
-                {
-                    "domain": "earth.google.com"
-                },
-                {
-                    "domain": "iscorp.com"
-                },
                 {
                     "domain": "marvel.com"
                 },
@@ -8609,7 +8715,7 @@
                     }
                 ]
             },
-            "hash": "151d7ee40451c4aac4badfcc829ea0b5"
+            "hash": "90687b1a5ac7aec8bf26f24a75cd883f"
         },
         "windowsPermissionUsage": {
             "exceptions": [],
@@ -8618,12 +8724,6 @@
         },
         "windowsStartupBoost": {
             "exceptions": [
-                {
-                    "domain": "earth.google.com"
-                },
-                {
-                    "domain": "iscorp.com"
-                },
                 {
                     "domain": "marvel.com"
                 },
@@ -8632,7 +8732,7 @@
                 }
             ],
             "state": "disabled",
-            "hash": "5e792dd491428702bc0104240fbce0ce"
+            "hash": "dc1b4fa301193a03ddcd4bdf7ee3e610"
         },
         "windowsWaitlist": {
             "exceptions": [],
diff --git a/DuckDuckGo/ContentBlocker/trackerData.json b/DuckDuckGo/ContentBlocker/trackerData.json
index 647e15dbb6..f7618c909f 100644
--- a/DuckDuckGo/ContentBlocker/trackerData.json
+++ b/DuckDuckGo/ContentBlocker/trackerData.json
@@ -1,7 +1,7 @@
 {
     "_builtWith": {
-        "tracker-radar": "09133e827d9dcbba9465c87efdf0229ddd910d3e867f8ccd5efc31abd7073963-4013b4e91930c643394cb31c6c745356f133b04f",
-        "tracker-surrogates": "ba0d8cefe4432723ec75b998241efd2454dff35a"
+        "tracker-radar": "74dd9601901673a7c0f87e609695b5a0e31b808adabd62e6db6ed7c99bde966d-4013b4e91930c643394cb31c6c745356f133b04f",
+        "tracker-surrogates": "0528e3226df15b1a3e319ad68ef76612a8f26623"
     },
     "readme": "https://github.com/duckduckgo/tracker-blocklists",
     "trackers": {
@@ -464,7 +464,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -475,7 +475,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -521,7 +521,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -2409,7 +2409,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -2420,7 +2420,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -2464,7 +2464,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -2475,7 +2475,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -2590,7 +2590,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -2724,7 +2724,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -2735,7 +2735,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -3054,7 +3054,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -3181,7 +3181,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -3305,7 +3305,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -3689,7 +3689,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -3700,7 +3700,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -3711,7 +3711,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -3722,7 +3722,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -3788,7 +3788,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -3840,7 +3840,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -3851,7 +3851,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -3988,7 +3988,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -4339,7 +4339,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -4374,7 +4374,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -4820,7 +4820,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -4831,7 +4831,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -5033,7 +5033,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -5075,7 +5075,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -5098,7 +5098,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -5133,7 +5133,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -5162,7 +5162,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -5450,7 +5450,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -5567,7 +5567,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -5578,7 +5578,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -5589,7 +5589,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -5600,7 +5600,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -5637,7 +5637,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -5692,7 +5692,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -6228,7 +6228,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -6382,7 +6382,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -6698,7 +6698,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -6709,7 +6709,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -6829,7 +6829,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -7025,7 +7025,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -7061,7 +7061,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -7072,7 +7072,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -7083,7 +7083,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -7666,7 +7666,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -7677,7 +7677,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -7688,7 +7688,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -7769,7 +7769,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -7892,7 +7892,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -7903,7 +7903,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -7981,7 +7981,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -7992,7 +7992,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -8107,7 +8107,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -8258,7 +8258,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -8269,7 +8269,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -8760,7 +8760,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -8771,7 +8771,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -8812,7 +8812,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -9228,7 +9228,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -9833,7 +9833,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -9844,7 +9844,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -9855,7 +9855,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -9895,7 +9895,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -9937,7 +9937,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -9991,7 +9991,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -10059,7 +10059,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -10070,7 +10070,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -10118,7 +10118,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -10244,7 +10244,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -10404,7 +10404,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -10415,7 +10415,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -10426,7 +10426,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -10453,7 +10453,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -10503,7 +10503,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -10550,7 +10550,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -11028,7 +11028,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -11068,7 +11068,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -11804,7 +11804,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -11893,7 +11893,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -11904,7 +11904,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -12126,7 +12126,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -12166,7 +12166,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -12177,7 +12177,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -12188,7 +12188,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -12199,7 +12199,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -12525,7 +12525,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -12536,7 +12536,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -12547,7 +12547,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -14455,7 +14455,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -15140,7 +15140,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -15215,7 +15215,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -15266,7 +15266,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -16125,7 +16125,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -16136,7 +16136,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -16165,7 +16165,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -16384,7 +16384,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -16693,7 +16693,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -16704,7 +16704,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -16889,7 +16889,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -16938,7 +16938,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -17212,7 +17212,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -17223,7 +17223,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -17786,7 +17786,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -18134,7 +18134,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -18273,7 +18273,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -18632,7 +18632,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -18843,7 +18843,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -20020,7 +20020,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -20241,7 +20241,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -20252,7 +20252,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -20263,7 +20263,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -20403,7 +20403,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -20890,7 +20890,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -20919,7 +20919,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -20930,7 +20930,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -20941,7 +20941,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -21005,7 +21005,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -21085,7 +21085,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -21133,7 +21133,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -21144,7 +21144,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -21184,7 +21184,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -21195,7 +21195,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -21230,7 +21230,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -21241,7 +21241,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -21374,7 +21374,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -21458,7 +21458,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -21929,7 +21929,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -21940,7 +21940,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -21951,7 +21951,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -22021,7 +22021,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -22032,7 +22032,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -22185,7 +22185,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -22196,7 +22196,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -22238,7 +22238,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -22249,7 +22249,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -22260,7 +22260,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -22530,7 +22530,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -22541,7 +22541,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -22602,7 +22602,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -22660,7 +22660,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -22671,7 +22671,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -22771,7 +22771,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -22794,7 +22794,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -22805,7 +22805,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -23162,7 +23162,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -23266,7 +23266,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -23402,7 +23402,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -23477,7 +23477,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -23488,7 +23488,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -23532,7 +23532,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -23543,7 +23543,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -23554,7 +23554,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -23565,7 +23565,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -23645,7 +23645,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -23678,7 +23678,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -23729,7 +23729,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -23865,7 +23865,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -23994,7 +23994,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -24005,7 +24005,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -24252,7 +24252,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -24263,7 +24263,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -24274,7 +24274,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -24555,7 +24555,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -24590,7 +24590,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -24631,7 +24631,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -24747,7 +24747,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -24758,7 +24758,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -24787,7 +24787,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -24883,7 +24883,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -24940,7 +24940,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -24951,7 +24951,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -25072,7 +25072,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -25229,7 +25229,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -25255,7 +25255,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -25266,7 +25266,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -25329,7 +25329,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -25340,7 +25340,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -25351,7 +25351,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -25582,7 +25582,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -25609,7 +25609,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -25620,7 +25620,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -25631,7 +25631,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -25661,7 +25661,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -25672,7 +25672,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -25700,7 +25700,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -25711,7 +25711,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -25784,7 +25784,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -25832,7 +25832,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -25843,7 +25843,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -25854,7 +25854,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -25865,7 +25865,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -25876,7 +25876,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -25887,7 +25887,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -25959,7 +25959,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -25970,7 +25970,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -26024,7 +26024,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -26226,7 +26226,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -26534,7 +26534,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -26545,7 +26545,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -26556,7 +26556,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -26807,7 +26807,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -26818,7 +26818,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -27236,7 +27236,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -28093,7 +28093,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -28223,7 +28223,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -28234,7 +28234,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -28367,7 +28367,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -28450,7 +28450,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -28461,7 +28461,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -28822,7 +28822,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -29129,7 +29129,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -29140,7 +29140,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -29266,7 +29266,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -29277,7 +29277,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -31019,7 +31019,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -31324,7 +31324,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -32484,7 +32484,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -32495,7 +32495,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -32506,7 +32506,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -32517,7 +32517,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -32528,7 +32528,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -32539,7 +32539,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -32550,7 +32550,18 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
+            "fingerprinting": 1,
+            "cookies": 0.01,
+            "default": "block"
+        },
+        "accurateanimal.com": {
+            "domain": "accurateanimal.com",
+            "owner": {
+                "name": "Leven Labs, Inc. DBA Admiral",
+                "displayName": "Admiral"
+            },
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -32561,7 +32572,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -32572,7 +32583,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -32583,7 +32594,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -32594,7 +32605,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -32605,7 +32616,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -32616,7 +32627,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -32627,7 +32638,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -32638,7 +32649,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -32649,7 +32660,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -32660,7 +32671,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -32671,7 +32682,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -32682,7 +32693,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -32693,7 +32704,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -32704,7 +32715,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -32715,7 +32726,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -32726,7 +32737,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -32737,7 +32748,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -32748,7 +32759,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -32759,7 +32770,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -32770,7 +32781,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -32781,7 +32792,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -32792,7 +32803,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -32803,7 +32814,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -32814,7 +32825,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -32825,7 +32836,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -32836,7 +32847,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -32847,7 +32858,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -32858,7 +32869,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -32869,7 +32880,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -32880,7 +32891,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -32891,7 +32902,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -32902,7 +32913,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -32913,7 +32924,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -32924,7 +32935,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -32935,7 +32946,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -32946,7 +32957,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -32957,7 +32968,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -32968,7 +32979,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -32979,7 +32990,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -32990,7 +33001,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -33001,7 +33012,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -33012,7 +33023,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -33023,7 +33034,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -33034,7 +33045,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -33045,7 +33056,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -33056,7 +33067,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -33067,7 +33078,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -33078,7 +33089,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -33089,7 +33100,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -33100,7 +33111,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -33111,7 +33122,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -33122,7 +33133,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -33133,7 +33144,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -33144,7 +33155,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -33155,7 +33166,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -33166,7 +33177,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -33177,7 +33188,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -33188,7 +33199,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -33199,7 +33210,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -33210,7 +33221,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -33221,7 +33232,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -33232,7 +33243,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -33243,7 +33254,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -33254,7 +33265,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -33265,7 +33276,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -33276,7 +33287,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -33287,7 +33298,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -33298,7 +33309,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -33309,7 +33320,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -33320,7 +33331,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -33331,7 +33342,18 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
+            "fingerprinting": 1,
+            "cookies": 0.01,
+            "default": "block"
+        },
+        "calypsocapsule.com": {
+            "domain": "calypsocapsule.com",
+            "owner": {
+                "name": "Leven Labs, Inc. DBA Admiral",
+                "displayName": "Admiral"
+            },
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -33342,7 +33364,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -33353,7 +33375,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -33364,7 +33386,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -33375,7 +33397,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -33386,7 +33408,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -33397,7 +33419,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -33408,7 +33430,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -33419,7 +33441,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -33430,7 +33452,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -33441,7 +33463,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -33452,7 +33474,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -33463,7 +33485,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -33474,7 +33496,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -33485,7 +33507,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -33496,7 +33518,29 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
+            "fingerprinting": 1,
+            "cookies": 0.01,
+            "default": "block"
+        },
+        "chaireggnog.com": {
+            "domain": "chaireggnog.com",
+            "owner": {
+                "name": "Leven Labs, Inc. DBA Admiral",
+                "displayName": "Admiral"
+            },
+            "prevalence": 0.0129,
+            "fingerprinting": 1,
+            "cookies": 0.01,
+            "default": "block"
+        },
+        "chairsdonkey.com": {
+            "domain": "chairsdonkey.com",
+            "owner": {
+                "name": "Leven Labs, Inc. DBA Admiral",
+                "displayName": "Admiral"
+            },
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -33507,7 +33551,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -33518,7 +33562,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -33529,7 +33573,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -33540,7 +33584,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -33551,7 +33595,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -33562,7 +33606,29 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
+            "fingerprinting": 1,
+            "cookies": 0.01,
+            "default": "block"
+        },
+        "chipperisle.com": {
+            "domain": "chipperisle.com",
+            "owner": {
+                "name": "Leven Labs, Inc. DBA Admiral",
+                "displayName": "Admiral"
+            },
+            "prevalence": 0.0129,
+            "fingerprinting": 1,
+            "cookies": 0.01,
+            "default": "block"
+        },
+        "chivalrouscord.com": {
+            "domain": "chivalrouscord.com",
+            "owner": {
+                "name": "Leven Labs, Inc. DBA Admiral",
+                "displayName": "Admiral"
+            },
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -33573,7 +33639,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -33584,7 +33650,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -33595,7 +33661,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -33606,7 +33672,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -33617,7 +33683,18 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
+            "fingerprinting": 1,
+            "cookies": 0.01,
+            "default": "block"
+        },
+        "cobaltoverture.com": {
+            "domain": "cobaltoverture.com",
+            "owner": {
+                "name": "Leven Labs, Inc. DBA Admiral",
+                "displayName": "Admiral"
+            },
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -33628,7 +33705,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -33639,7 +33716,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -33650,7 +33727,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -33661,7 +33738,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -33672,7 +33749,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -33683,7 +33760,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -33694,7 +33771,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -33705,7 +33782,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -33716,7 +33793,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -33727,7 +33804,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -33738,7 +33815,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -33749,7 +33826,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -33760,7 +33837,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -33771,7 +33848,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -33782,7 +33859,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -33793,7 +33870,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -33804,7 +33881,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -33815,7 +33892,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -33826,7 +33903,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -33837,7 +33914,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -33848,7 +33925,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -33859,7 +33936,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -33870,7 +33947,18 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
+            "fingerprinting": 1,
+            "cookies": 0.01,
+            "default": "block"
+        },
+        "creatorpassenger.com": {
+            "domain": "creatorpassenger.com",
+            "owner": {
+                "name": "Leven Labs, Inc. DBA Admiral",
+                "displayName": "Admiral"
+            },
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -33881,7 +33969,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -33892,7 +33980,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -33903,7 +33991,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -33914,7 +34002,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -33925,7 +34013,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -33936,7 +34024,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -33947,7 +34035,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -33958,7 +34046,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -33969,7 +34057,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -33980,7 +34068,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -33991,7 +34079,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -34002,7 +34090,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -34013,7 +34101,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -34024,7 +34112,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -34035,7 +34123,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -34046,7 +34134,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -34057,7 +34145,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -34068,7 +34156,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -34079,7 +34167,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -34090,7 +34178,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -34101,7 +34189,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -34112,7 +34200,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -34123,7 +34211,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -34134,7 +34222,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -34145,7 +34233,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -34156,7 +34244,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -34167,7 +34255,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -34178,7 +34266,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -34189,7 +34277,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -34200,7 +34288,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -34211,7 +34299,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -34222,7 +34310,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -34233,7 +34321,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -34244,7 +34332,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -34255,7 +34343,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -34266,7 +34354,29 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
+            "fingerprinting": 1,
+            "cookies": 0.01,
+            "default": "block"
+        },
+        "eagerknight.com": {
+            "domain": "eagerknight.com",
+            "owner": {
+                "name": "Leven Labs, Inc. DBA Admiral",
+                "displayName": "Admiral"
+            },
+            "prevalence": 0.0129,
+            "fingerprinting": 1,
+            "cookies": 0.01,
+            "default": "block"
+        },
+        "echoinghaven.com": {
+            "domain": "echoinghaven.com",
+            "owner": {
+                "name": "Leven Labs, Inc. DBA Admiral",
+                "displayName": "Admiral"
+            },
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -34277,7 +34387,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -34288,7 +34398,18 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
+            "fingerprinting": 1,
+            "cookies": 0.01,
+            "default": "block"
+        },
+        "effulgenttempest.com": {
+            "domain": "effulgenttempest.com",
+            "owner": {
+                "name": "Leven Labs, Inc. DBA Admiral",
+                "displayName": "Admiral"
+            },
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -34299,7 +34420,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -34310,7 +34431,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -34321,7 +34442,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -34332,7 +34453,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -34343,7 +34464,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -34354,7 +34475,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -34365,7 +34486,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -34376,7 +34497,18 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
+            "fingerprinting": 1,
+            "cookies": 0.01,
+            "default": "block"
+        },
+        "engineertrick.com": {
+            "domain": "engineertrick.com",
+            "owner": {
+                "name": "Leven Labs, Inc. DBA Admiral",
+                "displayName": "Admiral"
+            },
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -34387,7 +34519,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -34398,7 +34530,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -34409,7 +34541,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -34420,7 +34552,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -34431,7 +34563,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -34442,7 +34574,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -34453,7 +34585,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -34464,7 +34596,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -34475,7 +34607,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -34486,7 +34618,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -34497,7 +34629,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -34508,7 +34640,18 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
+            "fingerprinting": 1,
+            "cookies": 0.01,
+            "default": "block"
+        },
+        "exquisiteartisanship.com": {
+            "domain": "exquisiteartisanship.com",
+            "owner": {
+                "name": "Leven Labs, Inc. DBA Admiral",
+                "displayName": "Admiral"
+            },
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -34519,7 +34662,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -34530,7 +34673,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -34541,7 +34684,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -34552,7 +34695,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -34563,7 +34706,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -34574,7 +34717,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -34585,7 +34728,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -34596,7 +34739,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -34607,7 +34750,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -34618,7 +34761,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -34629,7 +34772,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -34640,7 +34783,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -34651,7 +34794,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -34662,7 +34805,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -34673,7 +34816,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -34684,7 +34827,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -34695,7 +34838,18 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
+            "fingerprinting": 1,
+            "cookies": 0.01,
+            "default": "block"
+        },
+        "flameuncle.com": {
+            "domain": "flameuncle.com",
+            "owner": {
+                "name": "Leven Labs, Inc. DBA Admiral",
+                "displayName": "Admiral"
+            },
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -34706,7 +34860,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -34717,7 +34871,40 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
+            "fingerprinting": 1,
+            "cookies": 0.01,
+            "default": "block"
+        },
+        "flourishingcollaboration.com": {
+            "domain": "flourishingcollaboration.com",
+            "owner": {
+                "name": "Leven Labs, Inc. DBA Admiral",
+                "displayName": "Admiral"
+            },
+            "prevalence": 0.0129,
+            "fingerprinting": 1,
+            "cookies": 0.01,
+            "default": "block"
+        },
+        "flourishinginnovation.com": {
+            "domain": "flourishinginnovation.com",
+            "owner": {
+                "name": "Leven Labs, Inc. DBA Admiral",
+                "displayName": "Admiral"
+            },
+            "prevalence": 0.0129,
+            "fingerprinting": 1,
+            "cookies": 0.01,
+            "default": "block"
+        },
+        "flourishingpartnership.com": {
+            "domain": "flourishingpartnership.com",
+            "owner": {
+                "name": "Leven Labs, Inc. DBA Admiral",
+                "displayName": "Admiral"
+            },
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -34728,7 +34915,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -34739,7 +34926,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -34750,7 +34937,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -34761,7 +34948,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -34772,7 +34959,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -34783,7 +34970,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -34794,7 +34981,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -34805,7 +34992,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -34816,7 +35003,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -34827,7 +35014,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -34838,7 +35025,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -34849,7 +35036,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -34860,7 +35047,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -34871,7 +35058,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -34882,7 +35069,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -34893,7 +35080,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -34904,7 +35091,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -34915,7 +35102,18 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
+            "fingerprinting": 1,
+            "cookies": 0.01,
+            "default": "block"
+        },
+        "gladysway.com": {
+            "domain": "gladysway.com",
+            "owner": {
+                "name": "Leven Labs, Inc. DBA Admiral",
+                "displayName": "Admiral"
+            },
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -34926,7 +35124,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -34937,7 +35135,29 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
+            "fingerprinting": 1,
+            "cookies": 0.01,
+            "default": "block"
+        },
+        "glitteringbrook.com": {
+            "domain": "glitteringbrook.com",
+            "owner": {
+                "name": "Leven Labs, Inc. DBA Admiral",
+                "displayName": "Admiral"
+            },
+            "prevalence": 0.0129,
+            "fingerprinting": 1,
+            "cookies": 0.01,
+            "default": "block"
+        },
+        "goldfishgrowth.com": {
+            "domain": "goldfishgrowth.com",
+            "owner": {
+                "name": "Leven Labs, Inc. DBA Admiral",
+                "displayName": "Admiral"
+            },
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -34948,7 +35168,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -34959,7 +35179,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -34970,7 +35190,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -34981,7 +35201,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -34992,7 +35212,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -35003,7 +35223,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -35014,7 +35234,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -35025,7 +35245,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -35036,7 +35256,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -35047,7 +35267,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -35058,7 +35278,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -35069,7 +35289,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -35080,7 +35300,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -35091,7 +35311,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -35102,7 +35322,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -35113,7 +35333,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -35124,7 +35344,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -35135,7 +35355,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -35146,7 +35366,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -35157,7 +35377,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -35168,7 +35388,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -35179,7 +35399,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -35190,7 +35410,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -35201,7 +35421,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -35212,7 +35432,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -35223,7 +35443,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -35234,7 +35454,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -35245,7 +35465,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -35256,7 +35476,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -35267,7 +35487,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -35278,7 +35498,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -35289,7 +35509,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -35300,7 +35520,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -35311,7 +35531,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -35322,7 +35542,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -35333,7 +35553,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -35344,7 +35564,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -35355,7 +35575,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -35366,7 +35586,18 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
+            "fingerprinting": 1,
+            "cookies": 0.01,
+            "default": "block"
+        },
+        "impulselumber.com": {
+            "domain": "impulselumber.com",
+            "owner": {
+                "name": "Leven Labs, Inc. DBA Admiral",
+                "displayName": "Admiral"
+            },
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -35377,7 +35608,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -35388,7 +35619,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -35399,7 +35630,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -35410,7 +35641,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -35421,7 +35652,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -35432,7 +35663,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -35443,7 +35674,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -35454,7 +35685,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -35465,7 +35696,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -35476,7 +35707,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -35487,7 +35718,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -35498,7 +35729,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -35509,7 +35740,18 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
+            "fingerprinting": 1,
+            "cookies": 0.01,
+            "default": "block"
+        },
+        "keenquill.com": {
+            "domain": "keenquill.com",
+            "owner": {
+                "name": "Leven Labs, Inc. DBA Admiral",
+                "displayName": "Admiral"
+            },
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -35520,7 +35762,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -35531,7 +35773,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -35542,7 +35784,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -35553,7 +35795,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -35564,7 +35806,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -35575,7 +35817,18 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
+            "fingerprinting": 1,
+            "cookies": 0.01,
+            "default": "block"
+        },
+        "lighttalon.com": {
+            "domain": "lighttalon.com",
+            "owner": {
+                "name": "Leven Labs, Inc. DBA Admiral",
+                "displayName": "Admiral"
+            },
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -35586,7 +35839,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -35597,7 +35850,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -35608,7 +35861,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -35619,7 +35872,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -35630,7 +35883,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -35641,7 +35894,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -35652,7 +35905,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -35663,7 +35916,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -35674,7 +35927,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -35685,7 +35938,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -35696,7 +35949,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -35707,7 +35960,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -35718,7 +35971,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -35729,7 +35982,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -35740,7 +35993,18 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
+            "fingerprinting": 1,
+            "cookies": 0.01,
+            "default": "block"
+        },
+        "majesticwaterscape.com": {
+            "domain": "majesticwaterscape.com",
+            "owner": {
+                "name": "Leven Labs, Inc. DBA Admiral",
+                "displayName": "Admiral"
+            },
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -35751,7 +36015,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -35762,7 +36026,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -35773,7 +36037,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -35784,7 +36048,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -35795,7 +36059,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -35806,7 +36070,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -35817,7 +36081,18 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
+            "fingerprinting": 1,
+            "cookies": 0.01,
+            "default": "block"
+        },
+        "melodiouscomposition.com": {
+            "domain": "melodiouscomposition.com",
+            "owner": {
+                "name": "Leven Labs, Inc. DBA Admiral",
+                "displayName": "Admiral"
+            },
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -35828,7 +36103,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -35839,7 +36114,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -35850,7 +36125,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -35861,7 +36136,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -35872,7 +36147,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -35883,7 +36158,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -35894,7 +36169,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -35905,7 +36180,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -35916,7 +36191,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -35927,7 +36202,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -35938,7 +36213,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -35949,7 +36224,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -35960,7 +36235,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -35971,7 +36246,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -35982,7 +36257,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -35993,7 +36268,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -36004,7 +36279,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -36015,7 +36290,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -36026,7 +36301,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -36037,7 +36312,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -36048,7 +36323,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -36059,7 +36334,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -36070,7 +36345,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -36081,7 +36356,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -36092,7 +36367,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -36103,7 +36378,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -36114,7 +36389,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -36125,7 +36400,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -36136,7 +36411,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -36147,7 +36422,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -36158,7 +36433,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -36169,7 +36444,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -36180,7 +36455,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -36191,7 +36466,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -36202,7 +36477,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -36213,7 +36488,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -36224,7 +36499,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -36235,7 +36510,18 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
+            "fingerprinting": 1,
+            "cookies": 0.01,
+            "default": "block"
+        },
+        "opulentsylvan.com": {
+            "domain": "opulentsylvan.com",
+            "owner": {
+                "name": "Leven Labs, Inc. DBA Admiral",
+                "displayName": "Admiral"
+            },
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -36246,7 +36532,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -36257,7 +36543,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -36268,7 +36554,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -36279,7 +36565,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -36290,7 +36576,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -36301,7 +36587,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -36312,7 +36598,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -36323,7 +36609,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -36334,7 +36620,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -36345,7 +36631,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -36356,7 +36642,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -36367,7 +36653,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -36378,7 +36664,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -36389,7 +36675,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -36400,7 +36686,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -36411,7 +36697,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -36422,7 +36708,18 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
+            "fingerprinting": 1,
+            "cookies": 0.01,
+            "default": "block"
+        },
+        "pluckyzone.com": {
+            "domain": "pluckyzone.com",
+            "owner": {
+                "name": "Leven Labs, Inc. DBA Admiral",
+                "displayName": "Admiral"
+            },
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -36433,7 +36730,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -36444,7 +36741,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -36455,7 +36752,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -36466,7 +36763,18 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
+            "fingerprinting": 1,
+            "cookies": 0.01,
+            "default": "block"
+        },
+        "polishedfolly.com": {
+            "domain": "polishedfolly.com",
+            "owner": {
+                "name": "Leven Labs, Inc. DBA Admiral",
+                "displayName": "Admiral"
+            },
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -36477,7 +36785,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -36488,7 +36796,18 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
+            "fingerprinting": 1,
+            "cookies": 0.01,
+            "default": "block"
+        },
+        "popplantation.com": {
+            "domain": "popplantation.com",
+            "owner": {
+                "name": "Leven Labs, Inc. DBA Admiral",
+                "displayName": "Admiral"
+            },
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -36499,7 +36818,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -36510,7 +36829,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -36521,7 +36840,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -36532,7 +36851,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -36543,7 +36862,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -36554,7 +36873,18 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
+            "fingerprinting": 1,
+            "cookies": 0.01,
+            "default": "block"
+        },
+        "publicsofa.com": {
+            "domain": "publicsofa.com",
+            "owner": {
+                "name": "Leven Labs, Inc. DBA Admiral",
+                "displayName": "Admiral"
+            },
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -36565,7 +36895,18 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
+            "fingerprinting": 1,
+            "cookies": 0.01,
+            "default": "block"
+        },
+        "pulsatingmeadow.com": {
+            "domain": "pulsatingmeadow.com",
+            "owner": {
+                "name": "Leven Labs, Inc. DBA Admiral",
+                "displayName": "Admiral"
+            },
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -36576,7 +36917,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -36587,7 +36928,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -36598,7 +36939,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -36609,7 +36950,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -36620,7 +36961,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -36631,7 +36972,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -36642,7 +36983,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -36653,7 +36994,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -36664,7 +37005,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -36675,7 +37016,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -36686,7 +37027,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -36697,7 +37038,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -36708,7 +37049,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -36719,7 +37060,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -36730,7 +37071,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -36741,7 +37082,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -36752,7 +37093,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -36763,7 +37104,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -36774,7 +37115,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -36785,7 +37126,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -36796,7 +37137,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -36807,7 +37148,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -36818,7 +37159,29 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
+            "fingerprinting": 1,
+            "cookies": 0.01,
+            "default": "block"
+        },
+        "relationrest.com": {
+            "domain": "relationrest.com",
+            "owner": {
+                "name": "Leven Labs, Inc. DBA Admiral",
+                "displayName": "Admiral"
+            },
+            "prevalence": 0.0129,
+            "fingerprinting": 1,
+            "cookies": 0.01,
+            "default": "block"
+        },
+        "rememberdiscussion.com": {
+            "domain": "rememberdiscussion.com",
+            "owner": {
+                "name": "Leven Labs, Inc. DBA Admiral",
+                "displayName": "Admiral"
+            },
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -36829,7 +37192,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -36840,7 +37203,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -36851,7 +37214,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -36862,7 +37225,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -36873,7 +37236,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -36884,7 +37247,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -36895,7 +37258,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -36906,7 +37269,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -36917,7 +37280,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -36928,7 +37291,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -36939,7 +37302,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -36950,7 +37313,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -36961,7 +37324,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -36972,7 +37335,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -36983,7 +37346,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -36994,7 +37357,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -37005,7 +37368,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -37016,7 +37379,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -37027,7 +37390,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -37038,7 +37401,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -37049,7 +37412,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -37060,7 +37423,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -37071,7 +37434,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -37082,7 +37445,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -37093,7 +37456,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -37104,7 +37467,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -37115,7 +37478,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -37126,7 +37489,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -37137,7 +37500,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -37148,7 +37511,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -37159,7 +37522,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -37170,7 +37533,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -37181,7 +37544,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -37192,7 +37555,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -37203,7 +37566,18 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
+            "fingerprinting": 1,
+            "cookies": 0.01,
+            "default": "block"
+        },
+        "serenecascade.com": {
+            "domain": "serenecascade.com",
+            "owner": {
+                "name": "Leven Labs, Inc. DBA Admiral",
+                "displayName": "Admiral"
+            },
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -37214,7 +37588,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -37225,7 +37599,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -37236,7 +37610,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -37247,7 +37621,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -37258,7 +37632,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -37269,7 +37643,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -37280,7 +37654,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -37291,7 +37665,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -37302,7 +37676,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -37313,7 +37687,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -37324,7 +37698,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -37335,7 +37709,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -37346,7 +37720,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -37357,7 +37731,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -37368,7 +37742,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -37379,7 +37753,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -37390,7 +37764,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -37401,7 +37775,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -37412,7 +37786,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -37423,7 +37797,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -37434,7 +37808,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -37445,7 +37819,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -37456,7 +37830,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -37467,7 +37841,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -37478,7 +37852,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -37489,7 +37863,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -37500,7 +37874,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -37511,7 +37885,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -37522,7 +37896,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -37533,7 +37907,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -37544,7 +37918,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -37555,7 +37929,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -37566,7 +37940,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -37577,7 +37951,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -37588,7 +37962,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -37599,7 +37973,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -37610,7 +37984,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -37621,7 +37995,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -37632,7 +38006,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -37643,7 +38017,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -37654,7 +38028,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -37665,7 +38039,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -37676,7 +38050,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -37687,7 +38061,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -37698,7 +38072,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -37709,7 +38083,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -37720,7 +38094,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -37731,7 +38105,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -37742,7 +38116,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -37753,7 +38127,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -37764,7 +38138,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -37775,7 +38149,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -37786,7 +38160,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -37797,7 +38171,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -37808,7 +38182,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -37819,7 +38193,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -37830,7 +38204,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -37841,7 +38215,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -37852,7 +38226,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -37863,7 +38237,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -37874,7 +38248,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -37885,7 +38259,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -37896,7 +38270,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -37907,7 +38281,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -37918,7 +38292,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -37929,7 +38303,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -37940,7 +38314,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -37951,7 +38325,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -37962,7 +38336,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -37973,7 +38347,18 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
+            "fingerprinting": 1,
+            "cookies": 0.01,
+            "default": "block"
+        },
+        "sublimequartz.com": {
+            "domain": "sublimequartz.com",
+            "owner": {
+                "name": "Leven Labs, Inc. DBA Admiral",
+                "displayName": "Admiral"
+            },
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -37984,7 +38369,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -37995,7 +38380,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -38006,7 +38391,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -38017,7 +38402,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -38028,7 +38413,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -38039,7 +38424,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -38050,7 +38435,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -38061,7 +38446,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -38072,7 +38457,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -38083,7 +38468,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -38094,7 +38479,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -38105,7 +38490,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -38116,7 +38501,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -38127,7 +38512,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -38138,7 +38523,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -38149,7 +38534,18 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
+            "fingerprinting": 1,
+            "cookies": 0.01,
+            "default": "block"
+        },
+        "tearfulglass.com": {
+            "domain": "tearfulglass.com",
+            "owner": {
+                "name": "Leven Labs, Inc. DBA Admiral",
+                "displayName": "Admiral"
+            },
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -38160,7 +38556,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -38171,7 +38567,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -38182,7 +38578,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -38193,7 +38589,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -38204,7 +38600,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -38215,7 +38611,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -38226,7 +38622,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -38237,7 +38633,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -38248,7 +38644,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -38259,7 +38655,18 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
+            "fingerprinting": 1,
+            "cookies": 0.01,
+            "default": "block"
+        },
+        "thrivingmarketplace.com": {
+            "domain": "thrivingmarketplace.com",
+            "owner": {
+                "name": "Leven Labs, Inc. DBA Admiral",
+                "displayName": "Admiral"
+            },
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -38270,7 +38677,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -38281,7 +38688,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -38292,7 +38699,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -38303,7 +38710,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -38314,7 +38721,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -38325,7 +38732,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -38336,7 +38743,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -38347,7 +38754,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -38358,7 +38765,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -38369,7 +38776,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -38380,7 +38787,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -38391,7 +38798,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -38402,7 +38809,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -38413,7 +38820,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -38424,7 +38831,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -38435,7 +38842,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -38446,7 +38853,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -38457,7 +38864,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -38468,7 +38875,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -38479,7 +38886,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -38490,7 +38897,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -38501,7 +38908,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -38512,7 +38919,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -38523,7 +38930,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -38534,7 +38941,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -38545,7 +38952,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -38556,7 +38963,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -38567,7 +38974,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -38578,7 +38985,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -38589,7 +38996,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -38600,7 +39007,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -38611,7 +39018,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -38622,7 +39029,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -38633,7 +39040,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -38644,7 +39051,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -38655,7 +39062,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -38666,7 +39073,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -38677,7 +39084,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -38688,7 +39095,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -38699,7 +39106,18 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
+            "fingerprinting": 1,
+            "cookies": 0.01,
+            "default": "block"
+        },
+        "vibrantcelebration.com": {
+            "domain": "vibrantcelebration.com",
+            "owner": {
+                "name": "Leven Labs, Inc. DBA Admiral",
+                "displayName": "Admiral"
+            },
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -38710,7 +39128,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -38721,7 +39139,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -38732,7 +39150,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -38743,7 +39161,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -38754,7 +39172,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -38765,7 +39183,18 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
+            "fingerprinting": 1,
+            "cookies": 0.01,
+            "default": "block"
+        },
+        "vividfrost.com": {
+            "domain": "vividfrost.com",
+            "owner": {
+                "name": "Leven Labs, Inc. DBA Admiral",
+                "displayName": "Admiral"
+            },
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -38776,7 +39205,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -38787,7 +39216,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -38798,7 +39227,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -38809,7 +39238,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -38820,7 +39249,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -38831,7 +39260,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -38842,7 +39271,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -38853,7 +39282,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -38864,7 +39293,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -38875,7 +39304,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -38886,7 +39315,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -38897,7 +39326,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -38908,7 +39337,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -38919,7 +39348,18 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
+            "fingerprinting": 1,
+            "cookies": 0.01,
+            "default": "block"
+        },
+        "wittyshack.com": {
+            "domain": "wittyshack.com",
+            "owner": {
+                "name": "Leven Labs, Inc. DBA Admiral",
+                "displayName": "Admiral"
+            },
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -38930,7 +39370,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -38941,7 +39381,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -38952,7 +39392,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -38963,7 +39403,29 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
+            "fingerprinting": 1,
+            "cookies": 0.01,
+            "default": "block"
+        },
+        "zestyhorizon.com": {
+            "domain": "zestyhorizon.com",
+            "owner": {
+                "name": "Leven Labs, Inc. DBA Admiral",
+                "displayName": "Admiral"
+            },
+            "prevalence": 0.0129,
+            "fingerprinting": 1,
+            "cookies": 0.01,
+            "default": "block"
+        },
+        "zestyrover.com": {
+            "domain": "zestyrover.com",
+            "owner": {
+                "name": "Leven Labs, Inc. DBA Admiral",
+                "displayName": "Admiral"
+            },
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -38974,7 +39436,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -38985,7 +39447,7 @@
                 "name": "Leven Labs, Inc. DBA Admiral",
                 "displayName": "Admiral"
             },
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "fingerprinting": 1,
             "cookies": 0.01,
             "default": "block"
@@ -48993,6 +49455,7 @@
                 "abstractedamount.com",
                 "abstractedauthority.com",
                 "acceptableauthority.com",
+                "accurateanimal.com",
                 "accuratecoal.com",
                 "acidpigs.com",
                 "actoramusement.com",
@@ -49088,6 +49551,7 @@
                 "calculatorstatement.com",
                 "callousbrake.com",
                 "calmcactus.com",
+                "calypsocapsule.com",
                 "capablecup.com",
                 "capriciouscorn.com",
                 "captivatingcanyon.com",
@@ -49107,6 +49571,8 @@
                 "ceciliavenus.com",
                 "celestialquasar.com",
                 "celestialspectra.com",
+                "chaireggnog.com",
+                "chairsdonkey.com",
                 "chalkoil.com",
                 "changeablecats.com",
                 "chargecracker.com",
@@ -49118,6 +49584,8 @@
                 "childlikeexample.com",
                 "childlikeform.com",
                 "chinsnakes.com",
+                "chipperisle.com",
+                "chivalrouscord.com",
                 "chunkycactus.com",
                 "circlelevel.com",
                 "cleanhaircut.com",
@@ -49125,6 +49593,7 @@
                 "cloisteredcurve.com",
                 "closedcows.com",
                 "coatfood.com",
+                "cobaltoverture.com",
                 "coldbalance.com",
                 "colossalclouds.com",
                 "colossalcoat.com",
@@ -49152,6 +49621,7 @@
                 "crabbychin.com",
                 "cratecamera.com",
                 "creatorcherry.com",
+                "creatorpassenger.com",
                 "creaturecabbage.com",
                 "crimsonmeadow.com",
                 "critictruck.com",
@@ -49204,8 +49674,11 @@
                 "drollwharf.com",
                 "dustydime.com",
                 "dustyhammer.com",
+                "eagerknight.com",
+                "echoinghaven.com",
                 "effervescentcoral.com",
                 "effervescentvista.com",
+                "effulgenttempest.com",
                 "elasticchange.com",
                 "elderlybean.com",
                 "elusivebreeze.com",
@@ -49215,6 +49688,7 @@
                 "encouragingthread.com",
                 "endurablebulb.com",
                 "energeticladybug.com",
+                "engineertrick.com",
                 "enigmaticcanyon.com",
                 "enigmaticvoyage.com",
                 "enormousearth.com",
@@ -49230,6 +49704,7 @@
                 "executeknowledge.com",
                 "exhibitsneeze.com",
                 "expansioneggnog.com",
+                "exquisiteartisanship.com",
                 "exuberantedge.com",
                 "fadedsnow.com",
                 "fadewaves.com",
@@ -49253,8 +49728,12 @@
                 "financefear.com",
                 "firstfrogs.com",
                 "fixedfold.com",
+                "flameuncle.com",
                 "flimsycircle.com",
                 "flimsythought.com",
+                "flourishingcollaboration.com",
+                "flourishinginnovation.com",
+                "flourishingpartnership.com",
                 "flowerstreatment.com",
                 "flowerycreature.com",
                 "floweryfact.com",
@@ -49284,9 +49763,12 @@
                 "giddycoat.com",
                 "giraffepiano.com",
                 "givevacation.com",
+                "gladysway.com",
                 "gleamingcow.com",
                 "glisteningguide.com",
+                "glitteringbrook.com",
                 "gloriousbeef.com",
+                "goldfishgrowth.com",
                 "gondolagnome.com",
                 "gorgeousedge.com",
                 "gracefulmilk.com",
@@ -49337,6 +49819,7 @@
                 "importantmeat.com",
                 "impossibleexpansion.com",
                 "impulsejewel.com",
+                "impulselumber.com",
                 "incompetentjoke.com",
                 "inconclusiveaction.com",
                 "inputicicle.com",
@@ -49351,6 +49834,7 @@
                 "jubilanttempest.com",
                 "jubilantwhisper.com",
                 "kaputquill.com",
+                "keenquill.com",
                 "knitstamp.com",
                 "knottyswing.com",
                 "laboredlocket.com",
@@ -49360,6 +49844,7 @@
                 "leftliquid.com",
                 "liftedknowledge.com",
                 "lightenafterthought.com",
+                "lighttalon.com",
                 "livelumber.com",
                 "livelylaugh.com",
                 "livelyreward.com",
@@ -49379,6 +49864,7 @@
                 "lunchroomlock.com",
                 "lustroushaven.com",
                 "maddeningpowder.com",
+                "majesticwaterscape.com",
                 "maliciousmusic.com",
                 "marketspiders.com",
                 "marriedbelief.com",
@@ -49390,6 +49876,7 @@
                 "meatydime.com",
                 "meddleplant.com",
                 "melodiouschorus.com",
+                "melodiouscomposition.com",
                 "meltmilk.com",
                 "memopilot.com",
                 "memorizematch.com",
@@ -49435,6 +49922,7 @@
                 "oldfashionedoffer.com",
                 "operationchicken.com",
                 "optimallimit.com",
+                "opulentsylvan.com",
                 "orientedargument.com",
                 "outstandingincome.com",
                 "outstandingsnails.com",
@@ -49462,13 +49950,16 @@
                 "pleasantpump.com",
                 "plotrabbit.com",
                 "pluckypocket.com",
+                "pluckyzone.com",
                 "pocketfaucet.com",
                 "poeticpackage.com",
                 "pointdigestion.com",
                 "pointlesspocket.com",
                 "pointlessprofit.com",
+                "polishedfolly.com",
                 "politeplanes.com",
                 "politicalporter.com",
+                "popplantation.com",
                 "possibleboats.com",
                 "possiblepencil.com",
                 "potatoinvention.com",
@@ -49484,7 +49975,9 @@
                 "profusesupport.com",
                 "protestcopy.com",
                 "psychedelicarithmetic.com",
+                "publicsofa.com",
                 "puffypurpose.com",
+                "pulsatingmeadow.com",
                 "pumpedpancake.com",
                 "punyplant.com",
                 "purposepipe.com",
@@ -49519,6 +50012,8 @@
                 "regularplants.com",
                 "regulatesleet.com",
                 "rehabilitatereason.com",
+                "relationrest.com",
+                "rememberdiscussion.com",
                 "repeatsweater.com",
                 "replaceroute.com",
                 "resonantbrush.com",
@@ -49576,6 +50071,7 @@
                 "selfishsnake.com",
                 "separatesort.com",
                 "seraphicjubilee.com",
+                "serenecascade.com",
                 "serenepebble.com",
                 "serioussuit.com",
                 "serpentshampoo.com",
@@ -49679,6 +50175,7 @@
                 "stupendoussleet.com",
                 "stupendoussnow.com",
                 "stupidscene.com",
+                "sublimequartz.com",
                 "succeedscene.com",
                 "sugarfriction.com",
                 "suggestionbridge.com",
@@ -49700,6 +50197,7 @@
                 "tangycover.com",
                 "tastelesstrees.com",
                 "tastelesstrucks.com",
+                "tearfulglass.com",
                 "tediousticket.com",
                 "teenytinycellar.com",
                 "teenytinyshirt.com",
@@ -49715,6 +50213,7 @@
                 "thomastorch.com",
                 "thoughtlessknot.com",
                 "threetruck.com",
+                "thrivingmarketplace.com",
                 "ticketaunt.com",
                 "tidymitten.com",
                 "tiredthroat.com",
@@ -49763,12 +50262,14 @@
                 "verdantlabyrinth.com",
                 "verdantloom.com",
                 "verseballs.com",
+                "vibrantcelebration.com",
                 "vibrantgale.com",
                 "vibranthaven.com",
                 "vibrantpact.com",
                 "vibranttalisman.com",
                 "virtualvincent.com",
                 "vividcanopy.com",
+                "vividfrost.com",
                 "vividmeadow.com",
                 "vividplume.com",
                 "volatileprofit.com",
@@ -49787,15 +50288,18 @@
                 "whispermeeting.com",
                 "wildcommittee.com",
                 "wistfulwaste.com",
+                "wittyshack.com",
                 "workoperation.com",
                 "wretchedfloor.com",
                 "wrongwound.com",
                 "zephyrlabyrinth.com",
                 "zestycrime.com",
+                "zestyhorizon.com",
+                "zestyrover.com",
                 "zipperxray.com",
                 "zlp6s.pw"
             ],
-            "prevalence": 0.0151,
+            "prevalence": 0.0129,
             "displayName": "Admiral"
         }
     },
@@ -50523,6 +51027,7 @@
         "abstractedamount.com": "Leven Labs, Inc. DBA Admiral",
         "abstractedauthority.com": "Leven Labs, Inc. DBA Admiral",
         "acceptableauthority.com": "Leven Labs, Inc. DBA Admiral",
+        "accurateanimal.com": "Leven Labs, Inc. DBA Admiral",
         "accuratecoal.com": "Leven Labs, Inc. DBA Admiral",
         "acidpigs.com": "Leven Labs, Inc. DBA Admiral",
         "actoramusement.com": "Leven Labs, Inc. DBA Admiral",
@@ -50618,6 +51123,7 @@
         "calculatorstatement.com": "Leven Labs, Inc. DBA Admiral",
         "callousbrake.com": "Leven Labs, Inc. DBA Admiral",
         "calmcactus.com": "Leven Labs, Inc. DBA Admiral",
+        "calypsocapsule.com": "Leven Labs, Inc. DBA Admiral",
         "capablecup.com": "Leven Labs, Inc. DBA Admiral",
         "capriciouscorn.com": "Leven Labs, Inc. DBA Admiral",
         "captivatingcanyon.com": "Leven Labs, Inc. DBA Admiral",
@@ -50637,6 +51143,8 @@
         "ceciliavenus.com": "Leven Labs, Inc. DBA Admiral",
         "celestialquasar.com": "Leven Labs, Inc. DBA Admiral",
         "celestialspectra.com": "Leven Labs, Inc. DBA Admiral",
+        "chaireggnog.com": "Leven Labs, Inc. DBA Admiral",
+        "chairsdonkey.com": "Leven Labs, Inc. DBA Admiral",
         "chalkoil.com": "Leven Labs, Inc. DBA Admiral",
         "changeablecats.com": "Leven Labs, Inc. DBA Admiral",
         "chargecracker.com": "Leven Labs, Inc. DBA Admiral",
@@ -50648,6 +51156,8 @@
         "childlikeexample.com": "Leven Labs, Inc. DBA Admiral",
         "childlikeform.com": "Leven Labs, Inc. DBA Admiral",
         "chinsnakes.com": "Leven Labs, Inc. DBA Admiral",
+        "chipperisle.com": "Leven Labs, Inc. DBA Admiral",
+        "chivalrouscord.com": "Leven Labs, Inc. DBA Admiral",
         "chunkycactus.com": "Leven Labs, Inc. DBA Admiral",
         "circlelevel.com": "Leven Labs, Inc. DBA Admiral",
         "cleanhaircut.com": "Leven Labs, Inc. DBA Admiral",
@@ -50655,6 +51165,7 @@
         "cloisteredcurve.com": "Leven Labs, Inc. DBA Admiral",
         "closedcows.com": "Leven Labs, Inc. DBA Admiral",
         "coatfood.com": "Leven Labs, Inc. DBA Admiral",
+        "cobaltoverture.com": "Leven Labs, Inc. DBA Admiral",
         "coldbalance.com": "Leven Labs, Inc. DBA Admiral",
         "colossalclouds.com": "Leven Labs, Inc. DBA Admiral",
         "colossalcoat.com": "Leven Labs, Inc. DBA Admiral",
@@ -50682,6 +51193,7 @@
         "crabbychin.com": "Leven Labs, Inc. DBA Admiral",
         "cratecamera.com": "Leven Labs, Inc. DBA Admiral",
         "creatorcherry.com": "Leven Labs, Inc. DBA Admiral",
+        "creatorpassenger.com": "Leven Labs, Inc. DBA Admiral",
         "creaturecabbage.com": "Leven Labs, Inc. DBA Admiral",
         "crimsonmeadow.com": "Leven Labs, Inc. DBA Admiral",
         "critictruck.com": "Leven Labs, Inc. DBA Admiral",
@@ -50734,8 +51246,11 @@
         "drollwharf.com": "Leven Labs, Inc. DBA Admiral",
         "dustydime.com": "Leven Labs, Inc. DBA Admiral",
         "dustyhammer.com": "Leven Labs, Inc. DBA Admiral",
+        "eagerknight.com": "Leven Labs, Inc. DBA Admiral",
+        "echoinghaven.com": "Leven Labs, Inc. DBA Admiral",
         "effervescentcoral.com": "Leven Labs, Inc. DBA Admiral",
         "effervescentvista.com": "Leven Labs, Inc. DBA Admiral",
+        "effulgenttempest.com": "Leven Labs, Inc. DBA Admiral",
         "elasticchange.com": "Leven Labs, Inc. DBA Admiral",
         "elderlybean.com": "Leven Labs, Inc. DBA Admiral",
         "elusivebreeze.com": "Leven Labs, Inc. DBA Admiral",
@@ -50745,6 +51260,7 @@
         "encouragingthread.com": "Leven Labs, Inc. DBA Admiral",
         "endurablebulb.com": "Leven Labs, Inc. DBA Admiral",
         "energeticladybug.com": "Leven Labs, Inc. DBA Admiral",
+        "engineertrick.com": "Leven Labs, Inc. DBA Admiral",
         "enigmaticcanyon.com": "Leven Labs, Inc. DBA Admiral",
         "enigmaticvoyage.com": "Leven Labs, Inc. DBA Admiral",
         "enormousearth.com": "Leven Labs, Inc. DBA Admiral",
@@ -50760,6 +51276,7 @@
         "executeknowledge.com": "Leven Labs, Inc. DBA Admiral",
         "exhibitsneeze.com": "Leven Labs, Inc. DBA Admiral",
         "expansioneggnog.com": "Leven Labs, Inc. DBA Admiral",
+        "exquisiteartisanship.com": "Leven Labs, Inc. DBA Admiral",
         "exuberantedge.com": "Leven Labs, Inc. DBA Admiral",
         "fadedsnow.com": "Leven Labs, Inc. DBA Admiral",
         "fadewaves.com": "Leven Labs, Inc. DBA Admiral",
@@ -50783,8 +51300,12 @@
         "financefear.com": "Leven Labs, Inc. DBA Admiral",
         "firstfrogs.com": "Leven Labs, Inc. DBA Admiral",
         "fixedfold.com": "Leven Labs, Inc. DBA Admiral",
+        "flameuncle.com": "Leven Labs, Inc. DBA Admiral",
         "flimsycircle.com": "Leven Labs, Inc. DBA Admiral",
         "flimsythought.com": "Leven Labs, Inc. DBA Admiral",
+        "flourishingcollaboration.com": "Leven Labs, Inc. DBA Admiral",
+        "flourishinginnovation.com": "Leven Labs, Inc. DBA Admiral",
+        "flourishingpartnership.com": "Leven Labs, Inc. DBA Admiral",
         "flowerstreatment.com": "Leven Labs, Inc. DBA Admiral",
         "flowerycreature.com": "Leven Labs, Inc. DBA Admiral",
         "floweryfact.com": "Leven Labs, Inc. DBA Admiral",
@@ -50814,9 +51335,12 @@
         "giddycoat.com": "Leven Labs, Inc. DBA Admiral",
         "giraffepiano.com": "Leven Labs, Inc. DBA Admiral",
         "givevacation.com": "Leven Labs, Inc. DBA Admiral",
+        "gladysway.com": "Leven Labs, Inc. DBA Admiral",
         "gleamingcow.com": "Leven Labs, Inc. DBA Admiral",
         "glisteningguide.com": "Leven Labs, Inc. DBA Admiral",
+        "glitteringbrook.com": "Leven Labs, Inc. DBA Admiral",
         "gloriousbeef.com": "Leven Labs, Inc. DBA Admiral",
+        "goldfishgrowth.com": "Leven Labs, Inc. DBA Admiral",
         "gondolagnome.com": "Leven Labs, Inc. DBA Admiral",
         "gorgeousedge.com": "Leven Labs, Inc. DBA Admiral",
         "gracefulmilk.com": "Leven Labs, Inc. DBA Admiral",
@@ -50867,6 +51391,7 @@
         "importantmeat.com": "Leven Labs, Inc. DBA Admiral",
         "impossibleexpansion.com": "Leven Labs, Inc. DBA Admiral",
         "impulsejewel.com": "Leven Labs, Inc. DBA Admiral",
+        "impulselumber.com": "Leven Labs, Inc. DBA Admiral",
         "incompetentjoke.com": "Leven Labs, Inc. DBA Admiral",
         "inconclusiveaction.com": "Leven Labs, Inc. DBA Admiral",
         "inputicicle.com": "Leven Labs, Inc. DBA Admiral",
@@ -50881,6 +51406,7 @@
         "jubilanttempest.com": "Leven Labs, Inc. DBA Admiral",
         "jubilantwhisper.com": "Leven Labs, Inc. DBA Admiral",
         "kaputquill.com": "Leven Labs, Inc. DBA Admiral",
+        "keenquill.com": "Leven Labs, Inc. DBA Admiral",
         "knitstamp.com": "Leven Labs, Inc. DBA Admiral",
         "knottyswing.com": "Leven Labs, Inc. DBA Admiral",
         "laboredlocket.com": "Leven Labs, Inc. DBA Admiral",
@@ -50890,6 +51416,7 @@
         "leftliquid.com": "Leven Labs, Inc. DBA Admiral",
         "liftedknowledge.com": "Leven Labs, Inc. DBA Admiral",
         "lightenafterthought.com": "Leven Labs, Inc. DBA Admiral",
+        "lighttalon.com": "Leven Labs, Inc. DBA Admiral",
         "livelumber.com": "Leven Labs, Inc. DBA Admiral",
         "livelylaugh.com": "Leven Labs, Inc. DBA Admiral",
         "livelyreward.com": "Leven Labs, Inc. DBA Admiral",
@@ -50909,6 +51436,7 @@
         "lunchroomlock.com": "Leven Labs, Inc. DBA Admiral",
         "lustroushaven.com": "Leven Labs, Inc. DBA Admiral",
         "maddeningpowder.com": "Leven Labs, Inc. DBA Admiral",
+        "majesticwaterscape.com": "Leven Labs, Inc. DBA Admiral",
         "maliciousmusic.com": "Leven Labs, Inc. DBA Admiral",
         "marketspiders.com": "Leven Labs, Inc. DBA Admiral",
         "marriedbelief.com": "Leven Labs, Inc. DBA Admiral",
@@ -50920,6 +51448,7 @@
         "meatydime.com": "Leven Labs, Inc. DBA Admiral",
         "meddleplant.com": "Leven Labs, Inc. DBA Admiral",
         "melodiouschorus.com": "Leven Labs, Inc. DBA Admiral",
+        "melodiouscomposition.com": "Leven Labs, Inc. DBA Admiral",
         "meltmilk.com": "Leven Labs, Inc. DBA Admiral",
         "memopilot.com": "Leven Labs, Inc. DBA Admiral",
         "memorizematch.com": "Leven Labs, Inc. DBA Admiral",
@@ -50965,6 +51494,7 @@
         "oldfashionedoffer.com": "Leven Labs, Inc. DBA Admiral",
         "operationchicken.com": "Leven Labs, Inc. DBA Admiral",
         "optimallimit.com": "Leven Labs, Inc. DBA Admiral",
+        "opulentsylvan.com": "Leven Labs, Inc. DBA Admiral",
         "orientedargument.com": "Leven Labs, Inc. DBA Admiral",
         "outstandingincome.com": "Leven Labs, Inc. DBA Admiral",
         "outstandingsnails.com": "Leven Labs, Inc. DBA Admiral",
@@ -50992,13 +51522,16 @@
         "pleasantpump.com": "Leven Labs, Inc. DBA Admiral",
         "plotrabbit.com": "Leven Labs, Inc. DBA Admiral",
         "pluckypocket.com": "Leven Labs, Inc. DBA Admiral",
+        "pluckyzone.com": "Leven Labs, Inc. DBA Admiral",
         "pocketfaucet.com": "Leven Labs, Inc. DBA Admiral",
         "poeticpackage.com": "Leven Labs, Inc. DBA Admiral",
         "pointdigestion.com": "Leven Labs, Inc. DBA Admiral",
         "pointlesspocket.com": "Leven Labs, Inc. DBA Admiral",
         "pointlessprofit.com": "Leven Labs, Inc. DBA Admiral",
+        "polishedfolly.com": "Leven Labs, Inc. DBA Admiral",
         "politeplanes.com": "Leven Labs, Inc. DBA Admiral",
         "politicalporter.com": "Leven Labs, Inc. DBA Admiral",
+        "popplantation.com": "Leven Labs, Inc. DBA Admiral",
         "possibleboats.com": "Leven Labs, Inc. DBA Admiral",
         "possiblepencil.com": "Leven Labs, Inc. DBA Admiral",
         "potatoinvention.com": "Leven Labs, Inc. DBA Admiral",
@@ -51014,7 +51547,9 @@
         "profusesupport.com": "Leven Labs, Inc. DBA Admiral",
         "protestcopy.com": "Leven Labs, Inc. DBA Admiral",
         "psychedelicarithmetic.com": "Leven Labs, Inc. DBA Admiral",
+        "publicsofa.com": "Leven Labs, Inc. DBA Admiral",
         "puffypurpose.com": "Leven Labs, Inc. DBA Admiral",
+        "pulsatingmeadow.com": "Leven Labs, Inc. DBA Admiral",
         "pumpedpancake.com": "Leven Labs, Inc. DBA Admiral",
         "punyplant.com": "Leven Labs, Inc. DBA Admiral",
         "purposepipe.com": "Leven Labs, Inc. DBA Admiral",
@@ -51049,6 +51584,8 @@
         "regularplants.com": "Leven Labs, Inc. DBA Admiral",
         "regulatesleet.com": "Leven Labs, Inc. DBA Admiral",
         "rehabilitatereason.com": "Leven Labs, Inc. DBA Admiral",
+        "relationrest.com": "Leven Labs, Inc. DBA Admiral",
+        "rememberdiscussion.com": "Leven Labs, Inc. DBA Admiral",
         "repeatsweater.com": "Leven Labs, Inc. DBA Admiral",
         "replaceroute.com": "Leven Labs, Inc. DBA Admiral",
         "resonantbrush.com": "Leven Labs, Inc. DBA Admiral",
@@ -51106,6 +51643,7 @@
         "selfishsnake.com": "Leven Labs, Inc. DBA Admiral",
         "separatesort.com": "Leven Labs, Inc. DBA Admiral",
         "seraphicjubilee.com": "Leven Labs, Inc. DBA Admiral",
+        "serenecascade.com": "Leven Labs, Inc. DBA Admiral",
         "serenepebble.com": "Leven Labs, Inc. DBA Admiral",
         "serioussuit.com": "Leven Labs, Inc. DBA Admiral",
         "serpentshampoo.com": "Leven Labs, Inc. DBA Admiral",
@@ -51209,6 +51747,7 @@
         "stupendoussleet.com": "Leven Labs, Inc. DBA Admiral",
         "stupendoussnow.com": "Leven Labs, Inc. DBA Admiral",
         "stupidscene.com": "Leven Labs, Inc. DBA Admiral",
+        "sublimequartz.com": "Leven Labs, Inc. DBA Admiral",
         "succeedscene.com": "Leven Labs, Inc. DBA Admiral",
         "sugarfriction.com": "Leven Labs, Inc. DBA Admiral",
         "suggestionbridge.com": "Leven Labs, Inc. DBA Admiral",
@@ -51230,6 +51769,7 @@
         "tangycover.com": "Leven Labs, Inc. DBA Admiral",
         "tastelesstrees.com": "Leven Labs, Inc. DBA Admiral",
         "tastelesstrucks.com": "Leven Labs, Inc. DBA Admiral",
+        "tearfulglass.com": "Leven Labs, Inc. DBA Admiral",
         "tediousticket.com": "Leven Labs, Inc. DBA Admiral",
         "teenytinycellar.com": "Leven Labs, Inc. DBA Admiral",
         "teenytinyshirt.com": "Leven Labs, Inc. DBA Admiral",
@@ -51245,6 +51785,7 @@
         "thomastorch.com": "Leven Labs, Inc. DBA Admiral",
         "thoughtlessknot.com": "Leven Labs, Inc. DBA Admiral",
         "threetruck.com": "Leven Labs, Inc. DBA Admiral",
+        "thrivingmarketplace.com": "Leven Labs, Inc. DBA Admiral",
         "ticketaunt.com": "Leven Labs, Inc. DBA Admiral",
         "tidymitten.com": "Leven Labs, Inc. DBA Admiral",
         "tiredthroat.com": "Leven Labs, Inc. DBA Admiral",
@@ -51293,12 +51834,14 @@
         "verdantlabyrinth.com": "Leven Labs, Inc. DBA Admiral",
         "verdantloom.com": "Leven Labs, Inc. DBA Admiral",
         "verseballs.com": "Leven Labs, Inc. DBA Admiral",
+        "vibrantcelebration.com": "Leven Labs, Inc. DBA Admiral",
         "vibrantgale.com": "Leven Labs, Inc. DBA Admiral",
         "vibranthaven.com": "Leven Labs, Inc. DBA Admiral",
         "vibrantpact.com": "Leven Labs, Inc. DBA Admiral",
         "vibranttalisman.com": "Leven Labs, Inc. DBA Admiral",
         "virtualvincent.com": "Leven Labs, Inc. DBA Admiral",
         "vividcanopy.com": "Leven Labs, Inc. DBA Admiral",
+        "vividfrost.com": "Leven Labs, Inc. DBA Admiral",
         "vividmeadow.com": "Leven Labs, Inc. DBA Admiral",
         "vividplume.com": "Leven Labs, Inc. DBA Admiral",
         "volatileprofit.com": "Leven Labs, Inc. DBA Admiral",
@@ -51317,11 +51860,14 @@
         "whispermeeting.com": "Leven Labs, Inc. DBA Admiral",
         "wildcommittee.com": "Leven Labs, Inc. DBA Admiral",
         "wistfulwaste.com": "Leven Labs, Inc. DBA Admiral",
+        "wittyshack.com": "Leven Labs, Inc. DBA Admiral",
         "workoperation.com": "Leven Labs, Inc. DBA Admiral",
         "wretchedfloor.com": "Leven Labs, Inc. DBA Admiral",
         "wrongwound.com": "Leven Labs, Inc. DBA Admiral",
         "zephyrlabyrinth.com": "Leven Labs, Inc. DBA Admiral",
         "zestycrime.com": "Leven Labs, Inc. DBA Admiral",
+        "zestyhorizon.com": "Leven Labs, Inc. DBA Admiral",
+        "zestyrover.com": "Leven Labs, Inc. DBA Admiral",
         "zipperxray.com": "Leven Labs, Inc. DBA Admiral",
         "zlp6s.pw": "Leven Labs, Inc. DBA Admiral",
         "abtasty.com": "AB Tasty",
diff --git a/DuckDuckGo/CrashReports/Model/CrashReport.swift b/DuckDuckGo/CrashReports/Model/CrashReport.swift
index 773c66cd27..05df42936f 100644
--- a/DuckDuckGo/CrashReports/Model/CrashReport.swift
+++ b/DuckDuckGo/CrashReports/Model/CrashReport.swift
@@ -17,13 +17,17 @@
 //
 
 import Foundation
+import MetricKit
 
-protocol CrashReport {
+protocol CrashReportPresenting {
+    var content: String? { get }
+}
+
+protocol CrashReport: CrashReportPresenting {
 
     static var fileExtension: String { get }
 
     var url: URL { get }
-    var content: String? { get }
     var contentData: Data? { get }
 
 }
@@ -91,3 +95,10 @@ struct JSONCrashReport: CrashReport {
     }
 
 }
+
+@available(macOS 12.0, *)
+extension MXDiagnosticPayload: CrashReportPresenting {
+    var content: String? {
+        jsonRepresentation().utf8String()
+    }
+}
diff --git a/DuckDuckGo/CrashReports/Model/CrashReportPromptPresenter.swift b/DuckDuckGo/CrashReports/Model/CrashReportPromptPresenter.swift
index 3d4e17cd2f..313c6a1e95 100644
--- a/DuckDuckGo/CrashReports/Model/CrashReportPromptPresenter.swift
+++ b/DuckDuckGo/CrashReports/Model/CrashReportPromptPresenter.swift
@@ -31,9 +31,9 @@ final class CrashReportPromptPresenter {
         // swiftlint:enable force_cast
     }
 
-    func showPrompt(_ delegate: CrashReportPromptViewControllerDelegate, for crashReport: CrashReport) {
-        viewController.delegate = delegate
+    func showPrompt(for crashReport: CrashReportPresenting, userDidAllowToReport: @escaping () -> Void) {
         viewController.crashReport = crashReport
+        viewController.userDidAllowToReport = userDidAllowToReport
 
         windowController.showWindow(self)
         windowController.window?.center()
diff --git a/DuckDuckGo/CrashReports/Model/CrashReportSender.swift b/DuckDuckGo/CrashReports/Model/CrashReportSender.swift
deleted file mode 100644
index e6ac958fc3..0000000000
--- a/DuckDuckGo/CrashReports/Model/CrashReportSender.swift
+++ /dev/null
@@ -1,45 +0,0 @@
-//
-//  CrashReportSender.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
-
-final class CrashReportSender {
-
-    static let reportServiceUrl = URL(string: "https://duckduckgo.com/crash.js")!
-
-    private let session = URLSession(configuration: .ephemeral)
-
-    func send(_ crashReport: CrashReport) {
-        guard let contentData = crashReport.contentData else {
-            assertionFailure("CrashReportSender: Can't get the content of the crash report")
-            return
-        }
-        var request = URLRequest(url: Self.reportServiceUrl)
-        request.setValue("text/plain", forHTTPHeaderField: "Content-Type")
-        request.setValue("ddg_mac", forHTTPHeaderField: "User-Agent")
-        request.httpMethod = "POST"
-        request.httpBody = contentData
-
-        session.dataTask(with: request) { (_, _, error) in
-            if error != nil {
-                assertionFailure("CrashReportSender: Failed to send the crash reprot")
-            }
-        }.resume()
-    }
-
-}
diff --git a/DuckDuckGo/CrashReports/Model/CrashReporter.swift b/DuckDuckGo/CrashReports/Model/CrashReporter.swift
index 39288b6043..f8e73f87e6 100644
--- a/DuckDuckGo/CrashReports/Model/CrashReporter.swift
+++ b/DuckDuckGo/CrashReports/Model/CrashReporter.swift
@@ -16,19 +16,20 @@
 //  limitations under the License.
 //
 
+import Common
+import Crashes
 import Foundation
+import PixelKit
 
 final class CrashReporter {
 
     private let reader = CrashReportReader()
-    private lazy var sender = CrashReportSender()
+    private lazy var sender = CrashReportSender(platform: .macOS, log: .default)
     private lazy var promptPresenter = CrashReportPromptPresenter()
 
     @UserDefaultsWrapper(key: .lastCrashReportCheckDate, defaultValue: nil)
     private var lastCheckDate: Date?
 
-    private var latestCrashReport: CrashReport?
-
     func checkForNewReports() {
 
 #if !DEBUG
@@ -47,31 +48,19 @@ final class CrashReporter {
             return
         }
 
-        Pixel.fire(.crash)
-
-        latestCrashReport = latest
-        promptPresenter.showPrompt(self, for: latest)
-
-#endif
-
-    }
-
-}
-
-extension CrashReporter: CrashReportPromptViewControllerDelegate {
+        PixelKit.fire(GeneralPixel.crash)
 
-    func crashReportPromptViewController(_ crashReportPromptViewController: CrashReportPromptViewController,
-                                         userDidAllowToReport: Bool) {
-        guard userDidAllowToReport else {
-            return
+        promptPresenter.showPrompt(for: latest) {
+            guard let contentData = latest.contentData else {
+                assertionFailure("CrashReporter: Can't get the content of the crash report")
+                return
+            }
+            Task {
+                await self.sender.send(contentData)
+            }
         }
 
-        guard let latestCrashReport = latestCrashReport else {
-            assertionFailure("CrashReporter: The latest crash report is nil")
-            return
-        }
+#endif
 
-        sender.send(latestCrashReport)
     }
-
 }
diff --git a/DuckDuckGo/CrashReports/View/CrashReportPromptViewController.swift b/DuckDuckGo/CrashReports/View/CrashReportPromptViewController.swift
index f8977d640b..4b21d7a222 100644
--- a/DuckDuckGo/CrashReports/View/CrashReportPromptViewController.swift
+++ b/DuckDuckGo/CrashReports/View/CrashReportPromptViewController.swift
@@ -18,13 +18,6 @@
 
 import Cocoa
 
-protocol CrashReportPromptViewControllerDelegate: AnyObject {
-
-    func crashReportPromptViewController(_ crashReportPromptViewController: CrashReportPromptViewController,
-                                         userDidAllowToReport: Bool)
-
-}
-
 final class CrashReportPromptViewController: NSViewController {
     @IBOutlet weak var titleLabel: NSTextField!
     @IBOutlet weak var dontSendButton: NSButton!
@@ -33,8 +26,9 @@ final class CrashReportPromptViewController: NSViewController {
     @IBOutlet weak var descriptionLabel: NSTextField!
     @IBOutlet var textView: NSTextView!
 
-    weak var delegate: CrashReportPromptViewControllerDelegate?
-    var crashReport: CrashReport? {
+    var userDidAllowToReport: () -> Void = {}
+
+    var crashReport: CrashReportPresenting? {
         didSet {
             updateView()
         }
@@ -58,12 +52,11 @@ final class CrashReportPromptViewController: NSViewController {
     }
 
     @IBAction func sendAction(_ sender: Any) {
-        delegate?.crashReportPromptViewController(self, userDidAllowToReport: true)
+        userDidAllowToReport()
         view.window?.close()
     }
 
     @IBAction func dontSendAction(_ sender: Any) {
-        delegate?.crashReportPromptViewController(self, userDidAllowToReport: false)
         view.window?.close()
     }
 
diff --git a/DuckDuckGo/DBP/DBPHomeViewController.swift b/DuckDuckGo/DBP/DBPHomeViewController.swift
index f3b2cf95d0..cf9e05e900 100644
--- a/DuckDuckGo/DBP/DBPHomeViewController.swift
+++ b/DuckDuckGo/DBP/DBPHomeViewController.swift
@@ -33,8 +33,16 @@ public extension Notification.Name {
 final class DBPHomeViewController: NSViewController {
     private var presentedWindowController: NSWindowController?
     private let dataBrokerProtectionManager: DataBrokerProtectionManager
+    private let pixelHandler: EventMapping<DataBrokerProtectionPixels> = DataBrokerProtectionPixelsHandler()
+    private var currentChildViewController: NSViewController?
+    private var observer: NSObjectProtocol?
 
-    lazy var dataBrokerProtectionViewController: DataBrokerProtectionViewController = {
+    private let prerequisiteVerifier: DataBrokerPrerequisitesStatusVerifier
+    private lazy var errorViewController: DataBrokerProtectionErrorViewController = {
+        DataBrokerProtectionErrorViewController()
+    }()
+
+    private lazy var dataBrokerProtectionViewController: DataBrokerProtectionViewController = {
         let privacyConfigurationManager = PrivacyFeatures.contentBlocking.privacyConfigurationManager
         let features = ContentScopeFeatureToggles(emailProtection: false,
                                                   emailProtectionIncontextSignup: false,
@@ -63,8 +71,9 @@ final class DBPHomeViewController: NSViewController {
             })
     }()
 
-    init(dataBrokerProtectionManager: DataBrokerProtectionManager) {
+    init(dataBrokerProtectionManager: DataBrokerProtectionManager, prerequisiteVerifier: DataBrokerPrerequisitesStatusVerifier = DefaultDataBrokerPrerequisitesStatusVerifier()) {
         self.dataBrokerProtectionManager = dataBrokerProtectionManager
+        self.prerequisiteVerifier = prerequisiteVerifier
         super.init(nibName: nil, bundle: nil)
     }
 
@@ -79,32 +88,45 @@ final class DBPHomeViewController: NSViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
 
-        if !dataBrokerProtectionManager.shouldAskForInviteCode() {
-            attachDataBrokerContainerView()
-        }
+        setupUI()
+        setupObserver()
 
-        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("DBPHomeViewController error: viewDidLoad, error: %{public}@", log: .error, error.localizedDescription)
+            pixelHandler.fire(.generalError(error: error, functionOccurredIn: "DBPHomeViewController.viewDidLoad"))
         }
     }
 
-    private func attachDataBrokerContainerView() {
-        addChild(dataBrokerProtectionViewController)
-        view.addSubview(dataBrokerProtectionViewController.view)
-    }
-
     override func viewDidAppear() {
         super.viewDidAppear()
 
-        if dataBrokerProtectionManager.shouldAskForInviteCode() {
+        if shouldAskForInviteCode() {
             presentInviteCodeFlow()
         }
     }
 
     override func viewDidLayout() {
         super.viewDidLayout()
-        dataBrokerProtectionViewController.view.frame = view.bounds
+        if let currentChildViewController = currentChildViewController {
+            currentChildViewController.view.frame = view.bounds
+        }
+    }
+
+    private func setupUI() {
+        if !shouldAskForInviteCode() {
+            setupUIWithCurrentStatus()
+        }
+    }
+
+    private func setupObserver() {
+        observer = NotificationCenter.default.addObserver(forName: NSApplication.didBecomeActiveNotification, object: nil, queue: nil) { [weak self] _ in
+            self?.setupUI()
+        }
     }
 
     private func presentInviteCodeFlow() {
@@ -122,13 +144,54 @@ final class DBPHomeViewController: NSViewController {
         }
         parentWindowController.window?.beginSheet(newWindow)
     }
+
+    private func setupUIWithCurrentStatus() {
+        setupUIWithStatus(prerequisiteVerifier.checkStatus())
+    }
+
+    private func setupUIWithStatus(_ status: DataBrokerPrerequisitesStatus) {
+        switch status {
+        case .invalidDirectory:
+            displayWrongDirectoryErrorUI()
+            pixelHandler.fire(.homeViewShowBadPathError)
+        case .invalidSystemPermission:
+            displayWrongPermissionsErrorUI()
+            pixelHandler.fire(.homeViewShowNoPermissionError)
+        case .valid:
+            displayDBPUI()
+            pixelHandler.fire(.homeViewShowWebUI)
+        }
+    }
+
+    private func shouldAskForInviteCode() -> Bool {
+        prerequisiteVerifier.checkStatus() == .valid && dataBrokerProtectionManager.shouldAskForInviteCode()
+    }
+
+    private func displayDBPUI() {
+        replaceChildController(dataBrokerProtectionViewController)
+    }
+
+    private func replaceChildController(_ childViewController: NSViewController) {
+        if let child = currentChildViewController {
+            child.removeCompletely()
+        }
+
+        addAndLayoutChild(childViewController)
+        self.currentChildViewController = childViewController
+    }
+
+    deinit {
+        if let observer = observer {
+            NotificationCenter.default.removeObserver(observer)
+        }
+    }
 }
 
 extension DBPHomeViewController: DataBrokerProtectionInviteDialogsViewModelDelegate {
     func dataBrokerProtectionInviteDialogsViewModelDidReedemSuccessfully(_ viewModel: DataBrokerProtectionInviteDialogsViewModel) {
         presentedWindowController?.window?.close()
         presentedWindowController = nil
-        attachDataBrokerContainerView()
+        setupUIWithCurrentStatus()
     }
 
     func dataBrokerProtectionInviteDialogsViewModelDidCancel(_ viewModel: DataBrokerProtectionInviteDialogsViewModel) {
@@ -138,71 +201,54 @@ extension DBPHomeViewController: DataBrokerProtectionInviteDialogsViewModelDeleg
     }
 }
 
-public class DataBrokerProtectionPixelsHandler: EventMapping<DataBrokerProtectionPixels> {
-
-    // swiftlint:disable:next function_body_length
-    public init() {
-        super.init { event, _, _, _ in
-            switch event {
-            case .error(let error, _):
-                Pixel.fire(.debug(event: .pixelKitEvent(event), error: error))
-            case .ipcServerOptOutAllBrokersCompletion(error: let error),
-                    .ipcServerScanAllBrokersCompletion(error: let error),
-                    .ipcServerRunQueuedOperationsCompletion(error: 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 .parentChildMatches,
-                    .optOutStart,
-                    .optOutEmailGenerate,
-                    .optOutCaptchaParse,
-                    .optOutCaptchaSend,
-                    .optOutCaptchaSolve,
-                    .optOutSubmit,
-                    .optOutEmailReceive,
-                    .optOutEmailConfirm,
-                    .optOutValidate,
-                    .optOutFinish,
-                    .optOutSubmitSuccess,
-                    .optOutFillForm,
-                    .optOutSuccess,
-                    .optOutFailure,
-                    .backgroundAgentStarted,
-                    .backgroundAgentRunOperationsAndStartSchedulerIfPossible,
-                    .backgroundAgentRunOperationsAndStartSchedulerIfPossibleNoSavedProfile,
-                    .backgroundAgentRunOperationsAndStartSchedulerIfPossibleRunQueuedOperationsCallbackStartScheduler,
-                    .backgroundAgentStartedStoppingDueToAnotherInstanceRunning,
-                    .ipcServerRegister,
-                    .ipcServerStartScheduler,
-                    .ipcServerStopScheduler,
-                    .ipcServerOptOutAllBrokers,
-                    .ipcServerScanAllBrokers,
-                    .ipcServerRunQueuedOperations,
-                    .ipcServerRunAllOperations,
-                    .scanSuccess,
-                    .scanFailed,
-                    .scanError,
-                    .dataBrokerProtectionNotificationSentFirstScanComplete,
-                    .dataBrokerProtectionNotificationOpenedFirstScanComplete,
-                    .dataBrokerProtectionNotificationSentFirstRemoval,
-                    .dataBrokerProtectionNotificationOpenedFirstRemoval,
-                    .dataBrokerProtectionNotificationScheduled2WeeksCheckIn,
-                    .dataBrokerProtectionNotificationOpened2WeeksCheckIn,
-                    .dataBrokerProtectionNotificationSentAllRecordsRemoved,
-                    .dataBrokerProtectionNotificationOpenedAllRecordsRemoved,
-                    .dailyActiveUser,
-                    .weeklyActiveUser,
-                    .monthlyActiveUser,
-                    .weeklyReportScanning,
-                    .weeklyReportRemovals,
-                    .scanningEventNewMatch,
-                    .scanningEventReAppearance:
-                Pixel.fire(.pixelKitEvent(event))
-            }
+// MARK: - Error UI
+
+extension DBPHomeViewController {
+    private func displayWrongDirectoryErrorUI() {
+        let errorViewModel = DataBrokerProtectionErrorViewModel(title: UserText.dbpErrorPageBadPathTitle,
+                                                                message: UserText.dbpErrorPageBadPathMessage,
+                                                                ctaText: UserText.dbpErrorPageBadPathCTA,
+                                                                ctaAction: { [weak self] in
+            self?.moveToApplicationFolder()
+        })
+
+        errorViewController.errorViewModel = errorViewModel
+        replaceChildController(errorViewController)
+    }
+
+    private func displayWrongPermissionsErrorUI() {
+        let errorViewModel = DataBrokerProtectionErrorViewModel(title: UserText.dbpErrorPageNoPermissionTitle,
+                                                                message: UserText.dbpErrorPageNoPermissionMessage,
+                                                                ctaText: UserText.dbpErrorPageNoPermissionCTA,
+                                                                ctaAction: { [weak self] in
+            self?.openLoginItemSettings()
+        })
+
+        errorViewController.errorViewModel = errorViewModel
+        replaceChildController(errorViewController)
+    }
+}
+
+// MARK: - System configuration
+
+import ServiceManagement
+
+extension DBPHomeViewController {
+    func openLoginItemSettings() {
+        pixelHandler.fire(.homeViewCTAGrantPermissionClicked)
+        if #available(macOS 13.0, *) {
+            SMAppService.openSystemSettingsLoginItems()
+        } else {
+            let loginItemsURL = URL(string: "x-apple.systempreferences:com.apple.LoginItems-Settings.extension")!
+            NSWorkspace.shared.open(loginItemsURL)
         }
     }
 
-    override init(mapping: @escaping EventMapping<DataBrokerProtectionPixels>.Mapping) {
-        fatalError("Use init()")
+    func moveToApplicationFolder() {
+        pixelHandler.fire(.homeViewCTAMoveApplicationClicked)
+        Task { @MainActor in
+            await AppLauncher(appBundleURL: Bundle.main.bundleURL).launchApp(withCommand: .moveAppToApplications)
+        }
     }
 }
 
diff --git a/DuckDuckGo/DBP/DataBrokerPrerequisitesStatusVerifier.swift b/DuckDuckGo/DBP/DataBrokerPrerequisitesStatusVerifier.swift
new file mode 100644
index 0000000000..f5f5c4d091
--- /dev/null
+++ b/DuckDuckGo/DBP/DataBrokerPrerequisitesStatusVerifier.swift
@@ -0,0 +1,50 @@
+//
+//  DataBrokerPrerequisitesStatusVerifier.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 DataBrokerProtection
+import LoginItems
+
+enum DataBrokerPrerequisitesStatus {
+    case invalidDirectory
+    case invalidSystemPermission
+    case valid
+}
+
+protocol DataBrokerPrerequisitesStatusVerifier: AnyObject {
+    func checkStatus() -> DataBrokerPrerequisitesStatus
+}
+
+final class DefaultDataBrokerPrerequisitesStatusVerifier: DataBrokerPrerequisitesStatusVerifier {
+    private let statusChecker: DBPLoginItemStatusChecker
+
+    init(statusChecker: DBPLoginItemStatusChecker = LoginItem.dbpBackgroundAgent) {
+        self.statusChecker = statusChecker
+    }
+
+    func checkStatus() -> DataBrokerPrerequisitesStatus {
+        if !statusChecker.doesHaveNecessaryPermissions() {
+            return .invalidSystemPermission
+        } else if !statusChecker.isInCorrectDirectory() {
+            return .invalidDirectory
+        } else {
+            return .valid
+        }
+    }
+}
diff --git a/DuckDuckGo/DBP/DataBrokerProtectionAppEvents.swift b/DuckDuckGo/DBP/DataBrokerProtectionAppEvents.swift
index b96ad16581..07a579367f 100644
--- a/DuckDuckGo/DBP/DataBrokerProtectionAppEvents.swift
+++ b/DuckDuckGo/DBP/DataBrokerProtectionAppEvents.swift
@@ -49,8 +49,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 profileQueriesCount = try? DataBrokerProtectionManager.shared.dataManager.profileQueriesCount(),
+               profileQueriesCount > 0 {
                 restartBackgroundAgent(loginItemsManager: loginItemsManager)
             } else {
                 featureVisibility.disableAndDeleteForWaitlistUsers()
@@ -81,9 +81,9 @@ struct DataBrokerProtectionAppEvents {
         if DataBrokerProtectionWaitlist().readyToAcceptTermsAndConditions {
             switch source {
             case .cardUI:
-                DataBrokerProtectionExternalWaitlistPixels.fire(pixel: .dataBrokerProtectionWaitlistCardUITapped, frequency: .dailyAndCount)
+                DataBrokerProtectionExternalWaitlistPixels.fire(pixel: GeneralPixel.dataBrokerProtectionWaitlistCardUITapped, frequency: .dailyAndCount)
             case .localPush:
-                DataBrokerProtectionExternalWaitlistPixels.fire(pixel: .dataBrokerProtectionWaitlistNotificationTapped, frequency: .dailyAndCount)
+                DataBrokerProtectionExternalWaitlistPixels.fire(pixel: GeneralPixel.dataBrokerProtectionWaitlistNotificationTapped, frequency: .dailyAndCount)
             }
 
             DataBrokerProtectionWaitlistViewControllerPresenter.show()
@@ -96,12 +96,12 @@ struct DataBrokerProtectionAppEvents {
 
     private func sendActiveDataBrokerProtectionWaitlistUserPixel() {
         if DefaultDataBrokerProtectionFeatureVisibility().waitlistIsOngoing {
-            DataBrokerProtectionExternalWaitlistPixels.fire(pixel: .dataBrokerProtectionWaitlistUserActive, frequency: .dailyOnly)
+            DataBrokerProtectionExternalWaitlistPixels.fire(pixel: GeneralPixel.dataBrokerProtectionWaitlistUserActive, frequency: .daily)
         }
     }
 
     private func restartBackgroundAgent(loginItemsManager: LoginItemsManager) {
-        DataBrokerProtectionLoginItemPixels.fire(pixel: .dataBrokerResetLoginItemDaily, frequency: .dailyOnly)
+        DataBrokerProtectionLoginItemPixels.fire(pixel: GeneralPixel.dataBrokerResetLoginItemDaily, frequency: .daily)
         loginItemsManager.disableLoginItems([LoginItem.dbpBackgroundAgent])
         loginItemsManager.enableLoginItems([LoginItem.dbpBackgroundAgent], log: .dbp)
 
diff --git a/DuckDuckGo/DBP/DataBrokerProtectionDebugMenu.swift b/DuckDuckGo/DBP/DataBrokerProtectionDebugMenu.swift
index 44bbfad4b1..b22ee8eac2 100644
--- a/DuckDuckGo/DBP/DataBrokerProtectionDebugMenu.swift
+++ b/DuckDuckGo/DBP/DataBrokerProtectionDebugMenu.swift
@@ -48,6 +48,7 @@ final class DataBrokerProtectionDebugMenu: NSMenu {
     private let customURLLabelMenuItem = NSMenuItem(title: "")
 
     private let environmentMenu = NSMenu()
+    private let statusMenuIconMenu = NSMenuItem(title: "Show Status Menu Icon", action: #selector(DataBrokerProtectionDebugMenu.toggleShowStatusMenuItem))
 
     private let webUISettings = DataBrokerProtectionWebUIURLSettings(.dbp)
     private let settings = DataBrokerProtectionSettings(defaults: .dbp)
@@ -147,6 +148,8 @@ final class DataBrokerProtectionDebugMenu: NSMenu {
 
             NSMenuItem.separator()
 
+            statusMenuIconMenu.targetting(self)
+
             NSMenuItem(title: "Show DB Browser", action: #selector(DataBrokerProtectionDebugMenu.showDatabaseBrowser))
                 .targetting(self)
             NSMenuItem(title: "Force Profile Removal", action: #selector(DataBrokerProtectionDebugMenu.showForceOptOutWindow))
@@ -172,6 +175,7 @@ final class DataBrokerProtectionDebugMenu: NSMenu {
         updateWaitlistItems()
         updateWebUIMenuItemsState()
         updateEnvironmentMenu()
+        updateShowStatusMenuIconMenu()
     }
 
     // MARK: - Menu functions
@@ -204,9 +208,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}d", log: .dataBrokerProtection, operationErrors.count)
+                }
             } else {
                 os_log("Queued operations finished", log: .dataBrokerProtection)
             }
@@ -217,9 +227,15 @@ 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.startManualScan(showWebView: showWebView, startTime: Date()) { 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}d", log: .dataBrokerProtection, operationErrors.count)
+                }
             } else {
                 os_log("Scan operations finished", log: .dataBrokerProtection)
             }
@@ -230,9 +246,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}d", log: .dataBrokerProtection, operationErrors.count)
+                }
             } else {
                 os_log("Optout operations finished", log: .dataBrokerProtection)
             }
@@ -348,6 +370,10 @@ final class DataBrokerProtectionDebugMenu: NSMenu {
         }
     }
 
+    @objc private func toggleShowStatusMenuItem() {
+        settings.showInMenuBar.toggle()
+    }
+
     @objc func setSelectedEnvironment(_ menuItem: NSMenuItem) {
         let title = menuItem.title
         let selectedEnvironment: DataBrokerProtectionSettings.SelectedEnvironment
@@ -430,6 +456,10 @@ final class DataBrokerProtectionDebugMenu: NSMenu {
         environmentMenu.items.first?.state = selectedEnvironment == .production ? .on: .off
         environmentMenu.items.last?.state = selectedEnvironment == .staging ? .on: .off
     }
+
+    private func updateShowStatusMenuIconMenu() {
+        statusMenuIconMenu.state = settings.showInMenuBar ? .on : .off
+    }
 }
 
 extension DataBrokerProtectionDebugMenu: NSWindowDelegate {
diff --git a/DuckDuckGo/DBP/DataBrokerProtectionExternalWaitlistPixels.swift b/DuckDuckGo/DBP/DataBrokerProtectionExternalWaitlistPixels.swift
index 79a6d85bf5..f23a4884a5 100644
--- a/DuckDuckGo/DBP/DataBrokerProtectionExternalWaitlistPixels.swift
+++ b/DuckDuckGo/DBP/DataBrokerProtectionExternalWaitlistPixels.swift
@@ -17,6 +17,7 @@
 //
 
 import Foundation
+import PixelKit
 
 struct DataBrokerProtectionExternalWaitlistPixels {
 
@@ -35,15 +36,11 @@ struct DataBrokerProtectionExternalWaitlistPixels {
         return (regionCode ?? "US") == "US"
     }
 
-    static func fire(pixel: Pixel.Event, frequency: DailyPixel.PixelFrequency) {
+    static func fire(pixel: PixelKitEventV2, frequency: PixelKit.Frequency) {
         if Self.isUserLocaleAllowed {
             let isInternalUser = NSApp.delegateTyped.internalUserDecider.isInternalUser
-            DailyPixel.fire(pixel: pixel,
-                            frequency: frequency,
-                            withAdditionalParameters: [
-                                "isInternalUser": isInternalUser.description
-                            ]
-            )
+            let parameters = ["isInternalUser": isInternalUser.description]
+            PixelKit.fire(pixel, frequency: frequency, withAdditionalParameters: parameters)
         }
     }
 }
diff --git a/DuckDuckGo/DBP/DataBrokerProtectionFeatureDisabler.swift b/DuckDuckGo/DBP/DataBrokerProtectionFeatureDisabler.swift
index b9ab9ac50a..83489b21bb 100644
--- a/DuckDuckGo/DBP/DataBrokerProtectionFeatureDisabler.swift
+++ b/DuckDuckGo/DBP/DataBrokerProtectionFeatureDisabler.swift
@@ -46,9 +46,13 @@ struct DataBrokerProtectionFeatureDisabler: DataBrokerProtectionFeatureDisabling
 
             scheduler.disableLoginItem()
 
-            dataManager.removeAllData()
+            do {
+                try dataManager.removeAllData()
+            } catch {
+                os_log("DataBrokerProtectionFeatureDisabler error: disableAndDelete, error: %{public}@", log: .error, error.localizedDescription)
+            }
 
-            DataBrokerProtectionLoginItemPixels.fire(pixel: .dataBrokerDisableAndDeleteDaily, frequency: .dailyOnly)
+            DataBrokerProtectionLoginItemPixels.fire(pixel: GeneralPixel.dataBrokerDisableAndDeleteDaily, frequency: .daily)
             NotificationCenter.default.post(name: .dbpWasDisabled, object: nil)
         }
     }
diff --git a/DuckDuckGo/DBP/DataBrokerProtectionLoginItemPixels.swift b/DuckDuckGo/DBP/DataBrokerProtectionLoginItemPixels.swift
index 30e2373a7f..6b10effcf1 100644
--- a/DuckDuckGo/DBP/DataBrokerProtectionLoginItemPixels.swift
+++ b/DuckDuckGo/DBP/DataBrokerProtectionLoginItemPixels.swift
@@ -17,19 +17,16 @@
 //
 
 import Foundation
+import PixelKit
 
 struct DataBrokerProtectionLoginItemPixels {
 
-    static func fire(pixel: Pixel.Event, frequency: DailyPixel.PixelFrequency) {
+    static func fire(pixel: PixelKitEventV2, frequency: PixelKit.Frequency) {
 
         DispatchQueue.main.async { // delegateTyped needs to be called in the main thread
             let isInternalUser = NSApp.delegateTyped.internalUserDecider.isInternalUser
-            DailyPixel.fire(pixel: pixel,
-                            frequency: frequency,
-                            withAdditionalParameters: [
-                                "isInternalUser": isInternalUser.description
-                            ]
-            )
+            let parameters = ["isInternalUser": isInternalUser.description]
+            PixelKit.fire(pixel, frequency: frequency, withAdditionalParameters: parameters)
         }
     }
 }
diff --git a/DuckDuckGo/DBP/DataBrokerProtectionLoginItemScheduler.swift b/DuckDuckGo/DBP/DataBrokerProtectionLoginItemScheduler.swift
index feb254562a..50b75e9fac 100644
--- a/DuckDuckGo/DBP/DataBrokerProtectionLoginItemScheduler.swift
+++ b/DuckDuckGo/DBP/DataBrokerProtectionLoginItemScheduler.swift
@@ -36,12 +36,12 @@ final class DataBrokerProtectionLoginItemScheduler {
     // MARK: - Login Item Management
 
     func disableLoginItem() {
-        DataBrokerProtectionLoginItemPixels.fire(pixel: .dataBrokerDisableLoginItemDaily, frequency: .dailyOnly)
+        DataBrokerProtectionLoginItemPixels.fire(pixel: GeneralPixel.dataBrokerDisableLoginItemDaily, frequency: .daily)
         loginItemsManager.disableLoginItems([.dbpBackgroundAgent])
     }
 
     func enableLoginItem() {
-        DataBrokerProtectionLoginItemPixels.fire(pixel: .dataBrokerEnableLoginItemDaily, frequency: .dailyOnly)
+        DataBrokerProtectionLoginItemPixels.fire(pixel: GeneralPixel.dataBrokerEnableLoginItemDaily, frequency: .daily)
         loginItemsManager.enableLoginItems([.dbpBackgroundAgent], log: .dbp)
     }
 }
@@ -55,9 +55,11 @@ extension DataBrokerProtectionLoginItemScheduler: DataBrokerProtectionScheduler
         ipcScheduler.statusPublisher
     }
 
-    func scanAllBrokers(showWebView: Bool, completion: ((Error?) -> Void)?) {
+    func startManualScan(showWebView: Bool,
+                         startTime: Date,
+                         completion: ((DataBrokerProtectionSchedulerErrorCollection?) -> Void)?) {
         enableLoginItem()
-        ipcScheduler.scanAllBrokers(showWebView: showWebView, completion: completion)
+        ipcScheduler.startManualScan(showWebView: showWebView, startTime: startTime, completion: completion)
     }
 
     func startScheduler(showWebView: Bool) {
@@ -69,7 +71,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,9 +80,14 @@ 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)
     }
+
+    func getDebugMetadata(completion: @escaping (DBPBackgroundAgentMetadata?) -> Void) {
+        ipcScheduler.getDebugMetadata(completion: completion)
+    }
 }
 
 #endif
diff --git a/DuckDuckGo/DBP/DataBrokerProtectionManager.swift b/DuckDuckGo/DBP/DataBrokerProtectionManager.swift
index 29ce721418..f3b8705674 100644
--- a/DuckDuckGo/DBP/DataBrokerProtectionManager.swift
+++ b/DuckDuckGo/DBP/DataBrokerProtectionManager.swift
@@ -36,12 +36,17 @@ 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
     }()
 
-    private lazy var ipcClient = DataBrokerProtectionIPCClient(machServiceName: Bundle.main.dbpBackgroundAgentBundleId, pixelHandler: pixelHandler)
+    private lazy var ipcClient: DataBrokerProtectionIPCClient = {
+        let loginItemStatusChecker = LoginItem.dbpBackgroundAgent
+        return DataBrokerProtectionIPCClient(machServiceName: Bundle.main.dbpBackgroundAgentBundleId,
+                                             pixelHandler: pixelHandler,
+                                             loginItemStatusChecker: loginItemStatusChecker)
+    }()
 
     lazy var scheduler: DataBrokerProtectionLoginItemScheduler = {
 
diff --git a/DuckDuckGo/DBP/DataBrokerProtectionPixelsHandler.swift b/DuckDuckGo/DBP/DataBrokerProtectionPixelsHandler.swift
new file mode 100644
index 0000000000..2f91fe97a0
--- /dev/null
+++ b/DuckDuckGo/DBP/DataBrokerProtectionPixelsHandler.swift
@@ -0,0 +1,122 @@
+//
+//  DataBrokerProtectionPixelsHandler.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 DataBrokerProtection
+import PixelKit
+import Common
+
+public class DataBrokerProtectionPixelsHandler: EventMapping<DataBrokerProtectionPixels> {
+
+    // swiftlint:disable:next function_body_length
+    public init() {
+        super.init { event, _, _, _ in
+            switch event {
+            case .error(let error, _):
+                PixelKit.fire(DebugEvent(event, error: error))
+            case .generalError(let error, _),
+                    .secureVaultInitError(let error),
+                    .secureVaultError(let error):
+                PixelKit.fire(DebugEvent(event, error: error))
+            case .ipcServerStartSchedulerXPCError(error: let error),
+                    .ipcServerStopSchedulerXPCError(error: let error),
+                    .ipcServerScanAllBrokersXPCError(error: let error),
+                    .ipcServerScanAllBrokersCompletedOnAgentWithError(error: let error),
+                    .ipcServerScanAllBrokersCompletionCalledOnAppWithError(error: let error),
+                    .ipcServerOptOutAllBrokersCompletion(error: let error),
+                    .ipcServerRunQueuedOperationsCompletion(error: let error):
+                PixelKit.fire(DebugEvent(event, error: error), frequency: .dailyAndCount, includeAppVersionParameter: true)
+            case .ipcServerStartSchedulerCalledByApp,
+                    .ipcServerStartSchedulerReceivedByAgent,
+                    .ipcServerStopSchedulerCalledByApp,
+                    .ipcServerStopSchedulerReceivedByAgent,
+                    .ipcServerScanAllBrokersAttemptedToCallWithoutLoginItemPermissions,
+                    .ipcServerScanAllBrokersAttemptedToCallInWrongDirectory,
+                    .ipcServerScanAllBrokersCalledByApp,
+                    .ipcServerScanAllBrokersReceivedByAgent,
+                    .ipcServerScanAllBrokersCompletedOnAgentWithoutError,
+                    .ipcServerScanAllBrokersCompletionCalledOnAppWithoutError,
+                    .ipcServerScanAllBrokersInterruptedOnAgent,
+                    .ipcServerScanAllBrokersCompletionCalledOnAppAfterInterruption:
+                PixelKit.fire(event, frequency: .dailyAndCount, includeAppVersionParameter: true)
+            case .parentChildMatches,
+                    .optOutStart,
+                    .optOutEmailGenerate,
+                    .optOutCaptchaParse,
+                    .optOutCaptchaSend,
+                    .optOutCaptchaSolve,
+                    .optOutSubmit,
+                    .optOutEmailReceive,
+                    .optOutEmailConfirm,
+                    .optOutValidate,
+                    .optOutFinish,
+                    .optOutSubmitSuccess,
+                    .optOutFillForm,
+                    .optOutSuccess,
+                    .optOutFailure,
+                    .backgroundAgentStarted,
+                    .backgroundAgentRunOperationsAndStartSchedulerIfPossible,
+                    .backgroundAgentRunOperationsAndStartSchedulerIfPossibleNoSavedProfile,
+                    .backgroundAgentRunOperationsAndStartSchedulerIfPossibleRunQueuedOperationsCallbackStartScheduler,
+                    .backgroundAgentStartedStoppingDueToAnotherInstanceRunning,
+                    .ipcServerOptOutAllBrokers,
+                    .ipcServerRunQueuedOperations,
+                    .ipcServerRunAllOperations,
+                    .scanSuccess,
+                    .scanFailed,
+                    .scanError,
+                    .dataBrokerProtectionNotificationSentFirstScanComplete,
+                    .dataBrokerProtectionNotificationOpenedFirstScanComplete,
+                    .dataBrokerProtectionNotificationSentFirstRemoval,
+                    .dataBrokerProtectionNotificationOpenedFirstRemoval,
+                    .dataBrokerProtectionNotificationScheduled2WeeksCheckIn,
+                    .dataBrokerProtectionNotificationOpened2WeeksCheckIn,
+                    .dataBrokerProtectionNotificationSentAllRecordsRemoved,
+                    .dataBrokerProtectionNotificationOpenedAllRecordsRemoved,
+                    .dailyActiveUser,
+                    .weeklyActiveUser,
+                    .monthlyActiveUser,
+                    .weeklyReportScanning,
+                    .weeklyReportRemovals,
+                    .scanningEventNewMatch,
+                    .scanningEventReAppearance,
+                    .webUILoadingFailed,
+                    .webUILoadingStarted,
+                    .webUILoadingSuccess,
+                    .emptyAccessTokenDaily,
+                    .generateEmailHTTPErrorDaily,
+                    .initialScanTotalDuration,
+                    .initialScanSiteLoadDuration,
+                    .initialScanPostLoadingDuration,
+                    .initialScanPreStartDuration:
+                PixelKit.fire(event)
+
+            case .homeViewShowNoPermissionError,
+                    .homeViewShowWebUI,
+                    .homeViewShowBadPathError,
+                    .homeViewCTAMoveApplicationClicked,
+                    .homeViewCTAGrantPermissionClicked:
+                PixelKit.fire(event, frequency: .dailyAndCount)
+            }
+        }
+    }
+
+    override init(mapping: @escaping EventMapping<DataBrokerProtectionPixels>.Mapping) {
+        fatalError("Use init()")
+    }
+}
diff --git a/DuckDuckGo/DBP/DataBrokerProtectionSubscriptionEventHandler.swift b/DuckDuckGo/DBP/DataBrokerProtectionSubscriptionEventHandler.swift
index 08ec829fb1..57dd6d5c33 100644
--- a/DuckDuckGo/DBP/DataBrokerProtectionSubscriptionEventHandler.swift
+++ b/DuckDuckGo/DBP/DataBrokerProtectionSubscriptionEventHandler.swift
@@ -15,11 +15,12 @@
 //  See the License for the specific language governing permissions and
 //  limitations under the License.
 //
-#if DBP && SUBSCRIPTION
+#if DBP
 
 import Foundation
 import Subscription
 import DataBrokerProtection
+import PixelKit
 
 final class DataBrokerProtectionSubscriptionEventHandler {
 
@@ -42,7 +43,7 @@ final class DataBrokerProtectionSubscriptionEventHandler {
 
     @objc private func handleAccountDidSignIn() {
         guard let token = accountManager.accessToken else {
-            Pixel.fire(.dataBrokerProtectionErrorWhenFetchingSubscriptionAuthTokenAfterSignIn)
+            PixelKit.fire(GeneralPixel.dataBrokerProtectionErrorWhenFetchingSubscriptionAuthTokenAfterSignIn)
             assertionFailure("[DBP Subscription] AccountManager signed in but token could not be retrieved")
             return
         }
diff --git a/DuckDuckGo/DBP/ErrorView/DataBrokerProtectionErrorViewController.swift b/DuckDuckGo/DBP/ErrorView/DataBrokerProtectionErrorViewController.swift
new file mode 100644
index 0000000000..fa628b686e
--- /dev/null
+++ b/DuckDuckGo/DBP/ErrorView/DataBrokerProtectionErrorViewController.swift
@@ -0,0 +1,92 @@
+//
+//  DataBrokerProtectionErrorViewController.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
+
+final class DataBrokerProtectionErrorViewController: NSViewController {
+    private var errorSubview: NSView?
+
+    var errorViewModel: DataBrokerProtectionErrorViewModel? {
+        didSet {
+            guard let errorViewModel = errorViewModel else { return }
+
+            errorSubview?.removeFromSuperview()
+
+            let errorView = DataBrokerProtectionErrorView(viewModel: errorViewModel)
+            errorSubview = NSHostingView(rootView: errorView)
+
+            if let errorSubview = errorSubview {
+                view.addAndLayout(errorSubview)
+            }
+        }
+    }
+}
+
+struct DataBrokerProtectionErrorView: View {
+    var viewModel: DataBrokerProtectionErrorViewModel
+
+    var body: some View {
+        VStack(alignment: .center, spacing: 16) {
+
+            HStack {
+                Image("DaxLockScreenLogo")
+                    .resizable()
+                    .aspectRatio(contentMode: .fit)
+                    .frame(width: 32, height: 32)
+
+                Text("Privacy Pro")
+                    .font(.title)
+                    .fontWeight(.light)
+            }
+            .padding(.bottom, 25)
+
+            HStack {
+                Image("dbp-error-info")
+                    .resizable()
+                    .frame(width: 24, height: 24)
+
+                Text(viewModel.title)
+                    .font(.title)
+                    .fontWeight(.light)
+            }
+
+            Text(viewModel.message)
+                .font(.body)
+                .fontWeight(.light)
+                .multilineTextAlignment(.center)
+                .padding(.bottom, 10)
+
+            Button(action: {
+                viewModel.ctaAction()
+            }) {
+                Text(viewModel.ctaText)
+            }
+
+            Spacer()
+        }.padding()
+            .frame(maxWidth: 500)
+    }
+}
+
+struct DataBrokerProtectionErrorViewModel {
+    let title: String
+    let message: String
+    let ctaText: String
+    let ctaAction: () -> Void
+}
diff --git a/DuckDuckGo/DBP/LoginItem+DataBrokerProtection.swift b/DuckDuckGo/DBP/LoginItem+DataBrokerProtection.swift
index cdbfa623a9..d6fbfa761f 100644
--- a/DuckDuckGo/DBP/LoginItem+DataBrokerProtection.swift
+++ b/DuckDuckGo/DBP/LoginItem+DataBrokerProtection.swift
@@ -18,6 +18,7 @@
 
 import Foundation
 import LoginItems
+import DataBrokerProtection
 
 #if DBP
 
@@ -27,4 +28,28 @@ extension LoginItem {
 
 }
 
+extension LoginItem: DBPLoginItemStatusChecker {
+
+    public func doesHaveNecessaryPermissions() -> Bool {
+        return status != .requiresApproval
+    }
+
+    public func isInCorrectDirectory() -> Bool {
+        guard let appPath = Bundle.main.resourceURL?.deletingLastPathComponent() else { return false }
+        let dirPaths = NSSearchPathForDirectoriesInDomains(.applicationDirectory, .localDomainMask, true)
+        for path in dirPaths {
+            let filePath: URL
+            if #available(macOS 13.0, *) {
+                filePath = URL(filePath: path)
+            } else {
+                filePath = URL(fileURLWithPath: path)
+            }
+            if appPath.absoluteString.hasPrefix(filePath.absoluteString) {
+                return true
+            }
+        }
+        return false
+    }
+}
+
 #endif
diff --git a/DuckDuckGo/DBP/RemoteMessaging/DataBrokerProtectionRemoteMessaging.swift b/DuckDuckGo/DBP/RemoteMessaging/DataBrokerProtectionRemoteMessaging.swift
index 4359b535e0..b43994834b 100644
--- a/DuckDuckGo/DBP/RemoteMessaging/DataBrokerProtectionRemoteMessaging.swift
+++ b/DuckDuckGo/DBP/RemoteMessaging/DataBrokerProtectionRemoteMessaging.swift
@@ -18,6 +18,7 @@
 
 import Foundation
 import Networking
+import PixelKit
 
 #if DBP
 
@@ -91,7 +92,7 @@ final class DefaultDataBrokerProtectionRemoteMessaging: DataBrokerProtectionRemo
                     try self.messageStorage.store(messages: messages)
                     self.updateLastRefreshDate() // Update last refresh date on success, otherwise let the app try again next time
                 } catch {
-                    Pixel.fire(.debug(event: .dataBrokerProtectionRemoteMessageStorageFailed, error: error))
+                    PixelKit.fire(DebugEvent(GeneralPixel.dataBrokerProtectionRemoteMessageStorageFailed, error: error))
                 }
             case .failure(let error):
                 // Ignore 403 errors, those happen when a file can't be found on S3
@@ -100,7 +101,7 @@ final class DefaultDataBrokerProtectionRemoteMessaging: DataBrokerProtectionRemo
                     return
                 }
 
-                Pixel.fire(.debug(event: .dataBrokerProtectionRemoteMessageFetchingFailed, error: error))
+                PixelKit.fire(DebugEvent(GeneralPixel.dataBrokerProtectionRemoteMessageFetchingFailed, error: error))
             }
         }
     }
diff --git a/DuckDuckGo/DataExport/CSVLoginExporter.swift b/DuckDuckGo/DataExport/CSVLoginExporter.swift
index 26e9a3f0d2..90062966fe 100644
--- a/DuckDuckGo/DataExport/CSVLoginExporter.swift
+++ b/DuckDuckGo/DataExport/CSVLoginExporter.swift
@@ -18,6 +18,7 @@
 
 import Foundation
 import BrowserServicesKit
+import PixelKit
 
 final class CSVLoginExporter {
 
@@ -49,7 +50,7 @@ final class CSVLoginExporter {
                 }
             }
         } catch {
-            Pixel.fire(.debug(event: .secureVaultError, error: error))
+            PixelKit.fire(DebugEvent(GeneralPixel.secureVaultError(error: error)))
             throw error
         }
 
diff --git a/DuckDuckGo/DataImport/Bookmarks/Firefox/FirefoxBookmarksReader.swift b/DuckDuckGo/DataImport/Bookmarks/Firefox/FirefoxBookmarksReader.swift
index fdf0029709..afef50085b 100644
--- a/DuckDuckGo/DataImport/Bookmarks/Firefox/FirefoxBookmarksReader.swift
+++ b/DuckDuckGo/DataImport/Bookmarks/Firefox/FirefoxBookmarksReader.swift
@@ -45,6 +45,8 @@ final class FirefoxBookmarksReader {
             case fetchAllFolders
 
             case copyTemporaryFile
+
+            case couldNotFindBookmarksFile
         }
 
         var action: DataImportAction { .bookmarks }
@@ -53,7 +55,7 @@ final class FirefoxBookmarksReader {
 
         var errorType: DataImport.ErrorType {
             switch type {
-            case .dbOpen: .noData
+            case .dbOpen, .couldNotFindBookmarksFile: .noData
             case .fetchRootEntries, .noRootEntries, .fetchTopLevelFolders, .fetchAllBookmarks, .fetchAllFolders: .dataCorrupted
             case .copyTemporaryFile: .other
             }
@@ -72,6 +74,10 @@ final class FirefoxBookmarksReader {
     }
 
     func readBookmarks() -> DataImportResult<ImportedBookmarks> {
+        guard FileManager.default.fileExists(atPath: firefoxPlacesDatabaseURL.path) else {
+            return .failure(ImportError(type: .couldNotFindBookmarksFile, underlyingError: nil))
+        }
+
         do {
             currentOperationType = .copyTemporaryFile
             return try firefoxPlacesDatabaseURL.withTemporaryFile { temporaryDatabaseURL in
diff --git a/DuckDuckGo/DataImport/Bookmarks/Safari/SafariDataImporter.swift b/DuckDuckGo/DataImport/Bookmarks/Safari/SafariDataImporter.swift
index 005fc26971..0f3daaef5d 100644
--- a/DuckDuckGo/DataImport/Bookmarks/Safari/SafariDataImporter.swift
+++ b/DuckDuckGo/DataImport/Bookmarks/Safari/SafariDataImporter.swift
@@ -17,7 +17,7 @@
 //
 
 import AppKit
-import Foundation
+import PixelKit
 
 final class SafariDataImporter: DataImporter {
 
@@ -114,7 +114,7 @@ final class SafariDataImporter: DataImporter {
             await faviconManager.handleFaviconsByDocumentUrl(faviconsByDocument)
 
         case .failure(let error):
-            Pixel.fire(.dataImportFailed(source: source, sourceVersion: profile.installedAppsMajorVersionDescription(), error: error))
+            PixelKit.fire(GeneralPixel.dataImportFailed(source: source, sourceVersion: profile.installedAppsMajorVersionDescription(), error: error))
         }
     }
 
diff --git a/DuckDuckGo/DataImport/Logins/Chromium/ChromiumDataImporter.swift b/DuckDuckGo/DataImport/Logins/Chromium/ChromiumDataImporter.swift
index a387ac7d34..1f920dd809 100644
--- a/DuckDuckGo/DataImport/Logins/Chromium/ChromiumDataImporter.swift
+++ b/DuckDuckGo/DataImport/Logins/Chromium/ChromiumDataImporter.swift
@@ -17,6 +17,7 @@
 //
 
 import Foundation
+import PixelKit
 
 internal class ChromiumDataImporter: DataImporter {
 
@@ -139,7 +140,7 @@ internal class ChromiumDataImporter: DataImporter {
             await faviconManager.handleFaviconsByDocumentUrl(faviconsByDocument)
 
         case .failure(let error):
-            Pixel.fire(.dataImportFailed(source: source, sourceVersion: profile.installedAppsMajorVersionDescription(), error: error))
+            PixelKit.fire(GeneralPixel.dataImportFailed(source: source, sourceVersion: profile.installedAppsMajorVersionDescription(), error: error))
         }
     }
 
diff --git a/DuckDuckGo/DataImport/Logins/Chromium/ChromiumKeychainPrompt.swift b/DuckDuckGo/DataImport/Logins/Chromium/ChromiumKeychainPrompt.swift
index 4e473eada8..08872a1d78 100644
--- a/DuckDuckGo/DataImport/Logins/Chromium/ChromiumKeychainPrompt.swift
+++ b/DuckDuckGo/DataImport/Logins/Chromium/ChromiumKeychainPrompt.swift
@@ -17,6 +17,7 @@
 //
 
 import Foundation
+import PixelKit
 
 enum ChromiumKeychainPromptResult {
     case password(String)
@@ -45,7 +46,7 @@ final class ChromiumKeychainPrompt: ChromiumKeychainPrompting {
         var dataFromKeychain: AnyObject?
 
         // Fire Pixel to help measure rate of password prompt denied actions
-        Pixel.fire(.passwordImportKeychainPrompt)
+        PixelKit.fire(GeneralPixel.passwordImportKeychainPrompt)
 
         let status: OSStatus = SecItemCopyMatching(query as CFDictionary, &dataFromKeychain)
 
diff --git a/DuckDuckGo/DataImport/Logins/Firefox/FirefoxDataImporter.swift b/DuckDuckGo/DataImport/Logins/Firefox/FirefoxDataImporter.swift
index a6b87ee62b..5eb7ca6353 100644
--- a/DuckDuckGo/DataImport/Logins/Firefox/FirefoxDataImporter.swift
+++ b/DuckDuckGo/DataImport/Logins/Firefox/FirefoxDataImporter.swift
@@ -18,6 +18,7 @@
 
 import Foundation
 import SecureStorage
+import PixelKit
 
 internal class FirefoxDataImporter: DataImporter {
 
@@ -139,7 +140,7 @@ internal class FirefoxDataImporter: DataImporter {
             await faviconManager.handleFaviconsByDocumentUrl(faviconsByDocument)
 
         case .failure(let error):
-            Pixel.fire(.dataImportFailed(source: source, sourceVersion: profile.installedAppsMajorVersionDescription(), error: error))
+            PixelKit.fire(GeneralPixel.dataImportFailed(source: source, sourceVersion: profile.installedAppsMajorVersionDescription(), error: error))
         }
     }
 
diff --git a/DuckDuckGo/DataImport/Logins/Firefox/FirefoxLoginReader.swift b/DuckDuckGo/DataImport/Logins/Firefox/FirefoxLoginReader.swift
index 3c354886cc..af702efd16 100644
--- a/DuckDuckGo/DataImport/Logins/Firefox/FirefoxLoginReader.swift
+++ b/DuckDuckGo/DataImport/Logins/Firefox/FirefoxLoginReader.swift
@@ -41,6 +41,8 @@ final class FirefoxLoginReader {
 
             case decryptUsername
             case decryptPassword
+
+            case couldNotFindKeyDB
         }
 
         var action: DataImportAction { .passwords }
@@ -49,7 +51,7 @@ final class FirefoxLoginReader {
 
         var errorType: DataImport.ErrorType {
             switch type {
-            case .couldNotFindLoginsFile, .couldNotReadLoginsFile: .noData
+            case .couldNotFindLoginsFile, .couldNotFindKeyDB, .couldNotReadLoginsFile: .noData
             case .key3readerStage1, .key3readerStage2, .key3readerStage3, .key4readerStage1, .key4readerStage2, .key4readerStage3, .decryptUsername, .decryptPassword: .decryptionError
             case .couldNotDetermineFormat: .dataCorrupted
             case .requiresPrimaryPassword: .other
@@ -94,7 +96,7 @@ final class FirefoxLoginReader {
     func readLogins(dataFormat: DataFormat?) -> DataImportResult<[ImportedLoginCredential]> {
         var currentOperationType: ImportError.OperationType = .couldNotFindLoginsFile
         do {
-            let dataFormat = try dataFormat ?? detectLoginFormat() ?? { throw ImportError(type: .couldNotDetermineFormat, underlyingError: nil) }()
+            let dataFormat = try dataFormat ?? detectLoginFormat() ?? { throw ImportError(type: .couldNotFindKeyDB, underlyingError: nil) }()
             let keyData = try getEncryptionKey(dataFormat: dataFormat)
             let result = try reallyReadLogins(dataFormat: dataFormat, keyData: keyData, currentOperationType: &currentOperationType)
             return .success(result)
@@ -106,7 +108,7 @@ final class FirefoxLoginReader {
     }
 
     func getEncryptionKey() throws -> Data {
-        let dataFormat = try detectLoginFormat() ?? { throw ImportError(type: .couldNotDetermineFormat, underlyingError: nil) }()
+        let dataFormat = try detectLoginFormat() ?? { throw ImportError(type: .couldNotFindKeyDB, underlyingError: nil) }()
         return try getEncryptionKey(dataFormat: dataFormat)
     }
 
diff --git a/DuckDuckGo/DataImport/Logins/SecureVault/SecureVaultLoginImporter.swift b/DuckDuckGo/DataImport/Logins/SecureVault/SecureVaultLoginImporter.swift
index 17acb874e0..193806cef0 100644
--- a/DuckDuckGo/DataImport/Logins/SecureVault/SecureVaultLoginImporter.swift
+++ b/DuckDuckGo/DataImport/Logins/SecureVault/SecureVaultLoginImporter.swift
@@ -23,7 +23,7 @@ import SecureStorage
 final class SecureVaultLoginImporter: LoginImporter {
 
     func importLogins(_ logins: [ImportedLoginCredential], progressCallback: @escaping (Int) throws -> Void) throws -> DataImport.DataTypeSummary {
-        let vault = try AutofillSecureVaultFactory.makeVault(errorReporter: SecureVaultErrorReporter.shared)
+        let vault = try AutofillSecureVaultFactory.makeVault(reporter: SecureVaultReporter.shared)
 
         var successful: [String] = []
         var duplicates: [String] = []
diff --git a/DuckDuckGo/DataImport/Model/DataImportViewModel.swift b/DuckDuckGo/DataImport/Model/DataImportViewModel.swift
index 1a2d1eef7b..7e6211da9d 100644
--- a/DuckDuckGo/DataImport/Model/DataImportViewModel.swift
+++ b/DuckDuckGo/DataImport/Model/DataImportViewModel.swift
@@ -18,8 +18,8 @@
 
 import AppKit
 import Common
-import Foundation
 import UniformTypeIdentifiers
+import PixelKit
 
 struct DataImportViewModel {
 
@@ -107,6 +107,11 @@ struct DataImportViewModel {
             self.dataType = dataType
             self.result = result
         }
+
+        static func == (lhs: DataTypeImportResult, rhs: DataTypeImportResult) -> Bool {
+            lhs.dataType == rhs.dataType &&
+            lhs.result.description == rhs.result.description
+        }
     }
 
     /// collected import summary for current import operation per selected import source
@@ -248,7 +253,7 @@ struct DataImportViewModel {
                     // switch to file import of the failed data type displaying successful import results
                     nextScreen = .fileImport(dataType: dataType, summary: Set(summary.filter({ $0.value.isSuccess }).keys))
                 }
-                Pixel.fire(.dataImportFailed(source: importSource, sourceVersion: importSource.installedAppsMajorVersionDescription(selectedProfile: selectedProfile), error: error))
+                PixelKit.fire(GeneralPixel.dataImportFailed(source: importSource, sourceVersion: importSource.installedAppsMajorVersionDescription(selectedProfile: selectedProfile), error: error))
             }
         }
 
@@ -286,7 +291,7 @@ struct DataImportViewModel {
             switch error {
             // chromium user denied keychain prompt error
             case let error as ChromiumLoginReader.ImportError where error.type == .userDeniedKeychainPrompt:
-                Pixel.fire(.passwordImportKeychainPromptDenied)
+                PixelKit.fire(GeneralPixel.passwordImportKeychainPromptDenied)
                 // stay on the same screen
                 return true
 
@@ -310,7 +315,7 @@ struct DataImportViewModel {
                 log("file read no permission for \(url.path)")
 
                 if url != selectedProfile?.profileURL.appendingPathComponent(SafariDataImporter.bookmarksFileName) {
-                    Pixel.fire(.dataImportFailed(source: importSource, sourceVersion: importSource.installedAppsMajorVersionDescription(selectedProfile: selectedProfile), error: importError))
+                    PixelKit.fire(GeneralPixel.dataImportFailed(source: importSource, sourceVersion: importSource.installedAppsMajorVersionDescription(selectedProfile: selectedProfile), error: importError))
                 }
                 screen = .getReadPermission(url)
                 return true
@@ -322,16 +327,19 @@ struct DataImportViewModel {
     }
 
     /// Skip button press
-    @MainActor mutating func skipImport() {
+    @MainActor mutating func skipImportOrDismiss(using dismiss: @escaping () -> Void) {
         if let screen = screenForNextDataTypeRemainingToImport(after: screen.fileImportDataType) {
             // skip to next non-imported data type
             self.screen = screen
-        } else if selectedDataTypes.first(where: { error(for: $0) != nil }) != nil {
+        } else if selectedDataTypes.first(where: {
+            let error = error(for: $0)
+            return error != nil && error?.errorType != .noData
+        }) != nil {
             // errors occurred during import: show feedback screen
             self.screen = .feedback
         } else {
-            // display total summary
-            self.screen = .summary(selectedDataTypes)
+            // When we skip a manual import, and there are no next non-imported data types, we dismiss
+            self.dismiss(using: dismiss)
         }
     }
 
@@ -671,7 +679,7 @@ extension DataImportViewModel {
             initiateImport()
 
         case .skip:
-            skipImport()
+            skipImportOrDismiss(using: dismiss)
 
         case .cancel:
             importTask?.cancel()
diff --git a/DuckDuckGo/DataImport/View/DataImportNoDataView.swift b/DuckDuckGo/DataImport/View/DataImportNoDataView.swift
index 84fb50a583..889daccbab 100644
--- a/DuckDuckGo/DataImport/View/DataImportNoDataView.swift
+++ b/DuckDuckGo/DataImport/View/DataImportNoDataView.swift
@@ -31,15 +31,13 @@ struct DataImportNoDataView: View {
                 Text("We couldn‘t find any bookmarks.", comment: "Data import error message: Bookmarks weren‘t found.")
                     .bold()
 
-                Text("Try importing bookmarks manually instead.",
-                     comment: "Data import error subtitle: suggestion to import Bookmarks manually by selecting a CSV or HTML file.")
+                Text(UserText.importNoDataBookmarksSubtitle(from: source))
 
             case .passwords:
                 Text("We couldn‘t find any passwords.", comment: "Data import error message: Passwords weren‘t found.")
                     .bold()
 
-                Text("Try importing passwords manually instead.",
-                     comment: "Data import error subtitle: suggestion to import Passwords manually by selecting a CSV or HTML file.")
+                Text(UserText.importNoDataPasswordsSubtitle(from: source))
             }
         }
     }
diff --git a/DuckDuckGo/DataImport/View/DataImportSummaryView.swift b/DuckDuckGo/DataImport/View/DataImportSummaryView.swift
index f9eddeecfb..b385a90c66 100644
--- a/DuckDuckGo/DataImport/View/DataImportSummaryView.swift
+++ b/DuckDuckGo/DataImport/View/DataImportSummaryView.swift
@@ -33,6 +33,8 @@ struct DataImportSummaryView: View {
         self.model = model
     }
 
+    private let zeroString = "0"
+
     var body: some View {
         VStack(alignment: .leading, spacing: 8) {
             {
@@ -61,7 +63,7 @@ struct DataImportSummaryView: View {
                     }
                     if summary.duplicate > 0 {
                         HStack {
-                            failureImage()
+                            skippedImage()
                             Text("Duplicate Bookmarks Skipped:",
                                  comment: "Data import summary format of how many duplicate bookmarks (%lld) were skipped during import.")
                             + Text(" " as String)
@@ -78,6 +80,15 @@ struct DataImportSummaryView: View {
                         }
                     }
 
+                case (.bookmarks, .failure(let error)) where error.errorType == .noData:
+                    HStack {
+                        skippedImage()
+                        Text("Bookmarks:",
+                             comment: "Data import summary format of how many bookmarks were successfully imported.")
+                        + Text(" " as String)
+                        + Text(zeroString).bold()
+                    }
+
                 case (.bookmarks, .failure):
                     HStack {
                         failureImage()
@@ -85,11 +96,21 @@ struct DataImportSummaryView: View {
                              comment: "Data import summary message of failed bookmarks import.")
                     }
 
-                case (.passwords, .failure):
-                    HStack {
-                        failureImage()
-                        Text("Password import failed.",
-                             comment: "Data import summary message of failed passwords import.")
+                case (.passwords, .failure(let error)):
+                    if error.errorType == .noData {
+                        HStack {
+                            skippedImage()
+                            Text("Passwords:",
+                                 comment: "Data import summary format of how many passwords were successfully imported.")
+                            + Text(" " as String)
+                            + Text(zeroString).bold()
+                        }
+                    } else {
+                        HStack {
+                            failureImage()
+                            Text("Password import failed.",
+                                 comment: "Data import summary message of failed passwords import.")
+                        }
                     }
 
                 case (.passwords, .success(let summary)):
@@ -126,6 +147,11 @@ private func failureImage() -> some View {
         .frame(width: 16, height: 16)
 }
 
+private func skippedImage() -> some View {
+    Image(.skipped)
+        .frame(width: 16, height: 16)
+}
+
 #if DEBUG
 #Preview {
     VStack {
diff --git a/DuckDuckGo/DataImport/View/DataImportView.swift b/DuckDuckGo/DataImport/View/DataImportView.swift
index 67a8dad11c..2302b54421 100644
--- a/DuckDuckGo/DataImport/View/DataImportView.swift
+++ b/DuckDuckGo/DataImport/View/DataImportView.swift
@@ -492,8 +492,7 @@ extension DataImportViewModel.ButtonType {
                   profileURL: URL(fileURLWithPath: "/test/Profile 1")),
             .init(browser: .chrome,
                   profileURL: URL(fileURLWithPath: "/test/Profile 2")),
-        ], validateProfileData: { _ in
-            { .init(logins: .available, bookmarks: .available) } // swiftlint:disable:this opening_brace
+        ], validateProfileData: { _ in { .init(logins: .available, bookmarks: .available) } // swiftlint:disable:this opening_brace
         })
     } dataImporterFactory: { source, type, _, _ in
         return MockDataImporter(source: source, dataType: type)
diff --git a/DuckDuckGo/DataImport/View/ReportFeedbackView.swift b/DuckDuckGo/DataImport/View/ReportFeedbackView.swift
index dc35dc0745..86aa8da7c4 100644
--- a/DuckDuckGo/DataImport/View/ReportFeedbackView.swift
+++ b/DuckDuckGo/DataImport/View/ReportFeedbackView.swift
@@ -150,4 +150,4 @@ private struct InfoItemView: View {
     }
     return PreviewView()
 
-} ()}
+}()}
diff --git a/DuckDuckGo/DeviceAuthentication/DeviceAuthenticationService.swift b/DuckDuckGo/DeviceAuthentication/DeviceAuthenticationService.swift
index 307a1bc3bd..3cc09f250d 100644
--- a/DuckDuckGo/DeviceAuthentication/DeviceAuthenticationService.swift
+++ b/DuckDuckGo/DeviceAuthentication/DeviceAuthenticationService.swift
@@ -21,6 +21,7 @@ import Foundation
 enum DeviceAuthenticationResult {
     case success
     case failure
+    case noAuthAvailable
 
     var authenticated: Bool {
         return self == .success
diff --git a/DuckDuckGo/DeviceAuthentication/LocalAuthenticationService.swift b/DuckDuckGo/DeviceAuthentication/LocalAuthenticationService.swift
index 474d53c750..b7ddbe7416 100644
--- a/DuckDuckGo/DeviceAuthentication/LocalAuthenticationService.swift
+++ b/DuckDuckGo/DeviceAuthentication/LocalAuthenticationService.swift
@@ -24,6 +24,12 @@ final class LocalAuthenticationService: DeviceAuthenticationService {
     func authenticateDevice(reason: String, result: @escaping DeviceAuthenticationResultHandler) {
         let context = LAContext()
 
+        var error: NSError?
+        guard context.canEvaluatePolicy(.deviceOwnerAuthentication, error: &error) else {
+            result(.noAuthAvailable)
+            return
+        }
+
         context.evaluatePolicy(.deviceOwnerAuthentication, localizedReason: reason) { authenticated, _ in
             DispatchQueue.main.async {
                 let authenticationResult: DeviceAuthenticationResult = authenticated ? .success : .failure
diff --git a/DuckDuckGo/Email/EmailManagerRequestDelegate.swift b/DuckDuckGo/Email/EmailManagerRequestDelegate.swift
index 6b01002a03..43e96115fd 100644
--- a/DuckDuckGo/Email/EmailManagerRequestDelegate.swift
+++ b/DuckDuckGo/Email/EmailManagerRequestDelegate.swift
@@ -17,6 +17,7 @@
 //
 
 import BrowserServicesKit
+import PixelKit
 
 extension EmailManagerRequestDelegate {
 
@@ -67,7 +68,7 @@ extension EmailManagerRequestDelegate {
             parameters["keychain_operation"] = "save"
         }
 
-        Pixel.fire(.debug(event: .emailAutofillKeychainError), withAdditionalParameters: parameters)
+        PixelKit.fire(DebugEvent(GeneralPixel.emailAutofillKeychainError), withAdditionalParameters: parameters)
     }
 
 }
diff --git a/DuckDuckGo/ErrorPage/ErrorPageHTMLTemplate.swift b/DuckDuckGo/ErrorPage/ErrorPageHTMLTemplate.swift
index af9d04103e..a288139546 100644
--- a/DuckDuckGo/ErrorPage/ErrorPageHTMLTemplate.swift
+++ b/DuckDuckGo/ErrorPage/ErrorPageHTMLTemplate.swift
@@ -19,6 +19,7 @@
 import Foundation
 import ContentScopeScripts
 import WebKit
+import Common
 
 struct ErrorPageHTMLTemplate {
 
@@ -43,3 +44,130 @@ struct ErrorPageHTMLTemplate {
     }
 
 }
+
+struct SSLErrorPageHTMLTemplate {
+    let domain: String
+    let errorCode: Int
+    let tld = TLD()
+
+    static var htmlTemplatePath: String {
+        guard let file = ContentScopeScripts.Bundle.path(forResource: "index", ofType: "html", inDirectory: "pages/sslerrorpage") else {
+            assertionFailure("HTML template not found")
+            return ""
+        }
+        return file
+    }
+
+    func makeHTMLFromTemplate() -> String {
+        let sslError = SSLErrorType.forErrorCode(errorCode)
+        guard let html = try? String(contentsOfFile: Self.htmlTemplatePath) else {
+            assertionFailure("Should be able to load template")
+            return ""
+        }
+        let eTldPlus1 = tld.eTLDplus1(domain) ?? domain
+        let loadTimeData = createJSONString(header: sslError.header, body: sslError.body(for: domain), advancedButton: sslError.advancedButton, leaveSiteButton: sslError.leaveSiteButton, advancedInfoHeader: sslError.advancedInfoTitle, specificMessage: sslError.specificMessage(for: domain, eTldPlus1: eTldPlus1), advancedInfoBody: sslError.advancedInfoBody, visitSiteButton: sslError.visitSiteButton)
+        return html.replacingOccurrences(of: "$LOAD_TIME_DATA$", with: loadTimeData, options: .literal)
+    }
+
+    private func createJSONString(header: String, body: String, advancedButton: String, leaveSiteButton: String, advancedInfoHeader: String, specificMessage: String, advancedInfoBody: String, visitSiteButton: String) -> String {
+        let innerDictionary: [String: Any] = [
+            "header": header.escapedUnicodeHtmlString(),
+            "body": body.escapedUnicodeHtmlString(),
+            "advancedButton": advancedButton.escapedUnicodeHtmlString(),
+            "leaveSiteButton": leaveSiteButton.escapedUnicodeHtmlString(),
+            "advancedInfoHeader": advancedInfoHeader.escapedUnicodeHtmlString(),
+            "specificMessage": specificMessage.escapedUnicodeHtmlString(),
+            "advancedInfoBody": advancedInfoBody.escapedUnicodeHtmlString(),
+            "visitSiteButton": visitSiteButton.escapedUnicodeHtmlString()
+        ]
+
+        let outerDictionary: [String: Any] = [
+            "strings": innerDictionary
+        ]
+
+        do {
+            let jsonData = try JSONSerialization.data(withJSONObject: outerDictionary, options: .prettyPrinted)
+            if let jsonString = String(data: jsonData, encoding: .utf8) {
+                return jsonString
+            } else {
+                return "Error: Could not encode jsonData to String."
+            }
+        } catch {
+            return "Error: \(error.localizedDescription)"
+        }
+    }
+
+}
+
+public enum SSLErrorType {
+    case expired
+    case wrongHost
+    case selfSigned
+    case invalid
+
+    var header: String {
+        return UserText.sslErrorPageHeader
+    }
+
+    func body(for domain: String) -> String {
+        let boldDomain = "<span style=\"font-weight: 600;\">\(domain)</span>"
+        return UserText.sslErrorPageBody(boldDomain)
+    }
+
+    var advancedButton: String {
+        return UserText.sslErrorPageAdvancedButton
+    }
+
+    var leaveSiteButton: String {
+        return UserText.sslErrorPageLeaveSiteButton
+    }
+
+    var visitSiteButton: String {
+        return UserText.sslErrorPageVisitSiteButton
+    }
+
+    var advancedInfoTitle: String {
+        return UserText.sslErrorAdvancedInfoTitle
+    }
+
+    var advancedInfoBody: String {
+        switch self {
+        case .expired:
+            return UserText.sslErrorAdvancedInfoBodyExpired
+        case .wrongHost:
+            return UserText.sslErrorAdvancedInfoBodyWrongHost
+        case .selfSigned:
+            return UserText.sslErrorAdvancedInfoBodyWrongHost
+        case .invalid:
+            return UserText.sslErrorAdvancedInfoBodyWrongHost
+        }
+    }
+
+    func specificMessage(for domain: String, eTldPlus1: String) -> String {
+        let boldDomain = "<span style=\"font-weight: 600;\">\(domain)</span>"
+        let boldETldPlus1 = "<span style=\"font-weight: 600;\">\(eTldPlus1)</span>"
+        switch self {
+        case .expired:
+            return UserText.sslErrorCertificateExpiredMessage(boldDomain)
+        case .wrongHost:
+            return UserText.sslErrorCertificateWrongHostMessage(boldDomain, eTldPlus1: boldETldPlus1)
+        case .selfSigned:
+            return UserText.sslErrorCertificateSelfSignedMessage(boldDomain)
+        case .invalid:
+            return UserText.sslErrorCertificateSelfSignedMessage(boldDomain)
+        }
+    }
+
+    static func forErrorCode(_ errorCode: Int) -> Self {
+        switch Int32(errorCode) {
+        case errSSLCertExpired:
+            return .expired
+        case errSSLHostNameMismatch:
+            return .wrongHost
+        case errSSLXCertChainInvalid:
+            return .selfSigned
+        default:
+            return .invalid
+        }
+    }
+}
diff --git a/DuckDuckGo/ErrorPage/SSLErrorPageUserScript.swift b/DuckDuckGo/ErrorPage/SSLErrorPageUserScript.swift
new file mode 100644
index 0000000000..1f3487834e
--- /dev/null
+++ b/DuckDuckGo/ErrorPage/SSLErrorPageUserScript.swift
@@ -0,0 +1,77 @@
+//
+//  SSLErrorPageUserScript.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 UserScript
+
+final class SSLErrorPageUserScript: NSObject, Subfeature {
+    enum MessageName: String, CaseIterable {
+        case leaveSite
+        case visitSite
+    }
+
+    public let messageOriginPolicy: MessageOriginPolicy = .all
+    public let featureName: String = "sslErrorPage"
+
+    var isEnabled: Bool = false
+    var failingURL: URL?
+
+    weak var broker: UserScriptMessageBroker?
+    weak var delegate: SSLErrorPageUserScriptDelegate?
+
+    func with(broker: UserScriptMessageBroker) {
+        self.broker = broker
+    }
+
+    @MainActor
+    func handler(forMethodNamed methodName: String) -> Subfeature.Handler? {
+        guard isEnabled else { return nil }
+        switch MessageName(rawValue: methodName) {
+        case .leaveSite:
+            return handleLeaveSiteAction
+        case .visitSite:
+            return handleVisitSiteAction
+        default:
+            assertionFailure("SSLErrorPageUserScript: Failed to parse User Script message: \(methodName)")
+            return nil
+        }
+    }
+
+    @MainActor
+    func handleLeaveSiteAction(params: Any, message: UserScriptMessage) -> Encodable? {
+        delegate?.leaveSite()
+        return nil
+    }
+
+    @MainActor
+    func handleVisitSiteAction(params: Any, message: UserScriptMessage) -> Encodable? {
+        delegate?.visitSite()
+        return nil
+    }
+
+    // MARK: - UserValuesNotification
+
+    struct UserValuesNotification: Encodable {
+        let userValuesNotification: UserValues
+    }
+}
+
+protocol SSLErrorPageUserScriptDelegate: AnyObject {
+    func leaveSite()
+    func visitSite()
+}
diff --git a/DuckDuckGo/Favicons/Services/FaviconStore.swift b/DuckDuckGo/Favicons/Services/FaviconStore.swift
index 7e2826c27e..2376d29162 100644
--- a/DuckDuckGo/Favicons/Services/FaviconStore.swift
+++ b/DuckDuckGo/Favicons/Services/FaviconStore.swift
@@ -20,6 +20,7 @@ import Cocoa
 import CoreData
 import Combine
 import Common
+import PixelKit
 
 protocol FaviconStoring {
 
@@ -230,7 +231,7 @@ fileprivate extension Favicon {
               let documentUrl = faviconMO.documentUrlEncrypted as? URL,
               let dateCreated = faviconMO.dateCreated,
               let relation = Favicon.Relation(rawValue: Int(faviconMO.relation)) else {
-            Pixel.fire(.debug(event: .faviconDecryptionFailedUnique), limitTo: .dailyFirst)
+            PixelKit.fire(DebugEvent(GeneralPixel.faviconDecryptionFailedUnique), frequency: .daily)
             assertionFailure("Favicon: Failed to init Favicon from FaviconManagedObject")
             return nil
         }
diff --git a/DuckDuckGo/FeatureFlagging/Model/FeatureFlag.swift b/DuckDuckGo/FeatureFlagging/Model/FeatureFlag.swift
index 8b784addef..32c34a8b9b 100644
--- a/DuckDuckGo/FeatureFlagging/Model/FeatureFlag.swift
+++ b/DuckDuckGo/FeatureFlagging/Model/FeatureFlag.swift
@@ -21,6 +21,7 @@ import BrowserServicesKit
 
 public enum FeatureFlag: String {
     case debugMenu
+    case sslCertificatesBypass
 
     /// Add experimental atb parameter to SERP queries for internal users to display Privacy Reminder
     /// https://app.asana.com/0/1199230911884351/1205979030848528/f
@@ -34,6 +35,8 @@ extension FeatureFlag: FeatureFlagSourceProviding {
             return .internalOnly
         case .appendAtbToSerpQueries:
             return .internalOnly
+        case .sslCertificatesBypass:
+            return .remoteReleasable(.subfeature(sslCertificatesSubfeature.allowBypass))
         }
     }
 }
diff --git a/DuckDuckGo/Feedback/Model/FeedbackSender.swift b/DuckDuckGo/Feedback/Model/FeedbackSender.swift
index 3e032d36aa..09be2ef5a7 100644
--- a/DuckDuckGo/Feedback/Model/FeedbackSender.swift
+++ b/DuckDuckGo/Feedback/Model/FeedbackSender.swift
@@ -19,6 +19,7 @@
 import Common
 import Foundation
 import Networking
+import PixelKit
 
 final class FeedbackSender {
 
@@ -43,7 +44,7 @@ final class FeedbackSender {
         request.fetch { _, error in
             if let error = error {
                 os_log("FeedbackSender: Failed to submit feedback %s", type: .error, error.localizedDescription)
-                Pixel.fire(.debug(event: .feedbackReportingFailed, error: error))
+                PixelKit.fire(DebugEvent(GeneralPixel.feedbackReportingFailed, error: error))
             }
         }
     }
diff --git a/DuckDuckGo/Feedback/View/FeedbackViewController.swift b/DuckDuckGo/Feedback/View/FeedbackViewController.swift
index ff45c1a7e9..6bec572e75 100644
--- a/DuckDuckGo/Feedback/View/FeedbackViewController.swift
+++ b/DuckDuckGo/Feedback/View/FeedbackViewController.swift
@@ -75,7 +75,7 @@ final class FeedbackViewController: NSViewController {
 
     var currentTab: Tab?
     var currentTabUrl: URL? {
-        guard let url = currentTab?.content.url else {
+        guard let url = currentTab?.content.urlForWebView else {
             return nil
         }
 
diff --git a/DuckDuckGo/FileDownload/Extensions/WKWebView+Download.swift b/DuckDuckGo/FileDownload/Extensions/WKWebView+Download.swift
index ad211f4eba..757f50f845 100644
--- a/DuckDuckGo/FileDownload/Extensions/WKWebView+Download.swift
+++ b/DuckDuckGo/FileDownload/Extensions/WKWebView+Download.swift
@@ -24,11 +24,7 @@ import WebKit
 extension WKWebView {
 
     var suggestedFilename: String? {
-        guard let title = self.title?.replacingOccurrences(of: "[~#@*+%{}<>\\[\\]|\"\\_^\\/:\\\\]",
-                                                           with: "_",
-                                                           options: .regularExpression),
-              !title.isEmpty
-        else {
+        guard let title = self.title?.replacingInvalidFileNameCharacters(), !title.isEmpty else {
             return url?.suggestedFilename
         }
         return title.appending(".html")
diff --git a/UnitTests/FileDownload/Helpers/DownloadListStoreMock.swift b/DuckDuckGo/FileDownload/Model/DownloadListStoreMock.swift
similarity index 92%
rename from UnitTests/FileDownload/Helpers/DownloadListStoreMock.swift
rename to DuckDuckGo/FileDownload/Model/DownloadListStoreMock.swift
index 28001ba4e1..edae68b750 100644
--- a/UnitTests/FileDownload/Helpers/DownloadListStoreMock.swift
+++ b/DuckDuckGo/FileDownload/Model/DownloadListStoreMock.swift
@@ -17,12 +17,12 @@
 //
 
 import Foundation
-@testable import DuckDuckGo_Privacy_Browser
 
+#if DEBUG
 final class DownloadListStoreMock: DownloadListStoring {
 
     var fetchBlock: ((@escaping @MainActor (Result<[DownloadListItem], Error>) -> Void) -> Void)?
-    func fetch(completionHandler: @escaping @MainActor (Result<[DuckDuckGo_Privacy_Browser.DownloadListItem], any Error>) -> Void) {
+    func fetch(completionHandler: @escaping @MainActor (Result<[DownloadListItem], any Error>) -> Void) {
         fetchBlock?(completionHandler)
     }
 
@@ -42,3 +42,4 @@ final class DownloadListStoreMock: DownloadListStoring {
     }
 
 }
+#endif
diff --git a/DuckDuckGo/FileDownload/Model/DownloadViewModel.swift b/DuckDuckGo/FileDownload/Model/DownloadViewModel.swift
index cdcdadf330..d22e8a9e6e 100644
--- a/DuckDuckGo/FileDownload/Model/DownloadViewModel.swift
+++ b/DuckDuckGo/FileDownload/Model/DownloadViewModel.swift
@@ -75,7 +75,7 @@ final class DownloadViewModel {
     }
 
     func update(with item: DownloadListItem) {
-        self.localURL = item.destinationURL
+        self.localURL = item.tempURL == nil ? item.destinationURL : nil // only return destination file URL for completed downloads
         self.filename = item.fileName
         let oldState = self.state
         let newState = State(item: item, shouldAnimateOnAppear: state.shouldAnimateOnAppear ?? true)
diff --git a/DuckDuckGo/FileDownload/Model/FilePresenter.swift b/DuckDuckGo/FileDownload/Model/FilePresenter.swift
index be8d94e8a6..1770935af2 100644
--- a/DuckDuckGo/FileDownload/Model/FilePresenter.swift
+++ b/DuckDuckGo/FileDownload/Model/FilePresenter.swift
@@ -23,7 +23,6 @@ import Foundation
 private protocol FilePresenterDelegate: AnyObject {
     var logger: FilePresenterLogger { get }
     var url: URL? { get }
-    var primaryPresentedItemURL: URL? { get }
     func presentedItemDidMove(to newURL: URL)
     func accommodatePresentedItemDeletion() throws
     func accommodatePresentedItemEviction() throws
@@ -57,12 +56,14 @@ internal class FilePresenter {
         final let presentedItemOperationQueue: OperationQueue
         fileprivate final weak var delegate: FilePresenterDelegate?
 
-        init(presentedItemOperationQueue: OperationQueue) {
+        init(presentedItemOperationQueue: OperationQueue, delegate: FilePresenterDelegate) {
             self.presentedItemOperationQueue = presentedItemOperationQueue
+            self.delegate = delegate
         }
 
+        final var fallbackPresentedItemURL: URL?
         final var presentedItemURL: URL? {
-            guard let delegate else { return nil }
+            guard let delegate else { return fallbackPresentedItemURL }
             FilePresenter.dispatchSourceQueue.async {
                 // prevent owning FilePresenter deallocation inside the presentedItemURL getter
                 withExtendedLifetime(delegate) {}
@@ -72,12 +73,10 @@ internal class FilePresenter {
         }
 
         final func presentedItemDidMove(to newURL: URL) {
-            assert(delegate != nil)
             delegate?.presentedItemDidMove(to: newURL)
         }
 
         func accommodatePresentedItemDeletion(completionHandler: @escaping @Sendable ((any Error)?) -> Void) {
-            assert(delegate != nil)
             do {
                 try delegate?.accommodatePresentedItemDeletion()
                 completionHandler(nil)
@@ -87,9 +86,8 @@ internal class FilePresenter {
         }
 
         func accommodatePresentedItemEviction(completionHandler: @escaping @Sendable ((any Error)?) -> Void) {
-            assert(delegate != nil)
             do {
-            try delegate?.accommodatePresentedItemEviction()
+                try delegate?.accommodatePresentedItemEviction()
                 completionHandler(nil)
             } catch {
                 completionHandler(error)
@@ -100,74 +98,138 @@ internal class FilePresenter {
 
     final private class DelegatingRelatedFilePresenter: DelegatingFilePresenter {
 
-        var primaryPresentedItemURL: URL? {
-            let url = delegate?.primaryPresentedItemURL
-            return url
+        let primaryPresentedItemURL: URL?
+
+        init(primaryPresentedItemURL: URL?, presentedItemOperationQueue: OperationQueue, delegate: FilePresenterDelegate) {
+            self.primaryPresentedItemURL = primaryPresentedItemURL
+            super.init(presentedItemOperationQueue: presentedItemOperationQueue, delegate: delegate)
         }
 
     }
 
     fileprivate let lock = NSLock()
-    private var innerPresenter: DelegatingFilePresenter?
+    private var innerPresenters = [DelegatingFilePresenter]()
     private var dispatchSourceCancellable: AnyCancellable?
 
     fileprivate let logger: any FilePresenterLogger
 
-    let primaryPresentedItemURL: URL?
-
-    private var _url: URL?
+    private var urlController: SecurityScopedFileURLController?
     final var url: URL? {
         lock.withLock {
-            _url
+            urlController?.url
         }
     }
     private func setURL(_ newURL: URL?) {
-        guard let oldValue = lock.withLock({ () -> URL?? in
-            let oldValue = _url
-            guard oldValue != newURL else { return URL??.none }
-            _url = newURL
-            return oldValue
-        }) else { return }
+        guard let oldValue = lock.withLock({ _setURL(newURL) }) else { return }
 
         didSetURL(newURL, oldValue: oldValue)
     }
 
+    // inside locked scope
+    private func _setURL(_ newURL: URL?) -> URL?? /* returns old value (URL?) if new value was updated */ {
+        let oldValue = urlController?.url
+        guard oldValue != newURL else { return URL??.none }
+        guard let newURL else {
+            urlController = nil
+            return newURL
+        }
+
+        // if the new url is pointing to the same path (only letter case has changed) - keep its sandbox extension in a new Controller
+        if let urlController, let oldValue,
+           oldValue.resolvingSymlinksInPath().path == newURL.resolvingSymlinksInPath().path,
+           urlController.isManagingSecurityScope {
+            urlController.updateUrlKeepingSandboxExtensionRetainCount(newURL)
+        } else {
+            urlController = SecurityScopedFileURLController(url: newURL, logger: logger)
+        }
+
+        return oldValue
+    }
+
     private var urlSubject = PassthroughSubject<URL?, Never>()
     final var urlPublisher: AnyPublisher<URL?, Never> {
         urlSubject.prepend(url).eraseToAnyPublisher()
     }
 
-    init(url: URL, primaryItemURL: URL? = nil, logger: FilePresenterLogger = OSLog.disabled, createIfNeededCallback: ((URL) throws -> URL)? = nil) throws {
-        self._url = url
-        self.primaryPresentedItemURL = primaryItemURL
+    /// - Parameter url: represented file URL access to which is coordinated by the File Presenter.
+    /// - Parameter consumeUnbalancedStartAccessingResource: assume the `url` is already accessible (e.g. after choosing the file using Open Panel).
+    ///   would cause an unbalanced `stopAccessingSecurityScopedResource` call on the File Presenter deallocation.
+    /// - Note: see https://stackoverflow.com/questions/25627628/sandboxed-mac-app-exhausting-security-scoped-url-resources
+    init(url: URL, consumeUnbalancedStartAccessingResource: Bool = false, logger: FilePresenterLogger = OSLog.disabled, createIfNeededCallback: ((URL) throws -> URL)? = nil) throws {
+        self.urlController = SecurityScopedFileURLController(url: url, manageSecurityScope: consumeUnbalancedStartAccessingResource, logger: logger)
+
         self.logger = logger
 
-        let innerPresenter: DelegatingFilePresenter
-        if primaryItemURL != nil {
-            innerPresenter = DelegatingRelatedFilePresenter(presentedItemOperationQueue: FilePresenter.presentedItemOperationQueue)
+        do {
+            try setupInnerPresenter(for: url, primaryItemURL: nil, createIfNeededCallback: createIfNeededCallback)
+            logger.log("🗄️  added file presenter for \"\(url.path)\"")
+        } catch {
+            removeFilePresenters()
+            throw error
+        }
+    }
+
+    /// - Parameter url: represented file URL access to which is coordinated by the File Presenter.
+    /// - Parameter primaryItemURL: URL to a main file resource access to which has been granted.
+    ///   Used to grant out-of-sandbox access to `url` representing a “related” resource like “download.duckload” where the `primaryItemURL` would point to “download.zip”.
+    /// - Note: the related (“duckload”) file extension should be registered in the Info.plist with `NSIsRelatedItemType` flag set to `true`.
+    /// - Note: when presenting a related item the security scoped resource access will always be stopped on the File Presenter deallocation
+    /// - Parameter consumeUnbalancedStartAccessingResource: assume the `url` is already accessible (e.g. after choosing the file using Open Panel).
+    ///   would cause an unbalanced `stopAccessingSecurityScopedResource` call on the File Presenter deallocation.
+    init(url: URL, primaryItemURL: URL, logger: FilePresenterLogger = OSLog.disabled, createIfNeededCallback: ((URL) throws -> URL)? = nil) throws {
+        self.urlController = SecurityScopedFileURLController(url: url, logger: logger)
+        self.logger = logger
+
+        do {
+            try setupInnerPresenter(for: url, primaryItemURL: primaryItemURL, createIfNeededCallback: createIfNeededCallback)
+            logger.log("🗄️  added file presenter for \"\(url.path) primary item: \"\(primaryItemURL.path)\"")
+        } catch {
+            removeFilePresenters()
+            throw error
+        }
+    }
+
+    private func setupInnerPresenter(for url: URL, primaryItemURL: URL?, createIfNeededCallback: ((URL) throws -> URL)?) throws {
+        let innerPresenter = if let primaryItemURL {
+            DelegatingRelatedFilePresenter(primaryPresentedItemURL: primaryItemURL, presentedItemOperationQueue: FilePresenter.presentedItemOperationQueue, delegate: self)
         } else {
-            innerPresenter = DelegatingFilePresenter(presentedItemOperationQueue: FilePresenter.presentedItemOperationQueue)
+            DelegatingFilePresenter(presentedItemOperationQueue: FilePresenter.presentedItemOperationQueue, delegate: self)
         }
-        self.innerPresenter = innerPresenter
-        innerPresenter.delegate = self
+        self.innerPresenters = [innerPresenter]
+
         NSFileCoordinator.addFilePresenter(innerPresenter)
 
         if !FileManager.default.fileExists(atPath: url.path) {
-            if let createFile = createIfNeededCallback {
-                logger.log("🗄️💥 creating file for presenter at \"\(url.path)\"")
-                self._url = try coordinateWrite(at: url, using: createFile)
-
-                // re-add File Presenter for the updated URL
+            guard let createFile = createIfNeededCallback else {
+                throw CocoaError(.fileReadNoSuchFile, userInfo: [NSFilePathErrorKey: url.path])
+            }
+            logger.log("🗄️💥 creating file for presenter at \"\(url.path)\"")
+            // create new file at the presented URL using the provided callback and update URL if needed
+            _=self._setURL(
+                try coordinateWrite(at: url, using: createFile)
+            )
+
+            if primaryItemURL == nil {
+                // Remove and re-add the file presenter for regular item presenters.
                 NSFileCoordinator.removeFilePresenter(innerPresenter)
                 NSFileCoordinator.addFilePresenter(innerPresenter)
-
-            } else {
-                throw CocoaError(.fileReadNoSuchFile, userInfo: [NSFilePathErrorKey: url.path])
             }
         }
-        addFSODispatchSource(for: url)
+        // to correctly handle file move events for a “related” item presenters we need to use a secondary presenter
+        if primaryItemURL != nil {
+            // set permanent original url without tracking file movements
+            // to correctly release the sandbox extension when the “related” presenter is removed
+            innerPresenter.fallbackPresentedItemURL = url
+            innerPresenter.delegate = nil
+
+            let innerPresenter2 = DelegatingFilePresenter(presentedItemOperationQueue: FilePresenter.presentedItemOperationQueue, delegate: self)
+            NSFileCoordinator.addFilePresenter(innerPresenter2)
+            innerPresenters.append(innerPresenter2)
+        }
 
-        logger.log("🗄️  added file presenter for \"\(url.path)\"\(primaryPresentedItemURL != nil ? " primary item: \"\(primaryPresentedItemURL!.path)\"" : "")")
+        try coordinateRead(at: url, with: .withoutChanges) { url in
+            addFSODispatchSource(for: url)
+        }
     }
 
     private func addFSODispatchSource(for url: URL) {
@@ -187,7 +249,7 @@ internal class FilePresenter {
             self.logger.log("🗄️⚠️ file delete event handler: \"\(url.path)\"")
             var resolvedBookmarkData: URL? {
                 var isStale = false
-                guard let presenter = self as? SandboxFilePresenter,
+                guard let presenter = self as? BookmarkFilePresenter,
                       let bookmarkData = presenter.fileBookmarkData,
                       let url = try? URL(resolvingBookmarkData: bookmarkData, bookmarkDataIsStale: &isStale) else {
                     if FileManager().fileExists(atPath: url.path) { return url } // file still exists but with different letter case ?
@@ -212,25 +274,36 @@ internal class FilePresenter {
         dispatchSource.resume()
     }
 
-    private func removeFilePresenter() {
-        if let innerPresenter {
-            logger.log("🗄️  removing file presenter for \"\(url?.path ?? "<nil>")\"")
+    private func removeFilePresenters() {
+        for (idx, innerPresenter) in innerPresenters.enumerated() {
+            // innerPresenter delegate won‘t be available at this point when called from `deinit`,
+            // so set the final url here to correctly remove the presenter.
+            if innerPresenter.fallbackPresentedItemURL == nil {
+                innerPresenter.fallbackPresentedItemURL = urlController?.url
+            }
+            logger.log("🗄️  removing file presenter \(idx) for \"\(innerPresenter.presentedItemURL?.path ?? "<nil>")\"")
             NSFileCoordinator.removeFilePresenter(innerPresenter)
-            self.innerPresenter = nil
         }
+        if innerPresenters.count > 1 {
+            // ”related” item File Presenters make an unbalanced sandbox extension retain,
+            // release the actual file URL sandbox extension by calling an extra `stopAccessingSecurityScopedResource`
+            urlController?.url.consumeUnbalancedStartAccessingSecurityScopedResource()
+        }
+        innerPresenters = []
     }
 
     fileprivate func didSetURL(_ newValue: URL?, oldValue: URL?) {
-        assert(newValue != oldValue)
+        assert(newValue == nil || newValue != oldValue)
         logger.log("🗄️  did update url from \"\(oldValue?.path ?? "<nil>")\" to \"\(newValue?.path ?? "<nil>")\"")
         urlSubject.send(newValue)
     }
 
     deinit {
-        removeFilePresenter()
+        removeFilePresenters()
     }
 
 }
+
 extension FilePresenter: FilePresenterDelegate {
 
     func presentedItemDidMove(to newURL: URL) {
@@ -240,8 +313,9 @@ extension FilePresenter: FilePresenterDelegate {
 
     func accommodatePresentedItemDeletion() throws {
         logger.log("🗄️  accommodatePresentedItemDeletion (\"\(url?.path ?? "<nil>")\")")
+        // should go before resetting the URL to correctly remove File Presenter
+        removeFilePresenters()
         setURL(nil)
-        removeFilePresenter()
     }
 
     func accommodatePresentedItemEviction() throws {
@@ -254,9 +328,7 @@ extension FilePresenter: FilePresenterDelegate {
 /// Maintains File Bookmark Data for presented resource URL
 /// and manages its sandbox security scope access calling `stopAccessingSecurityScopedResource` on deinit
 /// balanced with preceding `startAccessingSecurityScopedResource`
-final class SandboxFilePresenter: FilePresenter {
-
-    private let securityScopedURL: URL?
+final class BookmarkFilePresenter: FilePresenter {
 
     private var _fileBookmarkData: Data?
     final var fileBookmarkData: Data? {
@@ -271,21 +343,31 @@ final class SandboxFilePresenter: FilePresenter {
     }
 
     /// - Parameter url: represented file URL access to which is coordinated by the File Presenter.
-    /// - Parameter primaryItemURL: URL to a main file resource access to which has been granted.
-    ///   Used to grant out-of-sandbox access to `url` representing a “secondary” resource like “download.duckload” where the `primaryItemURL` would point to “download.zip”.
-    /// - Note: the secondary (“duckload”) file extension should be registered in the Info.plist with `NSIsRelatedItemType` flag set to `true`.
     /// - Parameter consumeUnbalancedStartAccessingResource: assume the `url` is already accessible (e.g. after choosing the file using Open Panel).
     ///   would cause an unbalanced `stopAccessingSecurityScopedResource` call on the File Presenter deallocation.
-    init(url: URL, primaryItemURL: URL? = nil, consumeUnbalancedStartAccessingResource: Bool = false, logger: FilePresenterLogger = OSLog.disabled, createIfNeededCallback: ((URL) throws -> URL)? = nil) throws {
+    override init(url: URL, consumeUnbalancedStartAccessingResource: Bool = false, logger: FilePresenterLogger = OSLog.disabled, createIfNeededCallback: ((URL) throws -> URL)? = nil) throws {
 
-        if consumeUnbalancedStartAccessingResource || url.startAccessingSecurityScopedResource() == true {
-            self.securityScopedURL = url
-            logger.log("🏝️ \(consumeUnbalancedStartAccessingResource ? "consuming unbalanced startAccessingResource for" : "started resource access for") \"\(url.path)\"")
-        } else {
-            self.securityScopedURL = nil
-            logger.log("🏖️ didn‘t start resource access for \"\(url.path)\"")
+        try super.init(url: url, consumeUnbalancedStartAccessingResource: consumeUnbalancedStartAccessingResource, logger: logger, createIfNeededCallback: createIfNeededCallback)
+
+        do {
+            try self.coordinateRead(at: url, with: .withoutChanges) { url in
+                logger.log("📒 updating bookmark data for \"\(url.path)\"")
+                self._fileBookmarkData = try url.bookmarkData(options: .withSecurityScope)
+            }
+        } catch {
+            logger.log("📕 bookmark data retreival failed for \"\(url.path)\": \(error)")
+            throw error
         }
+    }
 
+    /// - Parameter url: represented file URL access to which is coordinated by the File Presenter.
+    /// - Parameter primaryItemURL: URL to a main file resource access to which has been granted.
+    ///   Used to grant out-of-sandbox access to `url` representing a “related” resource like “download.duckload” where the `primaryItemURL` would point to “download.zip”.
+    /// - Note: the related (“duckload”) file extension should be registered in the Info.plist with `NSIsRelatedItemType` flag set to `true`.
+    /// - Note: when presenting a related item the security scoped resource access will always be stopped on the File Presenter deallocation
+    /// - Parameter consumeUnbalancedStartAccessingResource: assume the `url` is already accessible (e.g. after choosing the file using Open Panel).
+    ///   would cause an unbalanced `stopAccessingSecurityScopedResource` call on the File Presenter deallocation.
+    override init(url: URL, primaryItemURL: URL, logger: FilePresenterLogger = OSLog.disabled, createIfNeededCallback: ((URL) throws -> URL)? = nil) throws {
         try super.init(url: url, primaryItemURL: primaryItemURL, logger: logger, createIfNeededCallback: createIfNeededCallback)
 
         do {
@@ -305,15 +387,8 @@ final class SandboxFilePresenter: FilePresenter {
         var isStale = false
         logger.log("📒 resolving url from bookmark data")
         let url = try URL(resolvingBookmarkData: fileBookmarkData, options: .withSecurityScope, bookmarkDataIsStale: &isStale)
-        if url.startAccessingSecurityScopedResource() == true {
-            self.securityScopedURL = url
-            logger.log("🏝️ started resource access for \"\(url.path)\"\(isStale ? " (stale)" : "")")
-        } else {
-            self.securityScopedURL = nil
-            logger.log("🏖️ didn‘t start resource access for \"\(url.path)\"\(isStale ? " (stale)" : "")")
-        }
 
-        try super.init(url: url, logger: logger)
+        try super.init(url: url, consumeUnbalancedStartAccessingResource: true, logger: logger)
 
         if isStale {
             DispatchQueue.global().async { [weak self] in
@@ -346,25 +421,18 @@ final class SandboxFilePresenter: FilePresenter {
         fileBookmarkDataSubject.send(fileBookmarkData)
     }
 
-    deinit {
-        if let securityScopedURL {
-            logger.log("🗄️  stopAccessingSecurityScopedResource \"\(securityScopedURL.path)\"")
-            securityScopedURL.stopAccessingSecurityScopedResource()
-        }
-    }
-
 }
 
 extension FilePresenter {
 
     func coordinateRead<T>(at url: URL? = nil, with options: NSFileCoordinator.ReadingOptions = [], using reader: (URL) throws -> T) throws -> T {
-        guard let innerPresenter, let url = url ?? self.url else { throw CocoaError(.fileNoSuchFile) }
+        guard let innerPresenter = innerPresenters.last, let url = url ?? self.url else { throw CocoaError(.fileNoSuchFile) }
 
         return try NSFileCoordinator(filePresenter: innerPresenter).coordinateRead(at: url, with: options, using: reader)
     }
 
     func coordinateWrite<T>(at url: URL? = nil, with options: NSFileCoordinator.WritingOptions = [], using writer: (URL) throws -> T) throws -> T {
-        guard let innerPresenter, let url = url ?? self.url else { throw CocoaError(.fileNoSuchFile) }
+        guard let innerPresenter = innerPresenters.last, let url = url ?? self.url else { throw CocoaError(.fileNoSuchFile) }
 
         // temporarily disable DispatchSource file removal events
         dispatchSourceCancellable?.cancel()
@@ -377,7 +445,7 @@ extension FilePresenter {
     }
 
     public func coordinateMove<T>(from url: URL? = nil, to: URL, with options2: NSFileCoordinator.WritingOptions = .forReplacing, using move: (URL, URL) throws -> T) throws -> T {
-        guard let innerPresenter, let url = url ?? self.url else { throw CocoaError(.fileNoSuchFile) }
+        guard let innerPresenter = innerPresenters.last, let url = url ?? self.url else { throw CocoaError(.fileNoSuchFile) }
 
         return try NSFileCoordinator(filePresenter: innerPresenter).coordinateMove(from: url, to: to, with: options2, using: move)
     }
@@ -425,33 +493,3 @@ extension NSFileCoordinator {
     }
 
 }
-
-#if DEBUG
-extension NSURL {
-
-    private static var stopAccessingSecurityScopedResourceCallback: ((URL) -> Void)?
-
-    private static let originalStopAccessingSecurityScopedResource = {
-        class_getInstanceMethod(NSURL.self, #selector(NSURL.stopAccessingSecurityScopedResource))!
-    }()
-    private static let swizzledStopAccessingSecurityScopedResource = {
-        class_getInstanceMethod(NSURL.self, #selector(NSURL.swizzled_stopAccessingSecurityScopedResource))!
-    }()
-    private static let swizzleStopAccessingSecurityScopedResourceOnce: Void = {
-        method_exchangeImplementations(originalStopAccessingSecurityScopedResource, swizzledStopAccessingSecurityScopedResource)
-    }()
-
-    static func swizzleStopAccessingSecurityScopedResource(with stopAccessingSecurityScopedResourceCallback: ((URL) -> Void)?) {
-        _=swizzleStopAccessingSecurityScopedResourceOnce
-        self.stopAccessingSecurityScopedResourceCallback = stopAccessingSecurityScopedResourceCallback
-    }
-
-    @objc private dynamic func swizzled_stopAccessingSecurityScopedResource() {
-        if let stopAccessingSecurityScopedResourceCallback = Self.stopAccessingSecurityScopedResourceCallback {
-            stopAccessingSecurityScopedResourceCallback(self as URL)
-        }
-        self.swizzled_stopAccessingSecurityScopedResource() // call original
-    }
-
-}
-#endif
diff --git a/DuckDuckGo/FileDownload/Model/NSURL+sandboxExtensionRetainCount.m b/DuckDuckGo/FileDownload/Model/NSURL+sandboxExtensionRetainCount.m
new file mode 100644
index 0000000000..8a312c2fb0
--- /dev/null
+++ b/DuckDuckGo/FileDownload/Model/NSURL+sandboxExtensionRetainCount.m
@@ -0,0 +1,40 @@
+//
+//  NSURL+sandboxExtensionRetainCount.m
+//
+//  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/Foundation.h>
+
+// Macro for adding quotes
+#define STRINGIFY(X) STRINGIFY2(X)
+#define STRINGIFY2(X) #X
+
+#import STRINGIFY(SWIFT_OBJC_INTERFACE_HEADER_NAME)
+
+@implementation NSURL (sandboxExtensionRetainCount)
+
+/**
+ * This method will be automatically called at app launch time to swizzle `startAccessingSecurityScopedResource` and
+ * `stopAccessingSecurityScopedResource` methods to accurately reflect the current number of start and stop calls
+ * stored in the associated `NSURL.sandboxExtensionRetainCount` value.
+ *
+ * See SecurityScopedFileURLController.swift
+ */
++ (void)initialize {
+    [self swizzleStartStopAccessingSecurityScopedResourceOnce];
+}
+
+@end
diff --git a/DuckDuckGo/FileDownload/Model/SecurityScopedFileURLController.swift b/DuckDuckGo/FileDownload/Model/SecurityScopedFileURLController.swift
new file mode 100644
index 0000000000..bec94e02ac
--- /dev/null
+++ b/DuckDuckGo/FileDownload/Model/SecurityScopedFileURLController.swift
@@ -0,0 +1,182 @@
+//
+//  SecurityScopedFileURLController.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
+
+/// Manages security-scoped resource access to a file URL.
+///
+/// This class is designed to consume unbalanced `startAccessingSecurityScopedResource` calls and ensure proper
+/// resource cleanup by calling `stopAccessingSecurityScopedResource` the appropriate number of times
+/// to end the resource access securely.
+///
+/// - Note: Used in conjunction with NSURL extension swizzling the `startAccessingSecurityScopedResource` and
+///         `stopAccessingSecurityScopedResource` methods to accurately reflect the current number of start and stop calls.
+///         The number is reflected in the associated `URL.sandboxExtensionRetainCount` value.
+final class SecurityScopedFileURLController {
+
+    fileprivate let logger: any FilePresenterLogger
+
+    private(set) var url: URL
+    let isManagingSecurityScope: Bool
+
+    /// Initializes a new instance of `SecurityScopedFileURLController` with the provided URL and security-scoped resource handling options.
+    ///
+    /// - Parameters:
+    ///   - url: The URL of the file to manage.
+    ///   - manageSecurityScope: A Boolean value indicating whether the controller should manage the URL security scope access (i.e. call stop and end accessing resource methods).
+    ///   - logger: An optional logger instance for logging file operations. Defaults to disabled.
+    /// - Note: when `manageSecurityScope` is `true` access to the represented URL will be stopped for the whole app on the controller deallocation.
+    init(url: URL, manageSecurityScope: Bool = true, logger: any FilePresenterLogger = OSLog.disabled) {
+        assert(url.isFileURL)
+#if APPSTORE
+        let didStartAccess = manageSecurityScope && url.startAccessingSecurityScopedResource()
+#else
+        let didStartAccess = false
+#endif
+        self.url = url
+        self.isManagingSecurityScope = didStartAccess
+        self.logger = logger
+        logger.log("\(didStartAccess ? "🧪 " : "")SecurityScopedFileURLController.init: \(url.sandboxExtensionRetainCount) – \"\(url.path)\"")
+    }
+
+    func updateUrlKeepingSandboxExtensionRetainCount(_ newURL: URL) {
+        guard newURL as NSURL !== url as NSURL else { return }
+
+        for _ in 0..<url.sandboxExtensionRetainCount {
+            newURL.consumeUnbalancedStartAccessingSecurityScopedResource()
+        }
+        self.url = newURL
+    }
+
+    deinit {
+        if isManagingSecurityScope {
+            let url = url
+            logger.log("\(isManagingSecurityScope ? "🪓 " : "")SecurityScopedFileURLController.deinit: \(url.sandboxExtensionRetainCount) – \"\(url.path)\"")
+            for _ in 0..<(url as NSURL).sandboxExtensionRetainCount {
+                url.stopAccessingSecurityScopedResource()
+            }
+
+#if DEBUG && APPSTORE
+            url.ensureUrlIsNotWritable {
+            #if SANDBOX_TEST_TOOL
+                logger.log("❗️ url \(url.path) is still writable after stopping access to it")
+                fatalError("❗️ url \(url.path) is still writable after stopping access to it")
+            #else
+                breakByRaisingSigInt("❗️ url \(url.path) is still writable after stopping access to it")
+            #endif
+            }
+#endif
+        }
+    }
+
+}
+
+extension NSURL {
+
+    private static let originalStopAccessingSecurityScopedResource = {
+        class_getInstanceMethod(NSURL.self, #selector(NSURL.stopAccessingSecurityScopedResource))!
+    }()
+    private static let swizzledStopAccessingSecurityScopedResource = {
+        class_getInstanceMethod(NSURL.self, #selector(NSURL.swizzled_stopAccessingSecurityScopedResource))!
+    }()
+    private static let originalStartAccessingSecurityScopedResource = {
+        class_getInstanceMethod(NSURL.self, #selector(NSURL.startAccessingSecurityScopedResource))!
+    }()
+    private static let swizzledStartAccessingSecurityScopedResource = {
+        class_getInstanceMethod(NSURL.self, #selector(NSURL.swizzled_startAccessingSecurityScopedResource))!
+    }()
+
+    private static let _swizzleStartStopAccessingSecurityScopedResourceOnce: Void = {
+        method_exchangeImplementations(originalStopAccessingSecurityScopedResource, swizzledStopAccessingSecurityScopedResource)
+        method_exchangeImplementations(originalStartAccessingSecurityScopedResource, swizzledStartAccessingSecurityScopedResource)
+    }()
+    @objc static func swizzleStartStopAccessingSecurityScopedResourceOnce() {
+        _=_swizzleStartStopAccessingSecurityScopedResourceOnce
+    }
+
+    @objc private dynamic func swizzled_startAccessingSecurityScopedResource() -> Bool {
+        if self.swizzled_startAccessingSecurityScopedResource() /* call original */ {
+            sandboxExtensionRetainCount += 1
+            return true
+        }
+        return false
+    }
+
+    @objc private dynamic func swizzled_stopAccessingSecurityScopedResource() {
+        self.swizzled_stopAccessingSecurityScopedResource() // call original
+
+        var sandboxExtensionRetainCount = self.sandboxExtensionRetainCount
+        if sandboxExtensionRetainCount > 0 {
+            sandboxExtensionRetainCount -= 1
+            self.sandboxExtensionRetainCount = sandboxExtensionRetainCount
+        }
+    }
+
+    private static let sandboxExtensionRetainCountKey = UnsafeRawPointer(bitPattern: "sandboxExtensionRetainCountKey".hashValue)!
+    fileprivate(set) var sandboxExtensionRetainCount: Int {
+        get {
+            (objc_getAssociatedObject(self, Self.sandboxExtensionRetainCountKey) as? NSNumber)?.intValue ?? 0
+        }
+        set {
+            objc_setAssociatedObject(self, Self.sandboxExtensionRetainCountKey, NSNumber(value: newValue), .OBJC_ASSOCIATION_RETAIN)
+#if DEBUG
+            if newValue > 0 {
+                NSURL.activeSecurityScopedUrlUsages.insert(.init(url: self))
+            } else {
+                NSURL.activeSecurityScopedUrlUsages.remove(.init(url: self))
+            }
+#endif
+        }
+    }
+
+#if DEBUG
+    struct SecurityScopedUrlUsage: Hashable {
+        let url: NSURL
+        // hash url as object address
+        func hash(into hasher: inout Hasher) {
+            hasher.combine(ObjectIdentifier(url))
+        }
+        static func == (lhs: Self, rhs: Self) -> Bool {
+            lhs.url === rhs.url
+        }
+    }
+    static var activeSecurityScopedUrlUsages: Set<SecurityScopedUrlUsage> = []
+#endif
+
+}
+
+extension URL {
+
+    /// The number of times the security-scoped resource associated with the URL has been accessed
+    /// using `startAccessingSecurityScopedResource` without a corresponding call to
+    /// `stopAccessingSecurityScopedResource`. This property provides a count of active accesses
+    /// to the security-scoped resource, helping manage resource cleanup and ensure proper
+    /// handling of security-scoped resources.
+    ///
+    /// - Note: Accessing this property requires NSURL extension swizzling of `startAccessingSecurityScopedResource`
+    ///         and `stopAccessingSecurityScopedResource` methods to accurately track the count.
+    var sandboxExtensionRetainCount: Int {
+        (self as NSURL).sandboxExtensionRetainCount
+    }
+
+    func consumeUnbalancedStartAccessingSecurityScopedResource() {
+        (self as NSURL).sandboxExtensionRetainCount += 1
+    }
+
+}
diff --git a/DuckDuckGo/FileDownload/Model/WebKitDownloadTask.swift b/DuckDuckGo/FileDownload/Model/WebKitDownloadTask.swift
index a39f173fa1..db56c4d535 100644
--- a/DuckDuckGo/FileDownload/Model/WebKitDownloadTask.swift
+++ b/DuckDuckGo/FileDownload/Model/WebKitDownloadTask.swift
@@ -22,6 +22,7 @@ import Foundation
 import Navigation
 import UniformTypeIdentifiers
 import WebKit
+import PixelKit
 
 protocol WebKitDownloadTaskDelegate: AnyObject {
     func fileDownloadTaskNeedsDestinationURL(_ task: WebKitDownloadTask, suggestedFilename: String, suggestedFileType: UTType?) async -> (URL?, UTType?)
@@ -116,6 +117,7 @@ final class WebKitDownloadTask: NSObject, ProgressReporting, @unchecked Sendable
     @MainActor private var itemReplacementDirectory: URL?
     @MainActor private var itemReplacementDirectoryFSOCancellable: AnyCancellable?
     @MainActor private var tempFileUrlCancellable: AnyCancellable?
+    @MainActor private(set) var selectedDestinationURL: URL?
 
     var originalRequest: URLRequest? {
         download.originalRequest
@@ -226,6 +228,13 @@ final class WebKitDownloadTask: NSObject, ProgressReporting, @unchecked Sendable
         do {
             let fm = FileManager()
             guard let destinationURL else { throw URLError(.cancelled) }
+            // in case we‘re overwriting the URL – increment the access counter for the duration of the method
+            let accessStarted = destinationURL.startAccessingSecurityScopedResource()
+            defer {
+                if accessStarted {
+                    destinationURL.stopAccessingSecurityScopedResource()
+                }
+            }
             os_log(.debug, log: log, "download task callback: creating temp directory for \"\(destinationURL.path)\"")
 
             switch cleanupStyle {
@@ -266,7 +275,7 @@ final class WebKitDownloadTask: NSObject, ProgressReporting, @unchecked Sendable
 
                 self.download.cancel()
                 self.finish(with: .failure(.failedToCompleteDownloadTask(underlyingError: error, resumeData: nil, isRetryable: false)))
-                Pixel.fire(.debug(event: .fileGetDownloadLocationFailed, error: error))
+                PixelKit.fire(DebugEvent(GeneralPixel.fileGetDownloadLocationFailed, error: error))
             }
             return nil
         }
@@ -326,22 +335,22 @@ final class WebKitDownloadTask: NSObject, ProgressReporting, @unchecked Sendable
             self.download.cancel()
             self.finish(with: .failure(.failedToCompleteDownloadTask(underlyingError: error, resumeData: nil, isRetryable: false)))
 
-            Pixel.fire(.debug(event: .fileDownloadCreatePresentersFailed, error: error))
+            PixelKit.fire(DebugEvent(GeneralPixel.fileDownloadCreatePresentersFailed, error: error))
         }
     }
 
     /// opens File Presenters for destination file and temp file
     private nonisolated func filePresenters(for destinationURL: URL, tempURL: URL) async throws -> (tempFile: FilePresenter, destinationFile: FilePresenter) {
         var destinationURL = destinationURL
-        let duckloadURL = destinationURL.deletingPathExtension().appendingPathExtension(Self.downloadExtension)
-        let fm = FileManager.default
+        var duckloadURL = destinationURL.deletingPathExtension().appendingPathExtension(Self.downloadExtension)
+        let fm = FileManager()
 
         // 🧙‍♂️ now we‘re doing do some magique here 🧙‍♂️
         // --------------------------------------
         os_log(.debug, log: log, "🧙‍♂️ magique.start: \"\(destinationURL.path)\" (\"\(duckloadURL.path)\") directory writable: \(fm.isWritableFile(atPath: destinationURL.deletingLastPathComponent().path))")
         // 1. create our final destination file (let‘s say myfile.zip) and setup a File Presenter for it
         //    doing this we preserve access to the file until it‘s actually downloaded
-        let destinationFilePresenter = try SandboxFilePresenter(url: destinationURL, consumeUnbalancedStartAccessingResource: true, logger: log) { url in
+        let destinationFilePresenter = try BookmarkFilePresenter(url: destinationURL, consumeUnbalancedStartAccessingResource: true, logger: log) { url in
             try fm.createFile(atPath: url.path, contents: nil) ? url : {
                 throw CocoaError(.fileWriteNoPermission, userInfo: [NSFilePathErrorKey: url.path])
             }()
@@ -353,45 +362,76 @@ final class WebKitDownloadTask: NSObject, ProgressReporting, @unchecked Sendable
 
         // 2. mark the file as hidden until it‘s downloaded to not to confuse user
         //    and prevent from unintentional opening of the empty file
-        var resourceValues = URLResourceValues()
-        resourceValues.isHidden = true
-        try destinationURL.setResourceValues(resourceValues)
-        os_log(.debug, log: log, "🧙‍♂️ \"\(destinationURL.path)\" hidden, moving temp file from \"\(tempURL.path)\" to \"\(duckloadURL.path)\"")
+        try destinationURL.setFileHidden(true)
+        os_log(.debug, log: log, "🧙‍♂️ \"\(destinationURL.path)\" hidden")
 
-        // 3. then we move the temporary download file to the destination directory (myfile.zip.duckload)
+        // 3. then we move the temporary download file to the destination directory (myfile.duckload)
         //    this is doable in sandboxed builds by using “Related Items” i.e. using a file URL with an extra
         //    `.duckload` extension appended and “Primary Item” pointing to the sandbox-accessible destination URL
         //    the `.duckload` document type is registered in the Info.plist with `NSIsRelatedItemType` flag
         //
         // -  after the file is downloaded we‘ll replace the destination file with the `.duckload` file
         if fm.fileExists(atPath: duckloadURL.path) {
-            // remove the `.duckload` item if already exists
+            // `.duckload` already exists
             do {
-                try FilePresenter(url: duckloadURL, primaryItemURL: destinationURL).coordinateWrite(with: .forDeleting) { duckloadURL in
-                    try fm.removeItem(at: duckloadURL)
-                }
+                try chooseAlternativeDuckloadFileNameOrRemove(&duckloadURL, destinationURL: destinationURL)
             } catch {
                 // that‘s ok, we‘ll keep using the original temp file
-                os_log(.error, log: log, "❗️ could not remove \"\(duckloadURL.path)\" \(error)")
+                os_log(.error, log: log, "❗️ can‘t resolve duckload file exists: \"\(duckloadURL.path)\": \(error)")
+                duckloadURL = tempURL
             }
         }
-        // now move the temp file to `.duckload` instantiating a File Presenter with it
-        let tempFilePresenter = try SandboxFilePresenter(url: duckloadURL, primaryItemURL: destinationURL, logger: log) { [log] duckloadURL in
-            do {
-                try fm.moveItem(at: tempURL, to: duckloadURL)
-            } catch {
-                // fallback: move failed, keep the temp file in the original location
-                os_log(.error, log: log, "🙁 fallback with \(error), will use \(tempURL.path)")
-                Pixel.fire(.debug(event: .fileAccessRelatedItemFailed, error: error))
-                return tempURL
+
+        let tempFilePresenter = if duckloadURL == tempURL {
+            // we won‘t use a `.duckload` file for this download, the file will be left in the temp location instead
+            try BookmarkFilePresenter(url: duckloadURL, logger: log)
+        } else {
+            // now move the temp file to `.duckload` instantiating a File Presenter with it
+            try BookmarkFilePresenter(url: duckloadURL, primaryItemURL: destinationURL, logger: log) { [log] duckloadURL in
+                do {
+                    try fm.moveItem(at: tempURL, to: duckloadURL)
+                    return duckloadURL
+                } catch {
+                    // fallback: move failed, keep the temp file in the original location
+                    os_log(.error, log: log, "🙁 fallback with \(error), will use \(tempURL.path)")
+                    PixelKit.fire(DebugEvent(GeneralPixel.fileAccessRelatedItemFailed, error: error))
+                    return tempURL
+                }
             }
-            return duckloadURL
         }
         os_log(.debug, log: log, "🧙‍♂️ \"\(duckloadURL.path)\" (\"\(tempFilePresenter.url?.path ?? "<nil>")\") ready")
 
         return (tempFile: tempFilePresenter, destinationFile: destinationFilePresenter)
     }
 
+    private func chooseAlternativeDuckloadFileNameOrRemove(_ duckloadURL: inout URL, destinationURL: URL) throws {
+        let fm = FileManager()
+        // are we using the `.duckload` file for some other download (with different extension)?
+        if NSFileCoordinator.filePresenters.first(where: { $0.presentedItemURL?.resolvingSymlinksInPath() == duckloadURL.resolvingSymlinksInPath() }) != nil {
+            // if the downloads directory is writable without extra permission – try choosing another `.duckload` filename
+            if fm.isWritableFile(atPath: duckloadURL.deletingLastPathComponent().path) {
+                // append `.duckload` to the destination file name with extension
+                let destinationPathExtension = destinationURL.pathExtension
+                let pathExtension = destinationPathExtension.isEmpty ? Self.downloadExtension : destinationPathExtension + "." + Self.downloadExtension
+                duckloadURL = duckloadURL.deletingPathExtension().appendingPathExtension(pathExtension)
+
+                // choose non-existent path
+                duckloadURL = try fm.withNonExistentUrl(for: duckloadURL, incrementingIndexIfExistsUpTo: 1000, pathExtension: pathExtension) { url in
+                    try Data().write(to: url)
+                    return url
+                }
+            } else {
+                // continue keeping the temp file in the temp dir
+                throw CocoaError(.fileWriteFileExists)
+            }
+        }
+
+        os_log(.debug, log: log, "removing temp file \"\(duckloadURL.path)\"")
+        try FilePresenter(url: duckloadURL, primaryItemURL: destinationURL).coordinateWrite(with: .forDeleting) { duckloadURL in
+            try fm.removeItem(at: duckloadURL)
+        }
+    }
+
     private nonisolated func reuseFilePresenters(tempFile: FilePresenter, destination: FilePresenter, tempURL: URL) async throws -> (tempFile: FilePresenter, destinationFile: FilePresenter) {
         // if the download is “resumed” as a new download (replacing the destination file) -
         // use the existing `.duckload` file and move the temp file in its place
@@ -560,7 +600,7 @@ extension WebKitDownloadTask: WKDownloadDelegate {
             progress.totalUnitCount = response.expectedContentLength
         }
 
-        var suggestedFilename = suggestedFilename
+        var suggestedFilename = (suggestedFilename.removingPercentEncoding ?? suggestedFilename).replacingInvalidFileNameCharacters()
         // sometimes suggesteFilename has an extension appended to already present URL file extension
         // e.g. feed.xml.rss for www.domain.com/rss.xml
         if let urlSuggestedFilename = response.url?.suggestedFilename,
@@ -587,6 +627,7 @@ extension WebKitDownloadTask: WKDownloadDelegate {
             return nil
         }
 
+        self.selectedDestinationURL = destinationURL
         return await prepareChosenDestinationURL(destinationURL, fileType: suggestedFileType, cleanupStyle: cleanupStyle)
     }
 
@@ -646,7 +687,7 @@ extension WebKitDownloadTask: WKDownloadDelegate {
             self.finish(with: .success(destinationFile))
 
         } catch {
-            Pixel.fire(.debug(event: .fileMoveToDownloadsFailed, error: error))
+            PixelKit.fire(DebugEvent(GeneralPixel.fileMoveToDownloadsFailed, error: error))
             os_log(.error, log: log, "fileMoveToDownloadsFailed: \(error)")
             self.finish(with: .failure(.failedToCompleteDownloadTask(underlyingError: error, resumeData: nil, isRetryable: false)))
         }
@@ -697,20 +738,7 @@ extension WebKitDownloadTask {
     override var description: String {
         guard Thread.isMainThread else {
 #if DEBUG
-            os_log("""
-
-
-            ------------------------------------------------------------------------------------------------------
-                BREAK:
-            ------------------------------------------------------------------------------------------------------
-
-            ❗️accessing WebKitDownloadTask.description from non-main thread
-
-                Hit Continue (^⌘Y) to continue program execution
-            ------------------------------------------------------------------------------------------------------
-
-            """, type: .fault)
-            raise(SIGINT)
+            breakByRaisingSigInt("❗️accessing WebKitDownloadTask.description from non-main thread")
 #endif
             return ""
         }
diff --git a/DuckDuckGo/FileDownload/Services/DownloadListCoordinator.swift b/DuckDuckGo/FileDownload/Services/DownloadListCoordinator.swift
index a7d0b3e1d3..55763a2c5c 100644
--- a/DuckDuckGo/FileDownload/Services/DownloadListCoordinator.swift
+++ b/DuckDuckGo/FileDownload/Services/DownloadListCoordinator.swift
@@ -20,6 +20,7 @@ import Combine
 import Common
 import Foundation
 import Navigation
+import PixelKit
 
 @MainActor
 private func getFirstAvailableWebView() -> WKWebView? {
@@ -54,7 +55,7 @@ final class DownloadListCoordinator {
     enum UpdateKind {
         case added
         case removed
-        case updated
+        case updated(oldValue: DownloadListItem)
     }
     typealias Update = (kind: UpdateKind, item: DownloadListItem)
     private let updatesSubject = PassthroughSubject<Update, Never>()
@@ -152,9 +153,9 @@ final class DownloadListCoordinator {
         // locate destination file
         let destinationPresenterResult = Result<FilePresenter?, Error> {
             if let destinationFileBookmarkData = item.destinationFileBookmarkData {
-                try SandboxFilePresenter(fileBookmarkData: destinationFileBookmarkData, logger: log)
+                try BookmarkFilePresenter(fileBookmarkData: destinationFileBookmarkData, logger: log)
             } else if let destinationURL = item.destinationURL {
-                try SandboxFilePresenter(url: destinationURL, logger: log)
+                try BookmarkFilePresenter(url: destinationURL, logger: log)
             } else {
                 nil
             }
@@ -163,9 +164,9 @@ final class DownloadListCoordinator {
         // locate temp download file
         var tempFilePresenterResult = Result<FilePresenter?, Error> {
             if let tempFileBookmarkData = item.tempFileBookmarkData {
-                try SandboxFilePresenter(fileBookmarkData: tempFileBookmarkData, logger: log)
+                try BookmarkFilePresenter(fileBookmarkData: tempFileBookmarkData, logger: log)
             } else if let tempURL = item.tempURL {
-                try SandboxFilePresenter(url: tempURL, logger: log)
+                try BookmarkFilePresenter(url: tempURL, logger: log)
             } else {
                 nil
             }
@@ -223,10 +224,10 @@ final class DownloadListCoordinator {
                     case .downloading(destination: let destination, tempFile: let tempFile):
                         self.addItemIfNeededAndSubscribe(to: (destination, tempFile), for: item)
                     case .downloaded(let destination):
-                        let updatedItem = self.downloadTask(task, withId: item.identifier, completedWith: .finished)
+                        let updatedItem = self.downloadTask(task, withOriginalItem: item, completedWith: .finished)
                         self.subscribeToPresenters((destination: destination, tempFile: nil), of: updatedItem ?? item)
                     case .failed(destination: let destination, tempFile: let tempFile, resumeData: _, error: let error):
-                        let updatedItem = self.downloadTask(task, withId: item.identifier, completedWith: .failure(error))
+                        let updatedItem = self.downloadTask(task, withOriginalItem: item, completedWith: .failure(error))
                         self.subscribeToPresenters((destination: destination, tempFile: tempFile), of: updatedItem ?? item)
                     }
                 }
@@ -250,7 +251,7 @@ final class DownloadListCoordinator {
 
         Publishers.CombineLatest(
             presenters.destination?.urlPublisher ?? Just(nil).eraseToAnyPublisher(),
-            (presenters.destination as? SandboxFilePresenter)?.fileBookmarkDataPublisher ?? Just(nil).eraseToAnyPublisher()
+            (presenters.destination as? BookmarkFilePresenter)?.fileBookmarkDataPublisher ?? Just(nil).eraseToAnyPublisher()
         )
         .scan((oldURL: nil, newURL: nil, fileBookmarkData: nil)) { (oldURL: $0.newURL, newURL: $1.0, fileBookmarkData: $1.1) }
         .sink { [weak self] oldURL, newURL, fileBookmarkData in
@@ -279,7 +280,7 @@ final class DownloadListCoordinator {
 
         Publishers.CombineLatest(
             presenters.tempFile?.urlPublisher ?? Just(nil).eraseToAnyPublisher(),
-            (presenters.tempFile as? SandboxFilePresenter)?.fileBookmarkDataPublisher ?? Just(nil).eraseToAnyPublisher()
+            (presenters.tempFile as? BookmarkFilePresenter)?.fileBookmarkDataPublisher ?? Just(nil).eraseToAnyPublisher()
         )
         .scan((oldURL: nil, newURL: nil, fileBookmarkData: nil)) { (oldURL: $0.newURL, newURL: $1.0, fileBookmarkData: $1.1) }
         .sink { [weak self] oldURL, newURL, fileBookmarkData in
@@ -341,19 +342,25 @@ final class DownloadListCoordinator {
     }
 
     @MainActor
-    private func downloadTask(_ task: WebKitDownloadTask, withId identifier: UUID, completedWith result: Subscribers.Completion<FileDownloadError>) -> DownloadListItem? {
-        os_log(.debug, log: log, "coordinator: task did finish \(identifier) \(task) with .\(result)")
+    private func downloadTask(_ task: WebKitDownloadTask, withOriginalItem initialItem: DownloadListItem, completedWith result: Subscribers.Completion<FileDownloadError>) -> DownloadListItem? {
+        os_log(.debug, log: log, "coordinator: task did finish \(initialItem.identifier) \(task) with .\(result)")
 
         self.downloadTaskCancellables[task] = nil
 
-        // item will be really updated (completed) only if it was added before in `addItemOrUpdateFilePresenter` (when state switched to .downloading)
-        // if it has failed without starting - it won‘t be added or updated here
-        return updateItem(withId: identifier) { item in
+        return updateItem(withId: initialItem.identifier) { item in
             if item?.isBurner ?? false {
                 item = nil
                 return
             }
 
+            if item == nil,
+                case .failure(let failure) = result, !failure.isCancelled,
+                let fileName = task.selectedDestinationURL?.lastPathComponent {
+                // add instantly failed downloads to the list (not user-cancelled)
+                item = initialItem
+                item?.fileName = fileName
+            }
+
             item?.progress = nil
             if case .failure(let error) = result {
                 item?.error = error
@@ -379,8 +386,8 @@ final class DownloadListCoordinator {
         case (.none, .some(let item)):
             self.updatesSubject.send((.added, item))
             store.save(item)
-        case (.some, .some(let item)):
-            self.updatesSubject.send((.updated, item))
+        case (.some(let oldValue), .some(let item)):
+            self.updatesSubject.send((.updated(oldValue: oldValue), item))
             store.save(item)
         case (.some(let item), .none):
             item.progress?.cancel()
@@ -446,10 +453,9 @@ final class DownloadListCoordinator {
 
     @MainActor
     func downloads<T: Comparable>(sortedBy keyPath: KeyPath<DownloadListItem, T>, ascending: Bool) -> [DownloadListItem] {
-        let comparator: (T, T) -> Bool = ascending ? (<) : (>)
-        return items.values.sorted(by: {
-            comparator($0[keyPath: keyPath], $1[keyPath: keyPath])
-        })
+        return items.values.sorted {
+            ascending ? ($0[keyPath: keyPath] < $1[keyPath: keyPath]) : ($0[keyPath: keyPath] > $1[keyPath: keyPath])
+        }
     }
 
     var updates: AnyPublisher<Update, Never> {
@@ -477,7 +483,7 @@ final class DownloadListCoordinator {
                 }
             } catch {
                 assertionFailure("Resume data coding failed: \(error)")
-                Pixel.fire(.debug(event: .downloadResumeDataCodingFailed, error: error))
+                PixelKit.fire(DebugEvent(GeneralPixel.downloadResumeDataCodingFailed, error: error))
             }
 
             webView.resumeDownload(fromResumeData: resumeData,
diff --git a/DuckDuckGo/FileDownload/Services/DownloadListStore.swift b/DuckDuckGo/FileDownload/Services/DownloadListStore.swift
index cec1d0e0da..9af9ffb38a 100644
--- a/DuckDuckGo/FileDownload/Services/DownloadListStore.swift
+++ b/DuckDuckGo/FileDownload/Services/DownloadListStore.swift
@@ -21,6 +21,7 @@ import Common
 import CoreData
 import Foundation
 import UniformTypeIdentifiers
+import PixelKit
 
 protocol DownloadListStoring {
 
@@ -191,7 +192,7 @@ extension DownloadListItem {
               let modified = managedObject.modified,
               let url = managedObject.urlEncrypted as? URL
         else {
-            Pixel.fire(.debug(event: .downloadListItemDecryptionFailedUnique), limitTo: .dailyFirst)
+            PixelKit.fire(DebugEvent(GeneralPixel.downloadListItemDecryptionFailedUnique), frequency: .daily)
             assertionFailure("DownloadListItem: Failed to init from ManagedObject")
             return nil
         }
diff --git a/DuckDuckGo/FileDownload/View/Downloads.storyboard b/DuckDuckGo/FileDownload/View/Downloads.storyboard
deleted file mode 100644
index 41e5511da3..0000000000
--- a/DuckDuckGo/FileDownload/View/Downloads.storyboard
+++ /dev/null
@@ -1,483 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="22505" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="luO-ux-o3b">
-    <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22505"/>
-        <capability name="Named colors" minToolsVersion="9.0"/>
-        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
-    </dependencies>
-    <scenes>
-        <!--Downloads View Controller-->
-        <scene sceneID="fl2-yQ-6W0">
-            <objects>
-                <viewController storyboardIdentifier="PasswordManagement" id="luO-ux-o3b" customClass="DownloadsViewController" customModule="DuckDuckGo_Privacy_Browser" customModuleProvider="target" sceneMemberID="viewController">
-                    <view key="view" id="7fC-jy-ghc">
-                        <rect key="frame" x="0.0" y="0.0" width="420" height="484"/>
-                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                        <subviews>
-                            <customView translatesAutoresizingMaskIntoConstraints="NO" id="Bcr-Im-bcg">
-                                <rect key="frame" x="0.0" y="0.0" width="420" height="484"/>
-                                <subviews>
-                                    <box verticalHuggingPriority="750" boxType="separator" translatesAutoresizingMaskIntoConstraints="NO" id="wlm-tA-4J8">
-                                        <rect key="frame" x="1" y="438" width="418" height="5"/>
-                                    </box>
-                                    <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="h7h-Ho-bYo">
-                                        <rect key="frame" x="10" y="453" width="80" height="19"/>
-                                        <textFieldCell key="cell" lineBreakMode="clipping" title="Downloads" id="RlL-xR-1s1">
-                                            <font key="font" textStyle="title3" name=".SFNS-Regular"/>
-                                            <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
-                                            <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
-                                        </textFieldCell>
-                                    </textField>
-                                    <button translatesAutoresizingMaskIntoConstraints="NO" id="aKx-1h-4hp" userLabel="Downloads Button" customClass="MouseOverButton" customModule="DuckDuckGo_Privacy_Browser" customModuleProvider="target">
-                                        <rect key="frame" x="345" y="447" width="32" height="32"/>
-                                        <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="OpenDownloadsFolder" imagePosition="only" alignment="center" imageScaling="proportionallyDown" inset="2" id="zPp-Ue-FE8">
-                                            <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                                            <font key="font" metaFont="system"/>
-                                        </buttonCell>
-                                        <color key="contentTintColor" name="ButtonColor"/>
-                                        <constraints>
-                                            <constraint firstAttribute="width" constant="32" id="qmK-lZ-dXW"/>
-                                            <constraint firstAttribute="height" constant="32" id="x7g-Vs-qTK"/>
-                                        </constraints>
-                                        <userDefinedRuntimeAttributes>
-                                            <userDefinedRuntimeAttribute type="color" keyPath="mouseOverColor">
-                                                <color key="value" name="ButtonMouseOverColor"/>
-                                            </userDefinedRuntimeAttribute>
-                                            <userDefinedRuntimeAttribute type="color" keyPath="mouseDownColor">
-                                                <color key="value" name="ButtonMouseDownColor"/>
-                                            </userDefinedRuntimeAttribute>
-                                            <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
-                                                <real key="value" value="4"/>
-                                            </userDefinedRuntimeAttribute>
-                                            <userDefinedRuntimeAttribute type="point" keyPath="backgroundInset">
-                                                <point key="value" x="2" y="2"/>
-                                            </userDefinedRuntimeAttribute>
-                                        </userDefinedRuntimeAttributes>
-                                        <connections>
-                                            <action selector="openDownloadsFolderAction:" target="luO-ux-o3b" id="8Eo-z4-5r2"/>
-                                        </connections>
-                                    </button>
-                                    <button translatesAutoresizingMaskIntoConstraints="NO" id="cev-k6-wFH" userLabel="Downloads Button" customClass="MouseOverButton" customModule="DuckDuckGo_Privacy_Browser" customModuleProvider="target">
-                                        <rect key="frame" x="377" y="447" width="32" height="32"/>
-                                        <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="ClearDownloads" imagePosition="only" alignment="center" imageScaling="proportionallyDown" inset="2" id="rtz-Fb-5yl">
-                                            <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                                            <font key="font" metaFont="system"/>
-                                        </buttonCell>
-                                        <color key="contentTintColor" name="ButtonColor"/>
-                                        <constraints>
-                                            <constraint firstAttribute="width" constant="32" id="3WQ-PO-rHo"/>
-                                            <constraint firstAttribute="height" constant="32" id="mKF-nC-42R"/>
-                                        </constraints>
-                                        <userDefinedRuntimeAttributes>
-                                            <userDefinedRuntimeAttribute type="color" keyPath="mouseOverColor">
-                                                <color key="value" name="ButtonMouseOverColor"/>
-                                            </userDefinedRuntimeAttribute>
-                                            <userDefinedRuntimeAttribute type="color" keyPath="mouseDownColor">
-                                                <color key="value" name="ButtonMouseDownColor"/>
-                                            </userDefinedRuntimeAttribute>
-                                            <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
-                                                <real key="value" value="4"/>
-                                            </userDefinedRuntimeAttribute>
-                                            <userDefinedRuntimeAttribute type="point" keyPath="backgroundInset">
-                                                <point key="value" x="2" y="2"/>
-                                            </userDefinedRuntimeAttribute>
-                                        </userDefinedRuntimeAttributes>
-                                        <connections>
-                                            <action selector="clearDownloadsAction:" target="luO-ux-o3b" id="lD3-iw-Nrz"/>
-                                        </connections>
-                                    </button>
-                                    <scrollView borderType="none" autohidesScrollers="YES" horizontalLineScroll="60" horizontalPageScroll="10" verticalLineScroll="60" verticalPageScroll="10" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="v01-Bs-7xy">
-                                        <rect key="frame" x="0.0" y="0.0" width="420" height="440"/>
-                                        <clipView key="contentView" drawsBackground="NO" id="wkx-Z3-x2p">
-                                            <rect key="frame" x="0.0" y="0.0" width="420" height="440"/>
-                                            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                                            <subviews>
-                                                <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" tableStyle="fullWidth" columnReordering="NO" columnResizing="NO" multipleSelection="NO" autosaveColumns="NO" typeSelect="NO" rowHeight="60" viewBased="YES" id="zWp-mP-b3k">
-                                                    <rect key="frame" x="0.0" y="0.0" width="420" height="440"/>
-                                                    <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                                                    <color key="backgroundColor" name="ClearColor"/>
-                                                    <color key="gridColor" name="ClearColor"/>
-                                                    <tableColumns>
-                                                        <tableColumn width="408" minWidth="40" maxWidth="1000" id="BU8-mD-jcA">
-                                                            <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border">
-                                                                <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
-                                                                <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
-                                                            </tableHeaderCell>
-                                                            <textFieldCell key="dataCell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" title="Text Cell" id="hGV-2f-V4L">
-                                                                <font key="font" metaFont="system"/>
-                                                                <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
-                                                                <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
-                                                            </textFieldCell>
-                                                            <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
-                                                            <prototypeCellViews>
-                                                                <tableCellView identifier="cell" id="0Hy-P1-z0d" customClass="DownloadsCellView" customModule="DuckDuckGo_Privacy_Browser" customModuleProvider="target">
-                                                                    <rect key="frame" x="0.0" y="0.0" width="420" height="60"/>
-                                                                    <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                                                                    <subviews>
-                                                                        <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="hpj-1Y-eDv">
-                                                                            <rect key="frame" x="7" y="14" width="32" height="32"/>
-                                                                            <constraints>
-                                                                                <constraint firstAttribute="width" constant="32" id="0po-LV-gLD"/>
-                                                                                <constraint firstAttribute="height" constant="32" id="OH2-MV-vxr"/>
-                                                                            </constraints>
-                                                                            <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" id="Iz7-Te-xl9"/>
-                                                                        </imageView>
-                                                                        <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="w5d-I6-kEZ">
-                                                                            <rect key="frame" x="43" y="32" width="335" height="16"/>
-                                                                            <constraints>
-                                                                                <constraint firstAttribute="height" constant="16" id="e05-6Y-K6e"/>
-                                                                            </constraints>
-                                                                            <textFieldCell key="cell" lineBreakMode="truncatingMiddle" truncatesLastVisibleLine="YES" sendsActionOnEndEditing="YES" title="Table View Cell" id="7cy-zt-Zxl">
-                                                                                <font key="font" usesAppearanceFont="YES"/>
-                                                                                <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
-                                                                                <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
-                                                                            </textFieldCell>
-                                                                        </textField>
-                                                                        <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="ziJ-5p-mOT">
-                                                                            <rect key="frame" x="43" y="13" width="335" height="16"/>
-                                                                            <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Table View Cell" usesSingleLineMode="YES" id="P5k-0F-CZE">
-                                                                                <font key="font" usesAppearanceFont="YES"/>
-                                                                                <color key="textColor" name="secondaryLabelColor" catalog="System" colorSpace="catalog"/>
-                                                                                <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
-                                                                            </textFieldCell>
-                                                                        </textField>
-                                                                        <button horizontalHuggingPriority="750" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="CEa-RP-JgA" customClass="MouseOverButton" customModule="DuckDuckGo_Privacy_Browser" customModuleProvider="target">
-                                                                            <rect key="frame" x="384" y="14" width="32" height="32"/>
-                                                                            <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="CancelDownload" imagePosition="only" alignment="center" imageScaling="proportionallyDown" inset="2" id="kcy-Qa-BSO">
-                                                                                <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                                                                                <font key="font" metaFont="system"/>
-                                                                            </buttonCell>
-                                                                            <constraints>
-                                                                                <constraint firstAttribute="width" constant="32" id="AKX-kw-xvN"/>
-                                                                                <constraint firstAttribute="height" constant="32" id="HHP-yL-gQB"/>
-                                                                            </constraints>
-                                                                            <userDefinedRuntimeAttributes>
-                                                                                <userDefinedRuntimeAttribute type="color" keyPath="mouseOverColor">
-                                                                                    <color key="value" name="ButtonMouseOverColor"/>
-                                                                                </userDefinedRuntimeAttribute>
-                                                                                <userDefinedRuntimeAttribute type="color" keyPath="mouseDownColor">
-                                                                                    <color key="value" name="ButtonMouseDownColor"/>
-                                                                                </userDefinedRuntimeAttribute>
-                                                                                <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
-                                                                                    <real key="value" value="4"/>
-                                                                                </userDefinedRuntimeAttribute>
-                                                                                <userDefinedRuntimeAttribute type="point" keyPath="backgroundInset">
-                                                                                    <point key="value" x="2" y="2"/>
-                                                                                </userDefinedRuntimeAttribute>
-                                                                            </userDefinedRuntimeAttributes>
-                                                                            <connections>
-                                                                                <action selector="cancelDownloadAction:" target="luO-ux-o3b" id="Cq9-Zq-NDo"/>
-                                                                            </connections>
-                                                                        </button>
-                                                                        <button horizontalHuggingPriority="750" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Ejd-n2-PCA" customClass="MouseOverButton" customModule="DuckDuckGo_Privacy_Browser" customModuleProvider="target">
-                                                                            <rect key="frame" x="384" y="14" width="32" height="32"/>
-                                                                            <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="RevealDownload" imagePosition="only" alignment="center" imageScaling="proportionallyDown" inset="2" id="8X3-Se-bda">
-                                                                                <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                                                                                <font key="font" metaFont="system"/>
-                                                                            </buttonCell>
-                                                                            <constraints>
-                                                                                <constraint firstAttribute="width" constant="32" id="qKm-7W-LEz"/>
-                                                                                <constraint firstAttribute="height" constant="32" id="qsN-ta-Rgl"/>
-                                                                            </constraints>
-                                                                            <userDefinedRuntimeAttributes>
-                                                                                <userDefinedRuntimeAttribute type="color" keyPath="mouseOverColor">
-                                                                                    <color key="value" name="ButtonMouseOverColor"/>
-                                                                                </userDefinedRuntimeAttribute>
-                                                                                <userDefinedRuntimeAttribute type="color" keyPath="mouseDownColor">
-                                                                                    <color key="value" name="ButtonMouseDownColor"/>
-                                                                                </userDefinedRuntimeAttribute>
-                                                                                <userDefinedRuntimeAttribute type="point" keyPath="backgroundInset">
-                                                                                    <point key="value" x="2" y="2"/>
-                                                                                </userDefinedRuntimeAttribute>
-                                                                                <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
-                                                                                    <real key="value" value="4"/>
-                                                                                </userDefinedRuntimeAttribute>
-                                                                            </userDefinedRuntimeAttributes>
-                                                                            <connections>
-                                                                                <action selector="revealDownloadAction:" target="luO-ux-o3b" id="8i5-el-ZyA"/>
-                                                                            </connections>
-                                                                        </button>
-                                                                        <button horizontalHuggingPriority="750" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="foT-7L-XqL" customClass="MouseOverButton" customModule="DuckDuckGo_Privacy_Browser" customModuleProvider="target">
-                                                                            <rect key="frame" x="384" y="14" width="32" height="32"/>
-                                                                            <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="RestartDownload" imagePosition="only" alignment="center" imageScaling="proportionallyDown" inset="2" id="OH5-JL-AF7">
-                                                                                <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                                                                                <font key="font" metaFont="system"/>
-                                                                            </buttonCell>
-                                                                            <constraints>
-                                                                                <constraint firstAttribute="height" constant="32" id="ZVA-V5-l0y"/>
-                                                                                <constraint firstAttribute="width" constant="32" id="bXx-M6-jmk"/>
-                                                                            </constraints>
-                                                                            <userDefinedRuntimeAttributes>
-                                                                                <userDefinedRuntimeAttribute type="color" keyPath="mouseOverColor">
-                                                                                    <color key="value" name="ButtonMouseOverColor"/>
-                                                                                </userDefinedRuntimeAttribute>
-                                                                                <userDefinedRuntimeAttribute type="color" keyPath="mouseDownColor">
-                                                                                    <color key="value" name="ButtonMouseDownColor"/>
-                                                                                </userDefinedRuntimeAttribute>
-                                                                                <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
-                                                                                    <real key="value" value="4"/>
-                                                                                </userDefinedRuntimeAttribute>
-                                                                                <userDefinedRuntimeAttribute type="point" keyPath="backgroundInset">
-                                                                                    <point key="value" x="2" y="2"/>
-                                                                                </userDefinedRuntimeAttribute>
-                                                                            </userDefinedRuntimeAttributes>
-                                                                            <connections>
-                                                                                <action selector="restartDownloadAction:" target="luO-ux-o3b" id="g4e-M0-Abr"/>
-                                                                            </connections>
-                                                                        </button>
-                                                                        <customView translatesAutoresizingMaskIntoConstraints="NO" id="BUB-Ea-xr5" customClass="CircularProgressView" customModule="DuckDuckGo_Privacy_Browser" customModuleProvider="target">
-                                                                            <rect key="frame" x="387" y="17" width="27" height="27"/>
-                                                                            <constraints>
-                                                                                <constraint firstAttribute="height" constant="27" id="eYj-jc-HTB"/>
-                                                                                <constraint firstAttribute="width" constant="27" id="vVc-1u-0F0"/>
-                                                                            </constraints>
-                                                                        </customView>
-                                                                        <box verticalHuggingPriority="750" boxType="separator" translatesAutoresizingMaskIntoConstraints="NO" id="Fue-CV-Ukm">
-                                                                            <rect key="frame" x="0.0" y="-2" width="420" height="5"/>
-                                                                        </box>
-                                                                    </subviews>
-                                                                    <constraints>
-                                                                        <constraint firstAttribute="bottom" secondItem="Fue-CV-Ukm" secondAttribute="bottom" id="0h7-2u-nBf"/>
-                                                                        <constraint firstItem="ziJ-5p-mOT" firstAttribute="leading" secondItem="w5d-I6-kEZ" secondAttribute="leading" id="0iP-dw-9x9"/>
-                                                                        <constraint firstAttribute="trailing" secondItem="CEa-RP-JgA" secondAttribute="trailing" constant="4" id="1Ev-zW-tFt"/>
-                                                                        <constraint firstItem="Ejd-n2-PCA" firstAttribute="centerX" secondItem="foT-7L-XqL" secondAttribute="centerX" id="5EG-iy-UAq"/>
-                                                                        <constraint firstItem="CEa-RP-JgA" firstAttribute="centerX" secondItem="BUB-Ea-xr5" secondAttribute="centerX" id="AUi-Ig-OGp"/>
-                                                                        <constraint firstItem="w5d-I6-kEZ" firstAttribute="top" secondItem="0Hy-P1-z0d" secondAttribute="top" constant="12" id="EHy-1C-DMS"/>
-                                                                        <constraint firstItem="CEa-RP-JgA" firstAttribute="centerY" secondItem="0Hy-P1-z0d" secondAttribute="centerY" id="PT1-2e-9ta"/>
-                                                                        <constraint firstItem="Fue-CV-Ukm" firstAttribute="leading" secondItem="0Hy-P1-z0d" secondAttribute="leading" id="QBC-Js-e0p"/>
-                                                                        <constraint firstItem="Fue-CV-Ukm" firstAttribute="top" secondItem="ziJ-5p-mOT" secondAttribute="bottom" constant="12" id="QwU-JU-idK"/>
-                                                                        <constraint firstItem="hpj-1Y-eDv" firstAttribute="centerY" secondItem="0Hy-P1-z0d" secondAttribute="centerY" id="T7a-0E-ouJ"/>
-                                                                        <constraint firstItem="CEa-RP-JgA" firstAttribute="leading" secondItem="w5d-I6-kEZ" secondAttribute="trailing" constant="8" id="U1h-uy-ann"/>
-                                                                        <constraint firstItem="Ejd-n2-PCA" firstAttribute="centerY" secondItem="foT-7L-XqL" secondAttribute="centerY" id="ZL1-MJ-Czx"/>
-                                                                        <constraint firstItem="CEa-RP-JgA" firstAttribute="centerY" secondItem="BUB-Ea-xr5" secondAttribute="centerY" id="enG-OL-lav"/>
-                                                                        <constraint firstItem="w5d-I6-kEZ" firstAttribute="leading" secondItem="hpj-1Y-eDv" secondAttribute="trailing" constant="6" id="gSS-n9-QXX"/>
-                                                                        <constraint firstAttribute="trailing" secondItem="Fue-CV-Ukm" secondAttribute="trailing" id="oZ0-bh-Iaf"/>
-                                                                        <constraint firstItem="CEa-RP-JgA" firstAttribute="leading" secondItem="ziJ-5p-mOT" secondAttribute="trailing" constant="8" id="rp5-hJ-Ccg"/>
-                                                                        <constraint firstItem="CEa-RP-JgA" firstAttribute="centerX" secondItem="Ejd-n2-PCA" secondAttribute="centerX" id="uRp-Pm-Vkf"/>
-                                                                        <constraint firstItem="hpj-1Y-eDv" firstAttribute="leading" secondItem="0Hy-P1-z0d" secondAttribute="leading" constant="7" id="vnq-0C-72q"/>
-                                                                        <constraint firstItem="CEa-RP-JgA" firstAttribute="centerY" secondItem="Ejd-n2-PCA" secondAttribute="centerY" id="xeM-DX-IDw"/>
-                                                                    </constraints>
-                                                                    <connections>
-                                                                        <outlet property="cancelButton" destination="CEa-RP-JgA" id="6HV-AL-9dV"/>
-                                                                        <outlet property="detailLabel" destination="ziJ-5p-mOT" id="dFW-Ik-GZf"/>
-                                                                        <outlet property="imageView" destination="hpj-1Y-eDv" id="UAL-9t-YeS"/>
-                                                                        <outlet property="progressView" destination="BUB-Ea-xr5" id="TGe-Up-R7s"/>
-                                                                        <outlet property="restartButton" destination="foT-7L-XqL" id="bqc-H9-iee"/>
-                                                                        <outlet property="revealButton" destination="Ejd-n2-PCA" id="14h-MQ-zFZ"/>
-                                                                        <outlet property="separator" destination="Fue-CV-Ukm" id="QsF-aI-dCo"/>
-                                                                        <outlet property="textField" destination="w5d-I6-kEZ" id="2sR-pM-2jL"/>
-                                                                        <outlet property="titleLabel" destination="w5d-I6-kEZ" id="SCM-u6-XnF"/>
-                                                                    </connections>
-                                                                </tableCellView>
-                                                                <tableCellView identifier="NoDownloads" id="q3R-14-XtD" userLabel="No Downloads Cell View" customClass="NoDownloadViewCell" customModule="DuckDuckGo_Privacy_Browser" customModuleProvider="target">
-                                                                    <rect key="frame" x="0.0" y="60" width="420" height="60"/>
-                                                                    <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                                                                    <subviews>
-                                                                        <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="0d3-Th-2Ic">
-                                                                            <rect key="frame" x="144" y="32" width="133" height="16"/>
-                                                                            <textFieldCell key="cell" lineBreakMode="truncatingMiddle" sendsActionOnEndEditing="YES" title="No recent downloads" id="qQZ-ro-Kgg">
-                                                                                <font key="font" usesAppearanceFont="YES"/>
-                                                                                <color key="textColor" name="secondaryLabelColor" catalog="System" colorSpace="catalog"/>
-                                                                                <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
-                                                                            </textFieldCell>
-                                                                        </textField>
-                                                                        <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="l4f-0C-oRY" customClass="LinkButton" customModule="DuckDuckGo_Privacy_Browser" customModuleProvider="target">
-                                                                            <rect key="frame" x="136" y="12" width="149" height="16"/>
-                                                                            <buttonCell key="cell" type="square" title="Open Downloads Folder" bezelStyle="shadowlessSquare" alignment="center" imageScaling="proportionallyDown" inset="2" id="JMw-qp-avv">
-                                                                                <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                                                                                <font key="font" metaFont="system"/>
-                                                                            </buttonCell>
-                                                                            <color key="contentTintColor" name="linkColor" catalog="System" colorSpace="catalog"/>
-                                                                            <connections>
-                                                                                <action selector="openDownloadsFolderAction:" target="luO-ux-o3b" id="3v3-Ae-enC"/>
-                                                                            </connections>
-                                                                        </button>
-                                                                    </subviews>
-                                                                    <constraints>
-                                                                        <constraint firstItem="l4f-0C-oRY" firstAttribute="top" secondItem="0d3-Th-2Ic" secondAttribute="bottom" constant="4" id="AQs-sD-vah"/>
-                                                                        <constraint firstItem="0d3-Th-2Ic" firstAttribute="centerX" secondItem="q3R-14-XtD" secondAttribute="centerX" id="gUI-t6-4w4"/>
-                                                                        <constraint firstItem="l4f-0C-oRY" firstAttribute="centerX" secondItem="q3R-14-XtD" secondAttribute="centerX" id="tSu-Dg-QgC"/>
-                                                                        <constraint firstItem="0d3-Th-2Ic" firstAttribute="top" secondItem="q3R-14-XtD" secondAttribute="top" constant="12" id="x7x-WM-LPh"/>
-                                                                    </constraints>
-                                                                    <connections>
-                                                                        <outlet property="openFolderButton" destination="l4f-0C-oRY" id="EcS-Yt-5FO"/>
-                                                                        <outlet property="titleLabel" destination="0d3-Th-2Ic" id="e4X-dI-J8a"/>
-                                                                    </connections>
-                                                                </tableCellView>
-                                                                <tableCellView identifier="OpenDownloads" id="n1l-Gb-vtG" userLabel="Open Downloads Cell View" customClass="OpenDownloadViewCell" customModule="DuckDuckGo_Privacy_Browser" customModuleProvider="target">
-                                                                    <rect key="frame" x="0.0" y="120" width="420" height="60"/>
-                                                                    <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                                                                    <subviews>
-                                                                        <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Jbc-kS-JbC" customClass="LinkButton" customModule="DuckDuckGo_Privacy_Browser" customModuleProvider="target">
-                                                                            <rect key="frame" x="136" y="22" width="149" height="16"/>
-                                                                            <buttonCell key="cell" type="square" title="Open Downloads Folder" bezelStyle="shadowlessSquare" alignment="center" imageScaling="proportionallyDown" inset="2" id="31c-Jt-x7J">
-                                                                                <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                                                                                <font key="font" metaFont="system"/>
-                                                                            </buttonCell>
-                                                                            <color key="contentTintColor" name="linkColor" catalog="System" colorSpace="catalog"/>
-                                                                            <connections>
-                                                                                <action selector="openDownloadsFolderAction:" target="luO-ux-o3b" id="Q83-M4-EAR"/>
-                                                                            </connections>
-                                                                        </button>
-                                                                    </subviews>
-                                                                    <constraints>
-                                                                        <constraint firstItem="Jbc-kS-JbC" firstAttribute="centerX" secondItem="n1l-Gb-vtG" secondAttribute="centerX" id="tRC-kP-3dA"/>
-                                                                        <constraint firstItem="Jbc-kS-JbC" firstAttribute="centerY" secondItem="n1l-Gb-vtG" secondAttribute="centerY" id="uSf-1L-x5J"/>
-                                                                    </constraints>
-                                                                    <connections>
-                                                                        <outlet property="openFolderButton" destination="Jbc-kS-JbC" id="Iy6-7S-cGF"/>
-                                                                    </connections>
-                                                                </tableCellView>
-                                                            </prototypeCellViews>
-                                                        </tableColumn>
-                                                    </tableColumns>
-                                                    <connections>
-                                                        <action trigger="doubleAction" selector="doubleClickAction:" target="luO-ux-o3b" id="JjW-pA-gxL"/>
-                                                        <outlet property="dataSource" destination="luO-ux-o3b" id="jKn-YV-l8R"/>
-                                                        <outlet property="delegate" destination="luO-ux-o3b" id="ANr-09-OQ0"/>
-                                                        <outlet property="menu" destination="SCZ-TM-duL" id="0my-wn-Pdd"/>
-                                                    </connections>
-                                                </tableView>
-                                            </subviews>
-                                            <nil key="backgroundColor"/>
-                                        </clipView>
-                                        <constraints>
-                                            <constraint firstAttribute="height" constant="440" id="pa7-BQ-jMF"/>
-                                        </constraints>
-                                        <edgeInsets key="contentInsets" left="0.0" right="0.0" top="0.0" bottom="0.0"/>
-                                        <scroller key="horizontalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="YES" id="N8F-en-0JK">
-                                            <rect key="frame" x="-100" y="-100" width="184" height="16"/>
-                                            <autoresizingMask key="autoresizingMask"/>
-                                        </scroller>
-                                        <scroller key="verticalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="NO" id="skh-PL-IgJ">
-                                            <rect key="frame" x="224" y="17" width="15" height="102"/>
-                                            <autoresizingMask key="autoresizingMask"/>
-                                        </scroller>
-                                    </scrollView>
-                                </subviews>
-                                <constraints>
-                                    <constraint firstAttribute="trailing" secondItem="v01-Bs-7xy" secondAttribute="trailing" id="DfP-ji-bgO"/>
-                                    <constraint firstAttribute="bottom" secondItem="v01-Bs-7xy" secondAttribute="bottom" id="Kin-9D-Elb"/>
-                                    <constraint firstItem="h7h-Ho-bYo" firstAttribute="leading" secondItem="Bcr-Im-bcg" secondAttribute="leading" constant="12" id="NbX-pY-e0i"/>
-                                    <constraint firstItem="wlm-tA-4J8" firstAttribute="centerX" secondItem="Bcr-Im-bcg" secondAttribute="centerX" id="Qpp-H8-AEm"/>
-                                    <constraint firstItem="cev-k6-wFH" firstAttribute="leading" secondItem="aKx-1h-4hp" secondAttribute="trailing" id="QvA-Lh-kt7"/>
-                                    <constraint firstAttribute="trailing" secondItem="cev-k6-wFH" secondAttribute="trailing" constant="11" id="TTT-vT-pt8"/>
-                                    <constraint firstItem="wlm-tA-4J8" firstAttribute="width" secondItem="Bcr-Im-bcg" secondAttribute="width" constant="-2" id="VS1-TZ-mGu"/>
-                                    <constraint firstItem="aKx-1h-4hp" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="h7h-Ho-bYo" secondAttribute="trailing" constant="8" id="YCQ-I0-q5P"/>
-                                    <constraint firstItem="aKx-1h-4hp" firstAttribute="centerY" secondItem="h7h-Ho-bYo" secondAttribute="centerY" id="fzW-iW-ujL"/>
-                                    <constraint firstItem="v01-Bs-7xy" firstAttribute="top" secondItem="Bcr-Im-bcg" secondAttribute="top" constant="44" id="kby-oc-5mP"/>
-                                    <constraint firstItem="v01-Bs-7xy" firstAttribute="leading" secondItem="Bcr-Im-bcg" secondAttribute="leading" id="lSf-gv-mXN"/>
-                                    <constraint firstItem="wlm-tA-4J8" firstAttribute="top" secondItem="Bcr-Im-bcg" secondAttribute="top" constant="43" id="lgq-m3-jvf"/>
-                                    <constraint firstItem="h7h-Ho-bYo" firstAttribute="top" secondItem="Bcr-Im-bcg" secondAttribute="top" constant="12" id="q8X-iA-ppm"/>
-                                    <constraint firstItem="cev-k6-wFH" firstAttribute="centerY" secondItem="aKx-1h-4hp" secondAttribute="centerY" id="wcX-HE-efy"/>
-                                </constraints>
-                            </customView>
-                        </subviews>
-                        <constraints>
-                            <constraint firstItem="Bcr-Im-bcg" firstAttribute="top" secondItem="7fC-jy-ghc" secondAttribute="top" id="2xz-VQ-52H"/>
-                            <constraint firstAttribute="trailing" secondItem="Bcr-Im-bcg" secondAttribute="trailing" id="9gQ-8e-KA0"/>
-                            <constraint firstItem="Bcr-Im-bcg" firstAttribute="centerY" secondItem="7fC-jy-ghc" secondAttribute="centerY" id="H5a-rR-stb"/>
-                            <constraint firstAttribute="bottom" secondItem="Bcr-Im-bcg" secondAttribute="bottom" id="aNg-HQ-07t"/>
-                            <constraint firstItem="Bcr-Im-bcg" firstAttribute="leading" secondItem="7fC-jy-ghc" secondAttribute="leading" id="pje-73-8HC"/>
-                            <constraint firstItem="Bcr-Im-bcg" firstAttribute="centerX" secondItem="7fC-jy-ghc" secondAttribute="centerX" id="wWU-OR-U92"/>
-                        </constraints>
-                    </view>
-                    <connections>
-                        <outlet property="clearAllItem" destination="u1l-bF-hk1" id="KhZ-ke-xgr"/>
-                        <outlet property="clearDownloadsButton" destination="cev-k6-wFH" id="LWh-5Y-4p5"/>
-                        <outlet property="contextMenu" destination="SCZ-TM-duL" id="Moa-bC-2Tb"/>
-                        <outlet property="copyDownloadLinkItem" destination="p9Q-4g-R6I" id="VJH-8I-Btg"/>
-                        <outlet property="openDownloadsFolderButton" destination="aKx-1h-4hp" id="kPG-jg-ZTE"/>
-                        <outlet property="openItem" destination="i63-Th-gK9" id="wwV-jq-CNq"/>
-                        <outlet property="openWebsiteItem" destination="ctA-Z1-mdh" id="Fdx-7i-uxS"/>
-                        <outlet property="removeFromListItem" destination="sco-zV-CtX" id="wNw-dg-v6f"/>
-                        <outlet property="restartItem" destination="m1O-Mn-Tpq" id="UcI-Jc-0Gs"/>
-                        <outlet property="showInFinderItem" destination="mpk-Xn-tEe" id="UbD-y3-quN"/>
-                        <outlet property="stopItem" destination="8LJ-NR-kVo" id="VKl-cp-Bvp"/>
-                        <outlet property="tableView" destination="zWp-mP-b3k" id="uqE-oO-u61"/>
-                        <outlet property="tableViewHeightConstraint" destination="pa7-BQ-jMF" id="i8E-WJ-esr"/>
-                        <outlet property="titleLabel" destination="h7h-Ho-bYo" id="G9g-GN-Vii"/>
-                    </connections>
-                </viewController>
-                <customObject id="mPI-ye-bXg" userLabel="First Responder" customClass="NSResponder" sceneMemberID="firstResponder"/>
-                <menu id="SCZ-TM-duL">
-                    <items>
-                        <menuItem title="Open" id="i63-Th-gK9">
-                            <modifierMask key="keyEquivalentModifierMask"/>
-                            <connections>
-                                <action selector="openDownloadedFileAction:" target="luO-ux-o3b" id="rOb-xY-TJ5"/>
-                            </connections>
-                        </menuItem>
-                        <menuItem title="Show in Finder" id="mpk-Xn-tEe">
-                            <modifierMask key="keyEquivalentModifierMask"/>
-                            <connections>
-                                <action selector="revealDownloadAction:" target="luO-ux-o3b" id="aZQ-EM-c9f"/>
-                            </connections>
-                        </menuItem>
-                        <menuItem isSeparatorItem="YES" id="hjD-Lt-7jR"/>
-                        <menuItem title="Copy Download Link" id="p9Q-4g-R6I">
-                            <modifierMask key="keyEquivalentModifierMask"/>
-                            <connections>
-                                <action selector="copyDownloadLinkAction:" target="luO-ux-o3b" id="7DR-xW-0FY"/>
-                            </connections>
-                        </menuItem>
-                        <menuItem title="Open Originating Website" id="ctA-Z1-mdh">
-                            <modifierMask key="keyEquivalentModifierMask"/>
-                            <connections>
-                                <action selector="openOriginatingWebsiteAction:" target="luO-ux-o3b" id="gVw-sj-qSZ"/>
-                            </connections>
-                        </menuItem>
-                        <menuItem isSeparatorItem="YES" id="p77-2u-37g"/>
-                        <menuItem title="Remove from List" id="sco-zV-CtX">
-                            <modifierMask key="keyEquivalentModifierMask"/>
-                            <connections>
-                                <action selector="removeDownloadAction:" target="luO-ux-o3b" id="jvx-na-9oh"/>
-                            </connections>
-                        </menuItem>
-                        <menuItem title="Stop" id="8LJ-NR-kVo">
-                            <modifierMask key="keyEquivalentModifierMask"/>
-                            <connections>
-                                <action selector="cancelDownloadAction:" target="luO-ux-o3b" id="EEu-ZY-i0W"/>
-                            </connections>
-                        </menuItem>
-                        <menuItem title="Restart" id="m1O-Mn-Tpq">
-                            <modifierMask key="keyEquivalentModifierMask"/>
-                            <connections>
-                                <action selector="restartDownloadAction:" target="luO-ux-o3b" id="97R-Tj-hOg"/>
-                            </connections>
-                        </menuItem>
-                        <menuItem title="Clear All" id="u1l-bF-hk1">
-                            <modifierMask key="keyEquivalentModifierMask"/>
-                            <connections>
-                                <action selector="clearDownloadsAction:" target="luO-ux-o3b" id="xRO-xH-kAD"/>
-                            </connections>
-                        </menuItem>
-                    </items>
-                    <connections>
-                        <outlet property="delegate" destination="luO-ux-o3b" id="unw-fB-Kag"/>
-                    </connections>
-                </menu>
-            </objects>
-            <point key="canvasLocation" x="-1135" y="155.5"/>
-        </scene>
-    </scenes>
-    <resources>
-        <image name="CancelDownload" width="16" height="16"/>
-        <image name="ClearDownloads" width="16" height="16"/>
-        <image name="OpenDownloadsFolder" width="16" height="16"/>
-        <image name="RestartDownload" width="16" height="16"/>
-        <image name="RevealDownload" width="16" height="16"/>
-        <namedColor name="ButtonColor">
-            <color red="0.28627450980392155" green="0.28627450980392155" blue="0.28627450980392155" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-        </namedColor>
-        <namedColor name="ButtonMouseDownColor">
-            <color red="0.0" green="0.0" blue="0.0" alpha="0.18000000715255737" colorSpace="custom" customColorSpace="sRGB"/>
-        </namedColor>
-        <namedColor name="ButtonMouseOverColor">
-            <color red="0.0" green="0.0" blue="0.0" alpha="0.05000000074505806" colorSpace="custom" customColorSpace="sRGB"/>
-        </namedColor>
-        <namedColor name="ClearColor">
-            <color red="1" green="1" blue="1" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
-        </namedColor>
-    </resources>
-</document>
diff --git a/DuckDuckGo/FileDownload/View/DownloadsCellView.swift b/DuckDuckGo/FileDownload/View/DownloadsCellView.swift
index ad3ed7bdd5..2c3f803924 100644
--- a/DuckDuckGo/FileDownload/View/DownloadsCellView.swift
+++ b/DuckDuckGo/FileDownload/View/DownloadsCellView.swift
@@ -22,6 +22,11 @@ import UniformTypeIdentifiers
 
 final class DownloadsCellView: NSTableCellView {
 
+    fileprivate enum Constants {
+        static let width: CGFloat = 420
+        static let height: CGFloat = 60
+    }
+
     enum DownloadError: Error {
         case urlNotSet
         case fileRemoved
@@ -38,13 +43,22 @@ final class DownloadsCellView: NSTableCellView {
         }
     }
 
-    @IBOutlet var titleLabel: NSTextField!
-    @IBOutlet var detailLabel: NSTextField!
-    @IBOutlet var progressView: CircularProgressView!
-    @IBOutlet var cancelButton: MouseOverButton!
-    @IBOutlet var revealButton: MouseOverButton!
-    @IBOutlet var restartButton: MouseOverButton!
-    @IBOutlet var separator: NSBox!
+    private let fileIconView = NSImageView()
+    private let titleLabel = NSTextField()
+    private let detailLabel = NSTextField()
+
+    private let progressView = CircularProgressView()
+    private let cancelButton = MouseOverButton(image: .cancelDownload,
+                                               target: nil,
+                                               action: #selector(DownloadsViewController.cancelDownloadAction))
+    private let revealButton = MouseOverButton(image: .revealDownload,
+                                               target: nil,
+                                               action: #selector(DownloadsViewController.revealDownloadAction))
+    private let restartButton = MouseOverButton(image: .restartDownload,
+                                                target: nil,
+                                                action: #selector(DownloadsViewController.restartDownloadAction))
+
+    private let separator = NSBox()
 
     private var buttonOverCancellables = Set<AnyCancellable>()
     private var cancellables = Set<AnyCancellable>()
@@ -82,7 +96,149 @@ final class DownloadsCellView: NSTableCellView {
         }
     }
 
-    override func awakeFromNib() {
+    init(identifier: NSUserInterfaceItemIdentifier) {
+        super.init(frame: CGRect(x: 0, y: 0, width: Constants.width, height: Constants.height))
+        self.identifier = identifier
+
+        setupUI()
+        subscribeToMouseOverEvents()
+    }
+
+    required init?(coder: NSCoder) {
+        fatalError("\(Self.self): Bad initializer")
+    }
+
+    // swiftlint:disable:next function_body_length
+    private func setupUI() {
+        self.imageView = fileIconView
+        self.wantsLayer = true
+
+        addSubview(fileIconView)
+        addSubview(titleLabel)
+        addSubview(detailLabel)
+        addSubview(cancelButton)
+        addSubview(revealButton)
+        addSubview(restartButton)
+        addSubview(progressView)
+        addSubview(separator)
+
+        fileIconView.translatesAutoresizingMaskIntoConstraints = false
+        fileIconView.setContentHuggingPriority(.init(rawValue: 251), for: .horizontal)
+        fileIconView.setContentHuggingPriority(.init(rawValue: 251), for: .vertical)
+        fileIconView.imageScaling = .scaleProportionallyDown
+
+        titleLabel.translatesAutoresizingMaskIntoConstraints = false
+        titleLabel.isEditable = false
+        titleLabel.isBordered = false
+        titleLabel.isSelectable = false
+        titleLabel.drawsBackground = false
+        titleLabel.font = .systemFont(ofSize: 13)
+        titleLabel.textColor = .controlTextColor
+        titleLabel.lineBreakMode = .byTruncatingMiddle
+        titleLabel.setContentCompressionResistancePriority(.defaultLow, for: .horizontal)
+        titleLabel.setContentHuggingPriority(.defaultHigh, for: .vertical)
+        titleLabel.setContentHuggingPriority(.init(rawValue: 251), for: .horizontal)
+
+        detailLabel.translatesAutoresizingMaskIntoConstraints = false
+        detailLabel.setContentCompressionResistancePriority(.defaultLow, for: .horizontal)
+        detailLabel.isEditable = false
+        detailLabel.isBordered = false
+        detailLabel.isSelectable = false
+        detailLabel.drawsBackground = false
+        detailLabel.font = .systemFont(ofSize: 13)
+        detailLabel.textColor = .secondaryLabelColor
+        detailLabel.lineBreakMode = .byClipping
+        detailLabel.setContentHuggingPriority(.defaultHigh, for: .vertical)
+        detailLabel.setContentHuggingPriority(.init(rawValue: 251), for: .horizontal)
+
+        progressView.translatesAutoresizingMaskIntoConstraints = false
+
+        cancelButton.translatesAutoresizingMaskIntoConstraints = false
+        cancelButton.setContentHuggingPriority(.defaultHigh, for: .horizontal)
+        cancelButton.setContentHuggingPriority(.defaultHigh, for: .vertical)
+        cancelButton.bezelStyle = .shadowlessSquare
+        cancelButton.isBordered = false
+        cancelButton.imagePosition = .imageOnly
+        cancelButton.imageScaling = .scaleProportionallyDown
+        cancelButton.cornerRadius = 4
+        cancelButton.backgroundInset = CGPoint(x: 2, y: 2)
+        cancelButton.mouseDownColor = .buttonMouseDown
+        cancelButton.mouseOverColor = .buttonMouseOver
+
+        revealButton.translatesAutoresizingMaskIntoConstraints = false
+        revealButton.setContentHuggingPriority(.defaultHigh, for: .horizontal)
+        revealButton.setContentHuggingPriority(.defaultHigh, for: .vertical)
+        revealButton.alignment = .center
+        revealButton.bezelStyle = .shadowlessSquare
+        revealButton.isBordered = false
+        revealButton.imagePosition = .imageOnly
+        revealButton.imageScaling = .scaleProportionallyDown
+        revealButton.cornerRadius = 4
+        revealButton.backgroundInset = CGPoint(x: 2, y: 2)
+        revealButton.mouseDownColor = .buttonMouseDown
+        revealButton.mouseOverColor = .buttonMouseOver
+
+        restartButton.translatesAutoresizingMaskIntoConstraints = false
+        restartButton.setContentHuggingPriority(.defaultHigh, for: .horizontal)
+        restartButton.setContentHuggingPriority(.defaultHigh, for: .vertical)
+        restartButton.alignment = .center
+        restartButton.bezelStyle = .shadowlessSquare
+        restartButton.isBordered = false
+        restartButton.imagePosition = .imageOnly
+        restartButton.imageScaling = .scaleProportionallyDown
+        restartButton.cornerRadius = 4
+        restartButton.backgroundInset = CGPoint(x: 2, y: 2)
+        restartButton.mouseDownColor = .buttonMouseDown
+        restartButton.mouseOverColor = .buttonMouseOver
+
+        separator.boxType = .separator
+        separator.translatesAutoresizingMaskIntoConstraints = false
+
+        setupLayout()
+    }
+
+    private func setupLayout() {
+        NSLayoutConstraint.activate([
+            fileIconView.heightAnchor.constraint(equalToConstant: 32),
+            fileIconView.widthAnchor.constraint(equalToConstant: 32),
+            fileIconView.leadingAnchor.constraint(equalTo: leadingAnchor, constant: 7),
+            fileIconView.centerYAnchor.constraint(equalTo: centerYAnchor),
+
+            titleLabel.heightAnchor.constraint(equalToConstant: 16),
+            titleLabel.leadingAnchor.constraint(equalTo: fileIconView.trailingAnchor, constant: 6),
+            titleLabel.topAnchor.constraint(equalTo: topAnchor, constant: 12),
+            detailLabel.leadingAnchor.constraint(equalTo: titleLabel.leadingAnchor),
+
+            cancelButton.heightAnchor.constraint(equalToConstant: 32),
+            cancelButton.widthAnchor.constraint(equalToConstant: 32),
+            cancelButton.leadingAnchor.constraint(equalTo: titleLabel.trailingAnchor, constant: 8),
+            cancelButton.leadingAnchor.constraint(equalTo: detailLabel.trailingAnchor, constant: 8),
+            cancelButton.centerYAnchor.constraint(equalTo: centerYAnchor),
+            trailingAnchor.constraint(equalTo: cancelButton.trailingAnchor, constant: 4),
+
+            revealButton.widthAnchor.constraint(equalToConstant: 32),
+            revealButton.heightAnchor.constraint(equalToConstant: 32),
+            revealButton.centerYAnchor.constraint(equalTo: cancelButton.centerYAnchor),
+            revealButton.centerXAnchor.constraint(equalTo: cancelButton.centerXAnchor),
+
+            restartButton.widthAnchor.constraint(equalToConstant: 32),
+            restartButton.heightAnchor.constraint(equalToConstant: 32),
+            restartButton.centerXAnchor.constraint(equalTo: revealButton.centerXAnchor),
+            restartButton.centerYAnchor.constraint(equalTo: revealButton.centerYAnchor),
+
+            progressView.widthAnchor.constraint(equalToConstant: 27),
+            progressView.heightAnchor.constraint(equalToConstant: 27),
+            progressView.centerXAnchor.constraint(equalTo: cancelButton.centerXAnchor),
+            progressView.centerYAnchor.constraint(equalTo: cancelButton.centerYAnchor),
+
+            separator.topAnchor.constraint(equalTo: detailLabel.bottomAnchor, constant: 12),
+            separator.leadingAnchor.constraint(equalTo: leadingAnchor),
+            trailingAnchor.constraint(equalTo: separator.trailingAnchor),
+            bottomAnchor.constraint(equalTo: separator.bottomAnchor),
+        ])
+    }
+
+    private func subscribeToMouseOverEvents() {
         cancelButton.$isMouseOver.sink { [weak self] isMouseOver in
             self?.onButtonMouseOverChange?(isMouseOver)
         }.store(in: &buttonOverCancellables)
@@ -163,8 +319,10 @@ final class DownloadsCellView: NSTableCellView {
             .store(in: &cancellables)
     }
 
-    private static let fileRemovedTitleAttributes: [NSAttributedString.Key: Any] = [.strikethroughStyle: 1,
-                                                                                    .foregroundColor: NSColor.disabledControlTextColor]
+    private static let fileRemovedTitleAttributes: [NSAttributedString.Key: Any] = [
+        .strikethroughStyle: 1,
+        .foregroundColor: NSColor.disabledControlTextColor
+    ]
 
     private func updateFilename(_ filename: String, state: DownloadViewModel.State) {
         // hide progress with animation on completion/failure
@@ -357,3 +515,56 @@ extension DownloadsCellView.DownloadError: LocalizedError {
     }
 
 }
+
+#if DEBUG
+@available(macOS 14.0, *)
+#Preview {
+    DownloadsCellView.PreviewView()
+}
+@available(macOS 14.0, *)
+let previewDownloadListItems = [
+    DownloadListItem(identifier: .init(), added: .now, modified: .now, downloadURL: .empty, websiteURL: nil, fileName: "Indefinite progress download with long filename for clipping.zip", progress: Progress(totalUnitCount: -1), isBurner: false, destinationURL: URL(fileURLWithPath: "\(#file)"), destinationFileBookmarkData: nil, tempURL: URL(fileURLWithPath: "\(#file)"), tempFileBookmarkData: nil, error: nil),
+    DownloadListItem(identifier: .init(), added: .now, modified: .now, downloadURL: .empty, websiteURL: nil, fileName: "Active download.pdf", progress: Progress(totalUnitCount: 100, completedUnitCount: 42), isBurner: false, destinationURL: URL(fileURLWithPath: "\(#file)"), destinationFileBookmarkData: nil, tempURL: URL(fileURLWithPath: "\(#file)"), tempFileBookmarkData: nil, error: nil),
+    DownloadListItem(identifier: .init(), added: .now, modified: .now, downloadURL: .empty, websiteURL: nil, fileName: "Completed download.dmg", progress: nil, isBurner: false, destinationURL: URL(fileURLWithPath: "\(#file)"), destinationFileBookmarkData: nil, tempURL: nil, tempFileBookmarkData: nil, error: nil),
+    DownloadListItem(identifier: .init(), added: .now, modified: .now, downloadURL: .empty, websiteURL: nil, fileName: "Non-retryable download.txt", progress: nil, isBurner: false, destinationURL: URL(fileURLWithPath: "\(#file)"), destinationFileBookmarkData: nil, tempURL: URL(fileURLWithPath: "\(#file)"), tempFileBookmarkData: nil, error: nil),
+    DownloadListItem(identifier: .init(), added: .now, modified: .now, downloadURL: .empty, websiteURL: nil, fileName: "Retryable download.rtf", progress: nil, isBurner: false, destinationURL: URL(fileURLWithPath: "\(#file)"), destinationFileBookmarkData: nil, tempURL: URL(fileURLWithPath: "\(#file)"), tempFileBookmarkData: nil, error: FileDownloadError(URLError(.networkConnectionLost, userInfo: ["isRetryable": true]) as NSError)),
+]
+@available(macOS 14.0, *)
+extension DownloadsCellView {
+    final class PreviewView: NSView {
+
+        init() {
+            super.init(frame: .zero)
+            translatesAutoresizingMaskIntoConstraints = true
+
+            let cells = [
+                DownloadsCellView(identifier: .init("")),
+                DownloadsCellView(identifier: .init("")),
+                DownloadsCellView(identifier: .init("")),
+                DownloadsCellView(identifier: .init("")),
+                DownloadsCellView(identifier: .init("")),
+            ]
+
+            for (idx, cell) in cells.enumerated() {
+                cell.widthAnchor.constraint(equalToConstant: 420).isActive = true
+                cell.heightAnchor.constraint(equalToConstant: 60).isActive = true
+                let item = previewDownloadListItems[idx]
+                cell.objectValue = DownloadViewModel(item: item)
+            }
+
+            let stackView = NSStackView(views: cells as [NSView])
+            stackView.orientation = .vertical
+            stackView.spacing = 1
+            addAndLayout(stackView)
+
+            widthAnchor.constraint(equalToConstant: 420).isActive = true
+            heightAnchor.constraint(equalToConstant: CGFloat((60 + 1) * cells.count)).isActive = true
+        }
+
+        required init?(coder: NSCoder) {
+            fatalError("init(coder:) has not been implemented")
+        }
+
+    }
+}
+#endif
diff --git a/DuckDuckGo/FileDownload/View/DownloadsPopover.swift b/DuckDuckGo/FileDownload/View/DownloadsPopover.swift
index 31bc627e2f..b41bf222c3 100644
--- a/DuckDuckGo/FileDownload/View/DownloadsPopover.swift
+++ b/DuckDuckGo/FileDownload/View/DownloadsPopover.swift
@@ -38,7 +38,7 @@ final class DownloadsPopover: NSPopover {
     // swiftlint:enable force_cast
 
     private func setupContentController() {
-        let controller = DownloadsViewController.create()
+        let controller = DownloadsViewController()
         contentViewController = controller
     }
 
diff --git a/DuckDuckGo/FileDownload/View/DownloadsViewController.swift b/DuckDuckGo/FileDownload/View/DownloadsViewController.swift
index fb33a0788d..ddc8c1aeb5 100644
--- a/DuckDuckGo/FileDownload/View/DownloadsViewController.swift
+++ b/DuckDuckGo/FileDownload/View/DownloadsViewController.swift
@@ -20,58 +20,157 @@ import Cocoa
 import Combine
 
 protocol DownloadsViewControllerDelegate: AnyObject {
-
     func clearDownloadsActionTriggered()
-
 }
 
 final class DownloadsViewController: NSViewController {
 
     static let preferredContentSize = CGSize(width: 420, height: 500)
 
-    static func create() -> Self {
-        let storyboard = NSStoryboard(name: "Downloads", bundle: nil)
-        // swiftlint:disable force_cast
-        let controller = storyboard.instantiateInitialController() as! Self
-        controller.loadView()
-        // swiftlint:enable force_cast
-        return controller
-    }
-
-    @IBOutlet weak var openItem: NSMenuItem!
-    @IBOutlet weak var showInFinderItem: NSMenuItem!
-    @IBOutlet weak var copyDownloadLinkItem: NSMenuItem!
-    @IBOutlet weak var openWebsiteItem: NSMenuItem!
-    @IBOutlet weak var removeFromListItem: NSMenuItem!
-    @IBOutlet weak var stopItem: NSMenuItem!
-    @IBOutlet weak var restartItem: NSMenuItem!
-    @IBOutlet weak var clearAllItem: NSMenuItem!
-
-    @IBOutlet weak var titleLabel: NSTextField!
+    private lazy var titleLabel = NSTextField(string: UserText.downloadsDialogTitle)
 
-    @IBOutlet var openDownloadsFolderButton: NSButton!
-    @IBOutlet var clearDownloadsButton: NSButton!
+    private lazy var openDownloadsFolderButton = MouseOverButton(image: .openDownloadsFolder, target: self, action: #selector(openDownloadsFolderAction))
+    private lazy var clearDownloadsButton = MouseOverButton(image: .clearDownloads, target: self, action: #selector(clearDownloadsAction))
 
-    @IBOutlet var contextMenu: NSMenu!
-    @IBOutlet var tableView: NSTableView!
-    @IBOutlet var tableViewHeightConstraint: NSLayoutConstraint?
+    private lazy var scrollView = NSScrollView()
+    private lazy var tableView = NSTableView()
+    private var tableViewHeightConstraint: NSLayoutConstraint!
     private var cellIndexToUnselect: Int?
 
     weak var delegate: DownloadsViewControllerDelegate?
 
-    var viewModel = DownloadListViewModel()
-    var downloadsCancellable: AnyCancellable?
+    private let viewModel: DownloadListViewModel
+    private var downloadsCancellable: AnyCancellable?
 
-    override func viewDidLoad() {
-        super.viewDidLoad()
+    init(viewModel: DownloadListViewModel? = nil) {
+        self.viewModel = viewModel ?? DownloadListViewModel()
+        super.init(nibName: nil, bundle: nil)
+    }
 
-        setupDragAndDrop()
-        setUpStrings()
+    required init?(coder: NSCoder) {
+        self.viewModel = DownloadListViewModel()
+        super.init(coder: coder)
+    }
 
+    override func loadView() { // swiftlint:disable:this function_body_length
+        view = NSView()
+
+        view.addSubview(titleLabel)
+        view.addSubview(openDownloadsFolderButton)
+        view.addSubview(clearDownloadsButton)
+        view.addSubview(scrollView)
+
+        titleLabel.isSelectable = false
+        titleLabel.isEditable = false
+        titleLabel.isBordered = false
+        titleLabel.setContentHuggingPriority(.defaultHigh, for: .vertical)
+        titleLabel.setContentHuggingPriority(.init(rawValue: 251), for: .horizontal)
+        titleLabel.translatesAutoresizingMaskIntoConstraints = false
+        titleLabel.drawsBackground = false
+        titleLabel.font = .preferredFont(forTextStyle: .title3)
+        titleLabel.textColor = .labelColor
+
+        openDownloadsFolderButton.translatesAutoresizingMaskIntoConstraints = false
+        openDownloadsFolderButton.alignment = .center
+        openDownloadsFolderButton.bezelStyle = .shadowlessSquare
+        openDownloadsFolderButton.isBordered = false
+        openDownloadsFolderButton.imagePosition = .imageOnly
+        openDownloadsFolderButton.imageScaling = .scaleProportionallyDown
         openDownloadsFolderButton.toolTip = UserText.openDownloadsFolderTooltip
+        openDownloadsFolderButton.cornerRadius = 4
+        openDownloadsFolderButton.backgroundInset = CGPoint(x: 2, y: 2)
+        openDownloadsFolderButton.normalTintColor = .button
+        openDownloadsFolderButton.mouseDownColor = .buttonMouseDown
+        openDownloadsFolderButton.mouseOverColor = .buttonMouseOver
+
+        clearDownloadsButton.translatesAutoresizingMaskIntoConstraints = false
+        clearDownloadsButton.alignment = .center
+        clearDownloadsButton.bezelStyle = .shadowlessSquare
+        clearDownloadsButton.isBordered = false
+        clearDownloadsButton.imagePosition = .imageOnly
+        clearDownloadsButton.imageScaling = .scaleProportionallyDown
         clearDownloadsButton.toolTip = UserText.clearDownloadHistoryTooltip
+        clearDownloadsButton.cornerRadius = 4
+        clearDownloadsButton.backgroundInset = CGPoint(x: 2, y: 2)
+        clearDownloadsButton.normalTintColor = .button
+        clearDownloadsButton.mouseDownColor = .buttonMouseDown
+        clearDownloadsButton.mouseOverColor = .buttonMouseOver
+
+        scrollView.autohidesScrollers = true
+        scrollView.borderType = .noBorder
+        scrollView.hasHorizontalScroller = false
+        scrollView.translatesAutoresizingMaskIntoConstraints = false
+        scrollView.usesPredominantAxisScrolling = false
+        scrollView.automaticallyAdjustsContentInsets = false
+
+        let clipView = NSClipView()
+        clipView.documentView = tableView
+
+        clipView.autoresizingMask = [.width, .height]
+        clipView.drawsBackground = false
+        clipView.frame = CGRect(x: 0, y: 0, width: 420, height: 440)
+
+        tableView.addTableColumn(NSTableColumn())
+
+        tableView.headerView = nil
+        tableView.backgroundColor = .clear
+        tableView.gridColor = .clear
+        tableView.style = .fullWidth
+        tableView.rowHeight = 60
+        tableView.setContentHuggingPriority(.defaultHigh, for: .vertical)
+        tableView.allowsMultipleSelection = false
+        tableView.doubleAction = #selector(DownloadsViewController.doubleClickAction)
+        tableView.target = self
+        tableView.delegate = self
+        tableView.dataSource = self
+        tableView.menu = setUpContextMenu()
+
+        scrollView.contentView = clipView
+
+        let separator = NSBox()
+        separator.boxType = .separator
+        separator.translatesAutoresizingMaskIntoConstraints = false
+        view.addSubview(separator)
+
+        setupLayout(separator: separator)
+    }
+
+    private func setupLayout(separator: NSBox) {
+        tableViewHeightConstraint = scrollView.heightAnchor.constraint(equalToConstant: 440)
+
+        NSLayoutConstraint.activate([
+            titleLabel.leadingAnchor.constraint(equalTo: view.leadingAnchor, constant: 12),
+            titleLabel.topAnchor.constraint(equalTo: view.topAnchor, constant: 12),
+
+            openDownloadsFolderButton.widthAnchor.constraint(equalToConstant: 32),
+            openDownloadsFolderButton.heightAnchor.constraint(equalToConstant: 32),
+            openDownloadsFolderButton.leadingAnchor.constraint(greaterThanOrEqualTo: titleLabel.trailingAnchor, constant: 8),
+            openDownloadsFolderButton.centerYAnchor.constraint(equalTo: titleLabel.centerYAnchor),
+
+            clearDownloadsButton.widthAnchor.constraint(equalToConstant: 32),
+            clearDownloadsButton.heightAnchor.constraint(equalToConstant: 32),
+            clearDownloadsButton.leadingAnchor.constraint(equalTo: openDownloadsFolderButton.trailingAnchor),
+            view.trailingAnchor.constraint(equalTo: clearDownloadsButton.trailingAnchor, constant: 11),
+            clearDownloadsButton.centerYAnchor.constraint(equalTo: openDownloadsFolderButton.centerYAnchor),
+
+            view.trailingAnchor.constraint(equalTo: scrollView.trailingAnchor),
+            view.bottomAnchor.constraint(equalTo: scrollView.bottomAnchor),
+            scrollView.topAnchor.constraint(equalTo: view.topAnchor, constant: 44),
+            scrollView.leadingAnchor.constraint(equalTo: view.leadingAnchor),
+
+            separator.centerXAnchor.constraint(equalTo: view.centerXAnchor),
+            separator.widthAnchor.constraint(equalTo: view.widthAnchor, constant: -2),
+            separator.topAnchor.constraint(equalTo: view.topAnchor, constant: 43),
+
+            tableViewHeightConstraint
+        ])
+    }
+
+    override func viewDidLoad() {
+        super.viewDidLoad()
 
         preferredContentSize = Self.preferredContentSize
+        setupDragAndDrop()
     }
 
     override func viewWillAppear() {
@@ -116,16 +215,21 @@ final class DownloadsViewController: NSViewController {
         downloadsCancellable = nil
     }
 
-    private func setUpStrings() {
-        titleLabel.stringValue = UserText.downloadsDialogTitle
-        openItem.title = UserText.downloadsOpenItem
-        showInFinderItem.title = UserText.downloadsShowInFinderItem
-        copyDownloadLinkItem.title = UserText.downloadsCopyLinkItem
-        openWebsiteItem.title = UserText.downloadsOpenWebsiteItem
-        removeFromListItem.title = UserText.downloadsRemoveFromListItem
-        stopItem.title = UserText.downloadsStopItem
-        restartItem.title = UserText.downloadsRestartItem
-        clearAllItem.title = UserText.downloadsClearAllItem
+    private func setUpContextMenu() -> NSMenu {
+        let menu = NSMenu {
+            NSMenuItem(title: UserText.downloadsOpenItem, action: #selector(openDownloadAction), target: self)
+            NSMenuItem(title: UserText.downloadsShowInFinderItem, action: #selector(revealDownloadAction), target: self)
+            NSMenuItem.separator()
+            NSMenuItem(title: UserText.downloadsCopyLinkItem, action: #selector(copyDownloadLinkAction), target: self)
+            NSMenuItem(title: UserText.downloadsOpenWebsiteItem, action: #selector(openOriginatingWebsiteAction), target: self)
+            NSMenuItem.separator()
+            NSMenuItem(title: UserText.downloadsRemoveFromListItem, action: #selector(removeDownloadAction), target: self)
+            NSMenuItem(title: UserText.downloadsStopItem, action: #selector(cancelDownloadAction), target: self)
+            NSMenuItem(title: UserText.downloadsRestartItem, action: #selector(restartDownloadAction), target: self)
+            NSMenuItem(title: UserText.downloadsClearAllItem, action: #selector(clearDownloadsAction), target: self)
+        }
+        menu.delegate = self
+        return menu
     }
 
     private func index(for sender: Any) -> Int? {
@@ -156,63 +260,64 @@ final class DownloadsViewController: NSViewController {
 
     // MARK: User Actions
 
-    @IBAction func openDownloadsFolderAction(_ sender: Any) {
+    @objc func openDownloadsFolderAction(_ sender: Any) {
         let prefs = DownloadsPreferences.shared
+        let downloads = FileManager.default.urls(for: .downloadsDirectory, in: .userDomainMask)[0]
         var url: URL?
         var itemToSelect: URL?
 
         if prefs.alwaysRequestDownloadLocation {
-            url = FileManager.default.urls(for: .downloadsDirectory, in: .userDomainMask).first
+            url = prefs.lastUsedCustomDownloadLocation
 
+            // reveal the last completed download
             if let lastDownloaded = viewModel.items.first/* last added */(where: {
                 // should still exist
-                $0.localURL != nil && FileManager.default.fileExists(atPath: $0.localURL!.deletingLastPathComponent().path)
+                if let url = $0.localURL, FileManager.default.fileExists(atPath: url.path) { true } else { false }
             }),
                let lastDownloadedURL = lastDownloaded.localURL,
-               // if no downloads are from the default Downloads folder - open the last downloaded item folder
                !viewModel.items.contains(where: { $0.localURL?.deletingLastPathComponent().path == url?.path  }) || url == nil {
 
                 url = lastDownloadedURL.deletingLastPathComponent()
                 // select last downloaded item
                 itemToSelect = lastDownloadedURL
 
-            } /* else fallback to default User‘s Downloads */
+            } /* else fallback to the last location chosen in the Save Panel */
 
         } else {
             // open preferred downlod location
-            url = prefs.effectiveDownloadLocation ?? FileManager.default.urls(for: .downloadsDirectory, in: .userDomainMask).first
+            url = prefs.effectiveDownloadLocation
         }
 
-        guard let url else { return }
+        let folder = url ?? downloads
+
+        _=NSWorkspace.shared.selectFile(itemToSelect?.path, inFileViewerRootedAtPath: folder.path)
+        // hack for the sandboxed environment:
+        // when we have no permission to open a folder we don‘t have access to
+        // try to guess a file that would most probably exist and reveal it: it‘s the ".DS_Store" file
+        || NSWorkspace.shared.selectFile(folder.appendingPathComponent(".DS_Store").path, inFileViewerRootedAtPath: folder.path)
+        // fallback to default Downloads folder
+        || NSWorkspace.shared.selectFile(nil, inFileViewerRootedAtPath: downloads.path)
 
         self.dismiss()
-        NSWorkspace.shared.selectFile(itemToSelect?.path, inFileViewerRootedAtPath: url.path)
     }
 
-    @IBAction func clearDownloadsAction(_ sender: Any) {
+    @objc func clearDownloadsAction(_ sender: Any) {
         viewModel.cleanupInactiveDownloads()
         self.dismiss()
         delegate?.clearDownloadsActionTriggered()
     }
 
-    @IBAction func openDownloadedFileAction(_ sender: Any) {
-        guard let index = index(for: sender),
-              let url = viewModel.items[safe: index]?.localURL
-        else { return }
-        NSWorkspace.shared.open(url)
-    }
-
-    @IBAction func cancelDownloadAction(_ sender: Any) {
+    @objc func cancelDownloadAction(_ sender: Any) {
         guard let index = index(for: sender) else { return }
         viewModel.cancelDownload(at: index)
     }
 
-    @IBAction func removeDownloadAction(_ sender: Any) {
+    @objc func removeDownloadAction(_ sender: Any) {
         guard let index = index(for: sender) else { return }
         viewModel.removeDownload(at: index)
     }
 
-    @IBAction func revealDownloadAction(_ sender: Any) {
+    @objc func revealDownloadAction(_ sender: Any) {
         guard let index = index(for: sender),
               let url = viewModel.items[safe: index]?.localURL
         else { return }
@@ -220,7 +325,7 @@ final class DownloadsViewController: NSViewController {
         NSWorkspace.shared.activateFileViewerSelecting([url])
     }
 
-    func openDownloadAction(_ sender: Any) {
+    @objc func openDownloadAction(_ sender: Any) {
         guard let index = index(for: sender),
               let url = viewModel.items[safe: index]?.localURL
         else { return }
@@ -228,12 +333,12 @@ final class DownloadsViewController: NSViewController {
         NSWorkspace.shared.open(url)
     }
 
-    @IBAction func restartDownloadAction(_ sender: Any) {
+    @objc func restartDownloadAction(_ sender: Any) {
         guard let index = index(for: sender) else { return }
         viewModel.restartDownload(at: index)
     }
 
-    @IBAction func copyDownloadLinkAction(_ sender: Any) {
+    @objc func copyDownloadLinkAction(_ sender: Any) {
         guard let index = index(for: sender),
               let url = viewModel.items[safe: index]?.url
         else { return }
@@ -241,7 +346,7 @@ final class DownloadsViewController: NSViewController {
         NSPasteboard.general.copy(url)
     }
 
-    @IBAction func openOriginatingWebsiteAction(_ sender: Any) {
+    @objc func openOriginatingWebsiteAction(_ sender: Any) {
         guard let index = index(for: sender),
               let url = viewModel.items[safe: index]?.websiteURL
         else { return }
@@ -250,7 +355,7 @@ final class DownloadsViewController: NSViewController {
         WindowControllersManager.shared.show(url: url, source: .historyEntry, newTab: true)
     }
 
-    @IBAction func doubleClickAction(_ sender: Any) {
+    @objc func doubleClickAction(_ sender: Any) {
         if index(for: sender) != nil {
             openDownloadAction(sender)
         } else {
@@ -279,7 +384,7 @@ extension DownloadsViewController: NSMenuDelegate {
 
         for menuItem in menu.items {
             switch menuItem.action {
-            case #selector(openDownloadedFileAction(_:)),
+            case #selector(openDownloadAction(_:)),
                  #selector(revealDownloadAction(_:)):
                 if case .complete(.some(let url)) = item.state,
                    FileManager.default.fileExists(atPath: url.path) {
@@ -322,20 +427,17 @@ extension DownloadsViewController: NSTableViewDataSource, NSTableViewDelegate {
     }
 
     func tableView(_ tableView: NSTableView, viewFor tableColumn: NSTableColumn?, row: Int) -> NSView? {
-        let identifier: NSUserInterfaceItemIdentifier
         if viewModel.items.isEmpty {
-            identifier = .noDownloadsCell
+            return tableView.makeView(withIdentifier: .init(NoDownloadsCellView.className()), owner: self) as? NoDownloadsCellView
+            ?? NoDownloadsCellView(identifier: .init(NoDownloadsCellView.className()))
+
         } else if viewModel.items.indices.contains(row) {
-            identifier = .downloadCell
+            return tableView.makeView(withIdentifier: .init(DownloadsCellView.className()), owner: self) as? DownloadsCellView
+            ?? DownloadsCellView(identifier: .init(DownloadsCellView.className()))
         } else {
-            identifier = .openDownloadsCell
+            return tableView.makeView(withIdentifier: .init(OpenDownloadsCellView.className()), owner: self) as? OpenDownloadsCellView
+            ?? OpenDownloadsCellView(identifier: .init(OpenDownloadsCellView.className()))
         }
-        let cell = tableView.makeView(withIdentifier: identifier, owner: nil)
-        if identifier == .downloadCell {
-            cell?.menu = contextMenu
-        }
-
-        return cell
     }
 
     func tableView(_ tableView: NSTableView, shouldSelectRow row: Int) -> Bool {
@@ -380,27 +482,15 @@ extension DownloadsViewController: NSTableViewDataSource, NSTableViewDelegate {
 
 }
 
-private extension NSUserInterfaceItemIdentifier {
-    static let downloadCell = NSUserInterfaceItemIdentifier(rawValue: "cell")
-    static let noDownloadsCell = NSUserInterfaceItemIdentifier(rawValue: "NoDownloads")
-    static let openDownloadsCell = NSUserInterfaceItemIdentifier(rawValue: "OpenDownloads")
-}
-
-final class NoDownloadViewCell: NSTableCellView {
-    @IBOutlet weak var openFolderButton: LinkButton!
-    @IBOutlet weak var titleLabel: NSTextField!
-
-    override func awakeFromNib() {
-        titleLabel.stringValue = UserText.downloadsNoRecentDownload
-        openFolderButton.title = UserText.downloadsOpenDownloadsFolder
-    }
-}
-
-final class OpenDownloadViewCell: NSTableCellView {
-    @IBOutlet weak var openFolderButton: LinkButton!
+#if DEBUG
+@available(macOS 14.0, *)
+#Preview(traits: .fixedLayout(width: DownloadsViewController.preferredContentSize.width, height: DownloadsViewController.preferredContentSize.height)) { {
 
-    override func awakeFromNib() {
-        openFolderButton.title = UserText.downloadsOpenDownloadsFolder
+    let store = DownloadListStoreMock()
+    store.fetchBlock = { completion in
+        completion(.success(previewDownloadListItems))
     }
-
-}
+    let viewModel = DownloadListViewModel(coordinator: DownloadListCoordinator(store: store))
+    return DownloadsViewController(viewModel: viewModel)
+}() }
+#endif
diff --git a/DuckDuckGo/FileDownload/View/NoDownloadsCellView.swift b/DuckDuckGo/FileDownload/View/NoDownloadsCellView.swift
new file mode 100644
index 0000000000..9796154c32
--- /dev/null
+++ b/DuckDuckGo/FileDownload/View/NoDownloadsCellView.swift
@@ -0,0 +1,82 @@
+//
+//  NoDownloadsCellView.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
+
+final class NoDownloadsCellView: NSTableCellView {
+
+    fileprivate enum Constants {
+        static let width: CGFloat = 420
+        static let height: CGFloat = 60
+    }
+
+    private let titleLabel = NSTextField(string: UserText.downloadsNoRecentDownload)
+    private let openFolderButton = LinkButton(title: UserText.downloadsOpenDownloadsFolder,
+                                              target: nil,
+                                              action: #selector(DownloadsViewController.openDownloadsFolderAction))
+
+    init(identifier: NSUserInterfaceItemIdentifier) {
+        super.init(frame: CGRect(x: 0, y: 0, width: Constants.width, height: Constants.height))
+        self.identifier = identifier
+
+        setupUI()
+    }
+
+    required init?(coder: NSCoder) {
+        fatalError("\(Self.self): Bad initializer")
+    }
+
+    private func setupUI() {
+        addSubview(titleLabel)
+        addSubview(openFolderButton)
+
+        titleLabel.translatesAutoresizingMaskIntoConstraints = false
+        titleLabel.isEditable = false
+        titleLabel.isBordered = false
+        titleLabel.isSelectable = false
+        titleLabel.drawsBackground = false
+        titleLabel.font = .systemFont(ofSize: 13)
+        titleLabel.textColor = .secondaryLabelColor
+        titleLabel.lineBreakMode = .byTruncatingMiddle
+
+        openFolderButton.translatesAutoresizingMaskIntoConstraints = false
+        openFolderButton.bezelStyle = .shadowlessSquare
+        openFolderButton.isBordered = false
+        openFolderButton.alignment = .center
+        openFolderButton.font = .systemFont(ofSize: 13)
+        openFolderButton.contentTintColor = .linkColor
+
+        NSLayoutConstraint.activate([
+            titleLabel.topAnchor.constraint(equalTo: topAnchor, constant: 12),
+            titleLabel.centerXAnchor.constraint(equalTo: centerXAnchor),
+
+            openFolderButton.topAnchor.constraint(equalTo: titleLabel.bottomAnchor,
+                                                  constant: 4),
+            openFolderButton.centerXAnchor.constraint(equalTo: centerXAnchor),
+        ])
+    }
+
+}
+
+@available(macOS 14.0, *)
+#Preview(traits: .fixedLayout(width: NoDownloadsCellView.Constants.width,
+                              height: NoDownloadsCellView.Constants.height)) {
+    PreviewViewController(showWindowTitle: false) {
+        NoDownloadsCellView(identifier: .init(""))
+    }
+}
diff --git a/DuckDuckGo/FileDownload/View/OpenDownloadsCellView.swift b/DuckDuckGo/FileDownload/View/OpenDownloadsCellView.swift
new file mode 100644
index 0000000000..fbfed592da
--- /dev/null
+++ b/DuckDuckGo/FileDownload/View/OpenDownloadsCellView.swift
@@ -0,0 +1,67 @@
+//
+//  OpenDownloadsCellView.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
+
+final class OpenDownloadsCellView: NSTableCellView {
+
+    fileprivate enum Constants {
+        static let width: CGFloat = 420
+        static let height: CGFloat = 60
+    }
+
+    private let openFolderButton = LinkButton(title: UserText.downloadsOpenDownloadsFolder,
+                                              target: nil,
+                                              action: #selector(DownloadsViewController.openDownloadsFolderAction))
+
+    init(identifier: NSUserInterfaceItemIdentifier) {
+        super.init(frame: CGRect(x: 0, y: 0, width: Constants.width, height: Constants.height))
+        self.identifier = identifier
+
+        setupUI()
+    }
+
+    required init?(coder: NSCoder) {
+        fatalError("\(Self.self): Bad initializer")
+    }
+
+    private func setupUI() {
+        addSubview(openFolderButton)
+
+        openFolderButton.translatesAutoresizingMaskIntoConstraints = false
+        openFolderButton.bezelStyle = .shadowlessSquare
+        openFolderButton.isBordered = false
+        openFolderButton.alignment = .center
+        openFolderButton.font = .systemFont(ofSize: 13)
+        openFolderButton.contentTintColor = .linkColor
+
+        NSLayoutConstraint.activate([
+            openFolderButton.centerYAnchor.constraint(equalTo: centerYAnchor),
+            openFolderButton.centerXAnchor.constraint(equalTo: centerXAnchor),
+        ])
+    }
+
+}
+
+@available(macOS 14.0, *)
+#Preview(traits: .fixedLayout(width: OpenDownloadsCellView.Constants.width,
+                              height: OpenDownloadsCellView.Constants.height)) {
+    PreviewViewController(showWindowTitle: false) {
+        OpenDownloadsCellView(identifier: .init(""))
+    }
+}
diff --git a/DuckDuckGo/Fire/Model/Fire.swift b/DuckDuckGo/Fire/Model/Fire.swift
index a783f6b9ad..b5e9f9725c 100644
--- a/DuckDuckGo/Fire/Model/Fire.swift
+++ b/DuckDuckGo/Fire/Model/Fire.swift
@@ -400,7 +400,7 @@ final class Fire {
     // MARK: - Favicons
 
     private func autofillDomains() -> Set<String> {
-        guard let vault = try? secureVaultFactory.makeVault(errorReporter: SecureVaultErrorReporter.shared),
+        guard let vault = try? secureVaultFactory.makeVault(reporter: SecureVaultReporter.shared),
               let accounts = try? vault.accounts() else {
             return []
         }
diff --git a/DuckDuckGo/Fire/Model/TabCleanupPreparer.swift b/DuckDuckGo/Fire/Model/TabCleanupPreparer.swift
index 798ebc2f7c..30314266da 100644
--- a/DuckDuckGo/Fire/Model/TabCleanupPreparer.swift
+++ b/DuckDuckGo/Fire/Model/TabCleanupPreparer.swift
@@ -17,6 +17,7 @@
 //
 
 import Foundation
+import PixelKit
 
 protocol TabDataClearing {
     func prepareForDataClearing(caller: TabCleanupPreparer)
@@ -65,7 +66,7 @@ final class TabCleanupPreparer: NSObject, WKNavigationDelegate {
     }
 
     func webView(_ webView: WKWebView, didFail navigation: WKNavigation!, withError error: Error) {
-        Pixel.fire(.debug(event: .blankNavigationOnBurnFailed, error: error))
+        PixelKit.fire(DebugEvent(GeneralPixel.blankNavigationOnBurnFailed, error: error))
         processedTabs += 1
 
         notifyIfDone()
diff --git a/DuckDuckGo/Fire/View/FireViewController.swift b/DuckDuckGo/Fire/View/FireViewController.swift
index 1b82d96eb8..fee0006b48 100644
--- a/DuckDuckGo/Fire/View/FireViewController.swift
+++ b/DuckDuckGo/Fire/View/FireViewController.swift
@@ -17,7 +17,7 @@
 //
 
 import Cocoa
-@preconcurrency import Lottie
+import Lottie
 import Combine
 
 @MainActor
diff --git a/DuckDuckGo/Fire/ViewModel/FirePopoverViewModel.swift b/DuckDuckGo/Fire/ViewModel/FirePopoverViewModel.swift
index b10b728212..1221497f5f 100644
--- a/DuckDuckGo/Fire/ViewModel/FirePopoverViewModel.swift
+++ b/DuckDuckGo/Fire/ViewModel/FirePopoverViewModel.swift
@@ -20,6 +20,7 @@ import Cocoa
 import BrowserServicesKit
 import Common
 import History
+import PixelKit
 
 @MainActor
 final class FirePopoverViewModel {
@@ -188,7 +189,7 @@ final class FirePopoverViewModel {
     // MARK: - Burning
 
     func burn() {
-        Pixel.fire(.fireButtonFirstBurn, limitTo: .dailyFirst)
+        PixelKit.fire(GeneralPixel.fireButtonFirstBurn, frequency: .daily)
 
         switch (clearingOption, areAllSelected) {
         case (.currentTab, _):
@@ -197,7 +198,7 @@ final class FirePopoverViewModel {
                 assertionFailure("No tab selected")
                 return
             }
-            Pixel.fire(.fireButton(option: .tab))
+            PixelKit.fire(GeneralPixel.fireButton(option: .tab))
             let burningEntity = Fire.BurningEntity.tab(tabViewModel: tabViewModel,
                                                        selectedDomains: selectedDomains,
                                                        parentTabCollectionViewModel: tabCollectionViewModel)
@@ -207,17 +208,17 @@ final class FirePopoverViewModel {
                 assertionFailure("FirePopoverViewModel: TabCollectionViewModel is not present")
                 return
             }
-            Pixel.fire(.fireButton(option: .window))
+            PixelKit.fire(GeneralPixel.fireButton(option: .window))
             let burningEntity = Fire.BurningEntity.window(tabCollectionViewModel: tabCollectionViewModel,
                                                           selectedDomains: selectedDomains)
             fireViewModel.fire.burnEntity(entity: burningEntity)
 
         case (.allData, true):
-            Pixel.fire(.fireButton(option: .allSites))
+            PixelKit.fire(GeneralPixel.fireButton(option: .allSites))
             fireViewModel.fire.burnAll()
 
         case (.allData, false):
-            Pixel.fire(.fireButton(option: .allSites))
+            PixelKit.fire(GeneralPixel.fireButton(option: .allSites))
             fireViewModel.fire.burnEntity(entity: .allWindows(mainWindowControllers: WindowControllersManager.shared.mainWindowControllers,
                                                               selectedDomains: selectedDomains))
         }
diff --git a/DuckDuckGo/Fireproofing/Extensions/FireproofingURLExtensions.swift b/DuckDuckGo/Fireproofing/Extensions/FireproofingURLExtensions.swift
index d75068166c..da4b9df331 100644
--- a/DuckDuckGo/Fireproofing/Extensions/FireproofingURLExtensions.swift
+++ b/DuckDuckGo/Fireproofing/Extensions/FireproofingURLExtensions.swift
@@ -52,7 +52,7 @@ extension URL {
     ]
 
     var canFireproof: Bool {
-        guard let host = self.host else { return false }
+        guard let host = self.host, self.navigationalScheme?.isHypertextScheme == true else { return false }
         return (host != Self.cookieDomain)
     }
 
diff --git a/DuckDuckGo/History/Services/EncryptedHistoryStore.swift b/DuckDuckGo/History/Services/EncryptedHistoryStore.swift
index 361ab26a81..a62dc501ce 100644
--- a/DuckDuckGo/History/Services/EncryptedHistoryStore.swift
+++ b/DuckDuckGo/History/Services/EncryptedHistoryStore.swift
@@ -21,6 +21,7 @@ import Foundation
 import CoreData
 import Combine
 import History
+import PixelKit
 
 final class EncryptedHistoryStore: HistoryStoring {
 
@@ -91,7 +92,7 @@ final class EncryptedHistoryStore: HistoryStoring {
                 }
                 os_log("%d items cleaned from history", log: .history, entriesToDelete.count)
             } catch {
-                Pixel.fire(.debug(event: .historyRemoveFailed, error: error))
+                PixelKit.fire(DebugEvent(GeneralPixel.historyRemoveFailed, error: error))
                 self.context.reset()
                 return .failure(error)
             }
@@ -100,7 +101,7 @@ final class EncryptedHistoryStore: HistoryStoring {
         do {
             try context.save()
         } catch {
-            Pixel.fire(.debug(event: .historyRemoveFailed, error: error))
+            PixelKit.fire(DebugEvent(GeneralPixel.historyRemoveFailed, error: error))
             context.reset()
             return .failure(error)
         }
@@ -117,7 +118,7 @@ final class EncryptedHistoryStore: HistoryStoring {
             let history = BrowsingHistory(historyEntries: historyEntries)
             return .success(history)
         } catch {
-            Pixel.fire(.debug(event: .historyReloadFailed, error: error))
+            PixelKit.fire(DebugEvent(GeneralPixel.historyReloadFailed, error: error))
             return .failure(error)
         }
     }
@@ -133,7 +134,7 @@ final class EncryptedHistoryStore: HistoryStoring {
             }
             try context.save()
         } catch {
-            Pixel.fire(.debug(event: .historyCleanEntriesFailed, error: error))
+            PixelKit.fire(DebugEvent(GeneralPixel.historyCleanEntriesFailed, error: error))
             context.reset()
             return .failure(error)
         }
@@ -149,7 +150,7 @@ final class EncryptedHistoryStore: HistoryStoring {
             try context.save()
             return .success(())
         } catch {
-            Pixel.fire(.debug(event: .historyCleanVisitsFailed, error: error))
+            PixelKit.fire(DebugEvent(GeneralPixel.historyCleanVisitsFailed, error: error))
             context.reset()
             return .failure(error)
         }
@@ -174,7 +175,8 @@ final class EncryptedHistoryStore: HistoryStoring {
                 do {
                     fetchedObjects = try self.context.fetch(fetchRequest)
                 } catch {
-                    Pixel.fire(.debug(event: .historySaveFailed, error: error))
+                    PixelKit.fire(DebugEvent(GeneralPixel.historySaveFailed, error: error))
+                    PixelKit.fire(DebugEvent(GeneralPixel.historySaveFailedDaily, error: error), frequency: .legacyDaily)
                     promise(.failure(error))
                     return
                 }
@@ -202,14 +204,16 @@ final class EncryptedHistoryStore: HistoryStoring {
                                                            context: self.context)
                 switch insertionResult {
                 case .failure(let error):
-                    Pixel.fire(.debug(event: .historySaveFailed, error: error))
+                    PixelKit.fire(DebugEvent(GeneralPixel.historySaveFailed, error: error))
+                    PixelKit.fire(DebugEvent(GeneralPixel.historySaveFailedDaily, error: error), frequency: .legacyDaily)
                     context.reset()
                     promise(.failure(error))
                 case .success(let visitMOs):
                     do {
                         try self.context.save()
                     } catch {
-                        Pixel.fire(.debug(event: .historySaveFailed, error: error))
+                        PixelKit.fire(DebugEvent(GeneralPixel.historySaveFailed, error: error))
+                        PixelKit.fire(DebugEvent(GeneralPixel.historySaveFailedDaily, error: error), frequency: .legacyDaily)
                         context.reset()
                         promise(.failure(HistoryStoreError.savingFailed))
                         return
@@ -259,7 +263,7 @@ final class EncryptedHistoryStore: HistoryStoring {
                         context: NSManagedObjectContext) -> Result<VisitManagedObject, Error> {
         let insertedObject = NSEntityDescription.insertNewObject(forEntityName: VisitManagedObject.className(), into: context)
         guard let visitMO = insertedObject as? VisitManagedObject else {
-            Pixel.fire(.debug(event: .historyInsertVisitFailed))
+            PixelKit.fire(DebugEvent(GeneralPixel.historyInsertVisitFailed))
             context.reset()
             return .failure(HistoryStoreError.savingFailed)
         }
@@ -307,7 +311,7 @@ final class EncryptedHistoryStore: HistoryStoring {
                     context.delete(visit)
                 }
             } catch {
-                Pixel.fire(.debug(event: .historyRemoveVisitsFailed, error: error))
+                PixelKit.fire(DebugEvent(GeneralPixel.historyRemoveVisitsFailed, error: error))
                 return .failure(error)
             }
         }
@@ -315,7 +319,7 @@ final class EncryptedHistoryStore: HistoryStoring {
         do {
             try context.save()
         } catch {
-            Pixel.fire(.debug(event: .historyRemoveVisitsFailed, error: error))
+            PixelKit.fire(DebugEvent(GeneralPixel.historyRemoveVisitsFailed, error: error))
             context.reset()
             return .failure(error)
         }
@@ -343,7 +347,7 @@ fileprivate extension HistoryEntry {
         guard let url = historyEntryMO.urlEncrypted as? URL,
               let identifier = historyEntryMO.identifier,
               let lastVisit = historyEntryMO.lastVisit else {
-            Pixel.fire(.debug(event: .historyEntryDecryptionFailedUnique), limitTo: .dailyFirst)
+            PixelKit.fire(DebugEvent(GeneralPixel.historyEntryDecryptionFailedUnique), frequency: .daily)
             assertionFailure("HistoryEntry: Failed to init HistoryEntry from HistoryEntryManagedObject")
             return nil
         }
diff --git a/DuckDuckGo/HomePage/Model/DataImportStatusProviding.swift b/DuckDuckGo/HomePage/Model/DataImportStatusProviding.swift
index 7c729d99ad..17efd1a64d 100644
--- a/DuckDuckGo/HomePage/Model/DataImportStatusProviding.swift
+++ b/DuckDuckGo/HomePage/Model/DataImportStatusProviding.swift
@@ -19,6 +19,7 @@
 import Foundation
 import Bookmarks
 import BrowserServicesKit
+import PixelKit
 
 protocol DataImportStatusProviding {
     var didImport: Bool { get }
@@ -30,7 +31,7 @@ final class BookmarksAndPasswordsImportStatusProvider: DataImportStatusProviding
     let secureVault: (any AutofillSecureVault)?
     let bookmarkManager: BookmarkManager
 
-    init(secureVault: (any AutofillSecureVault)? = try? AutofillSecureVaultFactory.makeVault(errorReporter: SecureVaultErrorReporter.shared),
+    init(secureVault: (any AutofillSecureVault)? = try? AutofillSecureVaultFactory.makeVault(reporter: SecureVaultReporter.shared),
          bookmarkManager: BookmarkManager = LocalBookmarkManager.shared) {
         self.secureVault = secureVault
         self.bookmarkManager = bookmarkManager
@@ -80,7 +81,7 @@ final class BookmarksAndPasswordsImportStatusProvider: DataImportStatusProviding
             let identitiesDates = try secureVault.identities().map(\.created)
             dates.append(contentsOf: identitiesDates)
         } catch {
-            Pixel.fire(.debug(event: .secureVaultError, error: error))
+            PixelKit.fire(DebugEvent(GeneralPixel.secureVaultError(error: error)))
         }
         guard dates.count >= 2 else {
             return false
diff --git a/DuckDuckGo/HomePage/Model/HomePageContinueSetUpModel.swift b/DuckDuckGo/HomePage/Model/HomePageContinueSetUpModel.swift
index 41c8bc3075..b99a4a2949 100644
--- a/DuckDuckGo/HomePage/Model/HomePageContinueSetUpModel.swift
+++ b/DuckDuckGo/HomePage/Model/HomePageContinueSetUpModel.swift
@@ -20,11 +20,10 @@ import AppKit
 import BrowserServicesKit
 import Common
 import Foundation
+import PixelKit
 
-#if NETWORK_PROTECTION
 import NetworkProtection
 import NetworkProtectionUI
-#endif
 
 extension HomePage.Models {
 
@@ -41,38 +40,18 @@ extension HomePage.Models {
         let deleteActionTitle = UserText.newTabSetUpRemoveItemAction
         let privacyConfigurationManager: PrivacyConfigurationManaging
         let homePageRemoteMessaging: HomePageRemoteMessaging
+        let permanentSurveyManager: SurveyManager
 
-        var isDay0SurveyEnabled: Bool {
-            let newTabContinueSetUpSettings = privacyConfigurationManager.privacyConfig.settings(for: .newTabContinueSetUp)
-            if let day0SurveyString =  newTabContinueSetUpSettings["surveyCardDay0"] as? String {
-                if day0SurveyString == "enabled" {
-                    return true
-                }
-            }
-            return false
-        }
-        var isDay14SurveyEnabled: Bool {
-            let newTabContinueSetUpSettings = privacyConfigurationManager.privacyConfig.settings(for: .newTabContinueSetUp)
-            if let day14SurveyString =  newTabContinueSetUpSettings["surveyCardDay14"] as? String {
-                if day14SurveyString == "enabled" {
-                    return true
-                }
-            }
-            return false
-        }
         var duckPlayerURL: String {
             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/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 duckPlayerPreferences: DuckPlayerPreferencesPersistor
-        private let randomNumberGenerator: RandomNumberGenerating
 
         @UserDefaultsWrapper(key: .homePageShowAllFeatures, defaultValue: false)
         var shouldShowAllFeatures: Bool {
@@ -93,30 +72,15 @@ extension HomePage.Models {
         @UserDefaultsWrapper(key: .homePageShowEmailProtection, defaultValue: true)
         private var shouldShowEmailProtectionSetting: Bool
 
-        @UserDefaultsWrapper(key: .homePageShowSurveyDay0, defaultValue: true)
-        private var shouldShowSurveyDay0: Bool
-
-        @UserDefaultsWrapper(key: .homePageUserInteractedWithSurveyDay0, defaultValue: false)
-        private var userInteractedWithSurveyDay0: Bool
+        @UserDefaultsWrapper(key: .homePageShowPermanentSurvey, defaultValue: true)
+        private var shouldShowPermanentSurvey: Bool
 
         @UserDefaultsWrapper(key: .shouldShowDBPWaitlistInvitedCardUI, defaultValue: false)
         private var shouldShowDBPWaitlistInvitedCardUI: 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
-
         var isMoreOrLessButtonNeeded: Bool {
             return featuresMatrix.count > itemsRowCountWhenCollapsed
         }
@@ -125,10 +89,6 @@ extension HomePage.Models {
             return !featuresMatrix.isEmpty
         }
 
-        lazy var statisticsStore: StatisticsStore = LocalStatisticsStore()
-
-        lazy var waitlistBetaThankYouPresenter = WaitlistThankYouPromptPresenter()
-
         lazy var listOfFeatures = isFirstSession ? firstRunFeatures : randomisedFeatures
 
         private var featuresMatrix: [[FeatureType]] = [[]] {
@@ -146,7 +106,7 @@ extension HomePage.Models {
              duckPlayerPreferences: DuckPlayerPreferencesPersistor,
              homePageRemoteMessaging: HomePageRemoteMessaging,
              privacyConfigurationManager: PrivacyConfigurationManaging = AppPrivacyFeatures.shared.contentBlocking.privacyConfigurationManager,
-             randomNumberGenerator: RandomNumberGenerating = RandomNumberGenerator()) {
+             permanentSurveyManager: SurveyManager = PermanentSurveyManager()) {
             self.defaultBrowserProvider = defaultBrowserProvider
             self.dataImportProvider = dataImportProvider
             self.tabCollectionViewModel = tabCollectionViewModel
@@ -154,7 +114,7 @@ extension HomePage.Models {
             self.duckPlayerPreferences = duckPlayerPreferences
             self.homePageRemoteMessaging = homePageRemoteMessaging
             self.privacyConfigurationManager = privacyConfigurationManager
-            self.randomNumberGenerator = randomNumberGenerator
+            self.permanentSurveyManager = permanentSurveyManager
 
             refreshFeaturesMatrix()
 
@@ -162,12 +122,11 @@ extension HomePage.Models {
             NotificationCenter.default.addObserver(self, selector: #selector(windowDidBecomeKey(_:)), name: NSWindow.didBecomeKeyNotification, object: nil)
         }
 
-        // swiftlint:disable:next cyclomatic_complexity
         @MainActor func performAction(for featureType: FeatureType) {
             switch featureType {
             case .defaultBrowser:
                 do {
-                    Pixel.fire(.defaultRequestedFromHomepageSetupView)
+                    PixelKit.fire(GeneralPixel.defaultRequestedFromHomepageSetupView)
                     try defaultBrowserProvider.presentDefaultBrowserPrompt()
                 } catch {
                     defaultBrowserProvider.openSystemPreferences()
@@ -182,10 +141,8 @@ extension HomePage.Models {
             case .emailProtection:
                 let tab = Tab(content: .url(EmailUrls().emailProtectionLink, source: .ui), shouldLoadInBackground: true)
                 tabCollectionViewModel.append(tab: tab)
-            case .surveyDay0:
-                visitSurvey(day: .day0)
-            case .surveyDay14:
-                visitSurvey(day: .day14)
+            case .permanentSurvey:
+                visitSurvey()
             case .networkProtectionRemoteMessage(let message):
                 handle(remoteMessage: message)
             case .dataBrokerProtectionRemoteMessage(let message):
@@ -194,18 +151,9 @@ extension HomePage.Models {
 #if DBP
                 DataBrokerProtectionAppEvents().handleWaitlistInvitedNotification(source: .cardUI)
 #endif
-            case .vpnThankYou:
-                guard let window = NSApp.keyWindow,
-                      case .normal = NSApp.runType else { return }
-                waitlistBetaThankYouPresenter.presentVPNThankYouPrompt(in: window)
-            case .pirThankYou:
-                guard let window = NSApp.keyWindow,
-                      case .normal = NSApp.runType else { return }
-                waitlistBetaThankYouPresenter.presentPIRThankYouPrompt(in: window)
             }
         }
 
-        // swiftlint:disable:next cyclomatic_complexity
         func removeItem(for featureType: FeatureType) {
             switch featureType {
             case .defaultBrowser:
@@ -216,31 +164,22 @@ extension HomePage.Models {
                 shouldShowDuckPlayerSetting = false
             case .emailProtection:
                 shouldShowEmailProtectionSetting = false
-            case .surveyDay0:
-                shouldShowSurveyDay0 = false
-            case .surveyDay14:
-                shouldShowSurveyDay14 = false
+            case .permanentSurvey:
+                shouldShowPermanentSurvey = false
             case .networkProtectionRemoteMessage(let message):
-#if NETWORK_PROTECTION
                 homePageRemoteMessaging.networkProtectionRemoteMessaging.dismiss(message: message)
-                Pixel.fire(.networkProtectionRemoteMessageDismissed(messageID: message.id))
-#endif
+                PixelKit.fire(GeneralPixel.networkProtectionRemoteMessageDismissed(messageID: message.id))
             case .dataBrokerProtectionRemoteMessage(let message):
 #if DBP
                 homePageRemoteMessaging.dataBrokerProtectionRemoteMessaging.dismiss(message: message)
-                Pixel.fire(.dataBrokerProtectionRemoteMessageDismissed(messageID: message.id))
+                PixelKit.fire(GeneralPixel.dataBrokerProtectionRemoteMessageDismissed(messageID: message.id))
 #endif
             case .dataBrokerProtectionWaitlistInvited:
                 shouldShowDBPWaitlistInvitedCardUI = false
-            case .vpnThankYou:
-                waitlistBetaThankYouPresenter.didDismissVPNThankYouCard()
-            case .pirThankYou:
-                waitlistBetaThankYouPresenter.didDismissPIRThankYouCard()
             }
             refreshFeaturesMatrix()
         }
 
-        // swiftlint:disable:next cyclomatic_complexity function_body_length
         func refreshFeaturesMatrix() {
             var features: [FeatureType] = []
 #if DBP
@@ -250,67 +189,42 @@ extension HomePage.Models {
 
             for message in homePageRemoteMessaging.dataBrokerProtectionRemoteMessaging.presentableRemoteMessages() {
                 features.append(.dataBrokerProtectionRemoteMessage(message))
-                DailyPixel.fire(
-                    pixel: .dataBrokerProtectionRemoteMessageDisplayed(messageID: message.id),
-                    frequency: .dailyOnly
-                )
+                PixelKit.fire(GeneralPixel.dataBrokerProtectionRemoteMessageDisplayed(messageID: message.id), frequency: .daily)
             }
 #endif
 
-#if NETWORK_PROTECTION
             for message in homePageRemoteMessaging.networkProtectionRemoteMessaging.presentableRemoteMessages() {
-                features.append(.networkProtectionRemoteMessage(message))
-                DailyPixel.fire(
-                    pixel: .networkProtectionRemoteMessageDisplayed(messageID: message.id),
-                    frequency: .dailyOnly
-                )
+                PixelKit.fire(GeneralPixel.networkProtectionRemoteMessageDisplayed(messageID: message.id), frequency: .daily)
             }
-#endif
 
-            if waitlistBetaThankYouPresenter.canShowVPNCard {
-                features.append(.vpnThankYou)
-            }
+            appendFeatureCards(&features)
 
-            if waitlistBetaThankYouPresenter.canShowPIRCard {
-                features.append(.pirThankYou)
+            featuresMatrix = features.chunked(into: itemsPerRow)
+        }
+
+        private func appendFeatureCards(_ features: inout [FeatureType]) {
+            for feature in listOfFeatures where shouldAppendFeature(feature: feature) {
+                features.append(feature)
             }
+        }
 
-            for feature in listOfFeatures {
-                switch feature {
-                case .defaultBrowser:
-                    if shouldMakeDefaultCardBeVisible {
-                        features.append(feature)
-                    }
-                case .importBookmarksAndPasswords:
-                    if shouldImportCardBeVisible {
-                        features.append(feature)
-                    }
-                case .duckplayer:
-                    if shouldDuckPlayerCardBeVisible {
-                        features.append(feature)
-                    }
-                case .emailProtection:
-                    if shouldEmailProtectionCardBeVisible {
-                        features.append(feature)
-                    }
-                case .surveyDay0:
-                    if shouldSurveyDay0BeVisible {
-                        features.append(feature)
-                        userInteractedWithSurveyDay0 = true
-                    }
-                case .surveyDay14:
-                    if shouldSurveyDay14BeVisible {
-                        features.append(feature)
-                    }
-                case .networkProtectionRemoteMessage,
-                        .dataBrokerProtectionRemoteMessage,
-                        .dataBrokerProtectionWaitlistInvited,
-                        .vpnThankYou,
-                        .pirThankYou:
-                    break // Do nothing, these messages get appended first
-                }
+        private func shouldAppendFeature(feature: FeatureType) -> Bool {
+            switch feature {
+            case .defaultBrowser:
+                return shouldMakeDefaultCardBeVisible
+            case .importBookmarksAndPasswords:
+                return shouldImportCardBeVisible
+            case .duckplayer:
+                return shouldDuckPlayerCardBeVisible
+            case .emailProtection:
+                return shouldEmailProtectionCardBeVisible
+            case .permanentSurvey:
+                return shouldPermanentSurveyBeVisible
+            case .networkProtectionRemoteMessage,
+                 .dataBrokerProtectionRemoteMessage,
+                 .dataBrokerProtectionWaitlistInvited:
+                return false // These are handled separately
             }
-            featuresMatrix = features.chunked(into: itemsPerRow)
         }
 
         // Helper Functions
@@ -384,70 +298,22 @@ extension HomePage.Models {
             !emailManager.isSignedIn
         }
 
-        private var shouldSurveyDay0BeVisible: Bool {
-            let oneDayAgo = Calendar.current.date(byAdding: .weekday, value: -1, to: Date())!
-            return isDay0SurveyEnabled &&
-            shouldShowSurveyDay0 &&
-            firstLaunchDate >= oneDayAgo &&
-            Bundle.main.preferredLocalizations.first == "en" &&
-            isPartOfSurveyDay0On10Percent ?? calculateIfIn10percent(day: .day0)
-        }
-
-        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 &&
-            shouldShowSurveyDay14 &&
-            !userInteractedWithSurveyDay0 &&
-            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 var shouldPermanentSurveyBeVisible: Bool {
+            return shouldShowPermanentSurvey &&
+            permanentSurveyManager.isSurveyAvailable
         }
 
-        private enum SurveyDay {
-            case day0
-            case day14
-        }
+        @MainActor private func visitSurvey() {
+            guard let url = permanentSurveyManager.url else { return }
 
-        @MainActor private func visitSurvey(day: SurveyDay) {
-            var surveyURLString: String
-            switch day {
-            case .day0:
-                surveyURLString = day0SurveyURL
-            case .day14:
-                surveyURLString = day14SurveyURL
-            }
-
-            if let url = URL(string: surveyURLString) {
-                let tab = Tab(content: .url(url, source: .ui), shouldLoadInBackground: true)
-                tabCollectionViewModel.append(tab: tab)
-                switch day {
-                case .day0:
-                    shouldShowSurveyDay0 = false
-                case .day14:
-                    shouldShowSurveyDay14 = false
-                }
-            }
+            let tab = Tab(content: .url(url, source: .ui), shouldLoadInBackground: true)
+            tabCollectionViewModel.append(tab: tab)
+            shouldShowPermanentSurvey = false
         }
 
         @MainActor private func handle(remoteMessage: NetworkProtectionRemoteMessage) {
-#if NETWORK_PROTECTION
             guard let actionType = remoteMessage.action.actionType else {
-                Pixel.fire(.networkProtectionRemoteMessageDismissed(messageID: remoteMessage.id))
+                PixelKit.fire(GeneralPixel.networkProtectionRemoteMessageDismissed(messageID: remoteMessage.id))
                 homePageRemoteMessaging.networkProtectionRemoteMessaging.dismiss(message: remoteMessage)
                 refreshFeaturesMatrix()
                 return
@@ -460,20 +326,19 @@ extension HomePage.Models {
                 if let surveyURL = remoteMessage.presentableSurveyURL() {
                     let tab = Tab(content: .url(surveyURL, source: .ui), shouldLoadInBackground: true)
                     tabCollectionViewModel.append(tab: tab)
-                    Pixel.fire(.networkProtectionRemoteMessageOpened(messageID: remoteMessage.id))
+                    PixelKit.fire(GeneralPixel.networkProtectionRemoteMessageOpened(messageID: remoteMessage.id))
 
                     // Dismiss the message after the user opens the URL, even if they just close the tab immediately afterwards.
                     homePageRemoteMessaging.networkProtectionRemoteMessaging.dismiss(message: remoteMessage)
                     refreshFeaturesMatrix()
                 }
             }
-#endif
         }
 
         @MainActor private func handle(remoteMessage: DataBrokerProtectionRemoteMessage) {
 #if DBP
             guard let actionType = remoteMessage.action.actionType else {
-                Pixel.fire(.dataBrokerProtectionRemoteMessageDismissed(messageID: remoteMessage.id))
+                PixelKit.fire(GeneralPixel.dataBrokerProtectionRemoteMessageDismissed(messageID: remoteMessage.id))
                 homePageRemoteMessaging.dataBrokerProtectionRemoteMessaging.dismiss(message: remoteMessage)
                 refreshFeaturesMatrix()
                 return
@@ -486,7 +351,7 @@ extension HomePage.Models {
                 if let surveyURL = remoteMessage.presentableSurveyURL() {
                     let tab = Tab(content: .url(surveyURL, source: .ui), shouldLoadInBackground: true)
                     tabCollectionViewModel.append(tab: tab)
-                    Pixel.fire(.dataBrokerProtectionRemoteMessageOpened(messageID: remoteMessage.id))
+                    PixelKit.fire(GeneralPixel.dataBrokerProtectionRemoteMessageOpened(messageID: remoteMessage.id))
 
                     // Dismiss the message after the user opens the URL, even if they just close the tab immediately afterwards.
                     homePageRemoteMessaging.dataBrokerProtectionRemoteMessaging.dismiss(message: remoteMessage)
@@ -504,20 +369,17 @@ 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, .surveyDay14]
+            [.duckplayer, .emailProtection, .defaultBrowser, .importBookmarksAndPasswords, .permanentSurvey]
         }
 
         case duckplayer
         case emailProtection
         case defaultBrowser
         case importBookmarksAndPasswords
-        case surveyDay0
-        case surveyDay14
+        case permanentSurvey
         case networkProtectionRemoteMessage(NetworkProtectionRemoteMessage)
         case dataBrokerProtectionRemoteMessage(DataBrokerProtectionRemoteMessage)
         case dataBrokerProtectionWaitlistInvited
-        case vpnThankYou
-        case pirThankYou
 
         var title: String {
             switch self {
@@ -529,20 +391,14 @@ extension HomePage.Models {
                 return UserText.newTabSetUpDuckPlayerCardTitle
             case .emailProtection:
                 return UserText.newTabSetUpEmailProtectionCardTitle
-            case .surveyDay0:
-                return UserText.newTabSetUpSurveyDay0CardTitle
-            case .surveyDay14:
-                return UserText.newTabSetUpSurveyDay14CardTitle
+            case .permanentSurvey:
+                return PermanentSurveyManager.title
             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!"
             }
         }
 
@@ -556,20 +412,14 @@ extension HomePage.Models {
                 return UserText.newTabSetUpDuckPlayerSummary
             case .emailProtection:
                 return UserText.newTabSetUpEmailProtectionSummary
-            case .surveyDay0:
-                return UserText.newTabSetUpSurveyDay0Summary
-            case .surveyDay14:
-                return UserText.newTabSetUpSurveyDay14Summary
+            case .permanentSurvey:
+                return PermanentSurveyManager.body
             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."
             }
         }
 
@@ -583,20 +433,14 @@ extension HomePage.Models {
                 return UserText.newTabSetUpDuckPlayerAction
             case .emailProtection:
                 return UserText.newTabSetUpEmailProtectionAction
-            case .surveyDay0:
-                return UserText.newTabSetUpSurveyDay0Action
-            case .surveyDay14:
-                return UserText.newTabSetUpSurveyDay14Action
+            case .permanentSurvey:
+                return PermanentSurveyManager.actionTitle
             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"
             }
         }
 
@@ -612,20 +456,14 @@ extension HomePage.Models {
                 return .cleanTube128.resized(to: iconSize)!
             case .emailProtection:
                 return .inbox128.resized(to: iconSize)!
-            case .surveyDay0:
-                return .qandA128.resized(to: iconSize)!
-            case .surveyDay14:
-                return .qandA128.resized(to: iconSize)!
+            case .permanentSurvey:
+                return .survey128.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)!
             }
         }
     }
@@ -649,32 +487,23 @@ extension HomePage.Models {
 struct HomePageRemoteMessaging {
 
     static func defaultMessaging() -> HomePageRemoteMessaging {
-#if NETWORK_PROTECTION && DBP
+#if DBP
         return HomePageRemoteMessaging(
             networkProtectionRemoteMessaging: DefaultNetworkProtectionRemoteMessaging(),
             networkProtectionUserDefaults: .netP,
             dataBrokerProtectionRemoteMessaging: DefaultDataBrokerProtectionRemoteMessaging(),
             dataBrokerProtectionUserDefaults: .dbp
         )
-#elseif NETWORK_PROTECTION
+#else
         return HomePageRemoteMessaging(
             networkProtectionRemoteMessaging: DefaultNetworkProtectionRemoteMessaging(),
             networkProtectionUserDefaults: .netP
         )
-#elseif DBP
-        return HomePageRemoteMessaging(
-            dataBrokerProtectionRemoteMessaging: DefaultDataBrokerProtectionRemoteMessaging(),
-            dataBrokerProtectionUserDefaults: .dbp
-        )
-#else
-        return HomePageRemoteMessaging()
 #endif
     }
 
-#if NETWORK_PROTECTION
     let networkProtectionRemoteMessaging: NetworkProtectionRemoteMessaging
     let networkProtectionUserDefaults: UserDefaults
-#endif
 
 #if DBP
     let dataBrokerProtectionRemoteMessaging: DataBrokerProtectionRemoteMessaging
@@ -683,12 +512,12 @@ struct HomePageRemoteMessaging {
 
 }
 
-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)
+extension AppVersion {
+    public var majorAndMinorOSVersion: String {
+        let components = osVersion.split(separator: ".")
+        guard components.count >= 2 else {
+            return majorVersionNumber
+        }
+        return "\(components[0]).\(components[1])"
     }
 }
diff --git a/DuckDuckGo/HomePage/Model/HomePageRecentlyVisitedModel.swift b/DuckDuckGo/HomePage/Model/HomePageRecentlyVisitedModel.swift
index 2e627932cc..a22162f63e 100644
--- a/DuckDuckGo/HomePage/Model/HomePageRecentlyVisitedModel.swift
+++ b/DuckDuckGo/HomePage/Model/HomePageRecentlyVisitedModel.swift
@@ -28,7 +28,7 @@ final class RecentlyVisitedModel: ObservableObject {
         let f = RelativeDateTimeFormatter()
         f.unitsStyle = .abbreviated
         return f
-    } ()
+    }()
 
     private let fire: Fire
 
diff --git a/DuckDuckGo/HomePage/Model/PermanentSurveyManager.swift b/DuckDuckGo/HomePage/Model/PermanentSurveyManager.swift
new file mode 100644
index 0000000000..529b3ddf51
--- /dev/null
+++ b/DuckDuckGo/HomePage/Model/PermanentSurveyManager.swift
@@ -0,0 +1,141 @@
+//
+//  PermanentSurveyManager.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 Common
+import AppKit
+
+protocol SurveyManager {
+    var isSurveyAvailable: Bool { get }
+    var url: URL? { get }
+    static var title: String { get }
+    static var body: String { get }
+    static var actionTitle: String { get }
+}
+
+final class PermanentSurveyManager: SurveyManager {
+    static var title: String = "Help Us Improve"
+    static var body: String = "Take our short survey and help us build the best browser."
+    static var actionTitle: String = "Share Your Thoughts"
+
+    @UserDefaultsWrapper(key: .firstLaunchDate, defaultValue: Calendar.current.date(byAdding: .month, value: -1, to: Date())!)
+    private var firstLaunchDate: Date
+
+    @UserDefaultsWrapper(key: .homePageUserInSurveyShare, defaultValue: nil)
+    private var isUserRegisteredInSurveyShare: Bool?
+
+    private let surveySettings: [String: Any]?
+    private let userDecider: InternalUserDecider
+    private let randomNumberGenerator: RandomNumberGenerating
+
+    lazy var statisticsStore: StatisticsStore = LocalStatisticsStore()
+
+    init(privacyConfigurationManager: PrivacyConfigurationManaging = AppPrivacyFeatures.shared.contentBlocking.privacyConfigurationManager,
+         randomNumberGenerator: RandomNumberGenerating = RandomNumberGenerator()) {
+        let newTabContinueSetUpSettings = privacyConfigurationManager.privacyConfig.settings(for: .newTabContinueSetUp)
+        self.surveySettings = newTabContinueSetUpSettings["permanentSurvey"] as? [String: Any]
+        self.userDecider = NSApp.delegateTyped.internalUserDecider
+        self.randomNumberGenerator = randomNumberGenerator
+    }
+
+    public var isSurveyAvailable: Bool {
+        let firstSurveyDayDate = Calendar.current.date(byAdding: .weekday, value: -firstDay, to: Date())!
+        let lastSurveyDayDate = Calendar.current.date(byAdding: .weekday, value: -lastDay, to: Date())!
+        let rightLocale = isLocalized ? true : Bundle.main.preferredLocalizations.first == "en"
+
+        return
+            isEnabled &&
+            firstLaunchDate >= lastSurveyDayDate &&
+            firstLaunchDate <= firstSurveyDayDate &&
+            rightLocale &&
+            isUserInSurveyShare(sharePercentage)
+    }
+
+    public var url: URL? {
+        guard let urlString =  surveySettings?["url"] as? String else { return nil }
+        guard let url = URL(string: urlString) else { return nil }
+
+        var components = URLComponents(url: url, resolvingAgainstBaseURL: true)
+        var newQueryItems: [URLQueryItem] = []
+        if let atb = self.statisticsStore.atb {
+            newQueryItems.append(URLQueryItem(name: "atb", value: atb))
+        }
+        if let variant = statisticsStore.variant {
+            newQueryItems.append(URLQueryItem(name: "v", value: variant))
+        }
+        newQueryItems.append(URLQueryItem(name: "ddg", value: AppVersion.shared.versionNumber))
+        newQueryItems.append(URLQueryItem(name: "macos", value: AppVersion.shared.majorAndMinorOSVersion))
+        let oldQueryItems = components?.queryItems ?? []
+        components?.queryItems = oldQueryItems + newQueryItems
+
+        return components?.url ?? url
+    }
+
+    private func isUserInSurveyShare(_ share: Int) -> Bool {
+        if isUserRegisteredInSurveyShare ?? false {
+            return true
+        }
+        let randomNumber0To99 = randomNumberGenerator.random(in: 0..<100)
+        isUserRegisteredInSurveyShare = randomNumber0To99 < share
+        return isUserRegisteredInSurveyShare!
+    }
+
+    private var isEnabled: Bool {
+        if let state =  surveySettings?["state"] as? String {
+            if state == "enabled" {
+                return true
+            }
+            if state == "internal" && userDecider.isInternalUser {
+                return true
+            }
+        }
+        return false
+    }
+
+    private var isLocalized: Bool {
+        if let state =  surveySettings?["localization"] as? String {
+            if state == "enabled" {
+                return true
+            }
+        }
+        return false
+    }
+
+    private var firstDay: Int {
+        return surveySettings?["firstDay"] as? Int ?? 0
+    }
+
+    private var lastDay: Int {
+        return surveySettings?["lastDay"] as? Int ?? 365
+    }
+
+    private var sharePercentage: Int {
+        return surveySettings?["sharePercentage"] as? Int ?? 0
+    }
+}
+
+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/View/FavoritesView.swift b/DuckDuckGo/HomePage/View/FavoritesView.swift
index 52e7f585d1..39f74b58cf 100644
--- a/DuckDuckGo/HomePage/View/FavoritesView.swift
+++ b/DuckDuckGo/HomePage/View/FavoritesView.swift
@@ -324,12 +324,12 @@ struct Favorite: View {
             .link {
                 model.open(bookmark)
             }.contextMenu(ContextMenu(menuItems: {
-                Button(UserText.openInNewTab, action: { model.openInNewTab(bookmark) })
-                Button(UserText.openInNewWindow, action: { model.openInNewWindow(bookmark) })
+                Button(UserText.openInNewTab, action: { model.openInNewTab(bookmark) }).accessibilityIdentifier("HomePage.Views.openInNewTab")
+                Button(UserText.openInNewWindow, action: { model.openInNewWindow(bookmark) }).accessibilityIdentifier("HomePage.Views.openInNewWindow")
                 Divider()
-                Button(UserText.edit, action: { model.edit(bookmark) })
-                Button(UserText.removeFavorite, action: { model.removeFavorite(bookmark) })
-                Button(UserText.deleteBookmark, action: { model.deleteBookmark(bookmark) })
+                Button(UserText.edit, action: { model.edit(bookmark) }).accessibilityIdentifier("HomePage.Views.editBookmark")
+                Button(UserText.removeFavorite, action: { model.removeFavorite(bookmark) }).accessibilityIdentifier("HomePage.Views.removeFavorite")
+                Button(UserText.deleteBookmark, action: { model.deleteBookmark(bookmark) }).accessibilityIdentifier("HomePage.Views.deleteBookmark")
             }))
 
     }
@@ -344,13 +344,13 @@ extension HomePage.Models.FavoriteModel {
     var favoriteView: some View {
         switch favoriteType {
         case .bookmark(let bookmark):
-            HomePage.Views.Favorite(bookmark: bookmark)
+            HomePage.Views.Favorite(bookmark: bookmark)?.accessibilityIdentifier("HomePage.Models.FavoriteModel.\(bookmark.title)")
 
         case .addButton:
-            HomePage.Views.FavoritesGridAddButton()
+            HomePage.Views.FavoritesGridAddButton().accessibilityIdentifier("HomePage.Models.FavoriteModel.addButton")
 
         case .ghostButton:
-            HomePage.Views.FavoritesGridGhostButton()
+            HomePage.Views.FavoritesGridGhostButton().accessibilityIdentifier("HomePage.Models.FavoriteModel.ghostButton")
         }
     }
 }
diff --git a/DuckDuckGo/HomePage/View/HomePageViewController.swift b/DuckDuckGo/HomePage/View/HomePageViewController.swift
index 96fb2aca47..9769333182 100644
--- a/DuckDuckGo/HomePage/View/HomePageViewController.swift
+++ b/DuckDuckGo/HomePage/View/HomePageViewController.swift
@@ -20,6 +20,7 @@ import Cocoa
 import Combine
 import SwiftUI
 import History
+import PixelKit
 
 @MainActor
 final class HomePageViewController: NSViewController {
@@ -106,8 +107,8 @@ final class HomePageViewController: NSViewController {
 
     override func viewWillAppear() {
         super.viewWillAppear()
-        if OnboardingViewModel.isOnboardingFinished && Pixel.isNewUser {
-            Pixel.fire(.newTabInitial, limitTo: .initial)
+        if OnboardingViewModel.isOnboardingFinished && AppDelegate.isNewUser {
+            PixelKit.fire(GeneralPixel.newTabInitial, frequency: .legacyInitial)
         }
         subscribeToHistory()
     }
@@ -158,7 +159,7 @@ final class HomePageViewController: NSViewController {
 
     func createDefaultBrowserModel() -> HomePage.Models.DefaultBrowserModel {
         return .init(isDefault: DefaultBrowserPreferences.shared.isDefault, wasClosed: defaultBrowserDismissed, requestSetDefault: { [weak self] in
-            Pixel.fire(.defaultRequestedFromHomepage)
+            PixelKit.fire(GeneralPixel.defaultRequestedFromHomepage)
             let defaultBrowserPreferencesModel = DefaultBrowserPreferences.shared
             defaultBrowserPreferencesModel.becomeDefault { [weak self] isDefault in
                 _ = defaultBrowserPreferencesModel
diff --git a/DuckDuckGo/Info.plist b/DuckDuckGo/Info.plist
index a521153891..095900fb99 100644
--- a/DuckDuckGo/Info.plist
+++ b/DuckDuckGo/Info.plist
@@ -9,42 +9,444 @@
 	<key>CFBundleDevelopmentRegion</key>
 	<string>$(DEVELOPMENT_LANGUAGE)</string>
 	<key>CFBundleDocumentTypes</key>
-	<array>
-		<dict>
-			<key>CFBundleTypeExtensions</key>
-			<array>
-				<string>html</string>
-				<string>htm</string>
-				<string>shtml</string>
-				<string>xht</string>
-				<string>xhtml</string>
-			</array>
-			<key>CFBundleTypeIconFile</key>
-			<string>document.icns</string>
-			<key>CFBundleTypeName</key>
-			<string>HTML Document</string>
-			<key>CFBundleTypeOSTypes</key>
-			<array>
-				<string>HTML</string>
-			</array>
-			<key>CFBundleTypeRole</key>
-			<string>Viewer</string>
-			<key>LSHandlerRank</key>
-			<string>Default</string>
-		</dict>
-		<dict>
-			<key>CFBundleTypeExtensions</key>
-			<array>
-				<string>duckload</string>
-			</array>
-			<key>CFBundleTypeName</key>
-			<string>Incomplete download</string>
-			<key>CFBundleTypeRole</key>
-			<string>Editor</string>
-			<key>NSIsRelatedItemType</key>
-			<true/>
-		</dict>
-	</array>
+    <array>
+        <dict>
+            <key>CFBundleTypeExtensions</key>
+            <array>
+                <string>html</string>
+                <string>htm</string>
+                <string>shtml</string>
+                <string>xht</string>
+                <string>xhtml</string>
+            </array>
+            <key>CFBundleTypeIconFile</key>
+            <string>document.icns</string>
+            <key>CFBundleTypeIconSystemGenerated</key>
+            <string>YES</string>
+            <key>CFBundleTypeName</key>
+            <string>HTML Document</string>
+            <key>CFBundleTypeOSTypes</key>
+            <array>
+                <string>HTML</string>
+            </array>
+            <key>CFBundleTypeRole</key>
+            <string>Viewer</string>
+            <key>LSHandlerRank</key>
+            <string>Default</string>
+        </dict>
+        <dict>
+            <key>CFBundleTypeExtensions</key>
+            <array>
+                <string>txt</string>
+                <string>text</string>
+                <string>log</string>
+            </array>
+            <key>CFBundleTypeMIMETypes</key>
+            <array>
+                <string>text/plain</string>
+            </array>
+            <key>LSItemContentTypes</key>
+            <array>
+                <string>public.text</string>
+            </array>
+            <key>CFBundleTypeOSTypes</key>
+            <array>
+                <string>TEXT</string>
+            </array>
+            <key>CFBundleTypeIconFile</key>
+            <string>document.icns</string>
+            <key>CFBundleTypeIconSystemGenerated</key>
+            <string>YES</string>
+            <key>CFBundleTypeName</key>
+            <string>Text document</string>
+            <key>CFBundleTypeRole</key>
+            <string>Viewer</string>
+            <key>LSHandlerRank</key>
+            <string>Alternate</string>
+        </dict>
+        <dict>
+            <key>CFBundleTypeExtensions</key>
+            <array>
+                <string>webarchive</string>
+            </array>
+            <key>CFBundleTypeMIMETypes</key>
+            <array>
+                <string>application/x-webarchive</string>
+            </array>
+            <key>CFBundleTypeIconFile</key>
+            <string>document.icns</string>
+            <key>CFBundleTypeIconSystemGenerated</key>
+            <string>YES</string>
+            <key>CFBundleTypeName</key>
+            <string>Web archive</string>
+            <key>CFBundleTypeRole</key>
+            <string>Viewer</string>
+            <key>LSHandlerRank</key>
+            <string>Default</string>
+        </dict>
+        <dict>
+            <key>CFBundleTypeExtensions</key>
+            <array>
+                <string>duckload</string>
+            </array>
+            <key>CFBundleTypeName</key>
+            <string>Incomplete download</string>
+            <key>CFBundleTypeRole</key>
+            <string>Editor</string>
+            <key>NSIsRelatedItemType</key>
+            <true/>
+            <key>LSHandlerRank</key>
+            <string>Owner</string>
+        </dict>
+        <dict>
+            <key>CFBundleTypeExtensions</key>
+            <array>
+                <string>pdf</string>
+            </array>
+            <key>CFBundleTypeIconFile</key>
+            <string>document.icns</string>
+            <key>CFBundleTypeIconSystemGenerated</key>
+            <string>YES</string>
+            <key>CFBundleTypeName</key>
+            <string>PDF Document</string>
+            <key>CFBundleTypeMIMETypes</key>
+            <array>
+                <string>application/pdf</string>
+            </array>
+            <key>CFBundleTypeRole</key>
+            <string>Viewer</string>
+            <key>LSHandlerRank</key>
+            <string>Alternate</string>
+        </dict>
+        <dict>
+            <key>CFBundleTypeExtensions</key>
+            <array>
+                <string>png</string>
+            </array>
+            <key>CFBundleTypeMIMETypes</key>
+            <array>
+                <string>image/png</string>
+            </array>
+            <key>LSItemContentTypes</key>
+            <array>
+                <string>public.png</string>
+            </array>
+            <key>CFBundleTypeOSTypes</key>
+            <array>
+                <string>PNGf</string>
+            </array>
+            <key>CFBundleTypeIconFile</key>
+            <string>document.icns</string>
+            <key>CFBundleTypeName</key>
+            <string>PNG image</string>
+            <key>CFBundleTypeRole</key>
+            <string>Viewer</string>
+            <key>LSHandlerRank</key>
+            <string>Alternate</string>
+        </dict>
+        <dict>
+            <key>CFBundleTypeExtensions</key>
+            <array>
+                <string>jpg</string>
+                <string>jpeg</string>
+                <string>jp2</string>
+                <string>jpeg2</string>
+            </array>
+            <key>CFBundleTypeMIMETypes</key>
+            <array>
+                <string>image/jpeg</string>
+                <string>image/jp2</string>
+                <string>image/jpeg2000</string>
+            </array>
+            <key>CFBundleTypeOSTypes</key>
+            <array>
+                <string>JPEG</string>
+                <string>jp2 </string>
+            </array>
+            <key>LSItemContentTypes</key>
+            <array>
+                <string>public.jpeg</string>
+                <string>public.jpeg-2000</string>
+            </array>
+            <key>CFBundleTypeIconFile</key>
+            <string>document.icns</string>
+            <key>CFBundleTypeIconSystemGenerated</key>
+            <string>YES</string>
+            <key>CFBundleTypeName</key>
+            <string>JPEG image</string>
+            <key>CFBundleTypeRole</key>
+            <string>Viewer</string>
+            <key>LSHandlerRank</key>
+            <string>Alternate</string>
+        </dict>
+        <dict>
+            <key>CFBundleTypeExtensions</key>
+            <array>
+                <string>gif</string>
+                <string>giff</string>
+            </array>
+            <key>CFBundleTypeMIMETypes</key>
+            <array>
+                <string>image/gif</string>
+            </array>
+            <key>CFBundleTypeOSTypes</key>
+            <array>
+                <string>GIFf</string>
+            </array>
+            <key>LSItemContentTypes</key>
+            <array>
+                <string>com.compuserve.gif</string>
+            </array>
+            <key>CFBundleTypeIconFile</key>
+            <string>document.icns</string>
+            <key>CFBundleTypeIconSystemGenerated</key>
+            <string>YES</string>
+            <key>CFBundleTypeName</key>
+            <string>GIF image</string>
+            <key>CFBundleTypeRole</key>
+            <string>Viewer</string>
+            <key>LSHandlerRank</key>
+            <string>Alternate</string>
+        </dict>
+        <dict>
+            <key>CFBundleTypeExtensions</key>
+            <array>
+                <string>svg</string>
+            </array>
+            <key>CFBundleTypeMIMETypes</key>
+            <array>
+                <string>image/svg+xml</string>
+            </array>
+            <key>LSItemContentTypes</key>
+            <array>
+                <string>public.svg-image</string>
+            </array>
+            <key>CFBundleTypeIconFile</key>
+            <string>document.icns</string>
+            <key>CFBundleTypeIconSystemGenerated</key>
+            <string>YES</string>
+            <key>CFBundleTypeName</key>
+            <string>SVG image</string>
+            <key>CFBundleTypeRole</key>
+            <string>Viewer</string>
+            <key>LSHandlerRank</key>
+            <string>Alternate</string>
+        </dict>
+        <dict>
+            <key>CFBundleTypeExtensions</key>
+            <array>
+                <string>tiff</string>
+                <string>tif</string>
+            </array>
+            <key>CFBundleTypeMIMETypes</key>
+            <array>
+                <string>image/tiff</string>
+            </array>
+            <key>CFBundleTypeOSTypes</key>
+            <array>
+                <string>TIFF</string>
+            </array>
+            <key>CFBundleTypeIconFile</key>
+            <string>document.icns</string>
+            <key>CFBundleTypeIconSystemGenerated</key>
+            <string>YES</string>
+            <key>CFBundleTypeName</key>
+            <string>TIFF image</string>
+            <key>CFBundleTypeRole</key>
+            <string>Viewer</string>
+            <key>LSHandlerRank</key>
+            <string>Alternate</string>
+        </dict>
+        <dict>
+            <key>CFBundleTypeExtensions</key>
+            <array>
+                <string>ico</string>
+            </array>
+            <key>CFBundleTypeMIMETypes</key>
+            <array>
+                <string>image/x-icon</string>
+                <string>image/icon</string>
+                <string>image/ico</string>
+            </array>
+            <key>CFBundleTypeOSTypes</key>
+            <array>
+                <string>ICO </string>
+            </array>
+            <key>CFBundleTypeIconFile</key>
+            <string>document.icns</string>
+            <key>CFBundleTypeIconSystemGenerated</key>
+            <string>YES</string>
+            <key>CFBundleTypeName</key>
+            <string>Windows icon</string>
+            <key>CFBundleTypeRole</key>
+            <string>Viewer</string>
+            <key>LSHandlerRank</key>
+            <string>Alternate</string>
+        </dict>
+        <dict>
+            <key>CFBundleTypeExtensions</key>
+            <array>
+                <string>bmp</string>
+            </array>
+            <key>CFBundleTypeMIMETypes</key>
+            <array>
+                <string>image/bmp</string>
+                <string>image/x-bitmap</string>
+                <string>image/x-bmp</string>
+                <string>image/x-ms-bitmap</string>
+                <string>image/x-ms-bmp</string>
+            </array>
+            <key>LSItemContentTypes</key>
+            <array>
+                <string>com.microsoft.bmp</string>
+            </array>
+            <key>CFBundleTypeName</key>
+            <string>BMP Image</string>
+            <key>CFBundleTypeIconFile</key>
+            <string>document.icns</string>
+            <key>CFBundleTypeIconSystemGenerated</key>
+            <string>YES</string>
+            <key>LSRoleHandlerScheme</key>
+            <string>Viewer</string>
+            <key>LSHandlerRank</key>
+            <string>Alternate</string>
+        </dict>
+        <dict>
+            <key>CFBundleTypeExtensions</key>
+            <array>
+                <string>xml</string>
+                <string>rss</string>
+                <string>atom</string>
+            </array>
+            <key>CFBundleTypeMIMETypes</key>
+            <array>
+                <string>text/xml</string>
+                <string>application/xml</string>
+                <string>application/rss+xml</string>
+                <string>application/atom+xml</string>
+            </array>
+            <key>CFBundleTypeIconFile</key>
+            <string>document.icns</string>
+            <key>CFBundleTypeIconSystemGenerated</key>
+            <string>YES</string>
+            <key>CFBundleTypeName</key>
+            <string>XML document</string>
+            <key>CFBundleTypeRole</key>
+            <string>Viewer</string>
+            <key>LSHandlerRank</key>
+            <string>Default</string>
+        </dict>
+        <dict>
+            <key>CFBundleTypeExtensions</key>
+            <array>
+                <string>json</string>
+            </array>
+            <key>CFBundleTypeMIMETypes</key>
+            <array>
+                <string>text/json</string>
+                <string>application/json</string>
+            </array>
+            <key>LSItemContentTypes</key>
+            <array>
+                <string>public.json</string>
+            </array>
+            <key>CFBundleTypeIconFile</key>
+            <string>document.icns</string>
+            <key>CFBundleTypeIconSystemGenerated</key>
+            <string>YES</string>
+            <key>CFBundleTypeName</key>
+            <string>JSON document</string>
+            <key>CFBundleTypeRole</key>
+            <string>Viewer</string>
+            <key>LSHandlerRank</key>
+            <string>Default</string>
+        </dict>
+        <dict>
+            <key>CFBundleTypeExtensions</key>
+            <array>
+                <string>flac</string>
+                <string>m4a</string>
+                <string>mp3</string>
+                <string>mpg</string>
+                <string>wav</string>
+                <string>aac</string>
+                <string>amr</string>
+                <string>mp4</string>
+                <string>mpeg</string>
+            </array>
+            <key>CFBundleTypeMIMETypes</key>
+            <array>
+                <string>audio/flac</string>
+                <string>audio/x-flac</string>
+                <string>audio/m4a</string>
+                <string>audio/mp4</string>
+                <string>audio/mp3</string>
+                <string>audio/mpeg</string>
+                <string>audio/mpeg3</string>
+                <string>audio/qcp</string>
+                <string>audio/qcelp</string>
+                <string>audio/vnd.qcelp</string>
+                <string>audio/vnd.qcp</string>
+                <string>audio/vnd.wave</string>
+                <string>audio/x-wav</string>
+                <string>audio/x-aac</string>
+                <string>audio/aac</string>
+                <string>audio/x-amr</string>
+                <string>audio/amr</string>
+                <string>audio/x-m4a</string>
+                <string>audio/x-mp3</string>
+                <string>audio/x-mp4</string>
+                <string>audio/x-mpeg</string>
+                <string>audio/x-mpeg3</string>
+                <string>audio/x-mpg</string>
+            </array>
+            <key>CFBundleTypeIconFile</key>
+            <string>document.icns</string>
+            <key>CFBundleTypeIconSystemGenerated</key>
+            <string>YES</string>
+            <key>CFBundleTypeName</key>
+            <string>Audio File</string>
+            <key>LSRoleHandlerScheme</key>
+            <string>Viewer</string>
+            <key>LSHandlerRank</key>
+            <string>Alternate</string>
+        </dict>
+        <dict>
+            <key>CFBundleTypeExtensions</key>
+            <array>
+                <string>3gp</string>
+                <string>avi</string>
+                <string>m4v</string>
+                <string>mov</string>
+                <string>mp4</string>
+            </array>
+            <key>CFBundleTypeMIMETypes</key>
+            <array>
+                <string>video/3gp</string>
+                <string>video/3gpp</string>
+                <string>video/avi</string>
+                <string>video/x-msvideo</string>
+                <string>video/x-m4v</string>
+                <string>video/mp4</string>
+                <string>video/x-quicktime</string>
+                <string>video/quicktime</string>
+            </array>
+            <key>LSItemContentTypes</key>
+            <array>
+                <string>public.movie</string>
+            </array>
+            <key>CFBundleTypeIconFile</key>
+            <string>document.icns</string>
+            <key>CFBundleTypeIconSystemGenerated</key>
+            <string>YES</string>
+            <key>CFBundleTypeName</key>
+            <string>Video File</string>
+            <key>LSRoleHandlerScheme</key>
+            <string>Viewer</string>
+            <key>LSHandlerRank</key>
+            <string>Alternate</string>
+        </dict>
+    </array>
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>
diff --git a/DuckDuckGo/InfoPlist.xcstrings b/DuckDuckGo/InfoPlist.xcstrings
index e4f7972ce7..28e181ef08 100644
--- a/DuckDuckGo/InfoPlist.xcstrings
+++ b/DuckDuckGo/InfoPlist.xcstrings
@@ -363,4 +363,4 @@
     }
   },
   "version" : "1.0"
-}
+}
\ No newline at end of file
diff --git a/DuckDuckGo/Localizable.xcstrings b/DuckDuckGo/Localizable.xcstrings
index faac3cb31a..f65592de5a 100644
--- a/DuckDuckGo/Localizable.xcstrings
+++ b/DuckDuckGo/Localizable.xcstrings
@@ -317,6 +317,7 @@
       }
     },
     "••••••••••••" : {
+      "extractionState" : "stale",
       "localizations" : {
         "de" : {
           "stringUnit" : {
@@ -480,6 +481,58 @@
         }
       }
     },
+    "1." : {
+      "localizations" : {
+        "de" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "1."
+          }
+        },
+        "es" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "1."
+          }
+        },
+        "fr" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "1."
+          }
+        },
+        "it" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "1."
+          }
+        },
+        "nl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "1."
+          }
+        },
+        "pl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "1."
+          }
+        },
+        "pt" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "1."
+          }
+        },
+        "ru" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "1."
+          }
+        }
+      }
+    },
     "about.app_name" : {
       "comment" : "Application name to be displayed in the About dialog",
       "extractionState" : "extracted_with_value",
@@ -768,6 +821,7 @@
     },
     "Add Folder" : {
       "comment" : "Add Folder popover: Create folder button",
+      "extractionState" : "stale",
       "localizations" : {
         "de" : {
           "stringUnit" : {
@@ -1114,6 +1168,7 @@
     },
     "Address:" : {
       "comment" : "Add Bookmark dialog bookmark url field heading",
+      "extractionState" : "stale",
       "localizations" : {
         "de" : {
           "stringUnit" : {
@@ -2358,6 +2413,66 @@
         }
       }
     },
+    "auto.clear" : {
+      "comment" : "Header of a section in Settings. The setting configures clearing data automatically after quitting the app.",
+      "extractionState" : "extracted_with_value",
+      "localizations" : {
+        "de" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Automatisch löschen"
+          }
+        },
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "Auto-Clear"
+          }
+        },
+        "es" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Borrado automático"
+          }
+        },
+        "fr" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Effacement automatique"
+          }
+        },
+        "it" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Cancellazione automatica"
+          }
+        },
+        "nl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Automatisch wissen"
+          }
+        },
+        "pl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Automatyczne czyszczenie"
+          }
+        },
+        "pt" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Limpeza automática"
+          }
+        },
+        "ru" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Автоочистка"
+          }
+        }
+      }
+    },
     "autoconsent.checkbox.title" : {
       "comment" : "Autoconsent settings checkbox title",
       "extractionState" : "extracted_with_value",
@@ -3678,6 +3793,66 @@
         }
       }
     },
+    "autofill.hide-card-cvv" : {
+      "comment" : "Tooltip for the Autofill panel's Hide CVV button",
+      "extractionState" : "extracted_with_value",
+      "localizations" : {
+        "de" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "CVV ausblenden"
+          }
+        },
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "Hide CVV"
+          }
+        },
+        "es" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Ocultar CVV"
+          }
+        },
+        "fr" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Masquer CVV"
+          }
+        },
+        "it" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Nascondi CVV"
+          }
+        },
+        "nl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "CVV verbergen"
+          }
+        },
+        "pl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Ukryj CVV"
+          }
+        },
+        "pt" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Ocultar CVV"
+          }
+        },
+        "ru" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Скрыть CVV-код"
+          }
+        }
+      }
+    },
     "autofill.hide-password" : {
       "comment" : "Tooltip for the Autofill panel's Hide Password button",
       "extractionState" : "extracted_with_value",
@@ -5298,6 +5473,66 @@
         }
       }
     },
+    "autofill.show-card-cvv" : {
+      "comment" : "Tooltip for the Autofill panel's Show CVV button",
+      "extractionState" : "extracted_with_value",
+      "localizations" : {
+        "de" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "CVV anzeigen"
+          }
+        },
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "Show CVV"
+          }
+        },
+        "es" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Mostrar CVV"
+          }
+        },
+        "fr" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Afficher CVV"
+          }
+        },
+        "it" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Mostra CVV"
+          }
+        },
+        "nl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "CVV weergeven"
+          }
+        },
+        "pl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Pokaż CVV"
+          }
+        },
+        "pt" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Mostrar CVV"
+          }
+        },
+        "ru" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Показать CVV-код"
+          }
+        }
+      }
+    },
     "autofill.show-password" : {
       "comment" : "Tooltip for the Autofill panel's Show Password button",
       "extractionState" : "extracted_with_value",
@@ -5478,6 +5713,66 @@
         }
       }
     },
+    "automatically.clear.data" : {
+      "comment" : "Label after the checkbox in Settings which configures clearing data automatically after quitting the app.",
+      "extractionState" : "extracted_with_value",
+      "localizations" : {
+        "de" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Tabs und Browserdaten automatisch löschen, wenn DuckDuckGo beendet wird"
+          }
+        },
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "Automatically clear tabs and browsing data when DuckDuckGo quits"
+          }
+        },
+        "es" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Borra automáticamente las pestañas y los datos de navegación cuando se cierra DuckDuckGo"
+          }
+        },
+        "fr" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Effacer automatiquement les onglets et les données de navigation lorsque DuckDuckGo se ferme"
+          }
+        },
+        "it" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Cancella automaticamente schede e dati di navigazione quando chiudi DuckDuckGo"
+          }
+        },
+        "nl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Tabbladen en browsegegevens automatisch wissen wanneer DuckDuckGo stopt"
+          }
+        },
+        "pl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Automatycznie czyść karty i dane przeglądania przy wychodzeniu z DuckDuckGo"
+          }
+        },
+        "pt" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Limpar automaticamente os separadores e os dados de navegação quando o DuckDuckGo fecha"
+          }
+        },
+        "ru" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Автоматически закрывает вкладки и стирает данные о посещении сайтов при завершении работы DuckDuckGo."
+          }
+        }
+      }
+    },
     "Birthday" : {
       "comment" : "Title of the section of the Identities manager where the user can add/modify a date of birth",
       "localizations" : {
@@ -6130,6 +6425,186 @@
         }
       }
     },
+    "bitwarden.incompatible" : {
+      "comment" : "Message that warns user that specific Bitwarden app vesions are not compatible with this app",
+      "extractionState" : "extracted_with_value",
+      "localizations" : {
+        "de" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Die folgenden Bitwarden-Versionen sind mit DuckDuckGo inkompatibel: v2024.3.0, v2024.3.2, v2024.4.0, v2024.4.1. Bitte kehre zu einer älteren Version zurück, indem du die folgenden Schritte ausführst:"
+          }
+        },
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "The following Bitwarden versions are incompatible with DuckDuckGo: v2024.3.0, v2024.3.2, v2024.4.0, v2024.4.1. Please revert to an older version by following these steps:"
+          }
+        },
+        "es" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Las siguientes versiones de Bitwarden son incompatibles con DuckDuckGo: v2024.3.0, v2024.3.2, v2024.4.0, v2024.4.1. Vuelve a una versión anterior siguiendo estos pasos:"
+          }
+        },
+        "fr" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Les versions suivantes de Bitwarden sont incompatibles avec DuckDuckGo : v2024.3.0, v2024.3.2, v2024.4.0 et v2024.4.1. Veuillez revenir à une version antérieure en procédant comme suit :"
+          }
+        },
+        "it" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Le seguenti versioni di Bitwarden non sono compatibili con DuckDuckGo: v2024.3.0, v2024.3.2, v2024.4.0, v2024.4.1. È necessario tornare a una versione precedente seguendo questi passaggi:"
+          }
+        },
+        "nl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "De volgende versies van Bitwarden zijn niet compatibel met DuckDuckGo: v2024.3.0, v2024.3.2, v2024.4.0, v2024.4.1. Volg deze stappen om terug te gaan naar een oudere versie:"
+          }
+        },
+        "pl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Następujące wersje Bitwarden są niezgodne z DuckDuckGo: v2024.3.0, v2024.3.2, v2024.4.0, v2024.4.1. Przywróć starszą wersję, wykonując następujące czynności:"
+          }
+        },
+        "pt" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "As seguintes versões do Bitwarden são incompatíveis com o DuckDuckGo: v2024.3.0, v2024.3.2, v2024.4.0 e v2024.4.1. Reverte para uma versão mais antiga seguindo estes passos:"
+          }
+        },
+        "ru" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "С DuckDuckGo несовместимы следующие версии Bitwarden: 2024.3.0, 2024.3.2, 2024.4.0, 2024.4.1. Вернитесь к более старой версии, выполнив следующие действия:"
+          }
+        }
+      }
+    },
+    "bitwarden.incompatible.step.1" : {
+      "comment" : "First step to downgrade Bitwarden",
+      "extractionState" : "extracted_with_value",
+      "localizations" : {
+        "de" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "V2014.2.1 herunterladen"
+          }
+        },
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "Download v2014.2.1"
+          }
+        },
+        "es" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Descargar v2014.2.1"
+          }
+        },
+        "fr" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Télécharger v2014.2.1"
+          }
+        },
+        "it" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Scarica la versione v2014.2.1"
+          }
+        },
+        "nl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Download v2014.2.1"
+          }
+        },
+        "pl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Pobierz v2014.2.1"
+          }
+        },
+        "pt" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Transfere a versão v2014.2.1"
+          }
+        },
+        "ru" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Скачайте версию 2014.2.1"
+          }
+        }
+      }
+    },
+    "bitwarden.incompatible.step.2" : {
+      "comment" : "Second step to downgrade Bitwarden",
+      "extractionState" : "extracted_with_value",
+      "localizations" : {
+        "de" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "2. Öffne die heruntergeladene DMG-Datei und ziehe die Bitwarden-Anwendung auf den Ordner „/Applications“."
+          }
+        },
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "2. Open the downloaded DMG file and drag the Bitwarden application to\nthe /Applications folder."
+          }
+        },
+        "es" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "2. Abre el archivo DMG descargado y arrastra la aplicación Bitwarden a\nla carpeta /Applications."
+          }
+        },
+        "fr" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "2. Ouvrez le fichier DMG téléchargé et faites glisser l'application Bitwarden vers\nle dossier /Applications."
+          }
+        },
+        "it" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "2. Apri il file DMG scaricato e trascina l'applicazione Bitwarden nella\n/cartella Applications."
+          }
+        },
+        "nl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "2. Open het gedownloade DMG-bestand en sleep de Bitwarden-app naar\n de map /Applications."
+          }
+        },
+        "pl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "2. Otwórz pobrany plik DMG i przeciągnij aplikację Bitwarden do\nfolderu /Applications."
+          }
+        },
+        "pt" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "2. Abre o ficheiro DMG transferido e arrasta a aplicação Bitwarden para\na pasta /Applications."
+          }
+        },
+        "ru" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "2. Откройте загруженный файл DMG и перетащите приложение Bitwarden в стандартную папку «Программы»."
+          }
+        }
+      }
+    },
     "bitwarden.install" : {
       "comment" : "Button to install Bitwarden app",
       "extractionState" : "extracted_with_value",
@@ -7151,6 +7626,7 @@
     },
     "Bookmark Added" : {
       "comment" : "Bookmark Added popover title",
+      "extractionState" : "stale",
       "localizations" : {
         "de" : {
           "stringUnit" : {
@@ -7308,6 +7784,66 @@
         }
       }
     },
+    "bookmark.all.tabs" : {
+      "comment" : "Menu item for bookmarking all the open tabs",
+      "extractionState" : "extracted_with_value",
+      "localizations" : {
+        "de" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Alle Tabs mit Lesezeichen versehen…"
+          }
+        },
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "Bookmark All Tabs…"
+          }
+        },
+        "es" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Añadir todas las pestañas a marcadores…"
+          }
+        },
+        "fr" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Ajouter tous les onglets aux signets…"
+          }
+        },
+        "it" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Crea un segnalibro con tutte le schede…"
+          }
+        },
+        "nl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Alle tabbladen toevoegen als bladwijzer…"
+          }
+        },
+        "pl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Dodaj wszystkie karty do zakładek…"
+          }
+        },
+        "pt" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Marcar todos os separadores…"
+          }
+        },
+        "ru" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Добавить все вкладки в закладки…"
+          }
+        }
+      }
+    },
     "bookmark.dialog.add" : {
       "comment" : "Button to confim a bookmark creation",
       "extractionState" : "extracted_with_value",
@@ -7435,55 +7971,55 @@
         "de" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Diese Seite als Lesezeichen markieren"
+            "value" : "Diese Seite mit einem Lesezeichen versehen…"
           }
         },
         "en" : {
           "stringUnit" : {
             "state" : "new",
-            "value" : "Bookmark This Page"
+            "value" : "Bookmark This Page…"
           }
         },
         "es" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Marcar esta página"
+            "value" : "Marcar esta página…"
           }
         },
         "fr" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Ajouter cette page aux signets"
+            "value" : "Ajouter cette page aux signets…"
           }
         },
         "it" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Crea un segnalibro per questa pagina"
+            "value" : "Crea un segnalibro per questa pagina…"
           }
         },
         "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Bladwijzer toevoegen aan deze pagina"
+            "value" : "Bladwijzer toevoegen voor deze pagina…"
           }
         },
         "pl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Dodaj tę stronę do zakładek"
+            "value" : "Dodaj tę stronę do zakładek…"
           }
         },
         "pt" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Marcar esta página"
+            "value" : "Marcar esta página…"
           }
         },
         "ru" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Сохранить в закладках"
+            "value" : "Сохранить страницу в закладках…"
           }
         }
       }
@@ -8494,308 +9030,608 @@
         }
       }
     },
-    "bookmarks.dialog.action.addBookmark" : {
-      "comment" : "CTA title for adding a Bookmark",
-      "extractionState" : "extracted_with_value",
-      "localizations" : {
-        "de" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Lesezeichen hinzufügen"
-          }
-        },
-        "en" : {
-          "stringUnit" : {
-            "state" : "new",
-            "value" : "Add Bookmark"
-          }
-        },
-        "es" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Añadir marcador"
-          }
-        },
-        "fr" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Ajouter un signet"
-          }
-        },
-        "it" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Aggiungi ai segnalibri"
-          }
-        },
-        "nl" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Bladwijzer toevoegen"
-          }
-        },
-        "pl" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Dodaj zakładkę"
-          }
-        },
-        "pt" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Adicionar marcador"
-          }
-        },
-        "ru" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Добавить закладку"
-          }
-        }
-      }
-    },
-    "bookmarks.dialog.action.addFolder" : {
-      "comment" : "CTA title for adding a Folder",
+    "bookmarks.dialog.action.addAllBookmarks" : {
+      "comment" : "CTA title for saving multiple Bookmarks at once",
       "extractionState" : "extracted_with_value",
       "localizations" : {
         "de" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Ordner hinzufügen"
+            "value" : "Lesezeichen speichern"
           }
         },
         "en" : {
           "stringUnit" : {
             "state" : "new",
-            "value" : "Add Folder"
+            "value" : "Save Bookmarks"
           }
         },
         "es" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Añadir carpeta"
+            "value" : "Guardar marcadores"
           }
         },
         "fr" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Ajouter le dossier"
+            "value" : "Enregistrer les signets"
           }
         },
         "it" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Aggiungi cartella"
+            "value" : "Salva segnalibri"
           }
         },
         "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Map toevoegen"
+            "value" : "Bladwijzers opslaan"
           }
         },
         "pl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Dodaj folder"
+            "value" : "Zapisz zakładki"
           }
         },
         "pt" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Adicionar pasta"
+            "value" : "Guardar marcadores"
           }
         },
         "ru" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Добавить папку"
+            "value" : "Сохранение закладок"
           }
         }
       }
     },
-    "bookmarks.dialog.field.location" : {
-      "comment" : "Location field label for Bookmark folder",
-      "extractionState" : "extracted_with_value",
-      "localizations" : {
-        "de" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Standort"
-          }
-        },
-        "en" : {
-          "stringUnit" : {
-            "state" : "new",
-            "value" : "Location"
-          }
-        },
-        "es" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Ubicación"
-          }
-        },
-        "fr" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Localisation"
-          }
-        },
-        "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" : "Местоположение"
-          }
-        }
-      }
-    },
-    "bookmarks.dialog.field.name" : {
-      "comment" : "Name field label for Bookmark or Folder",
-      "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" : "Название"
-          }
-        }
-      }
-    },
-    "bookmarks.dialog.field.url" : {
-      "comment" : "URL field label for Bookmar",
+    "bookmarks.dialog.action.addBookmark" : {
+      "comment" : "CTA title for adding a Bookmark",
       "extractionState" : "extracted_with_value",
       "localizations" : {
         "de" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "URL"
+            "value" : "Lesezeichen hinzufügen"
           }
         },
         "en" : {
           "stringUnit" : {
             "state" : "new",
-            "value" : "URL"
+            "value" : "Add Bookmark"
           }
         },
         "es" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "URL"
+            "value" : "Añadir marcador"
           }
         },
         "fr" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "URL"
+            "value" : "Ajouter un signet"
           }
         },
         "it" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "URL"
+            "value" : "Aggiungi ai segnalibri"
           }
         },
         "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "URL"
+            "value" : "Bladwijzer toevoegen"
           }
         },
         "pl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Adres URL"
+            "value" : "Dodaj zakładkę"
           }
         },
         "pt" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "URL"
+            "value" : "Adicionar marcador"
           }
         },
         "ru" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "URL"
+            "value" : "Добавить закладку"
           }
         }
       }
     },
-    "bookmarks.dialog.folder.title.add" : {
-      "comment" : "Bookmark folder creation dialog title",
+    "bookmarks.dialog.action.addFolder" : {
+      "comment" : "CTA title for adding a Folder",
+      "extractionState" : "extracted_with_value",
+      "localizations" : {
+        "de" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Ordner hinzufügen"
+          }
+        },
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "Add Folder"
+          }
+        },
+        "es" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Añadir carpeta"
+          }
+        },
+        "fr" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Ajouter le dossier"
+          }
+        },
+        "it" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Aggiungi cartella"
+          }
+        },
+        "nl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Map toevoegen"
+          }
+        },
+        "pl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Dodaj folder"
+          }
+        },
+        "pt" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Adicionar pasta"
+          }
+        },
+        "ru" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Добавить папку"
+          }
+        }
+      }
+    },
+    "bookmarks.dialog.allTabs.message.add" : {
+      "comment" : "Bookmark creation for all open tabs dialog title",
+      "extractionState" : "extracted_with_value",
+      "localizations" : {
+        "de" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Diese Lesezeichen werden in einem neuen Ordner gespeichert:"
+          }
+        },
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "These bookmarks will be saved in a new folder:"
+          }
+        },
+        "es" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Estos marcadores se guardarán en una nueva carpeta:"
+          }
+        },
+        "fr" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Ces signets seront enregistrés dans un nouveau dossier:"
+          }
+        },
+        "it" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Questi segnalibri verranno salvati in una nuova cartella:"
+          }
+        },
+        "nl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Deze bladwijzers worden opgeslagen in een nieuwe map:"
+          }
+        },
+        "pl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Te zakładki zostaną zapisane w nowym folderze:"
+          }
+        },
+        "pt" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Estes marcadores serão guardados numa nova pasta:"
+          }
+        },
+        "ru" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Эти закладки будут сохранены в новой папке:"
+          }
+        }
+      }
+    },
+    "bookmarks.dialog.allTabs.title.add" : {
+      "comment" : "Title of dialog to bookmark all open tabs. E.g. 'Bookmark Open Tabs (42)'",
+      "extractionState" : "extracted_with_value",
+      "localizations" : {
+        "de" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Offene Tabs mit Lesezeichen versehen (%d)"
+          }
+        },
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "Bookmark Open Tabs (%d)"
+          }
+        },
+        "es" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Añadir pestañas abiertas (%d)"
+          }
+        },
+        "fr" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Ajouter les onglets ouverts (%d) aux signets"
+          }
+        },
+        "it" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Aggiungere ai segnalibri le schede aperte (%d)"
+          }
+        },
+        "nl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "%d geopende tabbladen toevoegen als bladwijzer"
+          }
+        },
+        "pl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Dodaj otwarte karty (%d) do zakładek"
+          }
+        },
+        "pt" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Marcar separadores abertos (%d)"
+          }
+        },
+        "ru" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Добавить открытые вкладки (%d) в закладки"
+          }
+        }
+      }
+    },
+    "bookmarks.dialog.field.folderName" : {
+      "comment" : "Folder name field label for Bookmarks folder",
+      "extractionState" : "extracted_with_value",
+      "localizations" : {
+        "de" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Ordnername"
+          }
+        },
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "Folder Name"
+          }
+        },
+        "es" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Nombre de la carpeta"
+          }
+        },
+        "fr" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Nom du dossier"
+          }
+        },
+        "it" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Nome della cartella"
+          }
+        },
+        "nl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Naam van de map"
+          }
+        },
+        "pl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Nazwa folderu"
+          }
+        },
+        "pt" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Nome da pasta"
+          }
+        },
+        "ru" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Название папки"
+          }
+        }
+      }
+    },
+    "bookmarks.dialog.field.folderName.value" : {
+      "comment" : "The suggested name of the folder that will contain the bookmark tabs. Eg. 2024-02-12 - Tabs (42)",
+      "extractionState" : "extracted_with_value",
+      "localizations" : {
+        "de" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "%1$@ – Tabs (%2$d)"
+          }
+        },
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "%1$@ - Tabs (%2$d)"
+          }
+        },
+        "es" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "%1$@ - Pestañas (%2$d)"
+          }
+        },
+        "fr" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "%1$@ - Onglets (%2$d)"
+          }
+        },
+        "it" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "%1$@ - Schede (%2$d)"
+          }
+        },
+        "nl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "%1$@ - Tabbladen (%2$d)"
+          }
+        },
+        "pl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "%1$@ - Karty (%2$d)"
+          }
+        },
+        "pt" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "%1$@ - Separadores (%2$d)"
+          }
+        },
+        "ru" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "%1$@ - Вкладки (%2$d)"
+          }
+        }
+      }
+    },
+    "bookmarks.dialog.field.location" : {
+      "comment" : "Location field label for Bookmark folder",
+      "extractionState" : "extracted_with_value",
+      "localizations" : {
+        "de" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Standort"
+          }
+        },
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "Location"
+          }
+        },
+        "es" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Ubicación"
+          }
+        },
+        "fr" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Localisation"
+          }
+        },
+        "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" : "Местоположение"
+          }
+        }
+      }
+    },
+    "bookmarks.dialog.field.name" : {
+      "comment" : "Name field label for Bookmark or Folder",
+      "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" : "Название"
+          }
+        }
+      }
+    },
+    "bookmarks.dialog.field.url" : {
+      "comment" : "URL field label for Bookmar",
+      "extractionState" : "extracted_with_value",
+      "localizations" : {
+        "de" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "URL"
+          }
+        },
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "URL"
+          }
+        },
+        "es" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "URL"
+          }
+        },
+        "fr" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "URL"
+          }
+        },
+        "it" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "URL"
+          }
+        },
+        "nl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "URL"
+          }
+        },
+        "pl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Adres URL"
+          }
+        },
+        "pt" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "URL"
+          }
+        },
+        "ru" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "URL"
+          }
+        }
+      }
+    },
+    "bookmarks.dialog.folder.title.add" : {
+      "comment" : "Bookmark folder creation dialog title",
       "extractionState" : "extracted_with_value",
       "localizations" : {
         "de" : {
@@ -8921,7 +9757,7 @@
         "de" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Lesezeichen hinzufügen"
+            "value" : "Add Bookmark"
           }
         },
         "en" : {
@@ -8933,43 +9769,43 @@
         "es" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Añadir marcador"
+            "value" : "Add Bookmark"
           }
         },
         "fr" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Ajouter un signet"
+            "value" : "Add Bookmark"
           }
         },
         "it" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Aggiungi ai segnalibri"
+            "value" : "Add Bookmark"
           }
         },
         "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Bladwijzer toevoegen"
+            "value" : "Add Bookmark"
           }
         },
         "pl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Dodaj zakładkę"
+            "value" : "Add Bookmark"
           }
         },
         "pt" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Adicionar marcador"
+            "value" : "Add Bookmark"
           }
         },
         "ru" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Добавить закладку"
+            "value" : "Add Bookmark"
           }
         }
       }
@@ -9041,7 +9877,7 @@
         "de" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Lesezeichen bearbeiten"
+            "value" : "Edit Bookmark"
           }
         },
         "en" : {
@@ -9053,43 +9889,43 @@
         "es" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Editar marcador"
+            "value" : "Edit Bookmark"
           }
         },
         "fr" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Modifier le signet"
+            "value" : "Edit Bookmark"
           }
         },
         "it" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Modifica segnalibro"
+            "value" : "Edit Bookmark"
           }
         },
         "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Bladwijzer bewerken"
+            "value" : "Edit Bookmark"
           }
         },
         "pl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Edytuj zakładkę"
+            "value" : "Edit Bookmark"
           }
         },
         "pt" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Editar marcador"
+            "value" : "Edit Bookmark"
           }
         },
         "ru" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Редактировать закладку"
+            "value" : "Edit Bookmark"
           }
         }
       }
@@ -10573,6 +11409,126 @@
         }
       }
     },
+    "clear.and.quit" : {
+      "comment" : "Button to clear data and quit the application",
+      "extractionState" : "extracted_with_value",
+      "localizations" : {
+        "de" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Löschen und Beenden"
+          }
+        },
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "Clear and Quit"
+          }
+        },
+        "es" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Borrar y salir"
+          }
+        },
+        "fr" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Effacer et quitter"
+          }
+        },
+        "it" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Cancella ed esci"
+          }
+        },
+        "nl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Wissen en stoppen"
+          }
+        },
+        "pl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Wyczyść i wyjdź"
+          }
+        },
+        "pt" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Limpar e sair"
+          }
+        },
+        "ru" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Очистить и выйти"
+          }
+        }
+      }
+    },
+    "close.all.other.tabs" : {
+      "comment" : "Menu item",
+      "extractionState" : "extracted_with_value",
+      "localizations" : {
+        "de" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Alle anderen Tabs schließen"
+          }
+        },
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "Close All Other Tabs"
+          }
+        },
+        "es" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Cerrar todas las demás pestañas"
+          }
+        },
+        "fr" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Fermer tous les autres onglets"
+          }
+        },
+        "it" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Chiudi tutte le altre schede"
+          }
+        },
+        "nl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Alle andere tabbladen sluiten"
+          }
+        },
+        "pl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Zamknij wszystkie inne karty"
+          }
+        },
+        "pt" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Fechar todos os outros separadores"
+          }
+        },
+        "ru" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Закрыть все остальные вкладки"
+          }
+        }
+      }
+    },
     "close.other.tabs" : {
       "comment" : "Menu item",
       "extractionState" : "extracted_with_value",
@@ -10813,6 +11769,66 @@
         }
       }
     },
+    "close.tabs.to.the.left" : {
+      "comment" : "Menu item",
+      "extractionState" : "extracted_with_value",
+      "localizations" : {
+        "de" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Tabs auf der linken Seite schließen"
+          }
+        },
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "Close Tabs to the Left"
+          }
+        },
+        "es" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Cerrar las pestañas a la izquierda"
+          }
+        },
+        "fr" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Fermer les onglets à gauche"
+          }
+        },
+        "it" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Chiudi le schede a sinistra"
+          }
+        },
+        "nl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Tabbladen links sluiten"
+          }
+        },
+        "pl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Zamknij karty po lewej stronie"
+          }
+        },
+        "pt" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Fechar separadores à esquerda"
+          }
+        },
+        "ru" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Закрыть вкладки слева"
+          }
+        }
+      }
+    },
     "close.tabs.to.the.right" : {
       "comment" : "Menu item",
       "extractionState" : "extracted_with_value",
@@ -11106,6 +12122,126 @@
         }
       }
     },
+    "context.menu.new.tab.mode.at.end" : {
+      "comment" : "Preferences > Tabs > At end of list",
+      "extractionState" : "extracted_with_value",
+      "localizations" : {
+        "de" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Rechts neben anderen Tabs hinzufügen"
+          }
+        },
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "Add to the right of other tabs"
+          }
+        },
+        "es" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Añadir a la derecha de otras pestañas"
+          }
+        },
+        "fr" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Ajouter à droite des autres onglets"
+          }
+        },
+        "it" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Aggiungi a destra di altre schede"
+          }
+        },
+        "nl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Toevoegen aan de rechterkant van andere tabbladen"
+          }
+        },
+        "pl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Dodaj po prawej stronie innych kart"
+          }
+        },
+        "pt" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Adicionar à direita dos outros separadores"
+          }
+        },
+        "ru" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Добавить справа от остальных вкладок"
+          }
+        }
+      }
+    },
+    "context.menu.new.tab.mode.next.to.current" : {
+      "comment" : "Preferences > Tabs > Next to current tab",
+      "extractionState" : "extracted_with_value",
+      "localizations" : {
+        "de" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Rechts neben dem aktuellen Tab hinzufügen"
+          }
+        },
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "Add to the right of the current tab"
+          }
+        },
+        "es" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Añadir a la derecha de la pestaña actual"
+          }
+        },
+        "fr" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Ajouter à droite de l'onglet actuel"
+          }
+        },
+        "it" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Aggiungi a destra della scheda attuale"
+          }
+        },
+        "nl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Toevoegen aan de rechterkant van het huidige tabblad"
+          }
+        },
+        "pl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Dodaj po prawej stronie bieżącej karty"
+          }
+        },
+        "pt" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Adicionar à direita do separador atual"
+          }
+        },
+        "ru" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Добавить справа от текущей вкладки"
+          }
+        }
+      }
+    },
     "copy" : {
       "comment" : "Copy button",
       "extractionState" : "extracted_with_value",
@@ -11168,6 +12304,7 @@
     },
     "Copy" : {
       "comment" : "Command",
+      "extractionState" : "stale",
       "localizations" : {
         "de" : {
           "stringUnit" : {
@@ -12407,6 +13544,7 @@
     },
     "Delete" : {
       "comment" : "Command",
+      "extractionState" : "stale",
       "localizations" : {
         "de" : {
           "stringUnit" : {
@@ -12691,6 +13829,66 @@
         }
       }
     },
+    "disable.auto.clear.to.enable.session.restore" : {
+      "comment" : "Information label in Settings. It tells user that to enable session restoration setting they have to disable burn on quit. Auto-Clear should match the string with 'auto.clear' key",
+      "extractionState" : "extracted_with_value",
+      "localizations" : {
+        "de" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Deaktiviere das automatische Löschen beim Beenden, um die Sitzungswiederherstellung einzuschalten."
+          }
+        },
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "Disable auto-clear on quit to turn on session restore."
+          }
+        },
+        "es" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Desactiva el borrado automático al salir para activar Restaurar sesión."
+          }
+        },
+        "fr" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Désactivez l'effacement automatique à la fermeture pour activer la restauration de session."
+          }
+        },
+        "it" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Disabilita la cancellazione automatica all'uscita per attivare il ripristino della sessione."
+          }
+        },
+        "nl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Schakel automatisch wissen uit wanneer u stopt om het herstellen van de sessie in te schakelen."
+          }
+        },
+        "pl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Wyłącz automatyczne czyszczenie przy wychodzeniu, aby włączyć przywracanie sesji."
+          }
+        },
+        "pt" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Desativa a limpeza automática ao sair para ativar a restauração da sessão."
+          }
+        },
+        "ru" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Чтобы активировать восстановление сеанса, отключите автоочистку данных при выходе."
+          }
+        }
+      }
+    },
     "disable.email.protection.mesage" : {
       "comment" : "Message for alert shown when user disables email protection",
       "extractionState" : "extracted_with_value",
@@ -14543,66 +15741,6 @@
         }
       }
     },
-    "downloads.restart.item" : {
-      "comment" : "Contextual menu item in downloads manager to restart the download",
-      "extractionState" : "extracted_with_value",
-      "localizations" : {
-        "de" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Stopp"
-          }
-        },
-        "en" : {
-          "stringUnit" : {
-            "state" : "new",
-            "value" : "Stop"
-          }
-        },
-        "es" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Detener"
-          }
-        },
-        "fr" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Arrêter"
-          }
-        },
-        "it" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Interrompi"
-          }
-        },
-        "nl" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Stoppen"
-          }
-        },
-        "pl" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Zatrzymaj"
-          }
-        },
-        "pt" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Parar"
-          }
-        },
-        "ru" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Остановить"
-          }
-        }
-      }
-    },
     "downloads.show-in-finder.item" : {
       "comment" : "Contextual menu item in downloads manager to show the downloaded file in Finder",
       "extractionState" : "extracted_with_value",
@@ -15663,6 +16801,7 @@
     },
     "Edit…" : {
       "comment" : "Command",
+      "extractionState" : "stale",
       "localizations" : {
         "de" : {
           "stringUnit" : {
@@ -19948,6 +21087,7 @@
     },
     "Hide" : {
       "comment" : "Main Menu > View > Home Button > None item\n   Preferences > Home Button > None item",
+      "extractionState" : "stale",
       "localizations" : {
         "de" : {
           "stringUnit" : {
@@ -24263,6 +25403,126 @@
         }
       }
     },
+    "import.nodata.bookmarks.subtitle" : {
+      "comment" : "Data import error subtitle: suggestion to import Bookmarks manually by selecting a CSV or HTML file. The placeholder here represents the source browser, e.g Firefox.",
+      "extractionState" : "extracted_with_value",
+      "localizations" : {
+        "de" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Wenn du %@ Lesezeichen hast, versuche stattdessen, sie manuell zu importieren."
+          }
+        },
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "If you have %@ bookmarks, try importing them manually instead."
+          }
+        },
+        "es" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Si tienes %@ marcadores, intenta importarlos manualmente."
+          }
+        },
+        "fr" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Si vous avez %@ signets, essayez plutôt de les importer manuellement."
+          }
+        },
+        "it" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Se hai %@ segnalibri, prova a importarli manualmente."
+          }
+        },
+        "nl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Als je %@ bladwijzers hebt, probeer ze dan handmatig te importeren."
+          }
+        },
+        "pl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Jeśli masz zakładki %@, spróbuj zaimportować je ręcznie."
+          }
+        },
+        "pt" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Se tens favoritos do %@, tenta importá-los manualmente."
+          }
+        },
+        "ru" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Если у вас есть %@-файл с закладками, попробуйте импортировать его вручную."
+          }
+        }
+      }
+    },
+    "import.nodata.passwords.subtitle" : {
+      "comment" : "Data import error subtitle: suggestion to import passwords manually by selecting a CSV or HTML file. The placeholder here represents the source browser, e.g Firefox.",
+      "extractionState" : "extracted_with_value",
+      "localizations" : {
+        "de" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Wenn du %@ Passwörter hast, versuche stattdessen, sie manuell zu importieren."
+          }
+        },
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "If you have %@ passwords, try importing them manually instead."
+          }
+        },
+        "es" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Si tiene %@ contraseñas, intenta importarlas manualmente."
+          }
+        },
+        "fr" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Si vous avez %@ mots de passe, essayez plutôt de les importer manuellement."
+          }
+        },
+        "it" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Se hai %@ password, prova a importarle manualmente."
+          }
+        },
+        "nl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Als je %@ wachtwoorden hebt, probeer ze dan handmatig te importeren."
+          }
+        },
+        "pl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Jeśli masz hasła %@, spróbuj zaimportować je ręcznie."
+          }
+        },
+        "pt" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Se tens palavras-passe do %@, tenta importá-las manualmente."
+          }
+        },
+        "ru" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Если у вас есть %@-файл с паролями, попробуйте импортировать его вручную."
+          }
+        }
+      }
+    },
     "import.onePassword.app.version.info" : {
       "comment" : "Instructions how to find an installed 1Password password manager app version.\n%1$s, %2$s - app name (1Password)",
       "extractionState" : "extracted_with_value",
@@ -30136,12 +31396,12 @@
     },
     "newTab.setup.survey.day.0.action" : {
       "comment" : "Action title of the Day 0 survey of the Set Up section in the home page",
-      "extractionState" : "extracted_with_value",
+      "extractionState" : "stale",
       "localizations" : {
         "de" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Teile deine Gedanken"
+            "value" : "Sign Up To Participate"
           }
         },
         "en" : {
@@ -30152,56 +31412,56 @@
         },
         "es" : {
           "stringUnit" : {
-            "state" : "needs_review",
-            "value" : "Comparte tus ideas"
+            "state" : "translated",
+            "value" : "Sign Up To Participate"
           }
         },
         "fr" : {
           "stringUnit" : {
-            "state" : "needs_review",
-            "value" : "Partagez votre avis"
+            "state" : "translated",
+            "value" : "Sign Up To Participate"
           }
         },
         "it" : {
           "stringUnit" : {
-            "state" : "needs_review",
-            "value" : "Comunicaci la tua opinione"
+            "state" : "translated",
+            "value" : "Sign Up To Participate"
           }
         },
         "nl" : {
           "stringUnit" : {
-            "state" : "needs_review",
-            "value" : "Deel je gedachten"
+            "state" : "translated",
+            "value" : "Sign Up To Participate"
           }
         },
         "pl" : {
           "stringUnit" : {
-            "state" : "needs_review",
-            "value" : "Podziel się przemyśleniami"
+            "state" : "translated",
+            "value" : "Sign Up To Participate"
           }
         },
         "pt" : {
           "stringUnit" : {
-            "state" : "needs_review",
-            "value" : "Partilha as tuas opiniões"
+            "state" : "translated",
+            "value" : "Sign Up To Participate"
           }
         },
         "ru" : {
           "stringUnit" : {
-            "state" : "needs_review",
-            "value" : "Поделиться соображениями"
+            "state" : "translated",
+            "value" : "Sign Up To Participate"
           }
         }
       }
     },
     "newTab.setup.survey.day.0.summary" : {
       "comment" : "Summary of the card on the new tab page that invites users to partecipate to a survey",
-      "extractionState" : "extracted_with_value",
+      "extractionState" : "stale",
       "localizations" : {
         "de" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Nimm an unserer kurzen Umfrage teil und hilf uns, den besten Browser zu entwickeln."
+            "value" : "Join an interview with a member of our research team to help us build the best browser."
           }
         },
         "en" : {
@@ -30212,56 +31472,56 @@
         },
         "es" : {
           "stringUnit" : {
-            "state" : "needs_review",
-            "value" : "Responde a nuestra breve encuesta y ayúdanos a crear el mejor navegador."
+            "state" : "translated",
+            "value" : "Join an interview with a member of our research team to help us build the best browser."
           }
         },
         "fr" : {
           "stringUnit" : {
-            "state" : "needs_review",
-            "value" : "Répondez à notre courte enquête et aidez-nous à créer le meilleur navigateur."
+            "state" : "translated",
+            "value" : "Join an interview with a member of our research team to help us build the best browser."
           }
         },
         "it" : {
           "stringUnit" : {
-            "state" : "needs_review",
-            "value" : "Rispondi al nostro breve sondaggio e aiutaci a creare il browser migliore."
+            "state" : "translated",
+            "value" : "Join an interview with a member of our research team to help us build the best browser."
           }
         },
         "nl" : {
           "stringUnit" : {
-            "state" : "needs_review",
-            "value" : "Vul onze korte enquête in en help ons de beste browser te bouwen."
+            "state" : "translated",
+            "value" : "Join an interview with a member of our research team to help us build the best browser."
           }
         },
         "pl" : {
           "stringUnit" : {
-            "state" : "needs_review",
-            "value" : "Weź udział w krótkiej ankiecie i pomóż nam opracować najlepszą przeglądarkę."
+            "state" : "translated",
+            "value" : "Join an interview with a member of our research team to help us build the best browser."
           }
         },
         "pt" : {
           "stringUnit" : {
-            "state" : "needs_review",
-            "value" : "Responde ao nosso curto inquérito e ajuda-nos a criar o melhor navegador."
+            "state" : "translated",
+            "value" : "Join an interview with a member of our research team to help us build the best browser."
           }
         },
         "ru" : {
           "stringUnit" : {
-            "state" : "needs_review",
-            "value" : "Пройдите короткий опрос и помогите DuckDuckGo стать лучшим из браузеров."
+            "state" : "translated",
+            "value" : "Join an interview with a member of our research team to help us build the best browser."
           }
         }
       }
     },
     "newTab.setup.survey.day.0.title" : {
       "comment" : "Title of the Day 0 durvey of the Set Up section in the home page",
-      "extractionState" : "extracted_with_value",
+      "extractionState" : "stale",
       "localizations" : {
         "de" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Sag uns, was dich hierher gebracht hat"
+            "value" : "Share Your Thoughts With Us"
           }
         },
         "en" : {
@@ -30272,44 +31532,44 @@
         },
         "es" : {
           "stringUnit" : {
-            "state" : "needs_review",
-            "value" : "Cuéntanos qué te ha traído hasta aquí"
+            "state" : "translated",
+            "value" : "Share Your Thoughts With Us"
           }
         },
         "fr" : {
           "stringUnit" : {
-            "state" : "needs_review",
-            "value" : "Dites-nous ce qui vous amène ici"
+            "state" : "translated",
+            "value" : "Share Your Thoughts With Us"
           }
         },
         "it" : {
           "stringUnit" : {
-            "state" : "needs_review",
-            "value" : "Raccontaci cosa ti ha portato qui"
+            "state" : "translated",
+            "value" : "Share Your Thoughts With Us"
           }
         },
         "nl" : {
           "stringUnit" : {
-            "state" : "needs_review",
-            "value" : "Vertel ons wat je hier heeft gebracht"
+            "state" : "translated",
+            "value" : "Share Your Thoughts With Us"
           }
         },
         "pl" : {
           "stringUnit" : {
-            "state" : "needs_review",
-            "value" : "Powiedz nam, co Cię tu sprowadziło"
+            "state" : "translated",
+            "value" : "Share Your Thoughts With Us"
           }
         },
         "pt" : {
           "stringUnit" : {
-            "state" : "needs_review",
-            "value" : "Diz-nos o que te trouxe aqui"
+            "state" : "translated",
+            "value" : "Share Your Thoughts With Us"
           }
         },
         "ru" : {
           "stringUnit" : {
-            "state" : "needs_review",
-            "value" : "Что привело вас к нам"
+            "state" : "translated",
+            "value" : "Share Your Thoughts With Us"
           }
         }
       }
@@ -30496,12 +31756,12 @@
     },
     "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",
+      "extractionState" : "stale",
       "localizations" : {
         "de" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Hilf uns, uns zu verbessern"
+            "value" : "Sign Up To Participate"
           }
         },
         "en" : {
@@ -30509,25 +31769,121 @@
             "state" : "new",
             "value" : "Sign Up To Participate"
           }
+        },
+        "es" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Sign Up To Participate"
+          }
+        },
+        "fr" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Sign Up To Participate"
+          }
+        },
+        "it" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Sign Up To Participate"
+          }
+        },
+        "nl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Sign Up To Participate"
+          }
+        },
+        "pl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Sign Up To Participate"
+          }
+        },
+        "pt" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Sign Up To Participate"
+          }
+        },
+        "ru" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "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",
+      "extractionState" : "stale",
       "localizations" : {
+        "de" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Join an interview with a member of our research team to help us build the best browser."
+          }
+        },
         "en" : {
           "stringUnit" : {
             "state" : "new",
             "value" : "Join an interview with a member of our research team to help us build the best browser."
           }
+        },
+        "es" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Join an interview with a member of our research team to help us build the best browser."
+          }
+        },
+        "fr" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Join an interview with a member of our research team to help us build the best browser."
+          }
+        },
+        "it" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Join an interview with a member of our research team to help us build the best browser."
+          }
+        },
+        "nl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Join an interview with a member of our research team to help us build the best browser."
+          }
+        },
+        "pl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Join an interview with a member of our research team to help us build the best browser."
+          }
+        },
+        "pt" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Join an interview with a member of our research team to help us build the best browser."
+          }
+        },
+        "ru" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "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",
+      "extractionState" : "stale",
       "localizations" : {
+        "de" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Share Your Thoughts With Us"
+          }
+        },
         "en" : {
           "stringUnit" : {
             "state" : "new",
@@ -30537,43 +31893,43 @@
         "es" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Ayúdanos a mejorar"
+            "value" : "Share Your Thoughts With Us"
           }
         },
         "fr" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Aidez-nous à nous améliorer"
+            "value" : "Share Your Thoughts With Us"
           }
         },
         "it" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Aiutaci a migliorare"
+            "value" : "Share Your Thoughts With Us"
           }
         },
         "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Help ons om te verbeteren"
+            "value" : "Share Your Thoughts With Us"
           }
         },
         "pl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Pomóż nam we wprowadzaniu ulepszeń"
+            "value" : "Share Your Thoughts With Us"
           }
         },
         "pt" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Ajuda-nos a melhorar"
+            "value" : "Share Your Thoughts With Us"
           }
         },
         "ru" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Помогите нам стать лучше"
+            "value" : "Share Your Thoughts With Us"
           }
         }
       }
@@ -30820,7 +32176,7 @@
     },
     "no.access.to.selected.folder" : {
       "comment" : "Alert presented to user if the app doesn't have rights to access selected folder",
-      "extractionState" : "extracted_with_value",
+      "extractionState" : "stale",
       "localizations" : {
         "de" : {
           "stringUnit" : {
@@ -30880,7 +32236,7 @@
     },
     "no.access.to.selected.folder.header" : {
       "comment" : "Header of the alert dialog informing user about failed download",
-      "extractionState" : "extracted_with_value",
+      "extractionState" : "stale",
       "localizations" : {
         "de" : {
           "stringUnit" : {
@@ -34811,7 +36167,7 @@
       }
     },
     "Passwords:" : {
-      "comment" : "Data import summary format of how many passwords (%lld) were successfully imported.",
+      "comment" : "Data import summary format of how many passwords were successfully imported.",
       "localizations" : {
         "de" : {
           "stringUnit" : {
@@ -42536,6 +43892,246 @@
         }
       }
     },
+    "preferences-tabs.new.tab.position.title" : {
+      "comment" : "Title for new tab positioning",
+      "extractionState" : "extracted_with_value",
+      "localizations" : {
+        "de" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Beim Erstellen eines neuen Tabs"
+          }
+        },
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "When creating a new tab"
+          }
+        },
+        "es" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Al crear una nueva pestaña"
+          }
+        },
+        "fr" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Lors de la création d'un nouvel onglet"
+          }
+        },
+        "it" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Quando si crea una nuova scheda"
+          }
+        },
+        "nl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Bij het maken van een nieuw tabblad"
+          }
+        },
+        "pl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Podczas tworzenia nowej karty"
+          }
+        },
+        "pt" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Ao criar um novo separador"
+          }
+        },
+        "ru" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "При создании новой вкладки"
+          }
+        }
+      }
+    },
+    "preferences-tabs.prefer.new.tabs.to.windows" : {
+      "comment" : "Option to prefer opening new tabs instead of windows when opening links",
+      "extractionState" : "extracted_with_value",
+      "localizations" : {
+        "de" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Links nach Möglichkeit in neuen Tabs statt in neuen Fenstern öffnen"
+          }
+        },
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "Open links in new tabs instead of new windows whenever possible"
+          }
+        },
+        "es" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Abrir enlaces en nuevas pestañas en lugar de nuevas ventanas siempre que sea posible"
+          }
+        },
+        "fr" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Ouvrir les liens dans de nouveaux onglets plutôt que dans de nouvelles fenêtres si possible"
+          }
+        },
+        "it" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Apri i collegamenti in nuove schede anziché in nuove finestre quando possibile"
+          }
+        },
+        "nl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Links waar mogelijk openen in nieuwe tabbladen in plaats van in nieuwe vensters"
+          }
+        },
+        "pl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Otwieraj linki w nowych kartach zamiast w nowych oknach, gdy tylko jest to możliwe"
+          }
+        },
+        "pt" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Abrir links em separadores novos em vez de novas janelas sempre que possível"
+          }
+        },
+        "ru" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "По возможности открывать ссылки в новых вкладках, а не окнах"
+          }
+        }
+      }
+    },
+    "preferences-tabs.switch.tab.when.opened" : {
+      "comment" : "Option to switch to a new tab/window when it is opened",
+      "extractionState" : "extracted_with_value",
+      "localizations" : {
+        "de" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Beim Öffnen von Links sofort zu einem neuen Tab oder Fenster wechseln"
+          }
+        },
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "When opening links, switch to the new tab or window immediately"
+          }
+        },
+        "es" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Al abrir enlaces, cambiar a la nueva pestaña o ventana inmediatamente"
+          }
+        },
+        "fr" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "À l'ouverture des liens, basculer immédiatement sur le nouvel onglet ou la nouvelle fenêtre"
+          }
+        },
+        "it" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Quando apri i collegamenti, passa immediatamente alla nuova scheda o finestra"
+          }
+        },
+        "nl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Meteen overschakelen naar het nieuwe tabblad of venster bij het openen van links"
+          }
+        },
+        "pl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Otwierając linki, natychmiast przełącz na nową kartę lub nowe okno"
+          }
+        },
+        "pt" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Ao abrir links, mudar imediatamente para o novo separador ou janela"
+          }
+        },
+        "ru" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "При открытии ссылки сразу переключаться на ее вкладку или окно"
+          }
+        }
+      }
+    },
+    "preferences-tabs.title" : {
+      "comment" : "Title for tabs section in settings",
+      "extractionState" : "extracted_with_value",
+      "localizations" : {
+        "de" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Tabs"
+          }
+        },
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "Tabs"
+          }
+        },
+        "es" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Pestañas"
+          }
+        },
+        "fr" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Onglets"
+          }
+        },
+        "it" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Schede"
+          }
+        },
+        "nl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Tabbladen"
+          }
+        },
+        "pl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Karty"
+          }
+        },
+        "pt" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Separadores"
+          }
+        },
+        "ru" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Вкладки"
+          }
+        }
+      }
+    },
     "preferences.about" : {
       "comment" : "Title of the option to show the About screen",
       "extractionState" : "extracted_with_value",
@@ -45416,6 +47012,58 @@
         }
       }
     },
+    "Privacy Pro" : {
+      "localizations" : {
+        "de" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Privacy Pro"
+          }
+        },
+        "es" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Privacy Pro"
+          }
+        },
+        "fr" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Privacy Pro"
+          }
+        },
+        "it" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Privacy Pro"
+          }
+        },
+        "nl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Privacy Pro"
+          }
+        },
+        "pl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Privacy Pro"
+          }
+        },
+        "pt" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Privacy Pro"
+          }
+        },
+        "ru" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Privacy Pro"
+          }
+        }
+      }
+    },
     "private.search.explenation" : {
       "comment" : "feature explanation in settings",
       "extractionState" : "extracted_with_value",
@@ -45536,115 +47184,121 @@
         }
       }
     },
-    "Recently Closed" : {
-      "comment" : "Main Menu History item",
+    "quit.without.clearing" : {
+      "comment" : "Button to quit the application without clearing data",
+      "extractionState" : "extracted_with_value",
       "localizations" : {
         "de" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Kürzlich geschlossen"
+            "value" : "Beenden ohne Löschen"
+          }
+        },
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "Quit Without Clearing"
           }
         },
         "es" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Cerrado recientemente"
+            "value" : "Salir sin borrar"
           }
         },
         "fr" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Récemment clôturé"
+            "value" : "Quitter sans effacer"
           }
         },
         "it" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Chiusa di recente"
+            "value" : "Esci senza cancellare"
           }
         },
         "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Onlangs gesloten"
+            "value" : "Stoppen zonder wissen"
           }
         },
         "pl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Niedawno zamknięte"
+            "value" : "Wyjdź bez czyszczenia"
           }
         },
         "pt" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Fechados recentemente"
+            "value" : "Sair sem limpar"
           }
         },
         "ru" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Недавно закрытые"
+            "value" : "Выйти без очистки"
           }
         }
       }
     },
-    "Reload Page" : {
-      "comment" : "Main Menu View item",
+    "Recently Closed" : {
+      "comment" : "Main Menu History item",
       "localizations" : {
         "de" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Seite neu laden"
+            "value" : "Kürzlich geschlossen"
           }
         },
         "es" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Volver a cargar página"
+            "value" : "Cerrado recientemente"
           }
         },
         "fr" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Recharger la page"
+            "value" : "Récemment clôturé"
           }
         },
         "it" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Ricarica pagina"
+            "value" : "Chiusa di recente"
           }
         },
         "nl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Pagina opnieuw laden"
+            "value" : "Onlangs gesloten"
           }
         },
         "pl" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Załaduj ponownie stronę"
+            "value" : "Niedawno zamknięte"
           }
         },
         "pt" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Recarregar página"
+            "value" : "Fechados recentemente"
           }
         },
         "ru" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Перезагрузить страницу"
+            "value" : "Недавно закрытые"
           }
         }
       }
     },
-    "reload.page" : {
-      "comment" : "Context menu item",
-      "extractionState" : "extracted_with_value",
+    "Reload Page" : {
+      "comment" : "Main Menu View item",
       "localizations" : {
         "de" : {
           "stringUnit" : {
@@ -45652,12 +47306,66 @@
             "value" : "Seite neu laden"
           }
         },
-        "en" : {
-          "stringUnit" : {
-            "state" : "new",
-            "value" : "Reload Page"
-          }
-        },
+        "es" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Volver a cargar página"
+          }
+        },
+        "fr" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Recharger la page"
+          }
+        },
+        "it" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Ricarica pagina"
+          }
+        },
+        "nl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Pagina opnieuw laden"
+          }
+        },
+        "pl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Załaduj ponownie stronę"
+          }
+        },
+        "pt" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Recarregar página"
+          }
+        },
+        "ru" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Перезагрузить страницу"
+          }
+        }
+      }
+    },
+    "reload.page" : {
+      "comment" : "Context menu item",
+      "extractionState" : "extracted_with_value",
+      "localizations" : {
+        "de" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Seite neu laden"
+          }
+        },
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "Reload Page"
+          }
+        },
         "es" : {
           "stringUnit" : {
             "state" : "translated",
@@ -45704,6 +47412,7 @@
     },
     "Remove" : {
       "comment" : "Remove bookmark button title",
+      "extractionState" : "stale",
       "localizations" : {
         "de" : {
           "stringUnit" : {
@@ -47683,6 +49392,7 @@
     },
     "Show left of the back button" : {
       "comment" : "Preferences > Home Button > left position item",
+      "extractionState" : "stale",
       "localizations" : {
         "de" : {
           "stringUnit" : {
@@ -47736,6 +49446,7 @@
     },
     "Show Left of the Back Button" : {
       "comment" : "Main Menu > View > Home Button > left position item",
+      "extractionState" : "stale",
       "localizations" : {
         "de" : {
           "stringUnit" : {
@@ -48001,6 +49712,7 @@
     },
     "Show right of the reload button" : {
       "comment" : "Preferences > Home Button > right position item",
+      "extractionState" : "stale",
       "localizations" : {
         "de" : {
           "stringUnit" : {
@@ -48054,6 +49766,7 @@
     },
     "Show Right of the Reload Button" : {
       "comment" : "Main Menu > View > Home Button > right position item",
+      "extractionState" : "stale",
       "localizations" : {
         "de" : {
           "stringUnit" : {
@@ -48158,6 +49871,66 @@
         }
       }
     },
+    "show.data.clearing.settings" : {
+      "comment" : "Button in Settings. It navigates user to Data Clearing Settings. The Data Clearing string should match the string with the preferences.data-clearing key",
+      "extractionState" : "extracted_with_value",
+      "localizations" : {
+        "de" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Einstellungen zum Löschen von Daten öffnen"
+          }
+        },
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "Open Data Clearing Settings"
+          }
+        },
+        "es" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Abrir configuración de borrado de datos"
+          }
+        },
+        "fr" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Ouvrir les paramètres d'effacement des données"
+          }
+        },
+        "it" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Apri Impostazioni cancellazione dati"
+          }
+        },
+        "nl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Instellingen voor het wissen van open gegevens"
+          }
+        },
+        "pl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Otwórz ustawienia czyszczenia danych"
+          }
+        },
+        "pt" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Abrir Definições de limpeza de dados"
+          }
+        },
+        "ru" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Открыть настройки очистки данных"
+          }
+        }
+      }
+    },
     "show.folder.contents" : {
       "comment" : "Menu item that shows the content of a folder ",
       "extractionState" : "extracted_with_value",
@@ -48483,6 +50256,726 @@
         }
       }
     },
+    "ssl.error.certificate.expired.message" : {
+      "comment" : "Describes an SSL error where a website's security certificate is expired. '%1$@' is a placeholder for the website's domain.",
+      "extractionState" : "extracted_with_value",
+      "localizations" : {
+        "de" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Das Sicherheitszertifikat für %1$@ ist abgelaufen."
+          }
+        },
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "The security certificate for %1$@ is expired."
+          }
+        },
+        "es" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "El certificado de seguridad de %1$@ ha caducado."
+          }
+        },
+        "fr" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Le certificat de sécurité de %1$@ a expiré."
+          }
+        },
+        "it" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Il certificato di sicurezza per %1$@ è scaduto."
+          }
+        },
+        "nl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Het beveiligingscertificaat voor %1$@ is verlopen."
+          }
+        },
+        "pl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Certyfikat zabezpieczeń dla %1$@ wygasł."
+          }
+        },
+        "pt" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "O certificado de segurança de %1$@ expirou."
+          }
+        },
+        "ru" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Срок действия сертификата безопасности сайта %1$@ истек."
+          }
+        }
+      }
+    },
+    "ssl.error.page.advanced.button" : {
+      "comment" : "Button shown in an error page that warns users of security risks on a website due to SSL issues. The buttons allows the user to see advanced options on click.",
+      "extractionState" : "extracted_with_value",
+      "localizations" : {
+        "de" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Erweitert …"
+          }
+        },
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "Advanced…"
+          }
+        },
+        "es" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Avanzadas..."
+          }
+        },
+        "fr" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Options avancées"
+          }
+        },
+        "it" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Avanzate…"
+          }
+        },
+        "nl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Geavanceerd ..."
+          }
+        },
+        "pl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Zaawansowane..."
+          }
+        },
+        "pt" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Avançado…"
+          }
+        },
+        "ru" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Дополнительно..."
+          }
+        }
+      }
+    },
+    "ssl.error.page.advanced.info.body.expired" : {
+      "comment" : "Body of the text of the Advanced info shown in an error page that warns users of security risks on a website due to SSL issues.",
+      "extractionState" : "extracted_with_value",
+      "localizations" : {
+        "de" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Es ist möglich, dass die Website falsch konfiguriert ist, ein Angreifer deine Verbindung kompromittiert hat oder deine Systemuhr falsch ist."
+          }
+        },
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "It’s possible that the website is misconfigured, that an attacker has compromised your connection, or that your system clock is incorrect."
+          }
+        },
+        "es" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Es posible que el sitio web esté mal configurado, que un atacante haya comprometido tu conexión o que el reloj del sistema no sea correcto."
+          }
+        },
+        "fr" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Il est possible que le site soit mal configuré, qu'un pirate ait compromis votre connexion ou que l'horloge de votre système soit incorrecte."
+          }
+        },
+        "it" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "È possibile che il sito web non sia configurato correttamente, che un aggressore abbia compromesso la tua connessione o che l'orologio del tuo sistema non sia corretto."
+          }
+        },
+        "nl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Mogelijk is de website verkeerd geconfigureerd, heeft een aanvaller je verbinding gecompromitteerd of staat de klok van je systeem niet goed."
+          }
+        },
+        "pl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Możliwe, że witryna jest błędnie skonfigurowana, osoba atakująca naruszyła połączenie lub ustawienie zegara systemowego jest nieprawidłowe."
+          }
+        },
+        "pt" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "É possível que o site esteja mal configurado, que um invasor tenha comprometido a tua ligação ou que o teu relógio do sistema esteja incorreto."
+          }
+        },
+        "ru" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Возможно, неверно задана конфигурация сайта, соединение перехвачено злоумышленником либо неправильно настроены системные часы."
+          }
+        }
+      }
+    },
+    "ssl.error.page.advanced.info.body.wrong.host" : {
+      "comment" : "Body of the text of the Advanced info shown in an error page that warns users of security risks on a website due to SSL issues.",
+      "extractionState" : "extracted_with_value",
+      "localizations" : {
+        "de" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Möglicherweise ist die Website falsch konfiguriert oder ein Angreifer hat deine Verbindung kompromittiert."
+          }
+        },
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "It’s possible that the website is misconfigured or that an attacker has compromised your connection."
+          }
+        },
+        "es" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Es posible que el sitio web esté mal configurado o que un atacante haya comprometido tu conexión."
+          }
+        },
+        "fr" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Il est possible que le site soit mal configuré ou qu'un pirate ait compromis votre connexion."
+          }
+        },
+        "it" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "È possibile che il sito web non sia configurato correttamente o che un malintenzionato abbia compromesso la tua connessione."
+          }
+        },
+        "nl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Mogelijk is de website verkeerd geconfigureerd of heeft een aanvaller je verbinding gecompromitteerd."
+          }
+        },
+        "pl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Możliwe, że witryna jest błędnie skonfigurowana lub osoba atakująca naruszyła połączenie."
+          }
+        },
+        "pt" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "É possível que o site esteja mal configurado ou que um invasor tenha comprometido a tua ligação."
+          }
+        },
+        "ru" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Возможно, неверно задана конфигурация сайта либо ваше соединение перехвачено злоумышленником."
+          }
+        }
+      }
+    },
+    "ssl.error.page.advanced.info.title" : {
+      "comment" : "Title of the Advanced info section shown in an error page that warns users of security risks on a website due to SSL issues.",
+      "extractionState" : "extracted_with_value",
+      "localizations" : {
+        "de" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "DuckDuckGo warnt dich, wenn eine Website ein ungültiges Zertifikat hat."
+          }
+        },
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "DuckDuckGo warns you when a website has an invalid certificate."
+          }
+        },
+        "es" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "DuckDuckGo te avisa cuando un sitio web tiene un certificado no válido."
+          }
+        },
+        "fr" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "DuckDuckGo vous avertit lorsque le certificat d'un site Web n'est pas valide."
+          }
+        },
+        "it" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "DuckDuckGo ti avverte quando un sito web ha un certificato non valido."
+          }
+        },
+        "nl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "DuckDuckGo waarschuwt je wanneer een website een ongeldig certificaat heeft."
+          }
+        },
+        "pl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "DuckDuckGo ostrzega gdy witryna internetowa ma nieprawidłowy certyfikat."
+          }
+        },
+        "pt" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "O DuckDuckGo avisa-te quando um site tem um certificado inválido."
+          }
+        },
+        "ru" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "DuckDuckGo предупредит вас, если у сайта окажется недействительный сертификат."
+          }
+        }
+      }
+    },
+    "ssl.error.page.body" : {
+      "comment" : "Error description shown in an error page that warns users of security risks on a website due to SSL issues. %1$@ represent the site domain.",
+      "extractionState" : "extracted_with_value",
+      "localizations" : {
+        "de" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Das Zertifikat für diese Website ist ungültig. Möglicherweise stellst du eine Verbindung zu einem Server her, der vorgibt, %1$@ zu sein, wodurch deine vertraulichen Daten in Gefahr sein könnten."
+          }
+        },
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "The certificate for this site is invalid. You might be connecting to a server that is pretending to be %1$@ which could put your confidential information at risk."
+          }
+        },
+        "es" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "El certificado de este sitio no es válido. Puede que te estés conectando a un servidor que se hace pasar por %1$@, lo que podría poner en riesgo tu información confidencial."
+          }
+        },
+        "fr" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Le certificat de ce site n'est pas valide. Vous vous connectez peut-être à un serveur qui se fait passer pour %1$@, ce qui pourrait mettre vos informations confidentielles en danger."
+          }
+        },
+        "it" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Il certificato di questo sito non è valido. Potresti collegarti a un server che finge di essere %1$@ e che potrebbe mettere a rischio le tue informazioni riservate."
+          }
+        },
+        "nl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Het certificaat voor deze website is ongeldig. Mogelijk maak je verbinding met een server die zich voordoet als %1$@, waardoor je vertrouwelijke informatie in gevaar kan komen."
+          }
+        },
+        "pl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Certyfikat tej witryny jest nieprawidłowy. Być może łączysz się z serwerem podszywającym się pod %1$@, co może narazić poufne informacje na niebezpieczeństwo."
+          }
+        },
+        "pt" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "O certificado deste site é inválido. Podes estar a estabelecer ligação a um servidor que finge ser %1$@, o que pode colocar as tuas informações confidenciais em risco."
+          }
+        },
+        "ru" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Сертификат этого сайта недействителен. Возможно, вы пытаетесь подключиться к серверу, который выдает себя за %1$@, что ставит под угрозу вашу конфиденциальную информацию."
+          }
+        }
+      }
+    },
+    "ssl.error.page.header" : {
+      "comment" : "Title shown in an error page that warn users of security risks on a website due to SSL issues",
+      "extractionState" : "extracted_with_value",
+      "localizations" : {
+        "de" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Warnung: Diese Website ist möglicherweise unsicher"
+          }
+        },
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "Warning: This site may be insecure"
+          }
+        },
+        "es" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Advertencia: este sitio puede ser inseguro"
+          }
+        },
+        "fr" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Avertissement : ce site n'est peut-être pas sécurisé"
+          }
+        },
+        "it" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Attenzione: questo sito potrebbe non essere sicuro"
+          }
+        },
+        "nl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Waarschuwing: Deze website is mogelijk onveilig"
+          }
+        },
+        "pl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Ostrzeżenie: ta witryna może być niebezpieczna"
+          }
+        },
+        "pt" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Aviso: este site pode ser inseguro"
+          }
+        },
+        "ru" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Внимание! Возможно, сайт небезопасен"
+          }
+        }
+      }
+    },
+    "ssl.error.page.leave.site.button" : {
+      "comment" : "Button shown in an error page that warns users of security risks on a website due to SSL issues. The buttons allows the user to leave the website and navigate to previous page.",
+      "extractionState" : "extracted_with_value",
+      "localizations" : {
+        "de" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Diese Website verlassen"
+          }
+        },
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "Leave This Site"
+          }
+        },
+        "es" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Salir de este sitio"
+          }
+        },
+        "fr" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Quitter ce site"
+          }
+        },
+        "it" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Esci da questo sito"
+          }
+        },
+        "nl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Deze website verlaten"
+          }
+        },
+        "pl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Opuść tę stronę"
+          }
+        },
+        "pt" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Deixar este site"
+          }
+        },
+        "ru" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Покинуть сайт"
+          }
+        }
+      }
+    },
+    "ssl.error.page.tab.title" : {
+      "comment" : "Title shown in an error page tab that warn users of security risks on a website due to SSL issues",
+      "extractionState" : "extracted_with_value",
+      "localizations" : {
+        "de" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Warnung: Website ist möglicherweise unsicher"
+          }
+        },
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "Warning: Site May Be Insecure"
+          }
+        },
+        "es" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Advertencia: el sitio puede ser inseguro"
+          }
+        },
+        "fr" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Avertissement : le site n'est peut-être pas sécurisé"
+          }
+        },
+        "it" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Attenzione: il sito potrebbe non essere sicuro"
+          }
+        },
+        "nl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Waarschuwing: Website mogelijk onveilig"
+          }
+        },
+        "pl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Ostrzeżenie: witryna może być niebezpieczna"
+          }
+        },
+        "pt" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Aviso: o site pode ser inseguro"
+          }
+        },
+        "ru" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Внимание! Возможно, сайт небезопасен"
+          }
+        }
+      }
+    },
+    "ssl.error.page.visit.site.button" : {
+      "comment" : "Button shown in an error page that warns users of security risks on a website due to SSL issues. The buttons allows the user to visit the website anyway despite the risks.",
+      "extractionState" : "extracted_with_value",
+      "localizations" : {
+        "de" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Risiko akzeptieren und Website besuchen"
+          }
+        },
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "Accept Risk and Visit Site"
+          }
+        },
+        "es" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Aceptar el riesgo y visitar el sitio"
+          }
+        },
+        "fr" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Accepter le risque et visiter le site"
+          }
+        },
+        "it" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Accetta il rischio e visita il sito"
+          }
+        },
+        "nl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Risico accepteren en site bezoeken"
+          }
+        },
+        "pl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Zaakceptuj ryzyko i odwiedź witrynę"
+          }
+        },
+        "pt" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Aceitar o risco e visitar o site"
+          }
+        },
+        "ru" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Принять риск и перейти на сайт"
+          }
+        }
+      }
+    },
+    "ssl.error.self.signed.message" : {
+      "comment" : "Warns the user that the site's security certificate is self-signed and not trusted. '%1$@' is the site's domain.",
+      "extractionState" : "extracted_with_value",
+      "localizations" : {
+        "de" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Das Sicherheitszertifikat für %1$@ wird vom Betriebssystem deines Geräts als nicht vertrauenswürdig eingestuft."
+          }
+        },
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "The security certificate for %1$@ is not trusted by your device's operating system."
+          }
+        },
+        "es" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "El sistema operativo del dispositivo no confía en el certificado de seguridad de %1$@."
+          }
+        },
+        "fr" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Le certificat de sécurité de %1$@ n'est pas approuvé par le système d'exploitation de votre appareil."
+          }
+        },
+        "it" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Il certificato di sicurezza di %1$@ non è considerato attendibile dal sistema operativo del tuo dispositivo."
+          }
+        },
+        "nl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Het besturingssysteem van je apparaat vertrouwt het beveiligingscertificaat voor %1$@ niet."
+          }
+        },
+        "pl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Certyfikat bezpieczeństwa %1$@ nie jest zaufany przez system operacyjny urządzenia."
+          }
+        },
+        "pt" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "O sistema operativo do teu dispositivo não confia no certificado de segurança de %1$@."
+          }
+        },
+        "ru" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Операционная система вашего устройства не доверяет сертификату безопасности сайта %1$@."
+          }
+        }
+      }
+    },
+    "ssl.error.wrong.host.message" : {
+      "comment" : "Explains an SSL error when a site's certificate doesn't match its domain. '%1$@' is the site's domain.",
+      "extractionState" : "extracted_with_value",
+      "localizations" : {
+        "de" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Das Sicherheitszertifikat für %1$@ stimmt nicht mit *.%2$@ überein."
+          }
+        },
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "The security certificate for %1$@ does not match *.%2$@."
+          }
+        },
+        "es" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "El certificado de seguridad de %1$@ no coincide con *.%2$@."
+          }
+        },
+        "fr" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Le certificat de sécurité de %1$@ ne correspond pas à *.%2$@."
+          }
+        },
+        "it" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Il certificato di protezione per %1$@ non corrisponde a *.%2$@."
+          }
+        },
+        "nl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Het beveiligingscertificaat voor %1$@ komt niet overeen met *.%2$@. "
+          }
+        },
+        "pl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Certyfikat zabezpieczeń %1$@ nie jest zgodny z *.%2$@."
+          }
+        },
+        "pt" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "O certificado de segurança de %1$@ não corresponde a *.%2$@."
+          }
+        },
+        "ru" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Сертификат безопасности сайта %1$@ не подходит для домена *.%2$@."
+          }
+        }
+      }
+    },
     "Start Speaking" : {
       "comment" : "Main Menu Edit-Speech item",
       "localizations" : {
@@ -48822,6 +51315,66 @@
         }
       }
     },
+    "tab.empty.title" : {
+      "comment" : "Title for an empty tab without a title",
+      "extractionState" : "extracted_with_value",
+      "localizations" : {
+        "de" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Ohne Titel"
+          }
+        },
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "Untitled"
+          }
+        },
+        "es" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Sin título"
+          }
+        },
+        "fr" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Sans titre"
+          }
+        },
+        "it" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Senza titolo"
+          }
+        },
+        "nl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Naamloos"
+          }
+        },
+        "pl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Bez tytułu"
+          }
+        },
+        "pt" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Sem título"
+          }
+        },
+        "ru" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Без названия"
+          }
+        }
+      }
+    },
     "tab.error.title" : {
       "comment" : "Tab error title",
       "extractionState" : "extracted_with_value",
@@ -50949,6 +53502,7 @@
     },
     "Try importing bookmarks manually instead." : {
       "comment" : "Data import error subtitle: suggestion to import Bookmarks manually by selecting a CSV or HTML file.",
+      "extractionState" : "stale",
       "localizations" : {
         "de" : {
           "stringUnit" : {
@@ -51002,6 +53556,7 @@
     },
     "Try importing passwords manually instead." : {
       "comment" : "Data import error subtitle: suggestion to import Passwords manually by selecting a CSV or HTML file.",
+      "extractionState" : "stale",
       "localizations" : {
         "de" : {
           "stringUnit" : {
@@ -51466,6 +54021,186 @@
         }
       }
     },
+    "warn.before.quit" : {
+      "comment" : "Label after the checkbox in Settings which configures a warning before clearing data on the application termination.",
+      "extractionState" : "extracted_with_value",
+      "localizations" : {
+        "de" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Warne mich, dass Tabs und Daten beim Beenden gelöscht werden"
+          }
+        },
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "Warn me that tabs and data will be cleared when quitting"
+          }
+        },
+        "es" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Advertirme de que las pestañas y los datos se borrarán al salir"
+          }
+        },
+        "fr" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "M'avertir que les onglets et les données seront effacés à la fermeture"
+          }
+        },
+        "it" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Avvisa prima di cancellare schede e dati all'uscita"
+          }
+        },
+        "nl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Waarschuwen dat tabbladen en gegevens worden gewist bij het afsluiten"
+          }
+        },
+        "pl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Ostrzegaj, że karty i dane zostaną wyczyszczone przy wychodzeniu"
+          }
+        },
+        "pt" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Avisar-me que os separadores e os dados serão limpos ao sair"
+          }
+        },
+        "ru" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Показывать предупреждение о сбросе вкладок и данных при выходе"
+          }
+        }
+      }
+    },
+    "warn.before.quit.dialog.checkbox.message" : {
+      "comment" : "A label after checkbox to configure the warning before clearing data on the application termination.",
+      "extractionState" : "extracted_with_value",
+      "localizations" : {
+        "de" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Jedes Mal warnen"
+          }
+        },
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "Warn me every time"
+          }
+        },
+        "es" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Advertirme cada vez"
+          }
+        },
+        "fr" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Toujours me prévenir"
+          }
+        },
+        "it" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Avvisa ogni volta"
+          }
+        },
+        "nl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Elke keer waarschuwen"
+          }
+        },
+        "pl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Ostrzegaj za każdym razem"
+          }
+        },
+        "pt" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Avisar-me sempre"
+          }
+        },
+        "ru" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Предупреждать каждый раз"
+          }
+        }
+      }
+    },
+    "warn.before.quit.dialog.header" : {
+      "comment" : "A header of warning before clearing data on the application termination.",
+      "extractionState" : "extracted_with_value",
+      "localizations" : {
+        "de" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Tabs und Browserdaten löschen und DuckDuckGo beenden?"
+          }
+        },
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "Clear tabs and browsing data and quit DuckDuckGo?"
+          }
+        },
+        "es" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "¿Borrar pestañas y datos de navegación y salir de DuckDuckGo?"
+          }
+        },
+        "fr" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Effacer les onglets et les données de navigation et quitter DuckDuckGo ?"
+          }
+        },
+        "it" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Cancellare le schede e i dati di navigazione e uscire da DuckDuckGo?"
+          }
+        },
+        "nl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Tabbladen en browsergegevens wissen en DuckDuckGo afsluiten?"
+          }
+        },
+        "pl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Wyczyścić karty i dane przeglądania i wyjść z DuckDuckGo?"
+          }
+        },
+        "pt" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Limpar separadores e dados de navegação e sair do DuckDuckGo?"
+          }
+        },
+        "ru" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Очистить вкладки и данные и выйти из DuckDuckGo?"
+          }
+        }
+      }
+    },
     "We couldn‘t find any bookmarks." : {
       "comment" : "Data import error message: Bookmarks weren‘t found.",
       "localizations" : {
diff --git a/DuckDuckGo/LoginItems/LoginItemsManager.swift b/DuckDuckGo/LoginItems/LoginItemsManager.swift
index e0a44a4fb4..076c75f2b8 100644
--- a/DuckDuckGo/LoginItems/LoginItemsManager.swift
+++ b/DuckDuckGo/LoginItems/LoginItemsManager.swift
@@ -19,10 +19,15 @@
 import Common
 import Foundation
 import LoginItems
+import PixelKit
+
+protocol LoginItemsManaging {
+    func throwingEnableLoginItems(_ items: Set<LoginItem>, log: OSLog) throws
+}
 
 /// Class to manage the login items for the VPN and DBP
 ///
-final class LoginItemsManager {
+final class LoginItemsManager: LoginItemsManaging {
     private enum Action: String {
         case enable
         case disable
@@ -42,6 +47,20 @@ final class LoginItemsManager {
         }
     }
 
+    /// Throwing version of enableLoginItems
+    ///
+    func throwingEnableLoginItems(_ items: Set<LoginItem>, log: OSLog) throws {
+        for item in items {
+            do {
+                try item.enable()
+                os_log("🟢 Enabled successfully %{public}@", log: log, String(describing: item))
+            } catch let error as NSError {
+                handleError(for: item, action: .enable, error: error)
+                throw error
+            }
+        }
+    }
+
     func restartLoginItems(_ items: Set<LoginItem>, log: OSLog) {
         for item in items {
             do {
@@ -66,17 +85,12 @@ final class LoginItemsManager {
     }
 
     private func handleError(for item: LoginItem, action: Action, error: NSError) {
-        let event = Pixel.Event.Debug.loginItemUpdateError(
-            loginItemBundleID: item.agentBundleID,
-            action: "enable",
-            buildType: AppVersion.shared.buildType,
-            osVersion: AppVersion.shared.osVersion
-        )
-        DailyPixel.fire(pixel: .debug(event: event, error: error), frequency: .dailyAndCount)
-
-        os_log("🔴 Could not enable %{public}@: %{public}@",
-               item.debugDescription,
-               error.debugDescription)
+        let event = GeneralPixel.loginItemUpdateError(loginItemBundleID: item.agentBundleID,
+                                                      action: "enable",
+                                                      buildType: AppVersion.shared.buildType,
+                                                      osVersion: AppVersion.shared.osVersion)
+        PixelKit.fire(DebugEvent(event, error: error), frequency: .dailyAndCount)
+        os_log("🔴 Could not enable %{public}@: %{public}@", item.debugDescription, error.debugDescription)
     }
 
     // MARK: - Debug Interactions
diff --git a/DuckDuckGo/MainWindow/MainViewController.swift b/DuckDuckGo/MainWindow/MainViewController.swift
index 17c166e932..118116eaad 100644
--- a/DuckDuckGo/MainWindow/MainViewController.swift
+++ b/DuckDuckGo/MainWindow/MainViewController.swift
@@ -20,11 +20,8 @@ import Cocoa
 import Carbon.HIToolbox
 import Combine
 import Common
-
-#if NETWORK_PROTECTION
 import NetworkProtection
 import NetworkProtectionIPC
-#endif
 
 final class MainViewController: NSViewController {
     private lazy var mainView = MainView(frame: NSRect(x: 0, y: 0, width: 600, height: 660))
@@ -35,6 +32,7 @@ final class MainViewController: NSViewController {
     let findInPageViewController: FindInPageViewController
     let fireViewController: FireViewController
     let bookmarksBarViewController: BookmarksBarViewController
+    private let bookmarksBarVisibilityManager: BookmarksBarVisibilityManager
 
     let tabCollectionViewModel: TabCollectionViewModel
     let isBurner: Bool
@@ -63,8 +61,8 @@ final class MainViewController: NSViewController {
         self.isBurner = tabCollectionViewModel.isBurner
 
         tabBarViewController = TabBarViewController.create(tabCollectionViewModel: tabCollectionViewModel)
+        bookmarksBarVisibilityManager = BookmarksBarVisibilityManager(selectedTabPublisher: tabCollectionViewModel.$selectedTabViewModel.eraseToAnyPublisher())
 
-#if NETWORK_PROTECTION
         let networkProtectionPopoverManager: NetPPopoverManager = {
 #if DEBUG
             guard case .normal = NSApp.runType else {
@@ -95,14 +93,12 @@ final class MainViewController: NSViewController {
                 serverInfoObserver: ipcClient.ipcServerInfoObserver,
                 connectionErrorObserver: ipcClient.ipcConnectionErrorObserver,
                 connectivityIssuesObserver: connectivityIssuesObserver,
-                controllerErrorMessageObserver: controllerErrorMessageObserver
+                controllerErrorMessageObserver: controllerErrorMessageObserver,
+                dataVolumeObserver: ipcClient.ipcDataVolumeObserver
             )
         }()
 
         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()
@@ -131,7 +127,7 @@ final class MainViewController: NSViewController {
         listenToKeyDownEvents()
         subscribeToMouseTrackingArea()
         subscribeToSelectedTabViewModel()
-        subscribeToAppSettingsNotifications()
+        subscribeToBookmarkBarVisibility()
         subscribeToFirstResponder()
         mainView.findInPageContainerView.applyDropShadow()
 
@@ -178,9 +174,6 @@ final class MainViewController: NSViewController {
 
             resizeNavigationBar(isHomePage: tabCollectionViewModel.selectedTabViewModel?.tab.content == .newtab,
                                 animated: false)
-
-            let bookmarksBarVisible = AppearancePreferences.shared.showBookmarksBar
-            updateBookmarksBarViewVisibility(visible: bookmarksBarVisible)
         }
 
         updateDividerColor(isShowingHomePage: tabCollectionViewModel.selectedTabViewModel?.tab.content == .newtab)
@@ -196,12 +189,8 @@ final class MainViewController: NSViewController {
         updateReloadMenuItem()
         updateStopMenuItem()
         browserTabViewController.windowDidBecomeKey()
-        presentWaitlistThankYouPromptIfNecessary()
 
-#if NETWORK_PROTECTION
-        sendActiveNetworkProtectionWaitlistUserPixel()
         refreshNetworkProtectionMessages()
-#endif
 
 #if DBP
         DataBrokerProtectionAppEvents().windowDidBecomeMain()
@@ -228,13 +217,11 @@ final class MainViewController: NSViewController {
         }
     }
 
-#if NETWORK_PROTECTION
     private let networkProtectionMessaging = DefaultNetworkProtectionRemoteMessaging()
 
     func refreshNetworkProtectionMessages() {
         networkProtectionMessaging.fetchRemoteMessages()
     }
-#endif
 
 #if DBP
     private let dataBrokerProtectionMessaging = DefaultDataBrokerProtectionRemoteMessaging()
@@ -316,21 +303,30 @@ final class MainViewController: NSViewController {
     }
 
     private func subscribeToTitleChange(of selectedTabViewModel: TabViewModel?) {
-        guard let window = self.view.window else { return }
-        selectedTabViewModel?.$title
+        guard let selectedTabViewModel else { return }
+
+        // Only subscribe once the view is added to the window.
+        let windowPublisher = view.publisher(for: \.window).filter({ $0 != nil }).prefix(1).asVoid()
+
+        windowPublisher
+            .combineLatest(selectedTabViewModel.$title) { $1 }
             .map {
                 $0.truncated(length: MainMenu.Constants.maxTitleLength)
             }
             .receive(on: DispatchQueue.main)
-            .assign(to: \.title, onWeaklyHeld: window)
+            .sink { [weak self] title in
+                self?.view.window?.title = title
+            }
             .store(in: &tabViewModelCancellables)
     }
 
-    private func subscribeToAppSettingsNotifications() {
-        bookmarksBarVisibilityChangedCancellable = NotificationCenter.default
-            .publisher(for: AppearancePreferences.Notifications.showBookmarksBarSettingChanged)
-            .sink { [weak self] _ in
-                self?.updateBookmarksBarViewVisibility(visible: AppearancePreferences.shared.showBookmarksBar)
+    private func subscribeToBookmarkBarVisibility() {
+        bookmarksBarVisibilityChangedCancellable = bookmarksBarVisibilityManager
+            .$isBookmarksBarVisible
+            .removeDuplicates()
+            .receive(on: DispatchQueue.main)
+            .sink { [weak self] isBookmarksBarVisible in
+                self?.updateBookmarksBarViewVisibility(visible: isBookmarksBarVisible)
             }
     }
 
@@ -347,7 +343,6 @@ final class MainViewController: NSViewController {
                 defer { lastTabContent = content }
 
                 resizeNavigationBar(isHomePage: content == .newtab, animated: content == .newtab && lastTabContent != .newtab)
-                updateBookmarksBar(content)
                 adjustFirstResponder(selectedTabViewModel: selectedTabViewModel, tabContent: content)
             }
             .store(in: &self.tabViewModelCancellables)
@@ -367,14 +362,6 @@ final class MainViewController: NSViewController {
         }
     }
 
-    private func updateBookmarksBar(_ content: Tab.TabContent, _ prefs: AppearancePreferences = AppearancePreferences.shared) {
-        if content.isUrl && prefs.bookmarksBarAppearance == .newTabOnly {
-            updateBookmarksBarViewVisibility(visible: false)
-        } else if prefs.showBookmarksBar {
-            updateBookmarksBarViewVisibility(visible: true)
-        }
-    }
-
     private func subscribeToFindInPage(of selectedTabViewModel: TabViewModel?) {
         selectedTabViewModel?.findInPage?
             .$isVisible
@@ -450,24 +437,6 @@ final class MainViewController: NSViewController {
         NSApp.mainMenuTyped.stopMenuItem.isEnabled = selectedTabViewModel.isLoading
     }
 
-#if NETWORK_PROTECTION
-    private func sendActiveNetworkProtectionWaitlistUserPixel() {
-        if DefaultNetworkProtectionVisibility().waitlistIsOngoing {
-            DailyPixel.fire(pixel: .networkProtectionWaitlistUserActive, frequency: .dailyOnly)
-        }
-    }
-#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) {
diff --git a/DuckDuckGo/Menus/HistoryMenu.swift b/DuckDuckGo/Menus/HistoryMenu.swift
index b99c7a867f..42fd97d990 100644
--- a/DuckDuckGo/Menus/HistoryMenu.swift
+++ b/DuckDuckGo/Menus/HistoryMenu.swift
@@ -53,7 +53,9 @@ final class HistoryMenu: NSMenu {
             reopenLastClosedMenuItem
             recentlyClosedMenuItem
             reopenAllWindowsFromLastSessionMenuItem
-            NSMenuItem.separator()
+
+            clearAllHistorySeparator
+            clearAllHistoryMenuItem
         }
 
         reopenMenuItemKeyEquivalentManager.reopenLastClosedMenuItem = reopenLastClosedMenuItem
diff --git a/DuckDuckGo/Menus/MainMenu.swift b/DuckDuckGo/Menus/MainMenu.swift
index 2e6c0d2639..66e026dc1d 100644
--- a/DuckDuckGo/Menus/MainMenu.swift
+++ b/DuckDuckGo/Menus/MainMenu.swift
@@ -24,15 +24,9 @@ import OSLog // swiftlint:disable:this enforce_os_log_wrapper
 import SwiftUI
 import WebKit
 import Configuration
-
-#if NETWORK_PROTECTION
 import NetworkProtection
-#endif
-
-#if SUBSCRIPTION
 import Subscription
 import SubscriptionUI
-#endif
 
 // swiftlint:disable:next type_body_length
 @MainActor final class MainMenu: NSMenu {
@@ -72,7 +66,7 @@ import SubscriptionUI
     var forwardMenuItem: NSMenuItem { historyMenu.forwardMenuItem }
 
     // MARK: Bookmarks
-    let manageBookmarksMenuItem = NSMenuItem(title: UserText.mainMenuHistoryManageBookmarks, action: #selector(MainViewController.showManageBookmarks))
+    let manageBookmarksMenuItem = NSMenuItem(title: UserText.mainMenuHistoryManageBookmarks, action: #selector(MainViewController.showManageBookmarks)).withAccessibilityIdentifier("MainMenu.manageBookmarksMenuItem")
     var bookmarksMenuToggleBookmarksBarMenuItem = NSMenuItem(title: "BookmarksBarMenuPlaceholder", action: #selector(MainViewController.toggleBookmarksBarFromMenu), keyEquivalent: "B")
     let importBookmarksMenuItem = NSMenuItem(title: UserText.importBookmarks, action: #selector(AppDelegate.openImportBrowserDataWindow))
     let bookmarksMenu = NSMenu(title: UserText.bookmarks)
@@ -85,9 +79,7 @@ import SubscriptionUI
     let toggleBookmarksShortcutMenuItem = NSMenuItem(title: UserText.mainMenuViewShowBookmarksShortcut, action: #selector(MainViewController.toggleBookmarksShortcut), keyEquivalent: "K")
     let toggleDownloadsShortcutMenuItem = NSMenuItem(title: UserText.mainMenuViewShowDownloadsShortcut, action: #selector(MainViewController.toggleDownloadsShortcut), keyEquivalent: "J")
 
-#if NETWORK_PROTECTION
     let toggleNetworkProtectionShortcutMenuItem = NSMenuItem(title: UserText.showNetworkProtectionShortcut, action: #selector(MainViewController.toggleNetworkProtectionShortcut), keyEquivalent: "N")
-#endif
 
     // MARK: Window
     let windowsMenu = NSMenu(title: UserText.mainMenuWindow)
@@ -270,9 +262,7 @@ import SubscriptionUI
             toggleBookmarksShortcutMenuItem
             toggleDownloadsShortcutMenuItem
 
-#if NETWORK_PROTECTION
             toggleNetworkProtectionShortcutMenuItem
-#endif
 
             NSMenuItem.separator()
 
@@ -301,6 +291,7 @@ import SubscriptionUI
     func buildBookmarksMenu() -> NSMenuItem {
         NSMenuItem(title: UserText.bookmarks).submenu(bookmarksMenu.buildItems {
             NSMenuItem(title: UserText.bookmarkThisPage, action: #selector(MainViewController.bookmarkThisPage), keyEquivalent: "d")
+            NSMenuItem(title: UserText.bookmarkAllTabs, action: #selector(MainViewController.bookmarkAllOpenTabs), keyEquivalent: [.command, .shift, "d"])
             manageBookmarksMenuItem
             bookmarksMenuToggleBookmarksBarMenuItem
             NSMenuItem.separator()
@@ -313,6 +304,7 @@ import SubscriptionUI
                 .submenu(favoritesMenu.buildItems {
                     NSMenuItem(title: UserText.mainMenuHistoryFavoriteThisPage, action: #selector(MainViewController.favoriteThisPage))
                         .withImage(.favorite)
+                        .withAccessibilityIdentifier("MainMenu.favoriteThisPage")
                     NSMenuItem.separator()
                 })
                 .withImage(.favorite)
@@ -328,6 +320,7 @@ import SubscriptionUI
                 NSMenuItem(title: UserText.zoom, action: #selector(NSWindow.performZoom))
                 NSMenuItem.separator()
 
+                NSMenuItem(title: UserText.duplicateTab, action: #selector(MainViewController.duplicateTab))
                 NSMenuItem(title: UserText.pinTab, action: #selector(MainViewController.pinOrUnpinTab))
                 NSMenuItem(title: UserText.moveTabToNewWindow, action: #selector(MainViewController.moveTabToNewWindow))
                 NSMenuItem(title: UserText.mainMenuWindowMergeAllWindows, action: #selector(NSWindow.mergeAllWindows))
@@ -398,10 +391,8 @@ import SubscriptionUI
     override func update() {
         super.update()
 
-#if NETWORK_PROTECTION
         // To be safe, hide the NetP shortcut menu item by default.
         toggleNetworkProtectionShortcutMenuItem.isHidden = true
-#endif
 
         updateHomeButtonMenuItem()
         updateBookmarksBarMenuItem()
@@ -549,14 +540,12 @@ import SubscriptionUI
             toggleBookmarksShortcutMenuItem.title = LocalPinningManager.shared.shortcutTitle(for: .bookmarks)
             toggleDownloadsShortcutMenuItem.title = LocalPinningManager.shared.shortcutTitle(for: .downloads)
 
-#if NETWORK_PROTECTION
             if DefaultNetworkProtectionVisibility().isVPNVisible() {
                 toggleNetworkProtectionShortcutMenuItem.isHidden = false
                 toggleNetworkProtectionShortcutMenuItem.title = LocalPinningManager.shared.shortcutTitle(for: .networkProtection)
             } else {
                 toggleNetworkProtectionShortcutMenuItem.isHidden = true
             }
-#endif
         }
     }
 
@@ -567,8 +556,16 @@ import SubscriptionUI
     // swiftlint:disable:next function_body_length
     private func setupDebugMenu() -> NSMenu {
         let debugMenu = NSMenu(title: "Debug") {
-            NSMenuItem(title: "Open Vanilla Browser", action: #selector(MainViewController.openVanillaBrowser))
+            NSMenuItem(title: "Open Vanilla Browser", action: #selector(MainViewController.openVanillaBrowser)).withAccessibilityIdentifier("MainMenu.openVanillaBrowser")
             NSMenuItem.separator()
+            NSMenuItem(title: "Tab") {
+                NSMenuItem(title: "Append Tabs") {
+                    NSMenuItem(title: "10 Tabs", action: #selector(MainViewController.addDebugTabs(_:)), representedObject: 10)
+                    NSMenuItem(title: "50 Tabs", action: #selector(MainViewController.addDebugTabs(_:)), representedObject: 50)
+                    NSMenuItem(title: "100 Tabs", action: #selector(MainViewController.addDebugTabs(_:)), representedObject: 100)
+                    NSMenuItem(title: "150 Tabs", action: #selector(MainViewController.addDebugTabs(_:)), representedObject: 150)
+                }
+            }
             NSMenuItem(title: "Reset Data") {
                 NSMenuItem(title: "Reset Default Browser Prompt", action: #selector(MainViewController.resetDefaultBrowserPrompt))
                 NSMenuItem(title: "Reset Default Grammar Checks", action: #selector(MainViewController.resetDefaultGrammarChecks))
@@ -577,17 +574,16 @@ import SubscriptionUI
                 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: "Permanent Survey share on", action: #selector(MainViewController.inPermanentSurveyShareOn(_:)))
+                NSMenuItem(title: "Permanent Survey share off", action: #selector(MainViewController.inPermanentSurveyShareOff(_:)))
                 NSMenuItem(title: "Change Activation Date") {
                     NSMenuItem(title: "Today", action: #selector(MainViewController.changeInstallDateToToday), keyEquivalent: "N")
-                    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: "Less Than a 5 days Ago", action: #selector(MainViewController.changeInstallDateToLessThan5DayAgo(_:)))
+                    NSMenuItem(title: "More Than 5 Days Ago", action: #selector(MainViewController.changeInstallDateToMoreThan5DayAgoButLessThan9(_:)))
+                    NSMenuItem(title: "More Than 9 Days Ago", action: #selector(MainViewController.changeInstallDateToMoreThan9DaysAgo(_:)))
                 }
                 NSMenuItem(title: "Reset Email Protection InContext Signup Prompt", action: #selector(MainViewController.resetEmailProtectionInContextPrompt))
-                NSMenuItem(title: "Reset Daily Pixels", action: #selector(MainViewController.resetDailyPixels))
+                NSMenuItem(title: "Reset Pixels Storage", action: #selector(MainViewController.resetDailyPixels))
             }.withAccessibilityIdentifier("MainMenu.resetData")
             NSMenuItem(title: "UI Triggers") {
                 NSMenuItem(title: "Show Save Credentials Popover", action: #selector(MainViewController.showSaveCredentialsPopover))
@@ -616,16 +612,13 @@ import SubscriptionUI
                 .submenu(DataBrokerProtectionDebugMenu())
 #endif
 
-#if NETWORK_PROTECTION
             if case .normal = NSApp.runType {
                 NSMenuItem(title: "VPN")
                     .submenu(NetworkProtectionDebugMenu())
             }
-#endif
 
             NSMenuItem(title: "Trigger Fatal Error", action: #selector(MainViewController.triggerFatalError))
 
-#if SUBSCRIPTION
             let currentEnvironmentWrapper = UserDefaultsWrapper(key: .subscriptionEnvironment, defaultValue: SubscriptionPurchaseEnvironment.ServiceEnvironment.default)
             let isInternalTestingWrapper = UserDefaultsWrapper(key: .subscriptionInternalTesting, defaultValue: false)
 
@@ -644,7 +637,6 @@ import SubscriptionUI
             },
                 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 51141f5da2..eca7f8004d 100644
--- a/DuckDuckGo/Menus/MainMenuActions.swift
+++ b/DuckDuckGo/Menus/MainMenuActions.swift
@@ -215,7 +215,7 @@ extension AppDelegate {
             savePanel.beginSheetModal(for: window) { response in
                 guard response == .OK, let selectedURL = savePanel.url else { return }
 
-                let vault = try? AutofillSecureVaultFactory.makeVault(errorReporter: SecureVaultErrorReporter.shared)
+                let vault = try? AutofillSecureVaultFactory.makeVault(reporter: SecureVaultReporter.shared)
                 let exporter = CSVLoginExporter(secureVault: vault!)
                 do {
                     try exporter.exportVaultLogins(to: selectedURL)
@@ -392,7 +392,7 @@ extension MainViewController {
             }
             navigationBarViewController.view.window?.makeKeyAndOrderFront(nil)
         }
-        navigationBarViewController.toggleDownloadsPopover(keepButtonVisible: false)
+        navigationBarViewController.toggleDownloadsPopover(keepButtonVisible: sender is NSMenuItem /* keep button visible for some time on Cmd+J */)
     }
 
     @objc func toggleBookmarksBarFromMenu(_ sender: Any) {
@@ -422,9 +422,7 @@ extension MainViewController {
     }
 
     @objc func toggleNetworkProtectionShortcut(_ sender: Any) {
-#if NETWORK_PROTECTION
         LocalPinningManager.shared.togglePinning(for: .networkProtection)
-#endif
     }
 
     // MARK: - History
@@ -509,6 +507,11 @@ extension MainViewController {
             .openBookmarkPopover(setFavorite: false, accessPoint: .init(sender: sender, default: .moreMenu))
     }
 
+    @objc func bookmarkAllOpenTabs(_ sender: Any) {
+        let websitesInfo = tabCollectionViewModel.tabs.compactMap(WebsiteInfo.init)
+        BookmarksDialogViewFactory.makeBookmarkAllOpenTabsView(websitesInfo: websitesInfo).show()
+    }
+
     @objc func favoriteThisPage(_ sender: Any) {
         guard let tabIndex = getActiveTabAndIndex()?.index else { return }
         if tabCollectionViewModel.selectedTabIndex != tabIndex {
@@ -603,6 +606,12 @@ extension MainViewController {
         WindowsManager.openNewWindow(with: tab)
     }
 
+    @objc func duplicateTab(_ sender: Any?) {
+        guard let (_, index) = getActiveTabAndIndex() else { return }
+
+        tabCollectionViewModel.duplicateTab(at: index)
+    }
+
     @objc func pinOrUnpinTab(_ sender: Any?) {
         guard let (_, selectedTabIndex) = getActiveTabAndIndex() else { return }
 
@@ -652,6 +661,14 @@ extension MainViewController {
 
     // MARK: - Debug
 
+    @objc func addDebugTabs(_ sender: AnyObject) {
+        let numberOfTabs = sender.representedObject as? Int ?? 1
+        (1...numberOfTabs).forEach { _ in
+            let tab = Tab(content: .url(.duckDuckGo, credential: nil, source: .ui))
+            tabCollectionViewModel.append(tab: tab)
+        }
+    }
+
     @objc func resetDefaultBrowserPrompt(_ sender: Any?) {
         UserDefaultsWrapper<Bool>.clear(.defaultBrowserDismissed)
     }
@@ -666,7 +683,7 @@ extension MainViewController {
     }
 
     @objc func resetSecureVaultData(_ sender: Any?) {
-        let vault = try? AutofillSecureVaultFactory.makeVault(errorReporter: SecureVaultErrorReporter.shared)
+        let vault = try? AutofillSecureVaultFactory.makeVault(reporter: SecureVaultReporter.shared)
 
         let accounts = (try? vault?.accounts()) ?? []
         for accountID in accounts.compactMap(\.id) {
@@ -715,9 +732,7 @@ extension MainViewController {
         UserDefaults.standard.set(true, forKey: UserDefaultsWrapper<Bool>.Key.homePageShowImport.rawValue)
         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.homePageShowSurveyDay14.rawValue)
-        UserDefaults.standard.set(false, forKey: UserDefaultsWrapper<Bool>.Key.homePageUserInteractedWithSurveyDay0.rawValue)
+        UserDefaults.standard.set(true, forKey: UserDefaultsWrapper<Bool>.Key.homePageShowPermanentSurvey.rawValue)
     }
 
     @objc func internalUserState(_ sender: Any?) {
@@ -742,47 +757,40 @@ extension MainViewController {
         UserDefaults.netP.networkProtectionEntitlementsExpired = false
 
         // Clear pixel data
-        DailyPixel.clearLastFireDate(pixel: .privacyProFeatureEnabled)
-        Pixel.shared?.clearRepetitions(for: .privacyProBetaUserThankYouDBP)
-        Pixel.shared?.clearRepetitions(for: .privacyProBetaUserThankYouVPN)
+        PixelKit.shared?.clearFrequencyHistoryFor(pixel: PrivacyProPixel.privacyProFeatureEnabled)
+        PixelKit.shared?.clearFrequencyHistoryFor(pixel: PrivacyProPixel.privacyProBetaUserThankYouDBP)
+        PixelKit.shared?.clearFrequencyHistoryFor(pixel: PrivacyProPixel.privacyProBetaUserThankYouVPN)
     }
 
     @objc func resetDailyPixels(_ sender: Any?) {
-        UserDefaults.standard.removePersistentDomain(forName: DailyPixel.Constant.dailyPixelStorageIdentifier)
+        PixelKit.shared?.clearFrequencyHistoryForAllPixels()
     }
 
-    @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 inPermanentSurveyShareOn(_ sender: Any?) {
+        UserDefaults.standard.set(true, forKey: UserDefaultsWrapper<Bool?>.Key.homePageUserInSurveyShare.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 inPermanentSurveyShareOff(_ sender: Any?) {
+        UserDefaults.standard.set(false, forKey: UserDefaultsWrapper<Bool?>.Key.homePageUserInSurveyShare.rawValue)
     }
 
     @objc func changeInstallDateToToday(_ sender: Any?) {
         UserDefaults.standard.set(Date(), 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 changeInstallDateToLessThan5DayAgo(_ sender: Any?) {
+        let lessThanFiveDaysAgo = Calendar.current.date(byAdding: .day, value: -4, to: Date())
+        UserDefaults.standard.set(lessThanFiveDaysAgo, 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 changeInstallDateToMoreThan5DayAgoButLessThan9(_ sender: Any?) {
+        let between5And9DaysAgo = Calendar.current.date(byAdding: .day, value: -5, to: Date())
+        UserDefaults.standard.set(between5And9DaysAgo, forKey: UserDefaultsWrapper<Date>.Key.firstLaunchDate.rawValue)
     }
 
-    @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)
+    @objc func changeInstallDateToMoreThan9DaysAgo(_ sender: Any?) {
+        let nineDaysAgo = Calendar.current.date(byAdding: .day, value: -9, to: Date())
+        UserDefaults.standard.set(nineDaysAgo, forKey: UserDefaultsWrapper<Date>.Key.firstLaunchDate.rawValue)
     }
 
     @objc func showSaveCredentialsPopover(_ sender: Any?) {
@@ -930,8 +938,8 @@ extension MainViewController: NSMenuItemValidation {
         case #selector(findInPage),
              #selector(findInPageNext),
              #selector(findInPagePrevious):
-            return activeTabViewModel?.canReload == true // must have content loaded
-                && view.window?.isKeyWindow == true // disable in full screen
+            return activeTabViewModel?.canFindInPage == true // must have content loaded
+                && view.window?.isKeyWindow == true // disable in video full screen
 
         case #selector(findInPageDone):
             return getActiveTabAndIndex()?.tab.findInPage?.isActive == true
@@ -949,6 +957,8 @@ extension MainViewController: NSMenuItemValidation {
         case #selector(MainViewController.bookmarkThisPage(_:)),
              #selector(MainViewController.favoriteThisPage(_:)):
             return activeTabViewModel?.canBeBookmarked == true
+        case #selector(MainViewController.bookmarkAllOpenTabs(_:)):
+            return tabCollectionViewModel.canBookmarkAllOpenTabs()
         case #selector(MainViewController.openBookmark(_:)),
              #selector(MainViewController.showManageBookmarks(_:)):
             return true
@@ -1047,7 +1057,7 @@ extension AppDelegate: NSMenuItemValidation {
     }
 
     private var areTherePasswords: Bool {
-        let vault = try? AutofillSecureVaultFactory.makeVault(errorReporter: SecureVaultErrorReporter.shared)
+        let vault = try? AutofillSecureVaultFactory.makeVault(reporter: SecureVaultReporter.shared)
         guard let vault else {
             return false
         }
diff --git a/DuckDuckGo/NavigationBar/PinningManager.swift b/DuckDuckGo/NavigationBar/PinningManager.swift
index d2cc6ef6bb..37eceb098c 100644
--- a/DuckDuckGo/NavigationBar/PinningManager.swift
+++ b/DuckDuckGo/NavigationBar/PinningManager.swift
@@ -17,20 +17,14 @@
 //
 
 import Foundation
-
-#if NETWORK_PROTECTION
 import NetworkProtection
-#endif
 
 enum PinnableView: String {
     case autofill
     case bookmarks
     case downloads
     case homeButton
-
-#if NETWORK_PROTECTION
     case networkProtection
-#endif
 }
 
 protocol PinningManager {
@@ -45,11 +39,7 @@ protocol PinningManager {
 
 final class LocalPinningManager: PinningManager {
 
-#if NETWORK_PROTECTION
     static let shared = LocalPinningManager(networkProtectionFeatureActivation: NetworkProtectionKeychainTokenStore())
-#else
-    static let shared = LocalPinningManager()
-#endif
 
     static let pinnedViewChangedNotificationViewTypeKey = "pinning.pinnedViewChanged.viewType"
 
@@ -59,13 +49,11 @@ final class LocalPinningManager: PinningManager {
     @UserDefaultsWrapper(key: .manuallyToggledPinnedViews, defaultValue: [])
     private var manuallyToggledPinnedViewsStrings: [String]
 
-#if NETWORK_PROTECTION
     private let networkProtectionFeatureActivation: NetworkProtectionFeatureActivation
 
     init(networkProtectionFeatureActivation: NetworkProtectionFeatureActivation) {
         self.networkProtectionFeatureActivation = networkProtectionFeatureActivation
     }
-#endif
 
     func togglePinning(for view: PinnableView) {
         flagAsManuallyToggled(view)
@@ -122,10 +110,8 @@ final class LocalPinningManager: PinningManager {
         case .bookmarks: return isPinned(.bookmarks) ? UserText.hideBookmarksShortcut : UserText.showBookmarksShortcut
         case .downloads: return isPinned(.downloads) ? UserText.hideDownloadsShortcut : UserText.showDownloadsShortcut
         case .homeButton: return ""
-#if NETWORK_PROTECTION
         case .networkProtection:
             return isPinned(.networkProtection) ? UserText.hideNetworkProtectionShortcut : UserText.showNetworkProtectionShortcut
-#endif
         }
     }
 
diff --git a/DuckDuckGo/NavigationBar/View/AddressBarButtonsViewController.swift b/DuckDuckGo/NavigationBar/View/AddressBarButtonsViewController.swift
index f4f0248735..975217aa58 100644
--- a/DuckDuckGo/NavigationBar/View/AddressBarButtonsViewController.swift
+++ b/DuckDuckGo/NavigationBar/View/AddressBarButtonsViewController.swift
@@ -52,6 +52,7 @@ final class AddressBarButtonsViewController: NSViewController {
         return permissionAuthorizationPopover ?? {
             let popover = PermissionAuthorizationPopover()
             self.permissionAuthorizationPopover = popover
+            popover.setAccessibilityIdentifier("AddressBarButtonsViewController.permissionAuthorizationPopover")
             return popover
         }()
     }
@@ -282,13 +283,13 @@ final class AddressBarButtonsViewController: NSViewController {
 
     private func updateBookmarkButtonVisibility() {
         guard view.window?.isPopUpWindow == false else { return }
-        bookmarkButton.setAccessibilityIdentifier("Bookmarks Button")
+        bookmarkButton.setAccessibilityIdentifier("AddressBarButtonsViewController.bookmarkButton")
         let hasEmptyAddressBar = textFieldValue?.isEmpty ?? true
-        var showBookmarkButton: Bool {
+        var shouldShowBookmarkButton: Bool {
             guard let tabViewModel, tabViewModel.canBeBookmarked else { return false }
 
             var isUrlBookmarked = false
-            if let url = tabViewModel.tab.content.url,
+            if let url = tabViewModel.tab.content.userEditableUrl,
                bookmarkManager.isUrlBookmarked(url: url) {
                 isUrlBookmarked = true
             }
@@ -296,7 +297,7 @@ final class AddressBarButtonsViewController: NSViewController {
             return clearButton.isHidden && !hasEmptyAddressBar && (isMouseOverNavigationBar || bookmarkPopover?.isShown == true || isUrlBookmarked)
         }
 
-        bookmarkButton.isHidden = !showBookmarkButton
+        bookmarkButton.isShown = shouldShowBookmarkButton
     }
 
     private func updateZoomButtonVisibility() {
@@ -324,7 +325,7 @@ final class AddressBarButtonsViewController: NSViewController {
         zoomButton.isHidden = !shouldShowZoom
     }
 
-    func openBookmarkPopover(setFavorite: Bool, accessPoint: Pixel.Event.AccessPoint) {
+    func openBookmarkPopover(setFavorite: Bool, accessPoint: GeneralPixel.AccessPoint) {
         let result = bookmarkForCurrentUrl(setFavorite: setFavorite, accessPoint: accessPoint)
         guard let bookmark = result.bookmark else {
             assertionFailure("Failed to get a bookmark for the popover")
@@ -333,7 +334,7 @@ final class AddressBarButtonsViewController: NSViewController {
 
         let bookmarkPopover = bookmarkPopoverCreatingIfNeeded()
         if !bookmarkPopover.isShown {
-            bookmarkButton.isHidden = false
+            bookmarkButton.isShown = true
             bookmarkPopover.isNew = result.isNew
             bookmarkPopover.bookmark = bookmark
             bookmarkPopover.show(positionedBelow: bookmarkButton)
@@ -353,7 +354,7 @@ final class AddressBarButtonsViewController: NSViewController {
         }()
 
         if query.permissions.contains(.camera)
-            || (query.permissions.contains(.microphone) && microphoneButton.isHidden && !cameraButton.isHidden) {
+            || (query.permissions.contains(.microphone) && microphoneButton.isHidden && cameraButton.isShown) {
             button = cameraButton
         } else {
             assert(query.permissions.count == 1)
@@ -376,9 +377,7 @@ final class AddressBarButtonsViewController: NSViewController {
                 return
             }
         }
-        guard !button.isHidden,
-              !permissionButtons.isHidden
-        else { return }
+        guard button.isShown, permissionButtons.isShown else { return }
 
         (popover.contentViewController as? PermissionAuthorizationViewController)?.query = query
         popover.show(relativeTo: button.bounds, of: button, preferredEdge: .maxY)
@@ -423,7 +422,7 @@ final class AddressBarButtonsViewController: NSViewController {
     func updateButtons() {
         stopAnimationsAfterFocus()
 
-        clearButton.isHidden = !(isTextFieldEditorFirstResponder && !(textFieldValue?.isEmpty ?? true))
+        clearButton.isShown = isTextFieldEditorFirstResponder && !textFieldValue.isEmpty
 
         updatePrivacyEntryPointButton()
         updateImageButton()
@@ -458,7 +457,7 @@ final class AddressBarButtonsViewController: NSViewController {
             permissions.microphone = tabViewModel.usedPermissions.microphone
         }
 
-        let url = tabViewModel.tab.content.url ?? .empty
+        let url = tabViewModel.tab.content.urlForWebView ?? .empty
         let domain = url.isFileURL ? .localhost : (url.host ?? "")
 
         PermissionContextMenu(permissions: permissions.map { ($0, $1) }, domain: domain, delegate: self)
@@ -477,7 +476,7 @@ final class AddressBarButtonsViewController: NSViewController {
             return
         }
 
-        let url = tabViewModel.tab.content.url ?? .empty
+        let url = tabViewModel.tab.content.urlForWebView ?? .empty
         let domain = url.isFileURL ? .localhost : (url.host ?? "")
 
         PermissionContextMenu(permissions: [(.microphone, state)], domain: domain, delegate: self)
@@ -496,7 +495,7 @@ final class AddressBarButtonsViewController: NSViewController {
             return
         }
 
-        let url = tabViewModel.tab.content.url ?? .empty
+        let url = tabViewModel.tab.content.urlForWebView ?? .empty
         let domain = url.isFileURL ? .localhost : (url.host ?? "")
 
         PermissionContextMenu(permissions: [(.geolocation, state)], domain: domain, delegate: self)
@@ -520,7 +519,7 @@ final class AddressBarButtonsViewController: NSViewController {
                 $0.append( (.popups, .requested($1)) )
             }
         } else {
-            let url = tabViewModel.tab.content.url ?? .empty
+            let url = tabViewModel.tab.content.urlForWebView ?? .empty
             domain = url.isFileURL ? .localhost : (url.host ?? "")
             permissions = [(.popups, state)]
         }
@@ -544,7 +543,7 @@ final class AddressBarButtonsViewController: NSViewController {
         }
 
         permissions = [(permissionType, state)]
-        let url = tabViewModel.tab.content.url ?? .empty
+        let url = tabViewModel.tab.content.urlForWebView ?? .empty
         let domain = url.isFileURL ? .localhost : (url.host ?? "")
 
         PermissionContextMenu(permissions: permissions, domain: domain, delegate: self)
@@ -600,7 +599,13 @@ final class AddressBarButtonsViewController: NSViewController {
     }
 
     private func setupAnimationViews() {
-        func addAndLayoutAnimationViewIfNeeded(animationView: LottieAnimationView?, animationName: String, renderingEngine: Lottie.RenderingEngineOption = .automatic) -> LottieAnimationView {
+
+        func addAndLayoutAnimationViewIfNeeded(animationView: LottieAnimationView?,
+                                               animationName: String,
+                                               // Default use of .mainThread to prevent high WindowServer Usage
+                                               // Pending Fix with newer Lottie versions
+                                               // https://app.asana.com/0/1177771139624306/1207024603216659/f
+                                               renderingEngine: Lottie.RenderingEngineOption = .mainThread) -> LottieAnimationView {
             if let animationView = animationView, animationView.identifier?.rawValue == animationName {
                 return animationView
             }
@@ -730,15 +735,15 @@ final class AddressBarButtonsViewController: NSViewController {
     }
 
     private func updatePermissionButtons() {
-        permissionButtons.isHidden = isTextFieldEditorFirstResponder
-        || isAnyTrackerAnimationPlaying
-        || (tabViewModel?.isShowingErrorPage ?? true)
+        guard let tabViewModel else { return }
+
+        permissionButtons.isShown = !isTextFieldEditorFirstResponder
+        && !isAnyTrackerAnimationPlaying
+        && !tabViewModel.isShowingErrorPage
         defer {
             showOrHidePermissionPopoverIfNeeded()
         }
 
-        guard let tabViewModel else { return }
-
         geolocationButton.buttonState = tabViewModel.usedPermissions.geolocation
 
         let (camera, microphone) = PermissionState?.combineCamera(tabViewModel.usedPermissions.camera,
@@ -773,16 +778,19 @@ final class AddressBarButtonsViewController: NSViewController {
     }
 
     private func updateBookmarkButtonImage(isUrlBookmarked: Bool = false) {
-        if let url = tabViewModel?.tab.content.url,
-           isUrlBookmarked || bookmarkManager.isUrlBookmarked(url: url) {
+        if let url = tabViewModel?.tab.content.userEditableUrl,
+           isUrlBookmarked || bookmarkManager.isUrlBookmarked(url: url)
+        {
             bookmarkButton.image = .bookmarkFilled
             bookmarkButton.mouseOverTintColor = NSColor.bookmarkFilledTint
             bookmarkButton.toolTip = UserText.editBookmarkTooltip
+            bookmarkButton.setAccessibilityValue("Bookmarked")
         } else {
             bookmarkButton.mouseOverTintColor = nil
             bookmarkButton.image = .bookmark
             bookmarkButton.contentTintColor = nil
             bookmarkButton.toolTip = UserText.addBookmarkTooltip
+            bookmarkButton.setAccessibilityValue("Unbookmarked")
         }
     }
 
@@ -807,22 +815,25 @@ final class AddressBarButtonsViewController: NSViewController {
     private func updatePrivacyEntryPointButton() {
         guard let tabViewModel else { return }
 
-        let urlScheme = tabViewModel.tab.content.url?.scheme
-        let isHypertextUrl = urlScheme == "http" || urlScheme == "https"
+        let url = tabViewModel.tab.content.userEditableUrl
+        let isNewTabOrOnboarding = [.newtab, .onboarding].contains(tabViewModel.tab.content)
+        let isHypertextUrl = url?.navigationalScheme?.isHypertextScheme == true && url?.isDuckPlayer == false
         let isEditingMode = controllerMode?.isEditing ?? false
         let isTextFieldValueText = textFieldValue?.isText ?? false
-        let isLocalUrl = tabViewModel.tab.content.url?.isLocalURL ?? false
+        let isLocalUrl = url?.isLocalURL ?? false
 
         // Privacy entry point button
-        privacyEntryPointButton.isHidden = isEditingMode
-        || isTextFieldEditorFirstResponder
-        || !isHypertextUrl
-        || tabViewModel.isShowingErrorPage
-        || isTextFieldValueText
-        || isLocalUrl
-        imageButtonWrapper.isHidden = view.window?.isPopUpWindow == true
-        || !privacyEntryPointButton.isHidden
-        || isAnyTrackerAnimationPlaying
+        privacyEntryPointButton.isShown = !isEditingMode
+        && !isTextFieldEditorFirstResponder
+        && isHypertextUrl
+        && !tabViewModel.isShowingErrorPage
+        && !isTextFieldValueText
+        && !isLocalUrl
+
+        imageButtonWrapper.isShown = view.window?.isPopUpWindow != true
+        && (isHypertextUrl || isTextFieldEditorFirstResponder || isEditingMode || isNewTabOrOnboarding)
+        && privacyEntryPointButton.isHidden
+        && !isAnyTrackerAnimationPlaying
     }
 
     private func updatePrivacyEntryPointIcon() {
@@ -833,15 +844,16 @@ final class AddressBarButtonsViewController: NSViewController {
         guard !isAnyShieldAnimationPlaying else { return }
 
         switch tabViewModel.tab.content {
-        case .url(let url, _, _):
+        case .url(let url, _, _), .identityTheftRestoration(let url), .subscription(let url):
             guard let host = url.host else { break }
 
             let isNotSecure = url.scheme == URL.NavigationalScheme.http.rawValue
+            let isCertificateValid = tabViewModel.tab.isCertificateValid ?? true
 
             let configuration = ContentBlocking.shared.privacyConfigurationManager.privacyConfig
             let isUnprotected = configuration.isUserUnprotected(domain: host)
 
-            let isShieldDotVisible = isNotSecure || isUnprotected
+            let isShieldDotVisible = isNotSecure || isUnprotected || !isCertificateValid
 
             privacyEntryPointButton.image = isShieldDotVisible ? .shieldDot : .shield
 
@@ -860,8 +872,7 @@ final class AddressBarButtonsViewController: NSViewController {
     let trackerAnimationImageProvider = TrackerAnimationImageProvider()
 
     private func animateTrackers() {
-        guard !privacyEntryPointButton.isHidden,
-              let tabViewModel else { return }
+        guard privacyEntryPointButton.isShown, let tabViewModel else { return }
 
         switch tabViewModel.tab.content {
         case .url(let url, _, _):
@@ -871,7 +882,7 @@ final class AddressBarButtonsViewController: NSViewController {
             }
 
             var animationView: LottieAnimationView
-            if url.scheme == "http" {
+            if url.navigationalScheme == .http {
                 animationView = shieldDotAnimationView
             } else {
                 animationView = shieldAnimationView
@@ -915,7 +926,7 @@ final class AddressBarButtonsViewController: NSViewController {
                                 shieldAnimations: Bool = true,
                                 badgeAnimations: Bool = true) {
         func stopAnimation(_ animationView: LottieAnimationView) {
-            if animationView.isAnimationPlaying || !animationView.isHidden {
+            if animationView.isAnimationPlaying || animationView.isShown {
                 animationView.isHidden = true
                 animationView.stop()
             }
@@ -957,9 +968,9 @@ final class AddressBarButtonsViewController: NSViewController {
         }
     }
 
-    private func bookmarkForCurrentUrl(setFavorite: Bool, accessPoint: Pixel.Event.AccessPoint) -> (bookmark: Bookmark?, isNew: Bool) {
+    private func bookmarkForCurrentUrl(setFavorite: Bool, accessPoint: GeneralPixel.AccessPoint) -> (bookmark: Bookmark?, isNew: Bool) {
         guard let tabViewModel,
-              let url = tabViewModel.tab.content.url else {
+              let url = tabViewModel.tab.content.userEditableUrl else {
             assertionFailure("No URL for bookmarking")
             return (nil, false)
         }
diff --git a/DuckDuckGo/NavigationBar/View/AddressBarTextField.swift b/DuckDuckGo/NavigationBar/View/AddressBarTextField.swift
index 84fbb30576..25cc50a039 100644
--- a/DuckDuckGo/NavigationBar/View/AddressBarTextField.swift
+++ b/DuckDuckGo/NavigationBar/View/AddressBarTextField.swift
@@ -22,6 +22,7 @@ import Combine
 import Common
 import Suggestions
 import Subscription
+import BrowserServicesKit
 
 final class AddressBarTextField: NSTextField {
 
@@ -233,7 +234,7 @@ final class AddressBarTextField: NSTextField {
         case .suggestion(let suggestionViewModel):
             let suggestion = suggestionViewModel.suggestion
             switch suggestion {
-            case .website, .bookmark, .historyEntry:
+            case .website, .bookmark, .historyEntry, .internalPage:
                 restoreValue(Value(stringValue: suggestionViewModel.autocompletionString, userTyped: true))
             case .phrase(phrase: let phase):
                 restoreValue(Value.text(phase, userTyped: false))
@@ -259,7 +260,7 @@ final class AddressBarTextField: NSTextField {
             switch self.value {
             case .suggestion(let suggestionViewModel):
                 switch suggestionViewModel.suggestion {
-                case .phrase, .website, .bookmark, .historyEntry: return false
+                case .phrase, .website, .bookmark, .historyEntry, .internalPage: return false
                 case .unknown: return true
                 }
             case .text(_, userTyped: true), .url(_, _, userTyped: true): return false
@@ -275,7 +276,7 @@ final class AddressBarTextField: NSTextField {
         guard let selectedTabViewModel = selectedTabViewModel ?? tabCollectionViewModel.selectedTabViewModel else { return }
 
         let addressBarString = addressBarString ?? selectedTabViewModel.addressBarString
-        let isSearch = selectedTabViewModel.tab.content.url?.isDuckDuckGoSearch ?? false
+        let isSearch = selectedTabViewModel.tab.content.userEditableUrl?.isDuckDuckGoSearch ?? false
         self.value = Value(stringValue: addressBarString, userTyped: false, isSearch: isSearch)
         clearUndoManager()
     }
@@ -332,9 +333,10 @@ final class AddressBarTextField: NSTextField {
         }
 
 #if APPSTORE
-        if providedUrl.isFileURL, let window = self.window {
-            let alert = NSAlert.cannotOpenFileAlert()
-            alert.beginSheetModal(for: window) { response in
+        if providedUrl.isFileURL, !providedUrl.isWritableLocation(), // is sandbox extension available for the file?
+           let window = self.window {
+
+            NSAlert.cannotOpenFileAlert().beginSheetModal(for: window) { response in
                 switch response {
                 case .alertSecondButtonReturn:
                     WindowControllersManager.shared.show(url: URL.ddgLearnMore, source: .ui, newTab: false)
@@ -344,10 +346,10 @@ final class AddressBarTextField: NSTextField {
                     return
                 }
             }
+            return
         }
 #endif
 
-#if SUBSCRIPTION
         if DefaultSubscriptionFeatureAvailability().isFeatureAvailable {
             if providedUrl.isChild(of: URL.subscriptionBaseURL) || providedUrl.isChild(of: URL.identityTheftRestoration) {
                 self.updateValue(selectedTabViewModel: nil, addressBarString: nil) // reset
@@ -355,7 +357,6 @@ final class AddressBarTextField: NSTextField {
                 return
             }
         }
-#endif
 
         self.window?.makeFirstResponder(nil)
         selectedTabViewModel.tab.setUrl(providedUrl, source: .userEntered(userEnteredValue, downloadRequested: downloadRequested))
@@ -418,7 +419,8 @@ final class AddressBarTextField: NSTextField {
         switch suggestion {
         case .bookmark(title: _, url: let url, isFavorite: _, allowedInTopHits: _),
              .historyEntry(title: _, url: let url, allowedInTopHits: _),
-             .website(url: let url):
+             .website(url: let url),
+             .internalPage(title: _, url: let url):
             finalUrl = url
             userEnteredValue = url.absoluteString
         case .phrase(phrase: let phrase),
@@ -802,7 +804,8 @@ extension AddressBarTextField {
                 self = Suffix.visit(host: host)
 
             case .bookmark(title: _, url: let url, isFavorite: _, allowedInTopHits: _),
-                    .historyEntry(title: _, url: let url, allowedInTopHits: _):
+                 .historyEntry(title: _, url: let url, allowedInTopHits: _),
+                 .internalPage(title: _, url: let url):
                 if let title = suggestionViewModel.title,
                    !title.isEmpty,
                    suggestionViewModel.autocompletionString != title {
@@ -856,6 +859,11 @@ extension AddressBarTextField {
     }
 
 }
+extension AddressBarTextField.Value? {
+    var isEmpty: Bool {
+        self?.isEmpty ?? true
+    }
+}
 
 // MARK: - NSTextFieldDelegate
 extension AddressBarTextField: NSTextFieldDelegate {
diff --git a/DuckDuckGo/NavigationBar/View/AddressBarViewController.swift b/DuckDuckGo/NavigationBar/View/AddressBarViewController.swift
index 04cd4cb362..7976bb9dc6 100644
--- a/DuckDuckGo/NavigationBar/View/AddressBarViewController.swift
+++ b/DuckDuckGo/NavigationBar/View/AddressBarViewController.swift
@@ -168,12 +168,7 @@ final class AddressBarViewController: NSViewController {
             return true
         }
 
-        // If the webview doesn't have content it doesn't handle becoming the first responder properly
-        if tabViewModel?.tab.webView.url != nil {
-            tabViewModel?.tab.webView.makeMeFirstResponder()
-        } else {
-            view.superview?.becomeFirstResponder()
-        }
+        view.window?.makeFirstResponder(nil)
 
         return true
     }
@@ -230,9 +225,9 @@ final class AddressBarViewController: NSViewController {
             passiveTextField.stringValue = ""
             return
         }
-        tabViewModel.$passiveAddressBarString
+        tabViewModel.$passiveAddressBarAttributedString
             .receive(on: DispatchQueue.main)
-            .assign(to: \.stringValue, onWeaklyHeld: passiveTextField)
+            .assign(to: \.attributedStringValue, onWeaklyHeld: passiveTextField)
             .store(in: &tabViewModelCancellables)
     }
 
@@ -244,9 +239,9 @@ final class AddressBarViewController: NSViewController {
 
         func shouldShowLoadingIndicator(for tabViewModel: TabViewModel, isLoading: Bool, error: Error?) -> Bool {
             if isLoading,
-               let url = tabViewModel.tab.content.url,
-               [.http, .https].contains(url.navigationalScheme),
-               url.isDuckDuckGoSearch == false,
+               let url = tabViewModel.tab.content.urlForWebView,
+               url.navigationalScheme?.isHypertextScheme == true,
+               !url.isDuckDuckGoSearch, !url.isDuckPlayer,
                error == nil {
                 return true
             } else {
@@ -264,7 +259,7 @@ final class AddressBarViewController: NSViewController {
             .sink { [weak self] value in
                 guard tabViewModel.isLoading,
                       let progressIndicator = self?.progressIndicator,
-                      progressIndicator.isShown
+                      progressIndicator.isProgressShown
                 else { return }
 
                 progressIndicator.increaseProgress(to: value)
@@ -279,7 +274,7 @@ final class AddressBarViewController: NSViewController {
                 if shouldShowLoadingIndicator(for: tabViewModel, isLoading: isLoading, error: error) {
                     progressIndicator.show(progress: tabViewModel.progress, startTime: tabViewModel.loadingStartTime)
 
-                } else if progressIndicator.isShown {
+                } else if progressIndicator.isProgressShown {
                     progressIndicator.finishAndHide()
                 }
             }
@@ -369,7 +364,7 @@ final class AddressBarViewController: NSViewController {
         case .suggestion(let suggestionViewModel):
             switch suggestionViewModel.suggestion {
             case .phrase, .unknown: self.mode = .editing(isUrl: false)
-            case .website, .bookmark, .historyEntry: self.mode = .editing(isUrl: true)
+            case .website, .bookmark, .historyEntry, .internalPage: self.mode = .editing(isUrl: true)
             }
         }
     }
@@ -496,12 +491,16 @@ extension AddressBarViewController {
         return event
     }
 
+    private static let maxClickReleaseDistanceToResignFirstResponder: CGFloat = 4
+
     func mouseUp(with event: NSEvent) -> NSEvent? {
         // click (same position down+up) outside of the field: resign first responder
         guard event.window === self.view.window,
               self.view.window?.firstResponder === addressBarTextField.currentEditor(),
-              self.clickPoint == event.locationInWindow
-        else { return event }
+              let clickPoint,
+              clickPoint.distance(to: event.locationInWindow) <= Self.maxClickReleaseDistanceToResignFirstResponder else {
+            return event
+        }
 
         self.view.window?.makeFirstResponder(nil)
 
diff --git a/DuckDuckGo/NavigationBar/View/MoreOptionsMenu.swift b/DuckDuckGo/NavigationBar/View/MoreOptionsMenu.swift
index 4598e190e4..847452c63c 100644
--- a/DuckDuckGo/NavigationBar/View/MoreOptionsMenu.swift
+++ b/DuckDuckGo/NavigationBar/View/MoreOptionsMenu.swift
@@ -20,18 +20,14 @@ import Cocoa
 import Combine
 import Common
 import BrowserServicesKit
-
-#if NETWORK_PROTECTION
+import PixelKit
 import NetworkProtection
-#endif
-
-#if SUBSCRIPTION
 import Subscription
-#endif
 
 protocol OptionsButtonMenuDelegate: AnyObject {
 
     func optionsButtonMenuRequestedBookmarkThisPage(_ sender: NSMenuItem)
+    func optionsButtonMenuRequestedBookmarkAllOpenTabs(_ sender: NSMenuItem)
     func optionsButtonMenuRequestedBookmarkPopover(_ menu: NSMenu)
     func optionsButtonMenuRequestedBookmarkManagementInterface(_ menu: NSMenu)
     func optionsButtonMenuRequestedBookmarkImportInterface(_ menu: NSMenu)
@@ -46,10 +42,8 @@ protocol OptionsButtonMenuDelegate: AnyObject {
 #if DBP
     func optionsButtonMenuRequestedDataBrokerProtection(_ menu: NSMenu)
 #endif
-#if SUBSCRIPTION
     func optionsButtonMenuRequestedSubscriptionPurchasePage(_ menu: NSMenu)
     func optionsButtonMenuRequestedIdentityTheftRestoration(_ menu: NSMenu)
-#endif
 }
 
 @MainActor
@@ -64,15 +58,12 @@ final class MoreOptionsMenu: NSMenu {
     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
-#endif
 
     required init(coder: NSCoder) {
         fatalError("MoreOptionsMenu: Bad initializer")
     }
 
-#if NETWORK_PROTECTION
     init(tabCollectionViewModel: TabCollectionViewModel,
          emailManager: EmailManager = EmailManager(),
          passwordManagerCoordinator: PasswordManagerCoordinator,
@@ -95,28 +86,6 @@ final class MoreOptionsMenu: NSMenu {
 
         setupMenuItems()
     }
-#else
-    init(tabCollectionViewModel: TabCollectionViewModel,
-         emailManager: EmailManager = EmailManager(),
-         passwordManagerCoordinator: PasswordManagerCoordinator,
-         sharingMenu: NSMenu? = nil,
-         internalUserDecider: InternalUserDecider) {
-
-        self.tabCollectionViewModel = tabCollectionViewModel
-        self.emailManager = emailManager
-        self.passwordManagerCoordinator = passwordManagerCoordinator
-        self.internalUserDecider = internalUserDecider
-
-        super.init(title: "")
-
-        if let sharingMenu {
-            self.sharingMenu = sharingMenu
-        }
-        self.emailManager.requestDelegate = self
-
-        setupMenuItems()
-    }
-#endif
 
     let zoomMenuItem = NSMenuItem(title: UserText.zoom, action: nil, keyEquivalent: "")
 
@@ -202,6 +171,10 @@ final class MoreOptionsMenu: NSMenu {
         actionDelegate?.optionsButtonMenuRequestedBookmarkThisPage(sender)
     }
 
+    @objc func bookmarkAllOpenTabs(_ sender: NSMenuItem) {
+        actionDelegate?.optionsButtonMenuRequestedBookmarkAllOpenTabs(sender)
+    }
+
     @objc func openBookmarks(_ sender: NSMenuItem) {
         actionDelegate?.optionsButtonMenuRequestedBookmarkPopover(self)
     }
@@ -250,7 +223,6 @@ final class MoreOptionsMenu: NSMenu {
         actionDelegate?.optionsButtonMenuRequestedAppearancePreferences(self)
     }
 
-#if SUBSCRIPTION
     @objc func openSubscriptionPurchasePage(_ sender: NSMenuItem) {
         actionDelegate?.optionsButtonMenuRequestedSubscriptionPurchasePage(self)
     }
@@ -258,7 +230,6 @@ final class MoreOptionsMenu: NSMenu {
     @objc func openIdentityTheftRestoration(_ sender: NSMenuItem) {
         actionDelegate?.optionsButtonMenuRequestedIdentityTheftRestoration(self)
     }
-#endif
 
     @objc func findInPage(_ sender: NSMenuItem) {
         tabCollectionViewModel.selectedTabViewModel?.showFindInPage()
@@ -298,7 +269,7 @@ final class MoreOptionsMenu: NSMenu {
             .targetting(self)
             .withImage(.bookmarks)
             .withSubmenu(bookmarksSubMenu)
-
+            .withAccessibilityIdentifier("MoreOptionsMenu.openBookmarks")
         addItem(withTitle: UserText.downloads, action: #selector(openDownloads), keyEquivalent: "j")
             .targetting(self)
             .withImage(.downloads)
@@ -317,15 +288,11 @@ final class MoreOptionsMenu: NSMenu {
     private func addSubscriptionItems() {
         var items: [NSMenuItem] = []
 
-#if SUBSCRIPTION
         if DefaultSubscriptionFeatureAvailability().isFeatureAvailable && !accountManager.isUserAuthenticated {
             items.append(contentsOf: makeInactiveSubscriptionItems())
         } else {
             items.append(contentsOf: makeActiveSubscriptionItems()) // this adds NETP and DBP only if conditionally enabled
         }
-#else
-        items.append(contentsOf: makeActiveSubscriptionItems()) // this adds NETP and DBP only if conditionally enabled
-#endif
 
         if !items.isEmpty {
             items.forEach { addItem($0) }
@@ -337,39 +304,27 @@ final class MoreOptionsMenu: NSMenu {
     private func makeActiveSubscriptionItems() -> [NSMenuItem] {
         var items: [NSMenuItem] = []
 
-#if SUBSCRIPTION
         let subscriptionFeatureAvailability = DefaultSubscriptionFeatureAvailability()
-#endif
+        let networkProtectionItem: NSMenuItem
 
-#if NETWORK_PROTECTION
-        if networkProtectionFeatureVisibility.isNetworkProtectionBetaVisible() {
-            let networkProtectionItem: NSMenuItem
+        networkProtectionItem = makeNetworkProtectionItem()
 
-            networkProtectionItem = makeNetworkProtectionItem()
-
-            items.append(networkProtectionItem)
-#if SUBSCRIPTION
-            if subscriptionFeatureAvailability.isFeatureAvailable && accountManager.isUserAuthenticated {
-                Task {
-                    let isMenuItemEnabled: Bool
+        items.append(networkProtectionItem)
 
-                    switch await accountManager.hasEntitlement(for: .networkProtection) {
-                    case let .success(result):
-                        isMenuItemEnabled = result
-                    case .failure:
-                        isMenuItemEnabled = false
-                    }
+        if subscriptionFeatureAvailability.isFeatureAvailable && accountManager.isUserAuthenticated {
+            Task {
+                let isMenuItemEnabled: Bool
 
-                    networkProtectionItem.isEnabled = isMenuItemEnabled
+                switch await accountManager.hasEntitlement(for: .networkProtection) {
+                case let .success(result):
+                    isMenuItemEnabled = result
+                case .failure:
+                    isMenuItemEnabled = false
                 }
-            }
-#endif
 
-            DailyPixel.fire(pixel: .networkProtectionWaitlistEntryPointMenuItemDisplayed, frequency: .dailyAndCount, includeAppVersionParameter: true)
-        } else {
-            networkProtectionFeatureVisibility.disableForWaitlistUsers()
+                networkProtectionItem.isEnabled = isMenuItemEnabled
+            }
         }
-#endif // NETWORK_PROTECTION
 
 #if DBP
         let dbpVisibility = DefaultDataBrokerProtectionFeatureVisibility()
@@ -381,8 +336,7 @@ final class MoreOptionsMenu: NSMenu {
                 .withImage(.dbpIcon)
             items.append(dataBrokerProtectionItem)
 
-#if SUBSCRIPTION
-            if subscriptionFeatureAvailability.isFeatureAvailable && accountManager.isUserAuthenticated  {
+            if subscriptionFeatureAvailability.isFeatureAvailable && accountManager.isUserAuthenticated {
                 Task {
                     let isMenuItemEnabled: Bool
 
@@ -396,16 +350,14 @@ final class MoreOptionsMenu: NSMenu {
                     dataBrokerProtectionItem.isEnabled = isMenuItemEnabled
                 }
             }
-#endif
 
-            DataBrokerProtectionExternalWaitlistPixels.fire(pixel: .dataBrokerProtectionWaitlistEntryPointMenuItemDisplayed, frequency: .dailyAndCount)
+            DataBrokerProtectionExternalWaitlistPixels.fire(pixel: GeneralPixel.dataBrokerProtectionWaitlistEntryPointMenuItemDisplayed, frequency: .dailyAndCount)
 
         } else {
             DefaultDataBrokerProtectionFeatureVisibility().disableAndDeleteForWaitlistUsers()
         }
 #endif // DBP
 
-#if SUBSCRIPTION
         if accountManager.isUserAuthenticated {
             let identityTheftRestorationItem = NSMenuItem(title: UserText.identityTheftRestorationOptionsMenuItem,
                                                           action: #selector(openIdentityTheftRestoration),
@@ -414,7 +366,7 @@ final class MoreOptionsMenu: NSMenu {
                 .withImage(.itrIcon)
             items.append(identityTheftRestorationItem)
 
-            if subscriptionFeatureAvailability.isFeatureAvailable && accountManager.isUserAuthenticated  {
+            if subscriptionFeatureAvailability.isFeatureAvailable && accountManager.isUserAuthenticated {
                 Task {
                     let isMenuItemEnabled: Bool
 
@@ -429,12 +381,10 @@ final class MoreOptionsMenu: NSMenu {
                 }
             }
         }
-#endif
 
         return items
     }
 
-#if SUBSCRIPTION
     private func makeInactiveSubscriptionItems() -> [NSMenuItem] {
         let shouldHidePrivacyProDueToNoProducts = SubscriptionPurchaseEnvironment.current == .appStore && SubscriptionPurchaseEnvironment.canPurchase == false
         if shouldHidePrivacyProDueToNoProducts {
@@ -449,13 +399,13 @@ final class MoreOptionsMenu: NSMenu {
 
         return [privacyProItem]
     }
-#endif
 
     private func addPageItems() {
-        guard let url = tabCollectionViewModel.selectedTabViewModel?.tab.content.url else { return }
+        guard let tabViewModel = tabCollectionViewModel.selectedTabViewModel,
+              let url = tabViewModel.tab.content.userEditableUrl else { return }
+        let oldItemsCount = items.count
 
         if url.canFireproof, let host = url.host {
-
             let isFireproof = FireproofDomains.shared.isFireproof(fireproofDomain: host)
             let title = isFireproof ? UserText.removeFireproofing : UserText.fireproofSite
             let image: NSImage = isFireproof ? .burn : .fireproof
@@ -463,28 +413,33 @@ final class MoreOptionsMenu: NSMenu {
             addItem(withTitle: title, action: #selector(toggleFireproofing(_:)), keyEquivalent: "")
                 .targetting(self)
                 .withImage(image)
-
         }
 
-        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)
-            .withImage(.share)
-            .withSubmenu(sharingMenu)
+        if tabViewModel.canFindInPage {
+            addItem(withTitle: UserText.findInPageMenuItem, action: #selector(findInPage(_:)), keyEquivalent: "f")
+                .targetting(self)
+                .withImage(.findSearch)
+                .withAccessibilityIdentifier("MoreOptionsMenu.findInPage")
+        }
 
-        addItem(withTitle: UserText.printMenuItem, action: #selector(doPrint(_:)), keyEquivalent: "")
-            .targetting(self)
-            .withImage(.print)
+        if tabViewModel.canReload {
+            addItem(withTitle: UserText.shareMenuItem, action: nil, keyEquivalent: "")
+                .targetting(self)
+                .withImage(.share)
+                .withSubmenu(sharingMenu)
+        }
 
-        addItem(NSMenuItem.separator())
+        if tabViewModel.canPrint {
+            addItem(withTitle: UserText.printMenuItem, action: #selector(doPrint(_:)), keyEquivalent: "")
+                .targetting(self)
+                .withImage(.print)
+        }
 
+        if items.count > oldItemsCount {
+            addItem(NSMenuItem.separator())
+        }
     }
 
-#if NETWORK_PROTECTION
     private func makeNetworkProtectionItem() -> NSMenuItem {
         let networkProtectionItem = NSMenuItem(title: "", action: #selector(showNetworkProtectionStatus(_:)), keyEquivalent: "")
             .targetting(self)
@@ -494,7 +449,6 @@ final class MoreOptionsMenu: NSMenu {
 
         return networkProtectionItem
     }
-#endif
 
 }
 
@@ -570,7 +524,7 @@ final class EmailOptionsButtonSubMenu: NSMenu {
             let pixelParameters = self.emailManager.emailPixelParameters
             self.emailManager.updateLastUseDate()
 
-            Pixel.fire(.emailUserCreatedAlias, withAdditionalParameters: pixelParameters)
+            PixelKit.fire(GeneralPixel.emailUserCreatedAlias, withAdditionalParameters: pixelParameters)
 
             NSPasteboard.general.copy(address)
             NotificationCenter.default.post(name: NSNotification.Name.privateEmailCopiedToClipboard, object: nil)
@@ -675,9 +629,16 @@ final class BookmarksSubMenu: NSMenu {
         let bookmarkPageItem = addItem(withTitle: UserText.bookmarkThisPage, action: #selector(MoreOptionsMenu.bookmarkPage(_:)), keyEquivalent: "d")
             .withModifierMask([.command])
             .targetting(target)
+            .withAccessibilityIdentifier("MoreOptionsMenu.bookmarkPage")
 
         bookmarkPageItem.isEnabled = tabCollectionViewModel.selectedTabViewModel?.canBeBookmarked == true
 
+        let bookmarkAllTabsItem = addItem(withTitle: UserText.bookmarkAllTabs, action: #selector(MoreOptionsMenu.bookmarkAllOpenTabs(_:)), keyEquivalent: "d")
+            .withModifierMask([.command, .shift])
+            .targetting(target)
+
+        bookmarkAllTabsItem.isEnabled = tabCollectionViewModel.canBookmarkAllOpenTabs()
+
         addItem(NSMenuItem.separator())
 
         addItem(withTitle: UserText.bookmarksShowToolbarPanel, action: #selector(MoreOptionsMenu.openBookmarks(_:)), keyEquivalent: "")
diff --git a/DuckDuckGo/NavigationBar/View/NavigationBar.storyboard b/DuckDuckGo/NavigationBar/View/NavigationBar.storyboard
index 541cc8a532..20efa231aa 100644
--- a/DuckDuckGo/NavigationBar/View/NavigationBar.storyboard
+++ b/DuckDuckGo/NavigationBar/View/NavigationBar.storyboard
@@ -739,6 +739,7 @@
                                                     <userDefinedRuntimeAttribute type="image" keyPath="disabledImage" value="Geolocation-Icon"/>
                                                     <userDefinedRuntimeAttribute type="image" keyPath="mutedImage" value="Geolocation-Icon"/>
                                                 </userDefinedRuntimeAttributes>
+                                                <accessibility identifier="NavigationBarViewController.geolocationPermissionButton"/>
                                             </button>
                                             <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="uao-nC-0co" userLabel="Microphone Button" customClass="PermissionButton" customModule="DuckDuckGo_Privacy_Browser" customModuleProvider="target">
                                                 <rect key="frame" x="32" y="0.0" width="32" height="32"/>
@@ -762,6 +763,7 @@
                                                     <userDefinedRuntimeAttribute type="image" keyPath="disabledImage" value="Microphone-Icon"/>
                                                     <userDefinedRuntimeAttribute type="image" keyPath="mutedImage" value="Microphone-Icon"/>
                                                 </userDefinedRuntimeAttributes>
+                                                <accessibility identifier="NavigationBarViewController.microphonePermissionButton"/>
                                             </button>
                                             <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="C2L-f9-L3r" userLabel="Camera Button" customClass="PermissionButton" customModule="DuckDuckGo_Privacy_Browser" customModuleProvider="target">
                                                 <rect key="frame" x="64" y="0.0" width="32" height="32"/>
@@ -785,6 +787,7 @@
                                                     <userDefinedRuntimeAttribute type="image" keyPath="disabledImage" value="Camera-Tab-Blocked"/>
                                                     <userDefinedRuntimeAttribute type="image" keyPath="mutedImage" value="Camera-Icon"/>
                                                 </userDefinedRuntimeAttributes>
+                                                <accessibility identifier="NavigationBarViewController.cameraPermissionButton"/>
                                             </button>
                                             <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="qqY-h9-UQ7" userLabel="Popups Button" customClass="PermissionButton" customModule="DuckDuckGo_Privacy_Browser" customModuleProvider="target">
                                                 <rect key="frame" x="96" y="0.0" width="32" height="32"/>
@@ -804,6 +807,7 @@
                                                         <color key="value" name="ButtonMouseDownColor"/>
                                                     </userDefinedRuntimeAttribute>
                                                 </userDefinedRuntimeAttributes>
+                                                <accessibility identifier="NavigationBarViewController.popupsPermissionButton"/>
                                             </button>
                                             <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="gGA-Yv-pnz" userLabel="External Scheme Button" customClass="PermissionButton" customModule="DuckDuckGo_Privacy_Browser" customModuleProvider="target">
                                                 <rect key="frame" x="128" y="0.0" width="32" height="32"/>
diff --git a/DuckDuckGo/NavigationBar/View/NavigationBarPopovers.swift b/DuckDuckGo/NavigationBar/View/NavigationBarPopovers.swift
index b8607c8f85..763cf56628 100644
--- a/DuckDuckGo/NavigationBar/View/NavigationBarPopovers.swift
+++ b/DuckDuckGo/NavigationBar/View/NavigationBarPopovers.swift
@@ -19,19 +19,15 @@
 import Foundation
 import BrowserServicesKit
 import AppKit
-
-#if NETWORK_PROTECTION
 import Combine
 import NetworkProtection
 import NetworkProtectionUI
 import NetworkProtectionIPC
-#endif
 
 protocol PopoverPresenter {
     func show(_ popover: NSPopover, positionedBelow view: NSView)
 }
 
-#if NETWORK_PROTECTION
 protocol NetPPopoverManager: AnyObject {
     var ipcClient: NetworkProtectionIPCClient { get }
     var isShown: Bool { get }
@@ -41,7 +37,6 @@ protocol NetPPopoverManager: AnyObject {
 
     func toggle(positionedBelow view: NSView, withDelegate delegate: NSPopoverDelegate)
 }
-#endif
 
 extension PopoverPresenter {
     func show(_ popover: NSPopover, positionedBelow view: NSView) {
@@ -63,7 +58,6 @@ final class NavigationBarPopovers: PopoverPresenter {
     private(set) var autofillPopoverPresenter: AutofillPopoverPresenter
     private(set) var downloadsPopover: DownloadsPopover?
 
-#if NETWORK_PROTECTION
     private let networkProtectionPopoverManager: NetPPopoverManager
 
     init(networkProtectionPopoverManager: NetPPopoverManager, autofillPopoverPresenter: AutofillPopoverPresenter) {
@@ -71,12 +65,6 @@ final class NavigationBarPopovers: PopoverPresenter {
         self.autofillPopoverPresenter = autofillPopoverPresenter
     }
 
-#else
-    init(passwordPopoverPresenter: PasswordPopoverPresenter) {
-        self.passwordPopoverPresenter = passwordPopoverPresenter
-    }
-#endif
-
     var passwordManagementDomain: String? {
         didSet {
             autofillPopoverPresenter.passwordDomain = passwordManagementDomain
@@ -101,11 +89,7 @@ final class NavigationBarPopovers: PopoverPresenter {
 
     @MainActor
     var isNetworkProtectionPopoverShown: Bool {
-#if NETWORK_PROTECTION
         networkProtectionPopoverManager.isShown
-#else
-        return false
-#endif
     }
 
     var bookmarkListPopoverShown: Bool {
@@ -121,7 +105,7 @@ final class NavigationBarPopovers: PopoverPresenter {
     }
 
     func passwordManagementButtonPressed(usingView view: NSView, withDelegate delegate: NSPopoverDelegate) {
-        if autofillPopoverPresenter.popoverIsShown == true && view.window == autofillPopoverPresenter.popoverPresentingWindow  {
+        if autofillPopoverPresenter.popoverIsShown == true && view.window == autofillPopoverPresenter.popoverPresentingWindow {
             autofillPopoverPresenter.dismiss()
         } else {
             showPasswordManagementPopover(selectedCategory: nil, usingView: view, withDelegate: delegate)
@@ -129,9 +113,7 @@ final class NavigationBarPopovers: PopoverPresenter {
     }
 
     func toggleNetworkProtectionPopover(usingView view: NSView, withDelegate delegate: NSPopoverDelegate) {
-#if NETWORK_PROTECTION
         networkProtectionPopoverManager.toggle(positionedBelow: view, withDelegate: delegate)
-#endif
     }
 
     func toggleDownloadsPopover(usingView view: NSView, popoverDelegate: NSPopoverDelegate, downloadsDelegate: DownloadsViewControllerDelegate) {
@@ -189,11 +171,9 @@ final class NavigationBarPopovers: PopoverPresenter {
             downloadsPopover?.close()
         }
 
-#if NETWORK_PROTECTION
         if networkProtectionPopoverManager.isShown {
             networkProtectionPopoverManager.close()
         }
-#endif
 
         return true
     }
@@ -297,13 +277,11 @@ final class NavigationBarPopovers: PopoverPresenter {
 
     // MARK: - VPN
 
-#if NETWORK_PROTECTION
     func showNetworkProtectionPopover(
         positionedBelow view: NSView,
         withDelegate delegate: NSPopoverDelegate) {
             networkProtectionPopoverManager.show(positionedBelow: view, withDelegate: delegate)
     }
-#endif
 }
 
 extension Notification.Name {
diff --git a/DuckDuckGo/NavigationBar/View/NavigationBarViewController.swift b/DuckDuckGo/NavigationBar/View/NavigationBarViewController.swift
index 2148a66473..6b81061e5e 100644
--- a/DuckDuckGo/NavigationBar/View/NavigationBarViewController.swift
+++ b/DuckDuckGo/NavigationBar/View/NavigationBarViewController.swift
@@ -20,17 +20,13 @@ import Cocoa
 import Combine
 import Common
 import BrowserServicesKit
+import PixelKit
 
-#if NETWORK_PROTECTION
 import NetworkProtection
 import NetworkProtectionIPC
 import NetworkProtectionUI
-#endif
-
-#if SUBSCRIPTION
 import Subscription
 import SubscriptionUI
-#endif
 
 // swiftlint:disable:next type_body_length
 final class NavigationBarViewController: NSViewController {
@@ -107,12 +103,9 @@ final class NavigationBarViewController: NSViewController {
     static private let homeButtonTag = 3
     static private let homeButtonLeftPosition = 0
 
-#if NETWORK_PROTECTION
     private let networkProtectionButtonModel: NetworkProtectionNavBarButtonModel
     private let networkProtectionFeatureActivation: NetworkProtectionFeatureActivation
-#endif
 
-#if NETWORK_PROTECTION
     static func create(tabCollectionViewModel: TabCollectionViewModel, isBurner: Bool,
                        networkProtectionFeatureActivation: NetworkProtectionFeatureActivation = NetworkProtectionKeychainTokenStore(),
                        downloadListCoordinator: DownloadListCoordinator = .shared,
@@ -136,24 +129,6 @@ final class NavigationBarViewController: NSViewController {
         goForwardButtonMenuDelegate = NavigationButtonMenuDelegate(buttonType: .forward, tabCollectionViewModel: tabCollectionViewModel)
         super.init(coder: coder)
     }
-#else
-    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, passwordPopoverPresenter: passwordPopoverPresenter)
-        }!
-    }
-
-    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
-        goBackButtonMenuDelegate = NavigationButtonMenuDelegate(buttonType: .back, tabCollectionViewModel: tabCollectionViewModel)
-        goForwardButtonMenuDelegate = NavigationButtonMenuDelegate(buttonType: .forward, tabCollectionViewModel: tabCollectionViewModel)
-        super.init(coder: coder)
-    }
-#endif
 
     required init?(coder: NSCoder) {
         fatalError("NavigationBarViewController: Bad initializer")
@@ -169,9 +144,7 @@ final class NavigationBarViewController: NSViewController {
 
         setupNavigationButtonMenus()
         subscribeToSelectedTabViewModel()
-#if NETWORK_PROTECTION
         listenToVPNToggleNotifications()
-#endif
         listenToPasswordManagerNotifications()
         listenToPinningManagerNotifications()
         listenToMessageNotifications()
@@ -189,9 +162,7 @@ final class NavigationBarViewController: NSViewController {
 
         networkProtectionButton.toolTip = UserText.networkProtectionButtonTooltip
 
-#if NETWORK_PROTECTION
         setupNetworkProtectionButton()
-#endif
 
 #if DEBUG || REVIEW
         addDebugNotificationListeners()
@@ -313,46 +284,18 @@ final class NavigationBarViewController: NSViewController {
         popovers.passwordManagementButtonPressed(usingView: passwordManagementButton, withDelegate: self)
     }
 
-#if NETWORK_PROTECTION
     @IBAction func networkProtectionButtonAction(_ sender: NSButton) {
         toggleNetworkProtectionPopover()
     }
 
     private func toggleNetworkProtectionPopover() {
-        let featureVisibility = DefaultNetworkProtectionVisibility()
-        guard featureVisibility.isNetworkProtectionBetaVisible() else {
-            featureVisibility.disableForWaitlistUsers()
-            LocalPinningManager.shared.unpin(.networkProtection)
+        guard DefaultSubscriptionFeatureAvailability().isFeatureAvailable,
+              NetworkProtectionKeychainTokenStore().isFeatureActivated else {
             return
         }
 
-        #if SUBSCRIPTION
-        if DefaultSubscriptionFeatureAvailability().isFeatureAvailable {
-            let accountManager = AccountManager(subscriptionAppGroup: Bundle.main.appGroup(bundle: .subs))
-            let networkProtectionTokenStorage = NetworkProtectionKeychainTokenStore()
-
-            if accountManager.accessToken != nil && (try? networkProtectionTokenStorage.fetchToken()) == nil {
-                print("[NetP Subscription] Got access token but not auth token, meaning token exchange failed")
-                return
-            }
-        }
-        #endif
-
-        // 1. If the user is on the waitlist but hasn't been invited or accepted terms and conditions, show the waitlist screen.
-        // 2. If the user has no waitlist state but has an auth token, show the NetP popover.
-        // 3. If the user has no state of any kind, show the waitlist screen.
-
-        if NetworkProtectionWaitlist().shouldShowWaitlistViewController {
-            NetworkProtectionWaitlistViewControllerPresenter.show()
-            DailyPixel.fire(pixel: .networkProtectionWaitlistIntroDisplayed, frequency: .dailyAndCount)
-        } else if NetworkProtectionKeychainTokenStore().isFeatureActivated {
-            popovers.toggleNetworkProtectionPopover(usingView: networkProtectionButton, withDelegate: networkProtectionButtonModel)
-        } else {
-            NetworkProtectionWaitlistViewControllerPresenter.show()
-            DailyPixel.fire(pixel: .networkProtectionWaitlistIntroDisplayed, frequency: .dailyAndCount)
-        }
+        popovers.toggleNetworkProtectionPopover(usingView: networkProtectionButton, withDelegate: networkProtectionButtonModel)
     }
-#endif
 
     @IBAction func downloadsButtonAction(_ sender: NSButton) {
         toggleDownloadsPopover(keepButtonVisible: false)
@@ -367,7 +310,6 @@ final class NavigationBarViewController: NSViewController {
         super.mouseDown(with: event)
     }
 
-#if NETWORK_PROTECTION
     func listenToVPNToggleNotifications() {
         vpnToggleCancellable = NotificationCenter.default.publisher(for: .ToggleNetworkProtectionInMainWindow).receive(on: DispatchQueue.main).sink { [weak self] _ in
             guard self?.view.window?.isKeyWindow == true else {
@@ -377,7 +319,6 @@ final class NavigationBarViewController: NSViewController {
             self?.toggleNetworkProtectionPopover()
         }
     }
-#endif
 
     func listenToPasswordManagerNotifications() {
         passwordManagerNotificationCancellable = NotificationCenter.default.publisher(for: .PasswordManagerChanged).sink { [weak self] _ in
@@ -403,10 +344,8 @@ final class NavigationBarViewController: NSViewController {
                     self.updateDownloadsButton(updatingFromPinnedViewsNotification: true)
                 case .homeButton:
                     self.updateHomeButton()
-#if NETWORK_PROTECTION
                 case .networkProtection:
                     self.networkProtectionButtonModel.updateVisibility()
-#endif
                 }
             } else {
                 assertionFailure("Failed to get changed pinned view type")
@@ -437,7 +376,6 @@ final class NavigationBarViewController: NSViewController {
                                                name: AutoconsentUserScript.newSitePopupHiddenNotification,
                                                object: nil)
 
-#if NETWORK_PROTECTION
         UserDefaults.netP
             .publisher(for: \.networkProtectionShouldShowVPNUninstalledMessage)
             .receive(on: DispatchQueue.main)
@@ -448,7 +386,6 @@ final class NavigationBarViewController: NSViewController {
                 }
             }
             .store(in: &cancellables)
-#endif
     }
 
     @objc private func showVPNUninstalledFeedback() {
@@ -641,9 +578,9 @@ final class NavigationBarViewController: NSViewController {
             logoWidth.constant = sizeClass.logoWidth
         }
 
-        let heightChange: DispatchWorkItem
-        if animated {
-            heightChange = DispatchWorkItem {
+        let heightChange: () -> Void
+        if animated, let window = view.window, window.isVisible == true {
+            heightChange = {
                 NSAnimationContext.runAnimationGroup { ctx in
                     ctx.duration = 0.1
                     performResize()
@@ -660,49 +597,64 @@ final class NavigationBarViewController: NSViewController {
             self.daxFadeInAnimation = fadeIn
         } else {
             daxLogo.alphaValue = sizeClass.isLogoVisible ? 1 : 0
-            heightChange = DispatchWorkItem {
+            heightChange = {
                 performResize()
             }
         }
-        DispatchQueue.main.async(execute: heightChange)
-        self.heightChangeAnimation = heightChange
+        if let window = view.window, window.isVisible {
+            let dispatchItem = DispatchWorkItem(block: heightChange)
+            DispatchQueue.main.async(execute: dispatchItem)
+            self.heightChangeAnimation = dispatchItem
+        } else {
+            // update synchronously for off-screen view
+            heightChange()
+        }
     }
 
     private func subscribeToDownloads() {
         downloadListCoordinator.updates
+            .filter { update in
+                // filter download completion events only
+                if case .updated(let oldValue) = update.kind,
+                   oldValue.progress != nil && update.item.progress == nil {
+                    return true
+                } else {
+                    return false
+                }
+            }
             .throttle(for: 1.0, scheduler: DispatchQueue.main, latest: true)
             .sink { [weak self] update in
                 guard let self else { return }
 
-                let shouldShowPopover = update.kind == .updated
-                && DownloadsPreferences.shared.shouldOpenPopupOnCompletion
-                && update.item.destinationURL != nil
-                && update.item.tempURL == nil
-                && !update.item.isBurner
-                && WindowControllersManager.shared.lastKeyMainWindowController?.window === downloadsButton.window
+                if DownloadsPreferences.shared.shouldOpenPopupOnCompletion,
+                    !update.item.isBurner,
+                    WindowControllersManager.shared.lastKeyMainWindowController?.window === downloadsButton.window {
 
-                if shouldShowPopover {
                     self.popovers.showDownloadsPopoverAndAutoHide(usingView: downloadsButton,
                                                                   popoverDelegate: self,
                                                                   downloadsDelegate: self)
-                } else {
-                    if update.item.isBurner {
-                        invalidateDownloadButtonHidingTimer()
-                        updateDownloadsButton(updatingFromPinnedViewsNotification: false)
-                    }
+                } else if update.item.isBurner {
+                    invalidateDownloadButtonHidingTimer()
                 }
                 updateDownloadsButton()
             }
             .store(in: &downloadsCancellables)
+
         downloadListCoordinator.progress.publisher(for: \.totalUnitCount)
             .combineLatest(downloadListCoordinator.progress.publisher(for: \.completedUnitCount))
-            .throttle(for: 0.2, scheduler: DispatchQueue.main, latest: true)
             .map { (total, completed) -> Double? in
                 guard total > 0, completed < total else { return nil }
                 return Double(completed) / Double(total)
             }
+            .dropFirst()
+            .throttle(for: 0.2, scheduler: DispatchQueue.main, latest: true)
             .sink { [weak downloadsProgressView] progress in
-                downloadsProgressView?.setProgress(progress, animated: true)
+                guard let downloadsProgressView else { return }
+                if progress == nil, downloadsProgressView.progress != 1 {
+                    // show download completed animation before hiding
+                    downloadsProgressView.setProgress(1, animated: true)
+                }
+                downloadsProgressView.setProgress(progress, animated: true)
             }
             .store(in: &downloadsCancellables)
     }
@@ -721,7 +673,7 @@ final class NavigationBarViewController: NSViewController {
         passwordManagementButton.menu = menu
         passwordManagementButton.toolTip = UserText.autofillShortcutTooltip
 
-        let url = tabCollectionViewModel.selectedTabViewModel?.tab.content.url
+        let url = tabCollectionViewModel.selectedTabViewModel?.tab.content.userEditableUrl
 
         passwordManagementButton.image = .passwordManagement
 
@@ -741,10 +693,11 @@ final class NavigationBarViewController: NSViewController {
         }
 
         popovers.passwordManagementDomain = nil
-        guard let url = url, let domain = url.host else {
+        guard let url = url, let hostAndPort = url.hostAndPort() else {
             return
         }
-        popovers.passwordManagementDomain = domain
+
+        popovers.passwordManagementDomain = hostAndPort
     }
 
     private func updateHomeButton() {
@@ -942,14 +895,12 @@ extension NavigationBarViewController: NSMenuDelegate {
         let downloadsTitle = LocalPinningManager.shared.shortcutTitle(for: .downloads)
         menu.addItem(withTitle: downloadsTitle, action: #selector(toggleDownloadsPanelPinning), keyEquivalent: "J")
 
-#if NETWORK_PROTECTION
         let isPopUpWindow = view.window?.isPopUpWindow ?? false
 
         if !isPopUpWindow && DefaultNetworkProtectionVisibility().isVPNVisible() {
             let networkProtectionTitle = LocalPinningManager.shared.shortcutTitle(for: .networkProtection)
             menu.addItem(withTitle: networkProtectionTitle, action: #selector(toggleNetworkProtectionPanelPinning), keyEquivalent: "N")
         }
-#endif
     }
 
     @objc
@@ -969,23 +920,14 @@ extension NavigationBarViewController: NSMenuDelegate {
 
     @objc
     private func toggleNetworkProtectionPanelPinning(_ sender: NSMenuItem) {
-#if NETWORK_PROTECTION
         LocalPinningManager.shared.togglePinning(for: .networkProtection)
-#endif
     }
 
     // MARK: - VPN
 
-#if NETWORK_PROTECTION
     func showNetworkProtectionStatus() {
-        let featureVisibility = DefaultNetworkProtectionVisibility()
-
-        if featureVisibility.isNetworkProtectionBetaVisible() {
-            popovers.showNetworkProtectionPopover(positionedBelow: networkProtectionButton,
-                                                  withDelegate: networkProtectionButtonModel)
-        } else {
-            featureVisibility.disableForWaitlistUsers()
-        }
+        popovers.showNetworkProtectionPopover(positionedBelow: networkProtectionButton,
+                                              withDelegate: networkProtectionButtonModel)
     }
 
     /// Sets up the VPN button.
@@ -1007,6 +949,7 @@ extension NavigationBarViewController: NSMenuDelegate {
             .store(in: &cancellables)
 
         networkProtectionButtonModel.$showButton
+            .removeDuplicates()
             .receive(on: RunLoop.main)
             .sink { [weak self] show in
                 let isPopUpWindow = self?.view.window?.isPopUpWindow ?? false
@@ -1021,7 +964,6 @@ extension NavigationBarViewController: NSMenuDelegate {
             }
             .store(in: &cancellables)
     }
-#endif
 
 }
 
@@ -1043,6 +985,11 @@ extension NavigationBarViewController: OptionsButtonMenuDelegate {
             .openBookmarkPopover(setFavorite: false, accessPoint: .init(sender: sender, default: .moreMenu))
     }
 
+    func optionsButtonMenuRequestedBookmarkAllOpenTabs(_ sender: NSMenuItem) {
+        let websitesInfo = tabCollectionViewModel.tabs.compactMap(WebsiteInfo.init)
+        BookmarksDialogViewFactory.makeBookmarkAllOpenTabsView(websitesInfo: websitesInfo).show()
+    }
+
     func optionsButtonMenuRequestedBookmarkPopover(_ menu: NSMenu) {
         popovers.showBookmarkListPopover(usingView: bookmarkListButton,
                                          withDelegate: self,
@@ -1068,15 +1015,11 @@ extension NavigationBarViewController: OptionsButtonMenuDelegate {
     }
 
     func optionsButtonMenuRequestedNetworkProtectionPopover(_ menu: NSMenu) {
-#if NETWORK_PROTECTION
         toggleNetworkProtectionPopover()
-#else
-        fatalError("Tried to open the VPN when it was disabled")
-#endif
     }
 
     func optionsButtonMenuRequestedDownloadsPopover(_ menu: NSMenu) {
-        toggleDownloadsPopover(keepButtonVisible: false)
+        toggleDownloadsPopover(keepButtonVisible: true)
     }
 
     func optionsButtonMenuRequestedPrint(_ menu: NSMenu) {
@@ -1091,17 +1034,14 @@ extension NavigationBarViewController: OptionsButtonMenuDelegate {
         WindowControllersManager.shared.showPreferencesTab(withSelectedPane: .appearance)
     }
 
-#if SUBSCRIPTION
     func optionsButtonMenuRequestedSubscriptionPurchasePage(_ menu: NSMenu) {
         WindowControllersManager.shared.showTab(with: .subscription(.subscriptionPurchase))
-        Pixel.fire(.privacyProOfferScreenImpression)
+        PixelKit.fire(PrivacyProPixel.privacyProOfferScreenImpression)
     }
 
     func optionsButtonMenuRequestedIdentityTheftRestoration(_ menu: NSMenu) {
         WindowControllersManager.shared.showTab(with: .identityTheftRestoration(.identityTheftRestoration))
     }
-#endif
-
 }
 
 // MARK: - NSPopoverDelegate
@@ -1180,8 +1120,6 @@ extension NavigationBarViewController {
 }
 #endif
 
-#if NETWORK_PROTECTION
 extension Notification.Name {
     static let ToggleNetworkProtectionInMainWindow = Notification.Name("com.duckduckgo.vpn.toggle-popover-in-main-window")
 }
-#endif
diff --git a/DuckDuckGo/NavigationBar/View/NetPPopoverManagerMock.swift b/DuckDuckGo/NavigationBar/View/NetPPopoverManagerMock.swift
index ef82b84da6..2e4fdacb8d 100644
--- a/DuckDuckGo/NavigationBar/View/NetPPopoverManagerMock.swift
+++ b/DuckDuckGo/NavigationBar/View/NetPPopoverManagerMock.swift
@@ -16,8 +16,9 @@
 //  limitations under the License.
 //
 
-#if DEBUG && NETWORK_PROTECTION
+#if DEBUG
 
+import AppKit
 import Combine
 import Foundation
 import NetworkProtection
@@ -63,9 +64,19 @@ final class IPCClientMock: NetworkProtectionIPCClient {
     }
     var ipcControllerErrorMessageObserver: any NetworkProtection.ControllerErrorMesssageObserver = ControllerErrorMesssageObserverMock()
 
-    func start() {}
+    final class DataVolumeObserverMock: NetworkProtection.DataVolumeObserver {
+        var publisher: AnyPublisher<DataVolume, Never> = PassthroughSubject().eraseToAnyPublisher()
+        var recentValue: DataVolume = .init()
+    }
+    var ipcDataVolumeObserver: any NetworkProtection.DataVolumeObserver = DataVolumeObserverMock()
+
+    func start(completion: @escaping (Error?) -> Void) {
+        completion(nil)
+    }
 
-    func stop() {}
+    func stop(completion: @escaping (Error?) -> Void) {
+        completion(nil)
+    }
 
 }
 
diff --git a/DuckDuckGo/NetworkProtection/AppAndExtensionAndAgentTargets/AppLauncher.swift b/DuckDuckGo/NetworkProtection/AppAndExtensionAndAgentTargets/AppLauncher.swift
index b85ed68d8b..6aecbc6727 100644
--- a/DuckDuckGo/NetworkProtection/AppAndExtensionAndAgentTargets/AppLauncher.swift
+++ b/DuckDuckGo/NetworkProtection/AppAndExtensionAndAgentTargets/AppLauncher.swift
@@ -16,8 +16,6 @@
 //  limitations under the License.
 //
 
-#if (NETWORK_PROTECTION || NETP_SYSTEM_EXTENSION)
-
 import AppKit
 import Foundation
 import Common
@@ -156,5 +154,3 @@ extension URL {
     }
 
 }
-
-#endif
diff --git a/DuckDuckGo/NetworkProtection/AppAndExtensionAndAgentTargets/NetworkProtectionPixelEvent.swift b/DuckDuckGo/NetworkProtection/AppAndExtensionAndAgentTargets/NetworkProtectionPixelEvent.swift
index efa517356a..e9b9f4c847 100644
--- a/DuckDuckGo/NetworkProtection/AppAndExtensionAndAgentTargets/NetworkProtectionPixelEvent.swift
+++ b/DuckDuckGo/NetworkProtection/AppAndExtensionAndAgentTargets/NetworkProtectionPixelEvent.swift
@@ -16,8 +16,6 @@
 //  limitations under the License.
 //
 
-#if NETWORK_PROTECTION
-
 import Foundation
 import PixelKit
 import NetworkProtection
@@ -30,16 +28,25 @@ enum NetworkProtectionPixelEvent: PixelKitEventV2 {
 
     case networkProtectionControllerStartAttempt
     case networkProtectionControllerStartSuccess
+    case networkProtectionControllerStartCancelled
     case networkProtectionControllerStartFailure(_ error: Error)
 
     case networkProtectionTunnelStartAttempt
     case networkProtectionTunnelStartSuccess
     case networkProtectionTunnelStartFailure(_ error: Error)
 
+    case networkProtectionTunnelStopAttempt
+    case networkProtectionTunnelStopSuccess
+    case networkProtectionTunnelStopFailure(_ error: Error)
+
     case networkProtectionTunnelUpdateAttempt
     case networkProtectionTunnelUpdateSuccess
     case networkProtectionTunnelUpdateFailure(_ error: Error)
 
+    case networkProtectionTunnelWakeAttempt
+    case networkProtectionTunnelWakeSuccess
+    case networkProtectionTunnelWakeFailure(_ error: Error)
+
     case networkProtectionEnableAttemptConnecting
     case networkProtectionEnableAttemptSuccess
     case networkProtectionEnableAttemptFailure
@@ -87,10 +94,17 @@ enum NetworkProtectionPixelEvent: PixelKitEventV2 {
     case networkProtectionRekeyCompleted
     case networkProtectionRekeyFailure(_ error: Error)
 
-    case networkProtectionSystemExtensionActivationFailure
+    case networkProtectionSystemExtensionActivationFailure(_ error: Error)
 
     case networkProtectionUnhandledError(function: String, line: Int, error: Error)
 
+    // Temporary pixels added to verify notification delivery rates:
+    case networkProtectionConnectedNotificationDisplayed
+    case networkProtectionDisconnectedNotificationDisplayed
+    case networkProtectionReconnectingNotificationDisplayed
+    case networkProtectionSupersededNotificationDisplayed
+    case networkProtectionExpiredEntitlementNotificationDisplayed
+
     /// Name of the pixel event
     /// - Unique pixels must end with `_u`
     /// - Daily pixels will automatically have `_d` or `_c` appended to their names
@@ -109,6 +123,9 @@ enum NetworkProtectionPixelEvent: PixelKitEventV2 {
         case .networkProtectionControllerStartSuccess:
             return "netp_controller_start_success"
 
+        case .networkProtectionControllerStartCancelled:
+            return "netp_controller_start_cancelled"
+
         case .networkProtectionControllerStartFailure:
             return "netp_controller_start_failure"
 
@@ -121,6 +138,15 @@ enum NetworkProtectionPixelEvent: PixelKitEventV2 {
         case .networkProtectionTunnelStartFailure:
             return "netp_tunnel_start_failure"
 
+        case .networkProtectionTunnelStopAttempt:
+            return "netp_tunnel_stop_attempt"
+
+        case .networkProtectionTunnelStopSuccess:
+            return "netp_tunnel_stop_success"
+
+        case .networkProtectionTunnelStopFailure:
+            return "netp_tunnel_stop_failure"
+
         case .networkProtectionTunnelUpdateAttempt:
             return "netp_tunnel_update_attempt"
 
@@ -130,6 +156,15 @@ enum NetworkProtectionPixelEvent: PixelKitEventV2 {
         case .networkProtectionTunnelUpdateFailure:
             return "netp_tunnel_update_failure"
 
+        case .networkProtectionTunnelWakeAttempt:
+            return "netp_tunnel_wake_attempt"
+
+        case .networkProtectionTunnelWakeSuccess:
+            return "netp_tunnel_wake_success"
+
+        case .networkProtectionTunnelWakeFailure:
+            return "netp_tunnel_wake_failure"
+
         case .networkProtectionEnableAttemptConnecting:
             return "netp_ev_enable_attempt"
 
@@ -249,6 +284,21 @@ enum NetworkProtectionPixelEvent: PixelKitEventV2 {
 
         case .networkProtectionUnhandledError:
             return "netp_unhandled_error"
+
+        case .networkProtectionConnectedNotificationDisplayed:
+            return "netp_connected_notification_displayed"
+
+        case .networkProtectionDisconnectedNotificationDisplayed:
+            return "netp_disconnected_notification_displayed"
+
+        case .networkProtectionReconnectingNotificationDisplayed:
+            return "netp_reconnecting_notification_displayed"
+
+        case .networkProtectionSupersededNotificationDisplayed:
+            return "netp_superseded_notification_displayed"
+
+        case .networkProtectionExpiredEntitlementNotificationDisplayed:
+            return "netp_expired_entitlement_notification_displayed"
         }
     }
 
@@ -256,148 +306,99 @@ enum NetworkProtectionPixelEvent: PixelKitEventV2 {
         switch self {
         case .networkProtectionKeychainErrorFailedToCastKeychainValueToData(let field):
             return [PixelKit.Parameters.keychainFieldName: field]
-
         case .networkProtectionKeychainReadError(let field, let status):
             return [
                 PixelKit.Parameters.keychainFieldName: field,
                 PixelKit.Parameters.errorCode: String(status)
             ]
-
         case .networkProtectionKeychainWriteError(let field, let status):
             return [
                 PixelKit.Parameters.keychainFieldName: field,
                 PixelKit.Parameters.errorCode: String(status)
             ]
-
         case .networkProtectionKeychainUpdateError(let field, let status):
             return [
                 PixelKit.Parameters.keychainFieldName: field,
                 PixelKit.Parameters.errorCode: String(status)
             ]
-
         case .networkProtectionKeychainDeleteError(let status):
-            return [
-                PixelKit.Parameters.errorCode: String(status)
-            ]
-
+            return [PixelKit.Parameters.errorCode: String(status)]
         case .networkProtectionClientFailedToFetchServerList(let error):
             return error?.pixelParameters
-
         case .networkProtectionClientFailedToFetchRegisteredServers(let error):
             return error?.pixelParameters
-
         case .networkProtectionClientFailedToRedeemInviteCode(let error):
             return error?.pixelParameters
-
         case .networkProtectionClientFailedToFetchLocations(let error):
             return error?.pixelParameters
-
         case .networkProtectionClientFailedToParseLocationsResponse(let error):
             return error?.pixelParameters
-
         case .networkProtectionUnhandledError(let function, let line, let error):
             var parameters = error.pixelParameters
             parameters[PixelKit.Parameters.function] = function
             parameters[PixelKit.Parameters.line] = String(line)
             return parameters
-
         case .networkProtectionWireguardErrorCannotSetNetworkSettings(let error):
             return error.pixelParameters
-
         case .networkProtectionWireguardErrorCannotStartWireguardBackend(code: let code):
-            return [
-                PixelKit.Parameters.errorCode: String(code)
-            ]
-
+            return [PixelKit.Parameters.errorCode: String(code)]
         case .networkProtectionWireguardErrorInvalidState(reason: let reason):
-            return [
-                PixelKit.Parameters.reason: reason
-            ]
-
-        case .networkProtectionTunnelConfigurationNoServerRegistrationInfo,
-             .networkProtectionTunnelConfigurationCouldNotSelectClosestServer,
-             .networkProtectionTunnelConfigurationCouldNotGetPeerPublicKey,
-             .networkProtectionTunnelConfigurationCouldNotGetPeerHostName,
-             .networkProtectionTunnelConfigurationCouldNotGetInterfaceAddressRange,
-             .networkProtectionClientFailedToParseServerListResponse,
-             .networkProtectionClientFailedToEncodeRegisterKeyRequest,
-             .networkProtectionClientFailedToParseRegisteredServersResponse,
-             .networkProtectionClientFailedToParseRedeemResponse,
-             .networkProtectionClientInvalidInviteCode,
-             .networkProtectionClientFailedToEncodeRedeemRequest,
-             .networkProtectionClientInvalidAuthToken,
-             .networkProtectionNoAuthTokenFoundError,
-             .networkProtectionRekeyAttempt,
-             .networkProtectionRekeyCompleted,
-             .networkProtectionRekeyFailure,
-             .networkProtectionWireguardErrorCannotLocateTunnelFileDescriptor,
-             .networkProtectionWireguardErrorFailedDNSResolution,
-             .networkProtectionSystemExtensionActivationFailure,
-             .networkProtectionActiveUser,
-             .networkProtectionNewUser,
-             .networkProtectionEnableAttemptConnecting,
-             .networkProtectionEnableAttemptSuccess,
-             .networkProtectionEnableAttemptFailure,
-             .networkProtectionTunnelFailureDetected,
-             .networkProtectionTunnelFailureRecovered,
-             .networkProtectionLatency,
-             .networkProtectionLatencyError,
-             .networkProtectionControllerStartAttempt,
-             .networkProtectionControllerStartSuccess,
-             .networkProtectionControllerStartFailure,
-             .networkProtectionTunnelStartAttempt,
-             .networkProtectionTunnelStartSuccess,
-             .networkProtectionTunnelStartFailure,
-             .networkProtectionTunnelUpdateAttempt,
-             .networkProtectionTunnelUpdateSuccess,
-             .networkProtectionTunnelUpdateFailure:
-
-            return nil
-        }
-    }
-
-    var error: (any Error)? {
-        switch self {
+            return [PixelKit.Parameters.reason: reason]
         case .networkProtectionActiveUser,
                 .networkProtectionNewUser,
                 .networkProtectionControllerStartAttempt,
                 .networkProtectionControllerStartSuccess,
+                .networkProtectionControllerStartCancelled,
+                .networkProtectionControllerStartFailure,
                 .networkProtectionTunnelStartAttempt,
                 .networkProtectionTunnelStartSuccess,
+                .networkProtectionTunnelStartFailure,
+                .networkProtectionTunnelStopAttempt,
+                .networkProtectionTunnelStopSuccess,
+                .networkProtectionTunnelStopFailure,
                 .networkProtectionTunnelUpdateAttempt,
                 .networkProtectionTunnelUpdateSuccess,
+                .networkProtectionTunnelUpdateFailure,
+                .networkProtectionTunnelWakeAttempt,
+                .networkProtectionTunnelWakeSuccess,
+                .networkProtectionTunnelWakeFailure,
                 .networkProtectionEnableAttemptConnecting,
                 .networkProtectionEnableAttemptSuccess,
                 .networkProtectionEnableAttemptFailure,
                 .networkProtectionTunnelFailureDetected,
                 .networkProtectionTunnelFailureRecovered,
-                .networkProtectionLatencyError,
                 .networkProtectionLatency,
+                .networkProtectionLatencyError,
                 .networkProtectionTunnelConfigurationNoServerRegistrationInfo,
+                .networkProtectionTunnelConfigurationCouldNotSelectClosestServer,
                 .networkProtectionTunnelConfigurationCouldNotGetPeerPublicKey,
                 .networkProtectionTunnelConfigurationCouldNotGetPeerHostName,
                 .networkProtectionTunnelConfigurationCouldNotGetInterfaceAddressRange,
                 .networkProtectionClientFailedToParseServerListResponse,
                 .networkProtectionClientFailedToEncodeRegisterKeyRequest,
                 .networkProtectionClientFailedToParseRegisteredServersResponse,
-                .networkProtectionTunnelConfigurationCouldNotSelectClosestServer,
                 .networkProtectionClientFailedToEncodeRedeemRequest,
                 .networkProtectionClientInvalidInviteCode,
+                .networkProtectionClientFailedToParseRedeemResponse,
                 .networkProtectionClientInvalidAuthToken,
-                .networkProtectionKeychainErrorFailedToCastKeychainValueToData,
-                .networkProtectionKeychainReadError,
-                .networkProtectionKeychainWriteError,
-                .networkProtectionKeychainUpdateError,
-                .networkProtectionKeychainDeleteError,
                 .networkProtectionWireguardErrorCannotLocateTunnelFileDescriptor,
-                .networkProtectionWireguardErrorInvalidState,
                 .networkProtectionWireguardErrorFailedDNSResolution,
-                .networkProtectionWireguardErrorCannotStartWireguardBackend,
                 .networkProtectionNoAuthTokenFoundError,
                 .networkProtectionRekeyAttempt,
                 .networkProtectionRekeyCompleted,
-                .networkProtectionSystemExtensionActivationFailure:
+                .networkProtectionRekeyFailure,
+                .networkProtectionSystemExtensionActivationFailure,
+                .networkProtectionConnectedNotificationDisplayed,
+                .networkProtectionDisconnectedNotificationDisplayed,
+                .networkProtectionReconnectingNotificationDisplayed,
+                .networkProtectionSupersededNotificationDisplayed,
+                .networkProtectionExpiredEntitlementNotificationDisplayed:
             return nil
+        }
+    }
+
+    var error: (any Error)? {
+        switch self {
         case .networkProtectionClientFailedToRedeemInviteCode(let error),
                 .networkProtectionClientFailedToFetchLocations(let error),
                 .networkProtectionClientFailedToParseLocationsResponse(let error),
@@ -406,14 +407,64 @@ enum NetworkProtectionPixelEvent: PixelKitEventV2 {
             return error
         case .networkProtectionControllerStartFailure(let error),
                 .networkProtectionTunnelStartFailure(let error),
+                .networkProtectionTunnelStopFailure(let error),
                 .networkProtectionTunnelUpdateFailure(let error),
+                .networkProtectionTunnelWakeFailure(let error),
                 .networkProtectionClientFailedToParseRedeemResponse(let error),
                 .networkProtectionWireguardErrorCannotSetNetworkSettings(let error),
                 .networkProtectionRekeyFailure(let error),
-                .networkProtectionUnhandledError(_, _, let error):
+                .networkProtectionUnhandledError(_, _, let error),
+                .networkProtectionSystemExtensionActivationFailure(let error):
             return error
+        case .networkProtectionActiveUser,
+                .networkProtectionNewUser,
+                .networkProtectionControllerStartAttempt,
+                .networkProtectionControllerStartSuccess,
+                .networkProtectionControllerStartCancelled,
+                .networkProtectionTunnelStartAttempt,
+                .networkProtectionTunnelStartSuccess,
+                .networkProtectionTunnelStopAttempt,
+                .networkProtectionTunnelStopSuccess,
+                .networkProtectionTunnelUpdateAttempt,
+                .networkProtectionTunnelUpdateSuccess,
+                .networkProtectionTunnelWakeAttempt,
+                .networkProtectionTunnelWakeSuccess,
+                .networkProtectionEnableAttemptConnecting,
+                .networkProtectionEnableAttemptSuccess,
+                .networkProtectionEnableAttemptFailure,
+                .networkProtectionTunnelFailureDetected,
+                .networkProtectionTunnelFailureRecovered,
+                .networkProtectionLatency,
+                .networkProtectionLatencyError,
+                .networkProtectionTunnelConfigurationNoServerRegistrationInfo,
+                .networkProtectionTunnelConfigurationCouldNotSelectClosestServer,
+                .networkProtectionTunnelConfigurationCouldNotGetPeerPublicKey,
+                .networkProtectionTunnelConfigurationCouldNotGetPeerHostName,
+                .networkProtectionTunnelConfigurationCouldNotGetInterfaceAddressRange,
+                .networkProtectionClientFailedToParseServerListResponse,
+                .networkProtectionClientFailedToEncodeRegisterKeyRequest,
+                .networkProtectionClientFailedToParseRegisteredServersResponse,
+                .networkProtectionClientFailedToEncodeRedeemRequest,
+                .networkProtectionClientInvalidInviteCode,
+                .networkProtectionClientInvalidAuthToken,
+                .networkProtectionKeychainErrorFailedToCastKeychainValueToData,
+                .networkProtectionKeychainReadError,
+                .networkProtectionKeychainWriteError,
+                .networkProtectionKeychainUpdateError,
+                .networkProtectionKeychainDeleteError,
+                .networkProtectionWireguardErrorCannotLocateTunnelFileDescriptor,
+                .networkProtectionWireguardErrorInvalidState,
+                .networkProtectionWireguardErrorFailedDNSResolution,
+                .networkProtectionWireguardErrorCannotStartWireguardBackend,
+                .networkProtectionNoAuthTokenFoundError,
+                .networkProtectionRekeyAttempt,
+                .networkProtectionRekeyCompleted,
+                .networkProtectionConnectedNotificationDisplayed,
+                .networkProtectionDisconnectedNotificationDisplayed,
+                .networkProtectionReconnectingNotificationDisplayed,
+                .networkProtectionSupersededNotificationDisplayed,
+                .networkProtectionExpiredEntitlementNotificationDisplayed:
+            return nil
         }
     }
 }
-
-#endif
diff --git a/DuckDuckGo/NetworkProtection/AppAndExtensionAndAgentTargets/UserDefaults+NetworkProtectionShared.swift b/DuckDuckGo/NetworkProtection/AppAndExtensionAndAgentTargets/UserDefaults+NetworkProtectionShared.swift
index 5e0799f8d5..e079676ce8 100644
--- a/DuckDuckGo/NetworkProtection/AppAndExtensionAndAgentTargets/UserDefaults+NetworkProtectionShared.swift
+++ b/DuckDuckGo/NetworkProtection/AppAndExtensionAndAgentTargets/UserDefaults+NetworkProtectionShared.swift
@@ -16,8 +16,6 @@
 //  limitations under the License.
 //
 
-#if NETWORK_PROTECTION
-
 import Combine
 import Foundation
 import NetworkProtectionUI
@@ -77,5 +75,3 @@ extension NetworkProtectionUI.OnboardingStatus {
 #endif
     }()
 }
-
-#endif
diff --git a/DuckDuckGo/NetworkProtection/AppAndExtensionAndAgentTargets/VPNOperationErrorRecorder.swift b/DuckDuckGo/NetworkProtection/AppAndExtensionAndAgentTargets/VPNOperationErrorRecorder.swift
new file mode 100644
index 0000000000..7fa58ab46d
--- /dev/null
+++ b/DuckDuckGo/NetworkProtection/AppAndExtensionAndAgentTargets/VPNOperationErrorRecorder.swift
@@ -0,0 +1,189 @@
+//
+//  VPNOperationErrorRecorder.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 NetworkProtectionIPC
+
+@objc
+final class ErrorInformation: NSObject, Codable {
+    let domain: String
+    let code: Int
+
+    init(_ error: Error) {
+        let nsError = error as NSError
+
+        domain = nsError.domain
+        code = nsError.code
+    }
+}
+
+/// This class provides information about VPN operation errors.
+///
+/// To be used in combination with ``VPNOperationErrorRecorder``
+///
+final class VPNOperationErrorHistory {
+
+    private let ipcClient: TunnelControllerIPCClient
+    private let defaults: UserDefaults
+
+    init(ipcClient: TunnelControllerIPCClient,
+         defaults: UserDefaults = .netP) {
+
+        self.ipcClient = ipcClient
+        self.defaults = defaults
+    }
+
+    /// The earliest error is the one that best represents the latest failure
+    ///
+    var lastStartError: ErrorInformation? {
+        lastIPCStartError ?? lastControllerStartError
+    }
+
+    var lastStartErrorDescription: String {
+        lastStartError.map { errorInformation in
+            "Error domain=\(errorInformation.domain) code=\(errorInformation.code)"
+        } ?? "none"
+    }
+
+    private var lastIPCStartError: ErrorInformation? {
+        defaults.vpnIPCStartError
+    }
+
+    private var lastControllerStartError: ErrorInformation? {
+        defaults.controllerStartError
+    }
+
+    var lastTunnelError: ErrorInformation? {
+        get async {
+            await withCheckedContinuation { (continuation: CheckedContinuation<ErrorInformation?, Never>) in
+                ipcClient.fetchLastError { error in
+                    if let error {
+                        continuation.resume(returning: ErrorInformation(error))
+                    } else {
+                        continuation.resume(returning: nil)
+                    }
+                }
+            }
+        }
+    }
+
+    var lastTunnelErrorDescription: String {
+        get async {
+            await lastTunnelError.map { errorInformation in
+                "Error domain=\(errorInformation.domain) code=\(errorInformation.code)"
+            } ?? "none"
+        }
+    }
+}
+
+/// This class records information about recent errors during VPN operation.
+///
+/// To be used in combination with ``VPNOperationErrorHistory``
+///
+final class VPNOperationErrorRecorder {
+
+    private let defaults: UserDefaults
+
+    init(defaults: UserDefaults = .netP) {
+        self.defaults = defaults
+    }
+
+    // IPC Errors
+
+    func beginRecordingIPCStart() {
+        defaults.vpnIPCStartError = nil
+    }
+
+    func recordIPCStartFailure(_ error: Error) {
+        defaults.vpnIPCStartError = ErrorInformation(error)
+    }
+
+    // VPN Controller Errors
+
+    func beginRecordingControllerStart() {
+        defaults.controllerStartError = nil
+
+        // This needs a special note because it may be non-obvious.  The thing is users
+        // can start the VPN directly from the menu app, and in this case we want IPC
+        // errors to be cleared because they have priority in the reporting.  Additionally
+        // if the controller is starting the VPN we can safely assume there was no IPC
+        // error in the current start attempt, so resetting ipc start errors should be fine,
+        // regardless.
+        defaults.vpnIPCStartError = nil
+    }
+
+    func recordControllerStartFailure(_ error: Error) {
+        defaults.controllerStartError = ErrorInformation(error)
+    }
+}
+
+fileprivate extension UserDefaults {
+    private var vpnIPCStartErrorKey: String {
+        "vpnIPCStartError"
+    }
+
+    @objc
+    dynamic var vpnIPCStartError: ErrorInformation? {
+        get {
+            guard let payload = data(forKey: vpnIPCStartErrorKey) else {
+                return nil
+            }
+
+            return try? JSONDecoder().decode(ErrorInformation.self, from: payload)
+        }
+
+        set {
+            guard let newValue,
+                  let payload = try? JSONEncoder().encode(newValue) else {
+
+                removeObject(forKey: vpnIPCStartErrorKey)
+                return
+            }
+
+            set(payload, forKey: vpnIPCStartErrorKey)
+        }
+    }
+}
+
+fileprivate extension UserDefaults {
+    private var controllerStartErrorKey: String {
+        "controllerStartError"
+    }
+
+    @objc
+    dynamic var controllerStartError: ErrorInformation? {
+        get {
+            guard let payload = data(forKey: controllerStartErrorKey) else {
+                return nil
+            }
+
+            return try? JSONDecoder().decode(ErrorInformation.self, from: payload)
+        }
+
+        set {
+            guard let newValue,
+                  let payload = try? JSONEncoder().encode(newValue) else {
+
+                removeObject(forKey: controllerStartErrorKey)
+                return
+            }
+
+            set(payload, forKey: controllerStartErrorKey)
+        }
+    }
+}
diff --git a/DuckDuckGo/NetworkProtection/AppAndExtensionTargets/AppAndExtensionAndNotificationTargets/NetworkProtectionOptionKeyExtension.swift b/DuckDuckGo/NetworkProtection/AppAndExtensionTargets/AppAndExtensionAndNotificationTargets/NetworkProtectionOptionKeyExtension.swift
index db40592ece..5c87d93191 100644
--- a/DuckDuckGo/NetworkProtection/AppAndExtensionTargets/AppAndExtensionAndNotificationTargets/NetworkProtectionOptionKeyExtension.swift
+++ b/DuckDuckGo/NetworkProtection/AppAndExtensionTargets/AppAndExtensionAndNotificationTargets/NetworkProtectionOptionKeyExtension.swift
@@ -16,12 +16,8 @@
 //  limitations under the License.
 //
 
-#if NETWORK_PROTECTION
-
 import NetworkProtection
 
 extension NetworkProtectionOptionKey {
     public static let defaultPixelHeaders = "defaultPixelHeaders"
 }
-
-#endif
diff --git a/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/Assets/vpn-dark-mode.json b/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/Assets/vpn-dark-mode.json
new file mode 100644
index 0000000000..2b97395d0e
--- /dev/null
+++ b/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/Assets/vpn-dark-mode.json
@@ -0,0 +1 @@
+{"v":"5.7.5","fr":100,"ip":0,"op":370,"w":128,"h":96,"nm":"Comp 1","ddd":0,"assets":[{"id":"0","layers":[{"ddd":0,"ind":1,"ty":4,"nm":"shadow","sr":1,"ks":{"p":{"a":0,"k":[10000,10000],"ix":2},"a":{"a":0,"k":[0,0],"ix":2},"s":{"a":0,"k":[100,100],"ix":2},"r":{"a":0,"k":0,"ix":2},"o":{"a":0,"k":100,"ix":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"sh","d":1,"ks":{"a":0,"k":{"c":true,"v":[[42.2357292175293,8.99384593963623],[41.2205810546875,0],[53.23579788208008,24.99367523193359],[21.23579597473145,56.99367141723633],[0,48.93241500854492],[2.235732555389404,48.99384307861328],[42.2357292175293,8.99384593963623]],"i":[[0,0],[0.664215087890625,2.89088249206543],[0,-10.11254501342773],[17.6731128692627,0],[5.649600028991699,5.015373229980469],[-0.750247597694397,0],[0,22.09139251708984]],"o":[[0,-3.092463970184326],[7.324420928955078,5.864182472229004],[0,17.6731128692627],[-8.148801803588867,0],[0.7400614619255066,0.040771484375],[22.09139251708984,0],[0,0]]}}},{"ty":"fl","c":{"a":1,"k":[{"t":40,"s":[0.5333333333333333,0.5333333333333333,0.5333333333333333],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"t":50,"s":[0.16862745098039217,0.3333333333333333,0.792156862745098],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}}],"ix":2},"o":{"a":0,"k":100,"ix":2},"r":1,"bm":0},{"ty":"tm","s":{"a":0,"k":0,"ix":2},"e":{"a":0,"k":100,"ix":2},"o":{"a":0,"k":0,"ix":2},"m":1},{"ty":"tr","p":{"a":0,"k":[69.3820571899414,35.50293731689453],"ix":2},"a":{"a":0,"k":[26.61789894104004,28.49683570861816],"ix":2},"s":{"a":0,"k":[100,100],"ix":2},"r":{"a":0,"k":0,"ix":2},"o":{"a":1,"k":[{"t":40,"s":[40],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"t":50,"s":[50],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}}],"ix":2},"sk":{"a":0,"k":0,"ix":2},"sa":{"a":0,"k":0,"ix":2}}]}],"ip":0,"op":371,"st":0,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"dot-nw","sr":1,"ks":{"p":{"a":0,"k":[10000,10000],"ix":2},"a":{"a":0,"k":[0,0],"ix":2},"s":{"a":0,"k":[100,100],"ix":2},"r":{"a":0,"k":0,"ix":2},"o":{"a":0,"k":100,"ix":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"el","d":1,"s":{"a":0,"k":[7,7],"ix":2},"p":{"a":0,"k":[0,0],"ix":2}},{"ty":"fl","c":{"a":1,"k":[{"t":40,"s":[0.9333333333333333,0.9333333333333333,0.9333333333333333],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"t":50,"s":[0.6784313725490196,0.7607843137254902,0.9882352941176471],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}}],"ix":2},"o":{"a":0,"k":100,"ix":2},"r":1,"bm":0},{"ty":"tm","s":{"a":0,"k":0,"ix":2},"e":{"a":0,"k":100,"ix":2},"o":{"a":0,"k":0,"ix":2},"m":1},{"ty":"tr","p":{"a":1,"k":[{"t":10,"s":[46.5,13.5],"i":{"x":[0.58],"y":[1]},"o":{"x":[0],"y":[0]}},{"t":40,"s":[50.5,6.5],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]},"ti":[-14.74848774275709,-23.38554600445718],"to":[-12.74848774275709,16.61445399554282]},{"t":80,"s":[53.5,66.5],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"t":81,"s":[57.5,-2.5],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"t":200,"s":[57.5,-2.5],"i":{"x":[0.58],"y":[1]},"o":{"x":[0],"y":[0]},"ti":[-20.75,-24.25],"to":[-20.75,23.08333333333333]},{"t":370,"s":[56.5,68.5],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}}],"ix":2},"a":{"a":0,"k":[0,0],"ix":2},"s":{"a":0,"k":[100,100],"ix":2},"r":{"a":0,"k":0,"ix":2},"o":{"a":0,"k":100,"ix":2},"sk":{"a":0,"k":0,"ix":2},"sa":{"a":0,"k":0,"ix":2}}]}],"ip":0,"op":371,"st":0,"bm":0},{"ddd":0,"ind":3,"ty":4,"nm":"dot-ne","sr":1,"ks":{"p":{"a":0,"k":[10000,10000],"ix":2},"a":{"a":0,"k":[0,0],"ix":2},"s":{"a":0,"k":[100,100],"ix":2},"r":{"a":0,"k":0,"ix":2},"o":{"a":0,"k":100,"ix":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"el","d":1,"s":{"a":0,"k":[7,7],"ix":2},"p":{"a":0,"k":[0,0],"ix":2}},{"ty":"fl","c":{"a":1,"k":[{"t":40,"s":[0.9333333333333333,0.9333333333333333,0.9333333333333333],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"t":50,"s":[0.6784313725490196,0.7607843137254902,0.9882352941176471],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}}],"ix":2},"o":{"a":0,"k":100,"ix":2},"r":1,"bm":0},{"ty":"tm","s":{"a":0,"k":0,"ix":2},"e":{"a":0,"k":100,"ix":2},"o":{"a":0,"k":0,"ix":2},"m":1},{"ty":"tr","p":{"a":1,"k":[{"t":10,"s":[69.5,21.5],"i":{"x":[0.58],"y":[1]},"o":{"x":[0],"y":[0]}},{"t":40,"s":[63.5,17.5],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]},"ti":[-6.951289398280807,-10.83253740846864],"to":[9.048710601719193,4.500795924864676]},{"t":80,"s":[87.5,40.5],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]},"ti":[26.75000000000003,-1.75],"to":[-10.58333333333334,-19.75]},{"t":81,"s":[31.5,13.5],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"t":150,"s":[31.5,13.5],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]},"ti":[-9.750000000000028,-19.41666666666666],"to":[27.58333333333334,-1.416666666666664]},{"t":300,"s":[87.5,40.5],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}}],"ix":2},"a":{"a":0,"k":[0,0],"ix":2},"s":{"a":0,"k":[100,100],"ix":2},"r":{"a":0,"k":0,"ix":2},"o":{"a":0,"k":100,"ix":2},"sk":{"a":0,"k":0,"ix":2},"sa":{"a":0,"k":0,"ix":2}}]}],"ip":0,"op":371,"st":0,"bm":0},{"ddd":0,"ind":4,"ty":4,"nm":"dot-s","sr":1,"ks":{"p":{"a":0,"k":[10000,10000],"ix":2},"a":{"a":0,"k":[0,0],"ix":2},"s":{"a":0,"k":[100,100],"ix":2},"r":{"a":0,"k":0,"ix":2},"o":{"a":0,"k":100,"ix":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"el","d":1,"s":{"a":0,"k":[7,7],"ix":2},"p":{"a":0,"k":[0,0],"ix":2}},{"ty":"fl","c":{"a":1,"k":[{"t":40,"s":[0.9333333333333333,0.9333333333333333,0.9333333333333333],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"t":50,"s":[0.6784313725490196,0.7607843137254902,0.9882352941176471],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}}],"ix":2},"o":{"a":0,"k":100,"ix":2},"r":1,"bm":0},{"ty":"tm","s":{"a":0,"k":0,"ix":2},"e":{"a":0,"k":100,"ix":2},"o":{"a":0,"k":0,"ix":2},"m":1},{"ty":"tr","p":{"a":1,"k":[{"t":10,"s":[59.5,49.5],"i":{"x":[0.58],"y":[1]},"o":{"x":[0],"y":[0]}},{"t":40,"s":[69.5,50.5],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]},"ti":[10.97134670487107,11.24832855778413],"to":[-17.69531996179562,-0.08500477554918007]},{"t":80,"s":[26.5,31.5],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]},"ti":[-20.749999999999986,-1.75],"to":[10.58333333333333,11.58333333333333]},{"t":81,"s":[73.5,52.5],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"t":130,"s":[73.5,50.5],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]},"ti":[12.58333333333336,13.250000000000014],"to":[-18.75,0.5833333333333144]},{"t":230,"s":[26.5,32.5],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}}],"ix":2},"a":{"a":0,"k":[0,0],"ix":2},"s":{"a":0,"k":[100,100],"ix":2},"r":{"a":0,"k":0,"ix":2},"o":{"a":0,"k":100,"ix":2},"sk":{"a":0,"k":0,"ix":2},"sa":{"a":0,"k":0,"ix":2}}]}],"ip":0,"op":371,"st":0,"bm":0},{"ddd":0,"ind":5,"ty":3,"nm":"","sr":1,"ks":{"p":{"a":0,"k":[10056,10032.5],"ix":2},"a":{"a":0,"k":[0,0],"ix":2},"s":{"a":0,"k":[100,100],"ix":2},"r":{"a":0,"k":0,"ix":2},"o":{"a":0,"k":100,"ix":2}},"ao":0,"ip":0,"op":371,"st":0,"bm":0},{"ddd":0,"ind":6,"ty":4,"nm":"Oval","sr":1,"ks":{"p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":2},"s":{"a":0,"k":[100,100],"ix":2},"r":{"a":0,"k":0,"ix":2},"o":{"a":0,"k":100,"ix":2}},"ao":0,"parent":5,"shapes":[{"ty":"gr","it":[{"ty":"sh","d":1,"ks":{"a":0,"k":{"c":true,"v":[[48,96],[0,48],[48,0],[96,48],[48,96]],"i":[[0,0],[0,26.50966996215028],[-26.50966996215028,0],[0,-26.50966996215028],[26.50966996215028,0]],"o":[[-26.50966996215028,0],[0,-26.50966996215028],[26.50966996215028,0],[0,26.50966996215028],[0,0]]}}},{"ty":"st","c":{"a":1,"k":[{"t":40,"s":[0.9333333333333333,0.9333333333333333,0.9333333333333333],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"t":50,"s":[0.6784313725490196,0.7607843137254902,0.9882352941176471],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}}],"ix":2},"o":{"a":0,"k":100,"ix":2},"w":{"a":0,"k":2,"ix":2},"lc":1,"lj":1},{"ty":"tm","s":{"a":0,"k":0,"ix":2},"e":{"a":0,"k":100,"ix":2},"o":{"a":0,"k":0,"ix":2},"m":1},{"ty":"tr","p":{"a":0,"k":[17,30.5],"ix":2},"a":{"a":0,"k":[48,48],"ix":2},"s":{"a":0,"k":[100,-100],"ix":2},"r":{"a":0,"k":0,"ix":2},"o":{"a":0,"k":100,"ix":2},"sk":{"a":0,"k":0,"ix":2},"sa":{"a":0,"k":0,"ix":2}}]}],"ip":0,"op":371,"st":0,"bm":0},{"ddd":0,"ind":7,"ty":4,"nm":"Oval","sr":1,"ks":{"p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":2},"s":{"a":0,"k":[100,100],"ix":2},"r":{"a":0,"k":0,"ix":2},"o":{"a":0,"k":100,"ix":2}},"ao":0,"parent":5,"shapes":[{"ty":"gr","it":[{"ty":"sh","d":1,"ks":{"a":0,"k":{"c":true,"v":[[48,96],[0,48],[48,0],[96,48],[48,96]],"i":[[0,0],[0,26.50966996215028],[-26.50966996215028,0],[0,-26.50966996215028],[26.50966996215028,0]],"o":[[-26.50966996215028,0],[0,-26.50966996215028],[26.50966996215028,0],[0,26.50966996215028],[0,0]]}}},{"ty":"st","c":{"a":1,"k":[{"t":40,"s":[0.9333333333333333,0.9333333333333333,0.9333333333333333],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"t":50,"s":[0.6784313725490196,0.7607843137254902,0.9882352941176471],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}}],"ix":2},"o":{"a":0,"k":100,"ix":2},"w":{"a":0,"k":2,"ix":2},"lc":1,"lj":1},{"ty":"tm","s":{"a":0,"k":0,"ix":2},"e":{"a":0,"k":100,"ix":2},"o":{"a":0,"k":0,"ix":2},"m":1},{"ty":"tr","p":{"a":0,"k":[-34,-13.5],"ix":2},"a":{"a":0,"k":[48,48],"ix":2},"s":{"a":0,"k":[100,-100],"ix":2},"r":{"a":0,"k":0,"ix":2},"o":{"a":0,"k":100,"ix":2},"sk":{"a":0,"k":0,"ix":2},"sa":{"a":0,"k":0,"ix":2}}]}],"ip":0,"op":371,"st":0,"bm":0},{"ddd":0,"ind":8,"ty":4,"nm":"Oval","sr":1,"ks":{"p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":2},"s":{"a":0,"k":[100,100],"ix":2},"r":{"a":0,"k":0,"ix":2},"o":{"a":0,"k":100,"ix":2}},"ao":0,"parent":5,"shapes":[{"ty":"gr","it":[{"ty":"sh","d":1,"ks":{"a":0,"k":{"c":true,"v":[[48,96],[0,48],[48,0],[96,48],[48,96]],"i":[[0,0],[0,26.50966996215028],[-26.50966996215028,0],[0,-26.50966996215028],[26.50966996215028,0]],"o":[[-26.50966996215028,0],[0,-26.50966996215028],[26.50966996215028,0],[0,26.50966996215028],[0,0]]}}},{"ty":"st","c":{"a":1,"k":[{"t":40,"s":[0.9333333333333333,0.9333333333333333,0.9333333333333333],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"t":50,"s":[0.6784313725490196,0.7607843137254902,0.9882352941176471],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}}],"ix":2},"o":{"a":0,"k":100,"ix":2},"w":{"a":0,"k":2,"ix":2},"lc":1,"lj":1},{"ty":"tm","s":{"a":0,"k":0,"ix":2},"e":{"a":0,"k":100,"ix":2},"o":{"a":0,"k":0,"ix":2},"m":1},{"ty":"tr","p":{"a":0,"k":[9,-30.5],"ix":2},"a":{"a":0,"k":[48,48],"ix":2},"s":{"a":0,"k":[100,-100],"ix":2},"r":{"a":0,"k":0,"ix":2},"o":{"a":0,"k":100,"ix":2},"sk":{"a":0,"k":0,"ix":2},"sa":{"a":0,"k":0,"ix":2}}]}],"ip":0,"op":371,"st":0,"bm":0},{"ddd":0,"ind":9,"ty":4,"nm":"Oval","sr":1,"ks":{"p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":2},"s":{"a":0,"k":[100,100],"ix":2},"r":{"a":0,"k":0,"ix":2},"o":{"a":0,"k":100,"ix":2}},"ao":0,"parent":5,"shapes":[{"ty":"gr","it":[{"ty":"sh","d":1,"ks":{"a":0,"k":{"c":true,"v":[[48,96],[0,48],[48,0],[96,48],[48,96]],"i":[[0,0],[0,26.50966996215028],[-26.50966996215028,0],[0,-26.50966996215028],[26.50966996215028,0]],"o":[[-26.50966996215028,0],[0,-26.50966996215028],[26.50966996215028,0],[0,26.50966996215028],[0,0]]}}},{"ty":"st","c":{"a":1,"k":[{"t":40,"s":[0.9333333333333333,0.9333333333333333,0.9333333333333333],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"t":50,"s":[0.6784313725490196,0.7607843137254902,0.9882352941176471],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}}],"ix":2},"o":{"a":0,"k":100,"ix":2},"w":{"a":0,"k":2,"ix":2},"lc":1,"lj":1},{"ty":"tm","s":{"a":0,"k":0,"ix":2},"e":{"a":0,"k":100,"ix":2},"o":{"a":0,"k":0,"ix":2},"m":1},{"ty":"tr","p":{"a":0,"k":[-13,28.5],"ix":2},"a":{"a":0,"k":[48,48],"ix":2},"s":{"a":0,"k":[100,-100],"ix":2},"r":{"a":0,"k":0,"ix":2},"o":{"a":0,"k":100,"ix":2},"sk":{"a":0,"k":0,"ix":2},"sa":{"a":0,"k":0,"ix":2}}]}],"ip":0,"op":371,"st":0,"bm":0},{"ddd":0,"ind":10,"ty":4,"nm":"Oval","sr":1,"ks":{"p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":2},"s":{"a":0,"k":[100,100],"ix":2},"r":{"a":0,"k":0,"ix":2},"o":{"a":0,"k":100,"ix":2}},"ao":0,"parent":5,"shapes":[{"ty":"gr","it":[{"ty":"sh","d":1,"ks":{"a":0,"k":{"c":true,"v":[[48,96],[0,48],[48,0],[96,48],[48,96]],"i":[[0,0],[0,26.50966996215028],[-26.50966996215028,0],[0,-26.50966996215028],[26.50966996215028,0]],"o":[[-26.50966996215028,0],[0,-26.50966996215028],[26.50966996215028,0],[0,26.50966996215028],[0,0]]}}},{"ty":"st","c":{"a":1,"k":[{"t":40,"s":[0.9333333333333333,0.9333333333333333,0.9333333333333333],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"t":50,"s":[0.6784313725490196,0.7607843137254902,0.9882352941176471],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}}],"ix":2},"o":{"a":0,"k":100,"ix":2},"w":{"a":0,"k":2,"ix":2},"lc":1,"lj":1},{"ty":"tm","s":{"a":0,"k":0,"ix":2},"e":{"a":0,"k":100,"ix":2},"o":{"a":0,"k":0,"ix":2},"m":1},{"ty":"tr","p":{"a":0,"k":[34,0.5],"ix":2},"a":{"a":0,"k":[48,48],"ix":2},"s":{"a":0,"k":[100,-100],"ix":2},"r":{"a":0,"k":0,"ix":2},"o":{"a":0,"k":100,"ix":2},"sk":{"a":0,"k":0,"ix":2},"sa":{"a":0,"k":0,"ix":2}}]}],"ip":0,"op":371,"st":0,"bm":0},{"ddd":0,"ind":11,"ty":4,"nm":"globe","sr":1,"ks":{"p":{"a":0,"k":[10000,10000],"ix":2},"a":{"a":0,"k":[0,0],"ix":2},"s":{"a":0,"k":[100,100],"ix":2},"r":{"a":0,"k":0,"ix":2},"o":{"a":0,"k":100,"ix":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"sh","d":1,"ks":{"a":0,"k":{"c":true,"v":[[32,63.99999999999999],[0,32],[32,0],[63.99999999999999,32],[32,63.99999999999999]],"i":[[0,0],[0,17.67311330810018],[-17.67311330810018,0],[0,-17.67311330810018],[17.67311330810018,0]],"o":[[-17.67311330810018,0],[0,-17.67311330810018],[17.67311330810018,0],[0,17.67311330810018],[0,0]]}}},{"ty":"fl","c":{"a":1,"k":[{"t":40,"s":[0.8,0.8,0.8],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"t":50,"s":[0.3333333333333333,0.4980392156862745,0.9529411764705882],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}}],"ix":2},"o":{"a":0,"k":100,"ix":2},"r":1,"bm":0},{"ty":"tm","s":{"a":0,"k":0,"ix":2},"e":{"a":0,"k":100,"ix":2},"o":{"a":0,"k":0,"ix":2},"m":1},{"ty":"tr","p":{"a":0,"k":[64,32],"ix":2},"a":{"a":0,"k":[32,32],"ix":2},"s":{"a":0,"k":[100,100],"ix":2},"r":{"a":0,"k":0,"ix":2},"o":{"a":0,"k":100,"ix":2},"sk":{"a":0,"k":0,"ix":2},"sa":{"a":0,"k":0,"ix":2}}]}],"ip":0,"op":371,"st":0,"bm":0}]},{"id":"1","layers":[{"ddd":0,"ind":12,"ty":4,"nm":"_mask","sr":1,"ks":{"p":{"a":0,"k":[10000,10000],"ix":2},"a":{"a":0,"k":[0,0],"ix":2},"s":{"a":0,"k":[100,100],"ix":2},"r":{"a":0,"k":0,"ix":2},"o":{"a":0,"k":100,"ix":2}},"td":1,"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"sh","d":1,"ks":{"a":0,"k":{"c":true,"v":[[55,35],[35,55],[35,61.1272168529097],[32.27027277742516,63.99888239316815],[32,64],[0,32],[32,0],[64,32],[63.99888239502384,32.27027632020794],[61.12722036453148,35],[55,35]],"i":[[0,0],[1.3527074874795e-15,-11.04569435119629],[0,-2.603342616466307],[1.549197989173602,-0.01281636670575817],[0.09017852706661245,0],[-2.164332234077084e-15,17.6731128692627],[-17.6731128692627,-2.164332234077084e-15],[2.164332445835321e-15,-17.67311477661133],[0.0007445845155729103,-0.09000398946863442],[1.549249531796702,0],[0,0]],"o":[[-11.04569244384766,-1.352707275721263e-15],[0,0],[0,1.549251002554159],[-0.09000283819779753,0.0007445848671139288],[-17.6731128692627,-2.164332234077084e-15],[2.164332022318847e-15,-17.67311096191406],[17.67311096191406,2.164332022318847e-15],[0,0.09017973898513532],[-0.01281618456122568,1.549196519872671],[-2.603342959208661,0],[0,0]]}}},{"ty":"fl","c":{"a":0,"k":[0,0,0],"ix":2},"o":{"a":0,"k":100,"ix":2},"r":1,"bm":0},{"ty":"tm","s":{"a":0,"k":0,"ix":2},"e":{"a":0,"k":100,"ix":2},"o":{"a":0,"k":0,"ix":2},"m":1},{"ty":"tr","p":{"a":0,"k":[64,32],"ix":2},"a":{"a":0,"k":[32,32],"ix":2},"s":{"a":0,"k":[100,100],"ix":2},"r":{"a":0,"k":0,"ix":2},"o":{"a":0,"k":100,"ix":2},"sk":{"a":0,"k":0,"ix":2},"sa":{"a":0,"k":0,"ix":2}}]}],"ip":0,"op":371,"st":0,"bm":0},{"ddd":0,"refId":"0","w":20000,"h":20000,"ind":13,"ty":0,"nm":"globe","sr":1,"ks":{"p":{"a":0,"k":[10000,10000],"ix":2},"a":{"a":0,"k":[10000,10000],"ix":2},"s":{"a":0,"k":[100,100],"ix":2},"r":{"a":0,"k":0,"ix":2},"o":{"a":0,"k":100,"ix":2}},"ao":0,"ip":0,"op":371,"st":0,"bm":0,"tt":1}]}],"layers":[{"ddd":0,"ind":14,"ty":3,"nm":"","sr":1,"ks":{"p":{"a":0,"k":[64,48],"ix":2},"a":{"a":0,"k":[64,35],"ix":2},"s":{"a":0,"k":[100,100],"ix":2},"r":{"a":0,"k":0,"ix":2},"o":{"a":0,"k":100,"ix":2}},"ao":0,"ip":0,"op":371,"st":0,"bm":0},{"ddd":0,"ind":15,"ty":3,"nm":"","sr":1,"ks":{"p":{"a":1,"k":[{"t":10,"s":[87,54],"i":{"x":[0.58],"y":[1]},"o":{"x":[0],"y":[0]}},{"t":30,"s":[87,48],"i":{"x":[0.8],"y":[1]},"o":{"x":[0.4],"y":[0]}},{"t":40,"s":[87,58],"i":{"x":[0.8],"y":[1]},"o":{"x":[0.4],"y":[0]}},{"t":50,"s":[87,54],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}}],"ix":2},"a":{"a":0,"k":[87,54],"ix":2},"s":{"a":0,"k":[100,100],"ix":2},"r":{"a":0,"k":0,"ix":2},"o":{"a":0,"k":100,"ix":2}},"ao":0,"ip":0,"op":371,"st":0,"bm":0,"parent":14},{"ddd":0,"ind":16,"ty":4,"nm":"lock-hook","sr":1,"ks":{"p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":2},"s":{"a":0,"k":[100,100],"ix":2},"r":{"a":0,"k":0,"ix":2},"o":{"a":0,"k":100,"ix":2}},"ao":0,"parent":15,"shapes":[{"ty":"gr","it":[{"ty":"sh","d":1,"ks":{"a":0,"k":{"c":false,"v":[[0,9],[0,4.048697948455811],[1.171572897169325,1.185836362838745],[4,2.333394250525001e-14],[6.828427208794487,1.185835719108582],[8,4.048697519302368],[8,8.46090259552002]],"i":[[0,0],[0,0],[-0.7501454883151584,0.7592780649662018],[-1.060865932040744,1.151999967419215e-7],[-0.7501456472608777,-0.7592779576778412],[-3.203726414034867e-7,-1.073781502246857],[0,0]],"o":[[0,0],[9.274384638047195e-8,-1.073781502246857],[0.7501454883151584,-0.7592780649662018],[1.060865932040744,-1.151999967419215e-7],[0.7501456472608777,0.7592779576778412],[0,0],[0,0]]}}},{"ty":"st","c":{"a":0,"k":[0.06666666666666667,0.06666666666666667,0.06666666666666667],"ix":2},"o":{"a":0,"k":100,"ix":2},"w":{"a":0,"k":2.666666746139526,"ix":2},"lc":1,"lj":1},{"ty":"tm","s":{"a":0,"k":0,"ix":2},"e":{"a":1,"k":[{"t":30,"s":[85],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"t":40,"s":[100],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}}],"ix":2},"o":{"a":0,"k":0,"ix":2},"m":1},{"ty":"tr","p":{"a":0,"k":[87,50.5],"ix":2},"a":{"a":0,"k":[4,4.5],"ix":2},"s":{"a":0,"k":[100,-100],"ix":2},"r":{"a":1,"k":[{"t":30,"s":[196],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"t":40,"s":[180],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}}],"ix":2},"o":{"a":0,"k":100,"ix":2},"sk":{"a":0,"k":-180,"ix":2},"sa":{"a":0,"k":0,"ix":2}}]}],"ip":0,"op":371,"st":0,"bm":0},{"ddd":0,"ind":17,"ty":4,"nm":"lock-base","sr":1,"ks":{"p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":2},"s":{"a":0,"k":[100,100],"ix":2},"r":{"a":0,"k":0,"ix":2},"o":{"a":0,"k":100,"ix":2}},"ao":0,"parent":15,"shapes":[{"ty":"gr","it":[{"ty":"sh","d":1,"ks":{"a":0,"k":{"c":true,"v":[[2.000000000000001,0],[14,0],[16,2.000000000000002],[16,7.333333015441899],[14,9.333333015441895],[1.999999999999996,9.333333015441895],[0,7.333333015441892],[0,1.999999999999995],[2.000000000000001,0]],"i":[[0,0],[-3.074004826695607,0],[0,-1.104569499661587],[0,-1.574570024376729],[1.104569499661587,0],[3.074004826695605,0],[0,1.104569499661587],[0,1.574570024376728],[-1.104569499661587,0]],"o":[[3.074004826695607,0],[1.104569499661587,0],[0,1.57457002437673],[0,1.104569499661587],[-3.074004826695608,0],[-1.104569499661587,0],[0,-1.57457002437673],[0,-1.104569499661587],[0,0]]}}},{"ty":"fl","c":{"a":0,"k":[0.06666666666666667,0.06666666666666667,0.06666666666666667],"ix":2},"o":{"a":0,"k":100,"ix":2},"r":1,"bm":0},{"ty":"tm","s":{"a":0,"k":0,"ix":2},"e":{"a":0,"k":100,"ix":2},"o":{"a":0,"k":0,"ix":2},"m":1},{"ty":"tr","p":{"a":0,"k":[87,58.66666793823242],"ix":2},"a":{"a":0,"k":[8,4.666666507720947],"ix":2},"s":{"a":0,"k":[100,-100],"ix":2},"r":{"a":0,"k":180,"ix":2},"o":{"a":0,"k":100,"ix":2},"sk":{"a":0,"k":-180,"ix":2},"sa":{"a":0,"k":0,"ix":2}}]}],"ip":0,"op":371,"st":0,"bm":0},{"ddd":0,"ind":18,"ty":4,"nm":"bg","sr":1,"ks":{"p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":2},"s":{"a":0,"k":[100,100],"ix":2},"r":{"a":0,"k":0,"ix":2},"o":{"a":0,"k":100,"ix":2}},"ao":0,"parent":15,"shapes":[{"ty":"gr","it":[{"ty":"sh","d":1,"ks":{"a":0,"k":{"c":true,"v":[[32,16],[16,32],[0,16],[16,0],[32,16]],"i":[[0,0],[8.836555727066532,0],[0,8.836555727066532],[-8.836555727066532,0],[0,-8.836555727066532]],"o":[[0,8.836555727066532],[-8.836555727066532,0],[0,-8.836555727066532],[8.836555727066532,0],[0,0]]}}},{"ty":"fl","c":{"a":1,"k":[{"t":30,"s":[0.9764705882352941,0.7450980392156863,0.10196078431372549],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"t":40,"s":[0.2980392156862745,0.7294117647058823,0.23529411764705882],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}}],"ix":2},"o":{"a":0,"k":100,"ix":2},"r":1,"bm":0},{"ty":"tm","s":{"a":0,"k":0,"ix":2},"e":{"a":0,"k":100,"ix":2},"o":{"a":0,"k":0,"ix":2},"m":1},{"ty":"tr","p":{"a":0,"k":[87,54],"ix":2},"a":{"a":0,"k":[16,16],"ix":2},"s":{"a":0,"k":[100,100],"ix":2},"r":{"a":0,"k":0,"ix":2},"o":{"a":0,"k":100,"ix":2},"sk":{"a":0,"k":0,"ix":2},"sa":{"a":0,"k":0,"ix":2}}]}],"ip":0,"op":371,"st":0,"bm":0},{"ddd":0,"refId":"1","w":20000,"h":20000,"ind":13,"ty":0,"nm":"globe","sr":1,"ks":{"p":{"a":0,"k":[64,32],"ix":2},"a":{"a":0,"k":[10064,10032],"ix":2},"s":{"a":1,"k":[{"t":40,"s":[100,100],"i":{"x":[0.8],"y":[1]},"o":{"x":[0.4],"y":[0]}},{"t":60,"s":[85,85],"i":{"x":[0.8],"y":[1]},"o":{"x":[0.4],"y":[0]}},{"t":70,"s":[105,105],"i":{"x":[0.8],"y":[1]},"o":{"x":[0.4],"y":[0]}},{"t":80,"s":[100,100],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}}],"ix":2},"r":{"a":0,"k":0,"ix":2},"o":{"a":0,"k":100,"ix":2}},"ao":0,"ip":0,"op":371,"st":0,"bm":0,"parent":14},{"ddd":0,"ind":19,"ty":3,"nm":"","sr":1,"ks":{"p":{"a":0,"k":[64,38.42728805541992],"ix":2},"a":{"a":0,"k":[64,38.42728805541992],"ix":2},"s":{"a":0,"k":[100,100],"ix":2},"r":{"a":0,"k":0,"ix":2},"o":{"a":0,"k":100,"ix":2}},"ao":0,"ip":0,"op":371,"st":0,"bm":0,"parent":14},{"ddd":0,"ind":20,"ty":3,"nm":"","sr":1,"ks":{"p":{"a":0,"k":[108.5400009155273,55],"ix":2},"a":{"a":0,"k":[108.5400009155273,55.00000190734863],"ix":2},"s":{"a":0,"k":[100,100],"ix":2},"r":{"a":0,"k":0,"ix":2},"o":{"a":0,"k":100,"ix":2}},"ao":0,"ip":0,"op":371,"st":0,"bm":0,"parent":19},{"ddd":0,"ind":21,"ty":4,"nm":"bling-N","sr":1,"ks":{"p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":2},"s":{"a":0,"k":[100,100],"ix":2},"r":{"a":0,"k":0,"ix":2},"o":{"a":0,"k":100,"ix":2}},"ao":0,"parent":20,"shapes":[{"ty":"gr","it":[{"ty":"sh","d":1,"ks":{"a":0,"k":{"c":false,"v":[[0,0],[3.329999923706055,0]],"i":[[0,0],[0,0]],"o":[[0,0],[0,0]]}}},{"ty":"st","c":{"a":0,"k":[0.8,0.8,0.8],"ix":2},"o":{"a":0,"k":100,"ix":2},"w":{"a":0,"k":2.5,"ix":2},"lc":2,"lj":1},{"ty":"tm","s":{"a":0,"k":0,"ix":2},"e":{"a":1,"k":[{"t":40,"s":[0],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"t":47,"s":[100],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"t":174,"s":[100],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"t":176,"s":[0],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"t":183,"s":[100],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}}],"ix":2},"o":{"a":0,"k":0,"ix":2},"m":1},{"ty":"tr","p":{"a":0,"k":[107.4273300170898,45.32266616821289],"ix":2},"a":{"a":0,"k":[1.664999961853027,0],"ix":2},"s":{"a":0,"k":[99.9999982885729,99.99999828857288],"ix":2},"r":{"a":0,"k":-45,"ix":2},"o":{"a":0,"k":100,"ix":2},"sk":{"a":0,"k":0,"ix":2},"sa":{"a":0,"k":0,"ix":2}}]}],"ip":0,"op":371,"st":0,"bm":0},{"ddd":0,"ind":22,"ty":4,"nm":"bling","sr":1,"ks":{"p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":2},"s":{"a":0,"k":[100,100],"ix":2},"r":{"a":0,"k":0,"ix":2},"o":{"a":0,"k":100,"ix":2}},"ao":0,"parent":20,"shapes":[{"ty":"gr","it":[{"ty":"sh","d":1,"ks":{"a":0,"k":{"c":false,"v":[[0,0],[3.329999923706055,0]],"i":[[0,0],[0,0]],"o":[[0,0],[0,0]]}}},{"ty":"st","c":{"a":0,"k":[0.8,0.8,0.8],"ix":2},"o":{"a":0,"k":100,"ix":2},"w":{"a":0,"k":2.5,"ix":2},"lc":2,"lj":1},{"ty":"tm","s":{"a":0,"k":0,"ix":2},"e":{"a":1,"k":[{"t":47,"s":[0],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"t":53,"s":[100],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"t":175,"s":[100],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"t":176,"s":[0],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"t":183,"s":[0],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"t":189,"s":[100],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}}],"ix":2},"o":{"a":0,"k":0,"ix":2},"m":1},{"ty":"tr","p":{"a":0,"k":[109.1650009155273,55],"ix":2},"a":{"a":0,"k":[1.664999961853027,0],"ix":2},"s":{"a":0,"k":[100,100],"ix":2},"r":{"a":0,"k":0,"ix":2},"o":{"a":0,"k":100,"ix":2},"sk":{"a":0,"k":0,"ix":2},"sa":{"a":0,"k":0,"ix":2}}]}],"ip":0,"op":371,"st":0,"bm":0},{"ddd":0,"ind":23,"ty":4,"nm":"bling-S","sr":1,"ks":{"p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":2},"s":{"a":0,"k":[100,100],"ix":2},"r":{"a":0,"k":0,"ix":2},"o":{"a":0,"k":100,"ix":2}},"ao":0,"parent":20,"shapes":[{"ty":"gr","it":[{"ty":"sh","d":1,"ks":{"a":0,"k":{"c":false,"v":[[0,0],[3.329999923706055,0]],"i":[[0,0],[0,0]],"o":[[0,0],[0,0]]}}},{"ty":"st","c":{"a":0,"k":[0.8,0.8,0.8],"ix":2},"o":{"a":0,"k":100,"ix":2},"w":{"a":0,"k":2.5,"ix":2},"lc":2,"lj":1},{"ty":"tm","s":{"a":0,"k":0,"ix":2},"e":{"a":1,"k":[{"t":53,"s":[0],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"t":60,"s":[100],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"t":175,"s":[100],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"t":176,"s":[0],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"t":189,"s":[0],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"t":190,"s":[0],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"t":196,"s":[100],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}}],"ix":2},"o":{"a":0,"k":0,"ix":2},"m":1},{"ty":"tr","p":{"a":0,"k":[107.4273300170898,64.67733001708984],"ix":2},"a":{"a":0,"k":[1.664999961853027,0],"ix":2},"s":{"a":0,"k":[99.9999982885729,99.99999828857288],"ix":2},"r":{"a":0,"k":45,"ix":2},"o":{"a":0,"k":100,"ix":2},"sk":{"a":0,"k":0,"ix":2},"sa":{"a":0,"k":0,"ix":2}}]}],"ip":0,"op":371,"st":0,"bm":0},{"ddd":0,"ind":24,"ty":3,"nm":"","sr":1,"ks":{"p":{"a":0,"k":[64,45.49990844726562],"ix":2},"a":{"a":0,"k":[0,0],"ix":2},"s":{"a":0,"k":[100,100],"ix":2},"r":{"a":0,"k":0,"ix":2},"o":{"a":0,"k":100,"ix":2}},"ao":0,"ip":0,"op":371,"st":0,"bm":0,"parent":19},{"ddd":0,"ind":25,"ty":4,"nm":"dot-L","sr":1,"ks":{"p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":2},"s":{"a":0,"k":[100,100],"ix":2},"r":{"a":0,"k":0,"ix":2},"o":{"a":0,"k":100,"ix":2}},"ao":0,"parent":24,"shapes":[{"ty":"gr","it":[{"ty":"sh","d":1,"ks":{"a":0,"k":{"c":true,"v":[[2,4],[0,2],[2,0],[4,2],[2,4]],"i":[[0,0],[0,1.100000023841858],[-1.100000023841858,0],[0,-1.100000023841858],[1.100000023841858,0]],"o":[[-1.100000023841858,0],[0,-1.100000023841858],[1.100000023841858,0],[0,1.100000023841858],[0,0]]}}},{"ty":"fl","c":{"a":1,"k":[{"t":75,"s":[0.9764705882352941,0.7450980392156863,0.10196078431372549],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"t":100,"s":[0.5333333333333333,0.5333333333333333,0.5333333333333333],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}}],"ix":2},"o":{"a":1,"k":[{"t":75,"s":[100],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"t":100,"s":[20],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}}],"ix":2},"r":1,"bm":0},{"ty":"tm","s":{"a":0,"k":0,"ix":2},"e":{"a":0,"k":100,"ix":2},"o":{"a":0,"k":0,"ix":2},"m":1},{"ty":"tr","p":{"a":1,"k":[{"t":40,"s":[-1,-15.5],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"t":75,"s":[-41,6.5],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}}],"ix":2},"a":{"a":0,"k":[2,2],"ix":2},"s":{"a":0,"k":[100,100],"ix":2},"r":{"a":0,"k":0,"ix":2},"o":{"a":0,"k":100,"ix":2},"sk":{"a":0,"k":0,"ix":2},"sa":{"a":0,"k":0,"ix":2}}]}],"ip":0,"op":371,"st":0,"bm":0},{"ddd":0,"ind":26,"ty":4,"nm":"dot-R","sr":1,"ks":{"p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":2},"s":{"a":0,"k":[100,100],"ix":2},"r":{"a":0,"k":0,"ix":2},"o":{"a":0,"k":100,"ix":2}},"ao":0,"parent":24,"shapes":[{"ty":"gr","it":[{"ty":"sh","d":1,"ks":{"a":0,"k":{"c":true,"v":[[1.5,3],[0,1.5],[1.5,0],[3,1.5],[1.5,3]],"i":[[0,0],[0,0.8250000178813934],[-0.8250000178813934,0],[0,-0.8250000178813934],[0.8250000178813934,0]],"o":[[-0.8250000178813934,0],[0,-0.8250000178813934],[0.8250000178813934,0],[0,0.8250000178813934],[0,0]]}}},{"ty":"fl","c":{"a":1,"k":[{"t":75,"s":[0.9764705882352941,0.7450980392156863,0.10196078431372549],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"t":100,"s":[0.5333333333333333,0.5333333333333333,0.5333333333333333],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}}],"ix":2},"o":{"a":1,"k":[{"t":75,"s":[100],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"t":100,"s":[20],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}}],"ix":2},"r":1,"bm":0},{"ty":"tm","s":{"a":0,"k":0,"ix":2},"e":{"a":0,"k":100,"ix":2},"o":{"a":0,"k":0,"ix":2},"m":1},{"ty":"tr","p":{"a":1,"k":[{"t":40,"s":[3.5,-14],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"t":75,"s":[62.5,-11],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"t":100,"s":[62.5,-11],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}}],"ix":2},"a":{"a":0,"k":[1.5,1.5],"ix":2},"s":{"a":0,"k":[100,100],"ix":2},"r":{"a":0,"k":0,"ix":2},"o":{"a":0,"k":100,"ix":2},"sk":{"a":0,"k":0,"ix":2},"sa":{"a":0,"k":0,"ix":2}}]}],"ip":0,"op":371,"st":0,"bm":0},{"ddd":0,"ind":27,"ty":4,"nm":"spark-L","sr":1,"ks":{"p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":2},"s":{"a":0,"k":[100,100],"ix":2},"r":{"a":0,"k":0,"ix":2},"o":{"a":0,"k":100,"ix":2}},"ao":0,"parent":24,"shapes":[{"ty":"gr","it":[{"ty":"sh","d":1,"ks":{"a":0,"k":{"c":true,"v":[[7.371442522321428,3.199999128069196],[8,4],[7.371442522321428,4.800000871930803],[5.828578404017857,5.199999128069196],[5.199986049107142,5.828569684709821],[4.800013950892857,7.371429443359375],[4,8],[3.199986049107143,7.371429443359375],[2.800013950892857,5.828569684709821],[2.171421595982143,5.199999128069196],[0.6285574776785714,4.800000871930803],[0,4],[0.6285574776785714,3.199999128069196],[2.171421595982143,2.800000871930803],[2.800013950892857,2.171430315290178],[3.199986049107143,0.628570556640625],[4,0],[4.800013950892857,0.628570556640625],[5.199986049107142,2.171430315290178],[5.828578404017857,2.800000871930803],[7.371442522321428,3.199999128069196]],"i":[[0,0],[0,-0.3999999931880406],[0.3999999931880406,-0.1142857159887041],[0,0],[0.05714285799435206,-0.2857142857142857],[0,0],[0.3999999931880406,0],[0.1142857159887041,0.3999999931880406],[0,0],[0.2857142857142857,0.05714285799435206],[0,0],[0,0.3999999931880406],[-0.3999999931880406,0.1142857159887041],[0,0],[-0.05714285799435206,0.2857142857142857],[0,0],[-0.3999999931880406,0],[-0.1142857159887041,-0.3999999931880406],[0,0],[-0.2857142857142857,-0.05714285799435206],[0,0]],"o":[[0.3428571564810616,0.05714285799435206],[0,0.3428571564810616],[0,0],[-0.2857142857142857,0.05714285799435206],[0,0],[-0.05714285799435206,0.3428571564810616],[-0.3428571564810616,0],[0,0],[-0.05714285799435206,-0.2857142857142857],[0,0],[-0.3428571564810616,-0.05714285799435206],[0,-0.3428571564810616],[0,0],[0.2857142857142857,-0.05714285799435206],[0,0],[0.05714285799435206,-0.3428571564810616],[0.3428571564810616,0],[0,0],[0.05714285799435206,0.2857142857142857],[0,0],[0,0]]}}},{"ty":"fl","c":{"a":1,"k":[{"t":75,"s":[0.9764705882352941,0.7450980392156863,0.10196078431372549],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"t":100,"s":[0.5333333333333333,0.5333333333333333,0.5333333333333333],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}}],"ix":2},"o":{"a":1,"k":[{"t":75,"s":[100],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"t":100,"s":[20],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}}],"ix":2},"r":1,"bm":0},{"ty":"tm","s":{"a":0,"k":0,"ix":2},"e":{"a":0,"k":100,"ix":2},"o":{"a":0,"k":0,"ix":2},"m":1},{"ty":"tr","p":{"a":1,"k":[{"t":40,"s":[-1,-16.5],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"t":75,"s":[-57,-7.5],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}}],"ix":2},"a":{"a":0,"k":[4,4],"ix":2},"s":{"a":0,"k":[100,-100],"ix":2},"r":{"a":1,"k":[{"t":40,"s":[360],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"t":75,"s":[180],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"t":100,"s":[180],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"t":130,"s":[180],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"t":370,"s":[-180],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}}],"ix":2},"o":{"a":0,"k":100,"ix":2},"sk":{"a":0,"k":0,"ix":2},"sa":{"a":0,"k":0,"ix":2}}]}],"ip":0,"op":371,"st":0,"bm":0},{"ddd":0,"ind":28,"ty":4,"nm":"spark-Big","sr":1,"ks":{"p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":2},"s":{"a":0,"k":[100,100],"ix":2},"r":{"a":0,"k":0,"ix":2},"o":{"a":0,"k":100,"ix":2}},"ao":0,"parent":24,"shapes":[{"ty":"gr","it":[{"ty":"sh","d":1,"ks":{"a":0,"k":{"c":true,"v":[[11.05716378348214,4.799997929164549],[12,5.999999046325684],[11.05716378348214,7.200000163486817],[8.742867606026785,7.799997452327391],[7.799979073660714,8.74285313742543],[7.200020926339286,11.05714240755333],[6,11.99999809265137],[4.799979073660714,11.05714240755333],[4.200020926339286,8.74285313742543],[3.257132393973214,7.799997452327391],[0.9428362165178571,7.200000163486817],[0,5.999999046325684],[0.9428362165178571,4.799997929164549],[3.257132393973214,4.200000640323976],[4.200020926339286,3.257144955225937],[4.799979073660714,0.9428556850980385],[6,0],[7.200020926339286,0.9428556850980385],[7.799979073660714,3.257144955225937],[8.742867606026785,4.200000640323976],[11.05716378348214,4.799997929164549]],"i":[[0,0],[0,-0.5999998944146309],[0.5999999897820608,-0.1714285467352182],[0,0],[0.0857142869915281,-0.4285713604518345],[0,0],[0.5999999897820608,0],[0.1714285739830562,0.5999998944146309],[0,0],[0.4285714285714285,0.08571427336760909],[0,0],[0,0.5999998944146309],[-0.5999999897820608,0.1714285467352182],[0,0],[-0.0857142869915281,0.4285713604518345],[0,0],[-0.5999999897820608,0],[-0.1714285739830562,-0.5999998944146309],[0,0],[-0.4285714285714285,-0.08571427336760909],[0,0]],"o":[[0.5142857347215924,0.08571427336760909],[0,0.5142856529780764],[0,0],[-0.4285714285714285,0.08571427336760909],[0,0],[-0.0857142869915281,0.5142856529780764],[-0.5142857347215924,0],[0,0],[-0.0857142869915281,-0.4285713604518345],[0,0],[-0.5142857347215924,-0.08571427336760909],[0,-0.5142856529780764],[0,0],[0.4285714285714285,-0.08571427336760909],[0,0],[0.0857142869915281,-0.5142856529780764],[0.5142857347215924,0],[0,0],[0.0857142869915281,0.4285713604518345],[0,0],[0,0]]}}},{"ty":"fl","c":{"a":1,"k":[{"t":75,"s":[0.9764705882352941,0.7450980392156863,0.10196078431372549],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"t":100,"s":[0.5333333333333333,0.5333333333333333,0.5333333333333333],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}}],"ix":2},"o":{"a":1,"k":[{"t":75,"s":[100],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"t":100,"s":[20],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}}],"ix":2},"r":1,"bm":0},{"ty":"tm","s":{"a":0,"k":0,"ix":2},"e":{"a":0,"k":100,"ix":2},"o":{"a":0,"k":0,"ix":2},"m":1},{"ty":"tr","p":{"a":1,"k":[{"t":40,"s":[-1,-15.5],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"t":75,"s":[-43,-28.5],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"t":100,"s":[-43,-28.5],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}}],"ix":2},"a":{"a":0,"k":[6,5.999999046325684],"ix":2},"s":{"a":1,"k":[{"t":130,"s":[100,-100],"i":{"x":[0.8],"y":[1]},"o":{"x":[0.4],"y":[0]}},{"t":250,"s":[50,-50],"i":{"x":[0.8],"y":[1]},"o":{"x":[0.4],"y":[0]}},{"t":370,"s":[100,-100],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}}],"ix":2},"r":{"a":1,"k":[{"t":40,"s":[360],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"t":75,"s":[180],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"t":100,"s":[180],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}}],"ix":2},"o":{"a":0,"k":100,"ix":2},"sk":{"a":0,"k":0,"ix":2},"sa":{"a":0,"k":0,"ix":2}}]}],"ip":0,"op":371,"st":0,"bm":0},{"ddd":0,"ind":29,"ty":4,"nm":"spark-R","sr":1,"ks":{"p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":2},"s":{"a":0,"k":[100,100],"ix":2},"r":{"a":0,"k":0,"ix":2},"o":{"a":0,"k":100,"ix":2}},"ao":0,"parent":24,"shapes":[{"ty":"gr","it":[{"ty":"sh","d":1,"ks":{"a":0,"k":{"c":true,"v":[[7.371442794799805,3.199999173482259],[8,4],[7.371442794799805,4.80000082651774],[5.828578313191731,5.199999173482259],[5.199986139933268,5.828570048014322],[4.800013860066731,7.371429443359375],[4,8],[3.199986139933268,7.371429443359375],[2.800013860066731,5.828570048014322],[2.171421686808268,5.199999173482259],[0.6285574833552042,4.80000082651774],[0,4],[0.6285574833552042,3.199999173482259],[2.171421686808268,2.800000826517741],[2.800013860066731,2.171430269877116],[3.199986139933268,0.628570556640625],[4,0],[4.800013860066731,0.628570556640625],[5.199986139933268,2.171430269877116],[5.828578313191731,2.800000826517741],[7.371442794799805,3.199999173482259]],"i":[[0,0],[0,-0.4000000158945719],[0.4000000158945719,-0.1142857174078623],[0,0],[0.05714285870393117,-0.2857142885526021],[0,0],[0.4000000158945719,0],[0.1142857174078623,0.4000000158945719],[0,0],[0.2857142885526021,0.05714285870393117],[0,0],[0,0.4000000158945719],[-0.4000000158945719,0.1142857174078623],[0,0],[-0.05714285870393117,0.2857142885526021],[0,0],[-0.4000000158945719,0],[-0.1142857174078623,-0.4000000158945719],[0,0],[-0.2857142885526021,-0.05714285870393117],[0,0]],"o":[[0.3428571621576945,0.05714285870393117],[0,0.3428571621576945],[0,0],[-0.2857142885526021,0.05714285870393117],[0,0],[-0.05714285870393117,0.3428571621576945],[-0.3428571621576945,0],[0,0],[-0.05714285870393117,-0.2857142885526021],[0,0],[-0.3428571621576945,-0.05714285870393117],[0,-0.3428571621576945],[0,0],[0.2857142885526021,-0.05714285870393117],[0,0],[0.05714285870393117,-0.3428571621576945],[0.3428571621576945,0],[0,0],[0.05714285870393117,0.2857142885526021],[0,0],[0,0]]}}},{"ty":"fl","c":{"a":1,"k":[{"t":75,"s":[0.9764705882352941,0.7450980392156863,0.10196078431372549],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"t":100,"s":[0.5333333333333333,0.5333333333333333,0.5333333333333333],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}}],"ix":2},"o":{"a":1,"k":[{"t":75,"s":[100],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"t":100,"s":[20],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}}],"ix":2},"r":1,"bm":0},{"ty":"tm","s":{"a":0,"k":0,"ix":2},"e":{"a":0,"k":100,"ix":2},"o":{"a":0,"k":0,"ix":2},"m":1},{"ty":"tr","p":{"a":1,"k":[{"t":40,"s":[2,-14.5],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"t":75,"s":[45,-22.5],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"t":100,"s":[45,-22.5],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}}],"ix":2},"a":{"a":0,"k":[4,4],"ix":2},"s":{"a":1,"k":[{"t":130,"s":[100,-100],"i":{"x":[0.8],"y":[1]},"o":{"x":[0.4],"y":[0]}},{"t":250,"s":[250,-250],"i":{"x":[0.8],"y":[1]},"o":{"x":[0.4],"y":[0]}},{"t":370,"s":[100,-100],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}}],"ix":2},"r":{"a":1,"k":[{"t":40,"s":[0],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"t":75,"s":[180],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"t":100,"s":[180],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}}],"ix":2},"o":{"a":0,"k":100,"ix":2},"sk":{"a":0,"k":0,"ix":2},"sa":{"a":0,"k":0,"ix":2}}]}],"ip":0,"op":371,"st":0,"bm":0}],"markers":[]}
\ No newline at end of file
diff --git a/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/Assets/vpn-light-mode.json b/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/Assets/vpn-light-mode.json
new file mode 100644
index 0000000000..fc062b9223
--- /dev/null
+++ b/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/Assets/vpn-light-mode.json
@@ -0,0 +1 @@
+{"v":"5.7.5","fr":100,"ip":0,"op":370,"w":128,"h":96,"nm":"Comp1","ddd":0,"assets":[{"id":"0","layers":[{"ddd":0,"ind":1,"ty":4,"nm":"shadow","sr":1,"ks":{"p":{"a":0,"k":[10000,10000],"ix":2},"a":{"a":0,"k":[0,0],"ix":2},"s":{"a":0,"k":[100,100],"ix":2},"r":{"a":0,"k":0,"ix":2},"o":{"a":0,"k":100,"ix":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"sh","d":1,"ks":{"a":0,"k":{"c":true,"v":[[42.2357292175293,8.99384593963623],[41.2205810546875,0],[53.23579788208008,24.99367523193359],[21.23579597473145,56.99367141723633],[0,48.93241500854492],[2.235732555389404,48.99384307861328],[42.2357292175293,8.99384593963623]],"i":[[0,0],[0.664215087890625,2.89088249206543],[0,-10.11254501342773],[17.6731128692627,0],[5.649600028991699,5.015373229980469],[-0.750247597694397,0],[0,22.09139251708984]],"o":[[0,-3.092463970184326],[7.324420928955078,5.864182472229004],[0,17.6731128692627],[-8.148801803588867,0],[0.7400614619255066,0.040771484375],[22.09139251708984,0],[0,0]]}}},{"ty":"fl","c":{"a":1,"k":[{"t":40,"s":[0.5333333333333333,0.5333333333333333,0.5333333333333333],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"t":50,"s":[0.1686274509803922,0.3333333333333333,0.792156862745098],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}}],"ix":2},"o":{"a":0,"k":100,"ix":2},"r":1,"bm":0},{"ty":"tm","s":{"a":0,"k":0,"ix":2},"e":{"a":0,"k":100,"ix":2},"o":{"a":0,"k":0,"ix":2},"m":1},{"ty":"tr","p":{"a":0,"k":[69.3820571899414,35.50293731689453],"ix":2},"a":{"a":0,"k":[26.61789894104004,28.49683570861816],"ix":2},"s":{"a":0,"k":[100,100],"ix":2},"r":{"a":0,"k":0,"ix":2},"o":{"a":1,"k":[{"t":40,"s":[40],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"t":50,"s":[50],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}}],"ix":2},"sk":{"a":0,"k":0,"ix":2},"sa":{"a":0,"k":0,"ix":2}}]}],"ip":0,"op":371,"st":0,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"dot-nw","sr":1,"ks":{"p":{"a":0,"k":[10000,10000],"ix":2},"a":{"a":0,"k":[0,0],"ix":2},"s":{"a":0,"k":[100,100],"ix":2},"r":{"a":0,"k":0,"ix":2},"o":{"a":0,"k":100,"ix":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"el","d":1,"s":{"a":0,"k":[7,7],"ix":2},"p":{"a":0,"k":[0,0],"ix":2}},{"ty":"fl","c":{"a":1,"k":[{"t":40,"s":[0.9333333333333333,0.9333333333333333,0.9333333333333333],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"t":50,"s":[0.6784313725490196,0.7607843137254902,0.9882352941176471],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}}],"ix":2},"o":{"a":0,"k":100,"ix":2},"r":1,"bm":0},{"ty":"tm","s":{"a":0,"k":0,"ix":2},"e":{"a":0,"k":100,"ix":2},"o":{"a":0,"k":0,"ix":2},"m":1},{"ty":"tr","p":{"a":1,"k":[{"t":10,"s":[46.5,13.5],"i":{"x":[0.58],"y":[1]},"o":{"x":[0],"y":[0]}},{"t":40,"s":[50.5,6.5],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]},"ti":[-14.74848774275709,-23.38554600445718],"to":[-12.74848774275709,16.61445399554282]},{"t":80,"s":[53.5,66.5],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"t":81,"s":[57.5,-2.5],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"t":200,"s":[57.5,-2.5],"i":{"x":[0.58],"y":[1]},"o":{"x":[0],"y":[0]},"ti":[-20.75,-24.25],"to":[-20.75,23.08333333333333]},{"t":370,"s":[56.5,68.5],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}}],"ix":2},"a":{"a":0,"k":[0,0],"ix":2},"s":{"a":0,"k":[100,100],"ix":2},"r":{"a":0,"k":0,"ix":2},"o":{"a":0,"k":100,"ix":2},"sk":{"a":0,"k":0,"ix":2},"sa":{"a":0,"k":0,"ix":2}}]}],"ip":0,"op":371,"st":0,"bm":0},{"ddd":0,"ind":3,"ty":4,"nm":"dot-ne","sr":1,"ks":{"p":{"a":0,"k":[10000,10000],"ix":2},"a":{"a":0,"k":[0,0],"ix":2},"s":{"a":0,"k":[100,100],"ix":2},"r":{"a":0,"k":0,"ix":2},"o":{"a":0,"k":100,"ix":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"el","d":1,"s":{"a":0,"k":[7,7],"ix":2},"p":{"a":0,"k":[0,0],"ix":2}},{"ty":"fl","c":{"a":1,"k":[{"t":40,"s":[0.9333333333333333,0.9333333333333333,0.9333333333333333],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"t":50,"s":[0.6784313725490196,0.7607843137254902,0.9882352941176471],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}}],"ix":2},"o":{"a":0,"k":100,"ix":2},"r":1,"bm":0},{"ty":"tm","s":{"a":0,"k":0,"ix":2},"e":{"a":0,"k":100,"ix":2},"o":{"a":0,"k":0,"ix":2},"m":1},{"ty":"tr","p":{"a":1,"k":[{"t":10,"s":[69.5,21.5],"i":{"x":[0.58],"y":[1]},"o":{"x":[0],"y":[0]}},{"t":40,"s":[63.5,17.5],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]},"ti":[-6.951289398280807,-10.83253740846864],"to":[9.048710601719193,4.500795924864676]},{"t":80,"s":[87.5,40.5],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]},"ti":[26.75000000000003,-1.75],"to":[-10.58333333333334,-19.75]},{"t":81,"s":[31.5,13.5],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"t":150,"s":[31.5,13.5],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]},"ti":[-9.750000000000028,-19.41666666666666],"to":[27.58333333333334,-1.416666666666664]},{"t":300,"s":[87.5,40.5],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}}],"ix":2},"a":{"a":0,"k":[0,0],"ix":2},"s":{"a":0,"k":[100,100],"ix":2},"r":{"a":0,"k":0,"ix":2},"o":{"a":0,"k":100,"ix":2},"sk":{"a":0,"k":0,"ix":2},"sa":{"a":0,"k":0,"ix":2}}]}],"ip":0,"op":371,"st":0,"bm":0},{"ddd":0,"ind":4,"ty":4,"nm":"dot-s","sr":1,"ks":{"p":{"a":0,"k":[10000,10000],"ix":2},"a":{"a":0,"k":[0,0],"ix":2},"s":{"a":0,"k":[100,100],"ix":2},"r":{"a":0,"k":0,"ix":2},"o":{"a":0,"k":100,"ix":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"el","d":1,"s":{"a":0,"k":[7,7],"ix":2},"p":{"a":0,"k":[0,0],"ix":2}},{"ty":"fl","c":{"a":1,"k":[{"t":40,"s":[0.9333333333333333,0.9333333333333333,0.9333333333333333],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"t":50,"s":[0.6784313725490196,0.7607843137254902,0.9882352941176471],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}}],"ix":2},"o":{"a":0,"k":100,"ix":2},"r":1,"bm":0},{"ty":"tm","s":{"a":0,"k":0,"ix":2},"e":{"a":0,"k":100,"ix":2},"o":{"a":0,"k":0,"ix":2},"m":1},{"ty":"tr","p":{"a":1,"k":[{"t":10,"s":[59.5,49.5],"i":{"x":[0.58],"y":[1]},"o":{"x":[0],"y":[0]}},{"t":40,"s":[69.5,50.5],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]},"ti":[10.97134670487107,11.24832855778413],"to":[-17.69531996179562,-0.08500477554918007]},{"t":80,"s":[26.5,31.5],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]},"ti":[-20.749999999999986,-1.75],"to":[10.58333333333333,11.58333333333333]},{"t":81,"s":[73.5,52.5],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"t":130,"s":[73.5,50.5],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]},"ti":[12.58333333333336,13.250000000000014],"to":[-18.75,0.5833333333333144]},{"t":230,"s":[26.5,32.5],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}}],"ix":2},"a":{"a":0,"k":[0,0],"ix":2},"s":{"a":0,"k":[100,100],"ix":2},"r":{"a":0,"k":0,"ix":2},"o":{"a":0,"k":100,"ix":2},"sk":{"a":0,"k":0,"ix":2},"sa":{"a":0,"k":0,"ix":2}}]}],"ip":0,"op":371,"st":0,"bm":0},{"ddd":0,"ind":5,"ty":3,"nm":"","sr":1,"ks":{"p":{"a":0,"k":[10056,10032.5],"ix":2},"a":{"a":0,"k":[0,0],"ix":2},"s":{"a":0,"k":[100,100],"ix":2},"r":{"a":0,"k":0,"ix":2},"o":{"a":0,"k":100,"ix":2}},"ao":0,"ip":0,"op":371,"st":0,"bm":0},{"ddd":0,"ind":6,"ty":4,"nm":"Oval","sr":1,"ks":{"p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":2},"s":{"a":0,"k":[100,100],"ix":2},"r":{"a":0,"k":0,"ix":2},"o":{"a":0,"k":100,"ix":2}},"ao":0,"parent":5,"shapes":[{"ty":"gr","it":[{"ty":"sh","d":1,"ks":{"a":0,"k":{"c":true,"v":[[48,96],[0,48],[48,0],[96,48],[48,96]],"i":[[0,0],[0,26.50966996215028],[-26.50966996215028,0],[0,-26.50966996215028],[26.50966996215028,0]],"o":[[-26.50966996215028,0],[0,-26.50966996215028],[26.50966996215028,0],[0,26.50966996215028],[0,0]]}}},{"ty":"st","c":{"a":1,"k":[{"t":40,"s":[0.9333333333333333,0.9333333333333333,0.9333333333333333],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"t":50,"s":[0.6784313725490196,0.7607843137254902,0.9882352941176471],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}}],"ix":2},"o":{"a":0,"k":100,"ix":2},"w":{"a":0,"k":2,"ix":2},"lc":1,"lj":1},{"ty":"tm","s":{"a":0,"k":0,"ix":2},"e":{"a":0,"k":100,"ix":2},"o":{"a":0,"k":0,"ix":2},"m":1},{"ty":"tr","p":{"a":0,"k":[17,30.5],"ix":2},"a":{"a":0,"k":[48,48],"ix":2},"s":{"a":0,"k":[100,-100],"ix":2},"r":{"a":0,"k":0,"ix":2},"o":{"a":0,"k":100,"ix":2},"sk":{"a":0,"k":0,"ix":2},"sa":{"a":0,"k":0,"ix":2}}]}],"ip":0,"op":371,"st":0,"bm":0},{"ddd":0,"ind":7,"ty":4,"nm":"Oval","sr":1,"ks":{"p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":2},"s":{"a":0,"k":[100,100],"ix":2},"r":{"a":0,"k":0,"ix":2},"o":{"a":0,"k":100,"ix":2}},"ao":0,"parent":5,"shapes":[{"ty":"gr","it":[{"ty":"sh","d":1,"ks":{"a":0,"k":{"c":true,"v":[[48,96],[0,48],[48,0],[96,48],[48,96]],"i":[[0,0],[0,26.50966996215028],[-26.50966996215028,0],[0,-26.50966996215028],[26.50966996215028,0]],"o":[[-26.50966996215028,0],[0,-26.50966996215028],[26.50966996215028,0],[0,26.50966996215028],[0,0]]}}},{"ty":"st","c":{"a":1,"k":[{"t":40,"s":[0.9333333333333333,0.9333333333333333,0.9333333333333333],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"t":50,"s":[0.6784313725490196,0.7607843137254902,0.9882352941176471],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}}],"ix":2},"o":{"a":0,"k":100,"ix":2},"w":{"a":0,"k":2,"ix":2},"lc":1,"lj":1},{"ty":"tm","s":{"a":0,"k":0,"ix":2},"e":{"a":0,"k":100,"ix":2},"o":{"a":0,"k":0,"ix":2},"m":1},{"ty":"tr","p":{"a":0,"k":[-34,-13.5],"ix":2},"a":{"a":0,"k":[48,48],"ix":2},"s":{"a":0,"k":[100,-100],"ix":2},"r":{"a":0,"k":0,"ix":2},"o":{"a":0,"k":100,"ix":2},"sk":{"a":0,"k":0,"ix":2},"sa":{"a":0,"k":0,"ix":2}}]}],"ip":0,"op":371,"st":0,"bm":0},{"ddd":0,"ind":8,"ty":4,"nm":"Oval","sr":1,"ks":{"p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":2},"s":{"a":0,"k":[100,100],"ix":2},"r":{"a":0,"k":0,"ix":2},"o":{"a":0,"k":100,"ix":2}},"ao":0,"parent":5,"shapes":[{"ty":"gr","it":[{"ty":"sh","d":1,"ks":{"a":0,"k":{"c":true,"v":[[48,96],[0,48],[48,0],[96,48],[48,96]],"i":[[0,0],[0,26.50966996215028],[-26.50966996215028,0],[0,-26.50966996215028],[26.50966996215028,0]],"o":[[-26.50966996215028,0],[0,-26.50966996215028],[26.50966996215028,0],[0,26.50966996215028],[0,0]]}}},{"ty":"st","c":{"a":1,"k":[{"t":40,"s":[0.9333333333333333,0.9333333333333333,0.9333333333333333],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"t":50,"s":[0.6784313725490196,0.7607843137254902,0.9882352941176471],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}}],"ix":2},"o":{"a":0,"k":100,"ix":2},"w":{"a":0,"k":2,"ix":2},"lc":1,"lj":1},{"ty":"tm","s":{"a":0,"k":0,"ix":2},"e":{"a":0,"k":100,"ix":2},"o":{"a":0,"k":0,"ix":2},"m":1},{"ty":"tr","p":{"a":0,"k":[9,-30.5],"ix":2},"a":{"a":0,"k":[48,48],"ix":2},"s":{"a":0,"k":[100,-100],"ix":2},"r":{"a":0,"k":0,"ix":2},"o":{"a":0,"k":100,"ix":2},"sk":{"a":0,"k":0,"ix":2},"sa":{"a":0,"k":0,"ix":2}}]}],"ip":0,"op":371,"st":0,"bm":0},{"ddd":0,"ind":9,"ty":4,"nm":"Oval","sr":1,"ks":{"p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":2},"s":{"a":0,"k":[100,100],"ix":2},"r":{"a":0,"k":0,"ix":2},"o":{"a":0,"k":100,"ix":2}},"ao":0,"parent":5,"shapes":[{"ty":"gr","it":[{"ty":"sh","d":1,"ks":{"a":0,"k":{"c":true,"v":[[48,96],[0,48],[48,0],[96,48],[48,96]],"i":[[0,0],[0,26.50966996215028],[-26.50966996215028,0],[0,-26.50966996215028],[26.50966996215028,0]],"o":[[-26.50966996215028,0],[0,-26.50966996215028],[26.50966996215028,0],[0,26.50966996215028],[0,0]]}}},{"ty":"st","c":{"a":1,"k":[{"t":40,"s":[0.9333333333333333,0.9333333333333333,0.9333333333333333],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"t":50,"s":[0.6784313725490196,0.7607843137254902,0.9882352941176471],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}}],"ix":2},"o":{"a":0,"k":100,"ix":2},"w":{"a":0,"k":2,"ix":2},"lc":1,"lj":1},{"ty":"tm","s":{"a":0,"k":0,"ix":2},"e":{"a":0,"k":100,"ix":2},"o":{"a":0,"k":0,"ix":2},"m":1},{"ty":"tr","p":{"a":0,"k":[-13,28.5],"ix":2},"a":{"a":0,"k":[48,48],"ix":2},"s":{"a":0,"k":[100,-100],"ix":2},"r":{"a":0,"k":0,"ix":2},"o":{"a":0,"k":100,"ix":2},"sk":{"a":0,"k":0,"ix":2},"sa":{"a":0,"k":0,"ix":2}}]}],"ip":0,"op":371,"st":0,"bm":0},{"ddd":0,"ind":10,"ty":4,"nm":"Oval","sr":1,"ks":{"p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":2},"s":{"a":0,"k":[100,100],"ix":2},"r":{"a":0,"k":0,"ix":2},"o":{"a":0,"k":100,"ix":2}},"ao":0,"parent":5,"shapes":[{"ty":"gr","it":[{"ty":"sh","d":1,"ks":{"a":0,"k":{"c":true,"v":[[48,96],[0,48],[48,0],[96,48],[48,96]],"i":[[0,0],[0,26.50966996215028],[-26.50966996215028,0],[0,-26.50966996215028],[26.50966996215028,0]],"o":[[-26.50966996215028,0],[0,-26.50966996215028],[26.50966996215028,0],[0,26.50966996215028],[0,0]]}}},{"ty":"st","c":{"a":1,"k":[{"t":40,"s":[0.9333333333333333,0.9333333333333333,0.9333333333333333],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"t":50,"s":[0.6784313725490196,0.7607843137254902,0.9882352941176471],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}}],"ix":2},"o":{"a":0,"k":100,"ix":2},"w":{"a":0,"k":2,"ix":2},"lc":1,"lj":1},{"ty":"tm","s":{"a":0,"k":0,"ix":2},"e":{"a":0,"k":100,"ix":2},"o":{"a":0,"k":0,"ix":2},"m":1},{"ty":"tr","p":{"a":0,"k":[34,0.5],"ix":2},"a":{"a":0,"k":[48,48],"ix":2},"s":{"a":0,"k":[100,-100],"ix":2},"r":{"a":0,"k":0,"ix":2},"o":{"a":0,"k":100,"ix":2},"sk":{"a":0,"k":0,"ix":2},"sa":{"a":0,"k":0,"ix":2}}]}],"ip":0,"op":371,"st":0,"bm":0},{"ddd":0,"ind":11,"ty":4,"nm":"globe","sr":1,"ks":{"p":{"a":0,"k":[10000,10000],"ix":2},"a":{"a":0,"k":[0,0],"ix":2},"s":{"a":0,"k":[100,100],"ix":2},"r":{"a":0,"k":0,"ix":2},"o":{"a":0,"k":100,"ix":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"sh","d":1,"ks":{"a":0,"k":{"c":true,"v":[[32,63.99999999999999],[0,32],[32,0],[63.99999999999999,32],[32,63.99999999999999]],"i":[[0,0],[0,17.67311330810018],[-17.67311330810018,0],[0,-17.67311330810018],[17.67311330810018,0]],"o":[[-17.67311330810018,0],[0,-17.67311330810018],[17.67311330810018,0],[0,17.67311330810018],[0,0]]}}},{"ty":"fl","c":{"a":1,"k":[{"t":40,"s":[0.8,0.8,0.8],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"t":50,"s":[0.3333333333333333,0.4980392156862745,0.9529411764705882],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}}],"ix":2},"o":{"a":0,"k":100,"ix":2},"r":1,"bm":0},{"ty":"tm","s":{"a":0,"k":0,"ix":2},"e":{"a":0,"k":100,"ix":2},"o":{"a":0,"k":0,"ix":2},"m":1},{"ty":"tr","p":{"a":0,"k":[64,32],"ix":2},"a":{"a":0,"k":[32,32],"ix":2},"s":{"a":0,"k":[100,100],"ix":2},"r":{"a":0,"k":0,"ix":2},"o":{"a":0,"k":100,"ix":2},"sk":{"a":0,"k":0,"ix":2},"sa":{"a":0,"k":0,"ix":2}}]}],"ip":0,"op":371,"st":0,"bm":0}]},{"id":"1","layers":[{"ddd":0,"ind":12,"ty":4,"nm":"_mask","sr":1,"ks":{"p":{"a":0,"k":[10000,10000],"ix":2},"a":{"a":0,"k":[0,0],"ix":2},"s":{"a":0,"k":[100,100],"ix":2},"r":{"a":0,"k":0,"ix":2},"o":{"a":0,"k":100,"ix":2}},"td":1,"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"sh","d":1,"ks":{"a":0,"k":{"c":true,"v":[[55,35],[35,55],[35,61.1272168529097],[32.27027277742516,63.99888239316815],[32,64],[0,32],[32,0],[64,32],[63.99888239502384,32.27027632020794],[61.12722036453148,35],[55,35]],"i":[[0,0],[1.3527074874795e-15,-11.04569435119629],[0,-2.603342616466307],[1.549197989173602,-0.01281636670575817],[0.09017852706661245,0],[-2.164332234077084e-15,17.6731128692627],[-17.6731128692627,-2.164332234077084e-15],[2.164332445835321e-15,-17.67311477661133],[0.0007445845155729103,-0.09000398946863442],[1.549249531796702,0],[0,0]],"o":[[-11.04569244384766,-1.352707275721263e-15],[0,0],[0,1.549251002554159],[-0.09000283819779753,0.0007445848671139288],[-17.6731128692627,-2.164332234077084e-15],[2.164332022318847e-15,-17.67311096191406],[17.67311096191406,2.164332022318847e-15],[0,0.09017973898513532],[-0.01281618456122568,1.549196519872671],[-2.603342959208661,0],[0,0]]}}},{"ty":"fl","c":{"a":0,"k":[0,0,0],"ix":2},"o":{"a":0,"k":100,"ix":2},"r":1,"bm":0},{"ty":"tm","s":{"a":0,"k":0,"ix":2},"e":{"a":0,"k":100,"ix":2},"o":{"a":0,"k":0,"ix":2},"m":1},{"ty":"tr","p":{"a":0,"k":[64,32],"ix":2},"a":{"a":0,"k":[32,32],"ix":2},"s":{"a":0,"k":[100,100],"ix":2},"r":{"a":0,"k":0,"ix":2},"o":{"a":0,"k":100,"ix":2},"sk":{"a":0,"k":0,"ix":2},"sa":{"a":0,"k":0,"ix":2}}]}],"ip":0,"op":371,"st":0,"bm":0},{"ddd":0,"refId":"0","w":20000,"h":20000,"ind":13,"ty":0,"nm":"globe","sr":1,"ks":{"p":{"a":0,"k":[10000,10000],"ix":2},"a":{"a":0,"k":[10000,10000],"ix":2},"s":{"a":0,"k":[100,100],"ix":2},"r":{"a":0,"k":0,"ix":2},"o":{"a":0,"k":100,"ix":2}},"ao":0,"ip":0,"op":371,"st":0,"bm":0,"tt":1}]}],"layers":[{"ddd":0,"ind":14,"ty":3,"nm":"","sr":1,"ks":{"p":{"a":0,"k":[64,48],"ix":2},"a":{"a":0,"k":[64,35],"ix":2},"s":{"a":0,"k":[100,100],"ix":2},"r":{"a":0,"k":0,"ix":2},"o":{"a":0,"k":100,"ix":2}},"ao":0,"ip":0,"op":371,"st":0,"bm":0},{"ddd":0,"ind":15,"ty":3,"nm":"","sr":1,"ks":{"p":{"a":1,"k":[{"t":10,"s":[87,54],"i":{"x":[0.58],"y":[1]},"o":{"x":[0],"y":[0]}},{"t":30,"s":[87,48],"i":{"x":[0.8],"y":[1]},"o":{"x":[0.4],"y":[0]}},{"t":40,"s":[87,58],"i":{"x":[0.8],"y":[1]},"o":{"x":[0.4],"y":[0]}},{"t":50,"s":[87,54],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}}],"ix":2},"a":{"a":0,"k":[87,54],"ix":2},"s":{"a":0,"k":[100,100],"ix":2},"r":{"a":0,"k":0,"ix":2},"o":{"a":0,"k":100,"ix":2}},"ao":0,"ip":0,"op":371,"st":0,"bm":0,"parent":14},{"ddd":0,"ind":16,"ty":4,"nm":"lock-hook","sr":1,"ks":{"p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":2},"s":{"a":0,"k":[100,100],"ix":2},"r":{"a":0,"k":0,"ix":2},"o":{"a":0,"k":100,"ix":2}},"ao":0,"parent":15,"shapes":[{"ty":"gr","it":[{"ty":"sh","d":1,"ks":{"a":0,"k":{"c":false,"v":[[0,9],[0,4.048697948455811],[1.171572897169325,1.185836362838745],[4,2.333394250525001e-14],[6.828427208794487,1.185835719108582],[8,4.048697519302368],[8,8.46090259552002]],"i":[[0,0],[0,0],[-0.7501454883151584,0.7592780649662018],[-1.060865932040744,1.151999967419215e-7],[-0.7501456472608777,-0.7592779576778412],[-3.203726414034867e-7,-1.073781502246857],[0,0]],"o":[[0,0],[9.274384638047195e-8,-1.073781502246857],[0.7501454883151584,-0.7592780649662018],[1.060865932040744,-1.151999967419215e-7],[0.7501456472608777,0.7592779576778412],[0,0],[0,0]]}}},{"ty":"st","c":{"a":0,"k":[1,1,1],"ix":2},"o":{"a":0,"k":100,"ix":2},"w":{"a":0,"k":2.666666746139526,"ix":2},"lc":1,"lj":1},{"ty":"tm","s":{"a":0,"k":0,"ix":2},"e":{"a":1,"k":[{"t":30,"s":[85],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"t":40,"s":[100],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}}],"ix":2},"o":{"a":0,"k":0,"ix":2},"m":1},{"ty":"tr","p":{"a":0,"k":[87,50.5],"ix":2},"a":{"a":0,"k":[4,4.5],"ix":2},"s":{"a":0,"k":[100,-100],"ix":2},"r":{"a":1,"k":[{"t":30,"s":[196],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"t":40,"s":[180],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}}],"ix":2},"o":{"a":0,"k":100,"ix":2},"sk":{"a":0,"k":-180,"ix":2},"sa":{"a":0,"k":0,"ix":2}}]}],"ip":0,"op":371,"st":0,"bm":0},{"ddd":0,"ind":17,"ty":4,"nm":"lock-base","sr":1,"ks":{"p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":2},"s":{"a":0,"k":[100,100],"ix":2},"r":{"a":0,"k":0,"ix":2},"o":{"a":0,"k":100,"ix":2}},"ao":0,"parent":15,"shapes":[{"ty":"gr","it":[{"ty":"sh","d":1,"ks":{"a":0,"k":{"c":true,"v":[[2.000000000000001,0],[14,0],[16,2.000000000000002],[16,7.333333015441899],[14,9.333333015441895],[1.999999999999996,9.333333015441895],[0,7.333333015441892],[0,1.999999999999995],[2.000000000000001,0]],"i":[[0,0],[-3.074004826695607,0],[0,-1.104569499661587],[0,-1.574570024376729],[1.104569499661587,0],[3.074004826695605,0],[0,1.104569499661587],[0,1.574570024376728],[-1.104569499661587,0]],"o":[[3.074004826695607,0],[1.104569499661587,0],[0,1.57457002437673],[0,1.104569499661587],[-3.074004826695608,0],[-1.104569499661587,0],[0,-1.57457002437673],[0,-1.104569499661587],[0,0]]}}},{"ty":"fl","c":{"a":0,"k":[1,1,1],"ix":2},"o":{"a":0,"k":100,"ix":2},"r":1,"bm":0},{"ty":"tm","s":{"a":0,"k":0,"ix":2},"e":{"a":0,"k":100,"ix":2},"o":{"a":0,"k":0,"ix":2},"m":1},{"ty":"tr","p":{"a":0,"k":[87,58.66666793823242],"ix":2},"a":{"a":0,"k":[8,4.666666507720947],"ix":2},"s":{"a":0,"k":[100,-100],"ix":2},"r":{"a":0,"k":180,"ix":2},"o":{"a":0,"k":100,"ix":2},"sk":{"a":0,"k":-180,"ix":2},"sa":{"a":0,"k":0,"ix":2}}]}],"ip":0,"op":371,"st":0,"bm":0},{"ddd":0,"ind":18,"ty":4,"nm":"bg","sr":1,"ks":{"p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":2},"s":{"a":0,"k":[100,100],"ix":2},"r":{"a":0,"k":0,"ix":2},"o":{"a":0,"k":100,"ix":2}},"ao":0,"parent":15,"shapes":[{"ty":"gr","it":[{"ty":"sh","d":1,"ks":{"a":0,"k":{"c":true,"v":[[32,16],[16,32],[0,16],[16,0],[32,16]],"i":[[0,0],[8.836555727066532,0],[0,8.836555727066532],[-8.836555727066532,0],[0,-8.836555727066532]],"o":[[0,8.836555727066532],[-8.836555727066532,0],[0,-8.836555727066532],[8.836555727066532,0],[0,0]]}}},{"ty":"fl","c":{"a":1,"k":[{"t":30,"s":[0.9764705882352941,0.7450980392156863,0.1019607843137255],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"t":40,"s":[0.2980392156862745,0.7294117647058823,0.2352941176470588],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}}],"ix":2},"o":{"a":0,"k":100,"ix":2},"r":1,"bm":0},{"ty":"tm","s":{"a":0,"k":0,"ix":2},"e":{"a":0,"k":100,"ix":2},"o":{"a":0,"k":0,"ix":2},"m":1},{"ty":"tr","p":{"a":0,"k":[87,54],"ix":2},"a":{"a":0,"k":[16,16],"ix":2},"s":{"a":0,"k":[100,100],"ix":2},"r":{"a":0,"k":0,"ix":2},"o":{"a":0,"k":100,"ix":2},"sk":{"a":0,"k":0,"ix":2},"sa":{"a":0,"k":0,"ix":2}}]}],"ip":0,"op":371,"st":0,"bm":0},{"ddd":0,"refId":"1","w":20000,"h":20000,"ind":13,"ty":0,"nm":"globe","sr":1,"ks":{"p":{"a":0,"k":[64,32],"ix":2},"a":{"a":0,"k":[10064,10032],"ix":2},"s":{"a":1,"k":[{"t":40,"s":[100,100],"i":{"x":[0.8],"y":[1]},"o":{"x":[0.4],"y":[0]}},{"t":60,"s":[85,85],"i":{"x":[0.8],"y":[1]},"o":{"x":[0.4],"y":[0]}},{"t":70,"s":[105,105],"i":{"x":[0.8],"y":[1]},"o":{"x":[0.4],"y":[0]}},{"t":80,"s":[100,100],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}}],"ix":2},"r":{"a":0,"k":0,"ix":2},"o":{"a":0,"k":100,"ix":2}},"ao":0,"ip":0,"op":371,"st":0,"bm":0,"parent":14},{"ddd":0,"ind":19,"ty":3,"nm":"","sr":1,"ks":{"p":{"a":0,"k":[64,38.42728805541992],"ix":2},"a":{"a":0,"k":[64,38.42728805541992],"ix":2},"s":{"a":0,"k":[100,100],"ix":2},"r":{"a":0,"k":0,"ix":2},"o":{"a":0,"k":100,"ix":2}},"ao":0,"ip":0,"op":371,"st":0,"bm":0,"parent":14},{"ddd":0,"ind":20,"ty":3,"nm":"","sr":1,"ks":{"p":{"a":0,"k":[108.5400009155273,55],"ix":2},"a":{"a":0,"k":[108.5400009155273,55.00000190734863],"ix":2},"s":{"a":0,"k":[100,100],"ix":2},"r":{"a":0,"k":0,"ix":2},"o":{"a":0,"k":100,"ix":2}},"ao":0,"ip":0,"op":371,"st":0,"bm":0,"parent":19},{"ddd":0,"ind":21,"ty":4,"nm":"bling-N","sr":1,"ks":{"p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":2},"s":{"a":0,"k":[100,100],"ix":2},"r":{"a":0,"k":0,"ix":2},"o":{"a":0,"k":100,"ix":2}},"ao":0,"parent":20,"shapes":[{"ty":"gr","it":[{"ty":"sh","d":1,"ks":{"a":0,"k":{"c":false,"v":[[0,0],[3.329999923706055,0]],"i":[[0,0],[0,0]],"o":[[0,0],[0,0]]}}},{"ty":"st","c":{"a":0,"k":[0.8,0.8,0.8],"ix":2},"o":{"a":0,"k":100,"ix":2},"w":{"a":0,"k":2.5,"ix":2},"lc":2,"lj":1},{"ty":"tm","s":{"a":0,"k":0,"ix":2},"e":{"a":1,"k":[{"t":40,"s":[0],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"t":47,"s":[100],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"t":174,"s":[100],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"t":176,"s":[0],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"t":183,"s":[100],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}}],"ix":2},"o":{"a":0,"k":0,"ix":2},"m":1},{"ty":"tr","p":{"a":0,"k":[107.4273300170898,45.32266616821289],"ix":2},"a":{"a":0,"k":[1.664999961853027,0],"ix":2},"s":{"a":0,"k":[99.9999982885729,99.99999828857288],"ix":2},"r":{"a":0,"k":-45,"ix":2},"o":{"a":0,"k":100,"ix":2},"sk":{"a":0,"k":0,"ix":2},"sa":{"a":0,"k":0,"ix":2}}]}],"ip":0,"op":371,"st":0,"bm":0},{"ddd":0,"ind":22,"ty":4,"nm":"bling","sr":1,"ks":{"p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":2},"s":{"a":0,"k":[100,100],"ix":2},"r":{"a":0,"k":0,"ix":2},"o":{"a":0,"k":100,"ix":2}},"ao":0,"parent":20,"shapes":[{"ty":"gr","it":[{"ty":"sh","d":1,"ks":{"a":0,"k":{"c":false,"v":[[0,0],[3.329999923706055,0]],"i":[[0,0],[0,0]],"o":[[0,0],[0,0]]}}},{"ty":"st","c":{"a":0,"k":[0.8,0.8,0.8],"ix":2},"o":{"a":0,"k":100,"ix":2},"w":{"a":0,"k":2.5,"ix":2},"lc":2,"lj":1},{"ty":"tm","s":{"a":0,"k":0,"ix":2},"e":{"a":1,"k":[{"t":47,"s":[0],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"t":53,"s":[100],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"t":175,"s":[100],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"t":176,"s":[0],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"t":183,"s":[0],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"t":189,"s":[100],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}}],"ix":2},"o":{"a":0,"k":0,"ix":2},"m":1},{"ty":"tr","p":{"a":0,"k":[109.1650009155273,55],"ix":2},"a":{"a":0,"k":[1.664999961853027,0],"ix":2},"s":{"a":0,"k":[100,100],"ix":2},"r":{"a":0,"k":0,"ix":2},"o":{"a":0,"k":100,"ix":2},"sk":{"a":0,"k":0,"ix":2},"sa":{"a":0,"k":0,"ix":2}}]}],"ip":0,"op":371,"st":0,"bm":0},{"ddd":0,"ind":23,"ty":4,"nm":"bling-S","sr":1,"ks":{"p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":2},"s":{"a":0,"k":[100,100],"ix":2},"r":{"a":0,"k":0,"ix":2},"o":{"a":0,"k":100,"ix":2}},"ao":0,"parent":20,"shapes":[{"ty":"gr","it":[{"ty":"sh","d":1,"ks":{"a":0,"k":{"c":false,"v":[[0,0],[3.329999923706055,0]],"i":[[0,0],[0,0]],"o":[[0,0],[0,0]]}}},{"ty":"st","c":{"a":0,"k":[0.8,0.8,0.8],"ix":2},"o":{"a":0,"k":100,"ix":2},"w":{"a":0,"k":2.5,"ix":2},"lc":2,"lj":1},{"ty":"tm","s":{"a":0,"k":0,"ix":2},"e":{"a":1,"k":[{"t":53,"s":[0],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"t":60,"s":[100],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"t":175,"s":[100],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"t":176,"s":[0],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"t":189,"s":[0],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"t":190,"s":[0],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"t":196,"s":[100],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}}],"ix":2},"o":{"a":0,"k":0,"ix":2},"m":1},{"ty":"tr","p":{"a":0,"k":[107.4273300170898,64.67733001708984],"ix":2},"a":{"a":0,"k":[1.664999961853027,0],"ix":2},"s":{"a":0,"k":[99.9999982885729,99.99999828857288],"ix":2},"r":{"a":0,"k":45,"ix":2},"o":{"a":0,"k":100,"ix":2},"sk":{"a":0,"k":0,"ix":2},"sa":{"a":0,"k":0,"ix":2}}]}],"ip":0,"op":371,"st":0,"bm":0},{"ddd":0,"ind":24,"ty":3,"nm":"","sr":1,"ks":{"p":{"a":0,"k":[64,45.49990844726562],"ix":2},"a":{"a":0,"k":[0,0],"ix":2},"s":{"a":0,"k":[100,100],"ix":2},"r":{"a":0,"k":0,"ix":2},"o":{"a":0,"k":100,"ix":2}},"ao":0,"ip":0,"op":371,"st":0,"bm":0,"parent":19},{"ddd":0,"ind":25,"ty":4,"nm":"dot-L","sr":1,"ks":{"p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":2},"s":{"a":0,"k":[100,100],"ix":2},"r":{"a":0,"k":0,"ix":2},"o":{"a":0,"k":100,"ix":2}},"ao":0,"parent":24,"shapes":[{"ty":"gr","it":[{"ty":"sh","d":1,"ks":{"a":0,"k":{"c":true,"v":[[2,4],[0,2],[2,0],[4,2],[2,4]],"i":[[0,0],[0,1.100000023841858],[-1.100000023841858,0],[0,-1.100000023841858],[1.100000023841858,0]],"o":[[-1.100000023841858,0],[0,-1.100000023841858],[1.100000023841858,0],[0,1.100000023841858],[0,0]]}}},{"ty":"fl","c":{"a":1,"k":[{"t":75,"s":[0.9764705882352941,0.7450980392156863,0.1019607843137255],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"t":100,"s":[0.5333333333333333,0.5333333333333333,0.5333333333333333],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}}],"ix":2},"o":{"a":1,"k":[{"t":75,"s":[100],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"t":100,"s":[20],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}}],"ix":2},"r":1,"bm":0},{"ty":"tm","s":{"a":0,"k":0,"ix":2},"e":{"a":0,"k":100,"ix":2},"o":{"a":0,"k":0,"ix":2},"m":1},{"ty":"tr","p":{"a":1,"k":[{"t":40,"s":[-1,-15.5],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"t":75,"s":[-41,6.5],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}}],"ix":2},"a":{"a":0,"k":[2,2],"ix":2},"s":{"a":0,"k":[100,100],"ix":2},"r":{"a":0,"k":0,"ix":2},"o":{"a":0,"k":100,"ix":2},"sk":{"a":0,"k":0,"ix":2},"sa":{"a":0,"k":0,"ix":2}}]}],"ip":0,"op":371,"st":0,"bm":0},{"ddd":0,"ind":26,"ty":4,"nm":"dot-R","sr":1,"ks":{"p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":2},"s":{"a":0,"k":[100,100],"ix":2},"r":{"a":0,"k":0,"ix":2},"o":{"a":0,"k":100,"ix":2}},"ao":0,"parent":24,"shapes":[{"ty":"gr","it":[{"ty":"sh","d":1,"ks":{"a":0,"k":{"c":true,"v":[[1.5,3],[0,1.5],[1.5,0],[3,1.5],[1.5,3]],"i":[[0,0],[0,0.8250000178813934],[-0.8250000178813934,0],[0,-0.8250000178813934],[0.8250000178813934,0]],"o":[[-0.8250000178813934,0],[0,-0.8250000178813934],[0.8250000178813934,0],[0,0.8250000178813934],[0,0]]}}},{"ty":"fl","c":{"a":1,"k":[{"t":75,"s":[0.9764705882352941,0.7450980392156863,0.1019607843137255],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"t":100,"s":[0.5333333333333333,0.5333333333333333,0.5333333333333333],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}}],"ix":2},"o":{"a":1,"k":[{"t":75,"s":[100],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"t":100,"s":[20],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}}],"ix":2},"r":1,"bm":0},{"ty":"tm","s":{"a":0,"k":0,"ix":2},"e":{"a":0,"k":100,"ix":2},"o":{"a":0,"k":0,"ix":2},"m":1},{"ty":"tr","p":{"a":1,"k":[{"t":40,"s":[3.5,-14],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"t":75,"s":[62.5,-11],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"t":100,"s":[62.5,-11],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}}],"ix":2},"a":{"a":0,"k":[1.5,1.5],"ix":2},"s":{"a":0,"k":[100,100],"ix":2},"r":{"a":0,"k":0,"ix":2},"o":{"a":0,"k":100,"ix":2},"sk":{"a":0,"k":0,"ix":2},"sa":{"a":0,"k":0,"ix":2}}]}],"ip":0,"op":371,"st":0,"bm":0},{"ddd":0,"ind":27,"ty":4,"nm":"spark-L","sr":1,"ks":{"p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":2},"s":{"a":0,"k":[100,100],"ix":2},"r":{"a":0,"k":0,"ix":2},"o":{"a":0,"k":100,"ix":2}},"ao":0,"parent":24,"shapes":[{"ty":"gr","it":[{"ty":"sh","d":1,"ks":{"a":0,"k":{"c":true,"v":[[7.371442522321428,3.199999128069196],[8,4],[7.371442522321428,4.800000871930803],[5.828578404017857,5.199999128069196],[5.199986049107142,5.828569684709821],[4.800013950892857,7.371429443359375],[4,8],[3.199986049107143,7.371429443359375],[2.800013950892857,5.828569684709821],[2.171421595982143,5.199999128069196],[0.6285574776785714,4.800000871930803],[0,4],[0.6285574776785714,3.199999128069196],[2.171421595982143,2.800000871930803],[2.800013950892857,2.171430315290178],[3.199986049107143,0.628570556640625],[4,0],[4.800013950892857,0.628570556640625],[5.199986049107142,2.171430315290178],[5.828578404017857,2.800000871930803],[7.371442522321428,3.199999128069196]],"i":[[0,0],[0,-0.3999999931880406],[0.3999999931880406,-0.1142857159887041],[0,0],[0.05714285799435206,-0.2857142857142857],[0,0],[0.3999999931880406,0],[0.1142857159887041,0.3999999931880406],[0,0],[0.2857142857142857,0.05714285799435206],[0,0],[0,0.3999999931880406],[-0.3999999931880406,0.1142857159887041],[0,0],[-0.05714285799435206,0.2857142857142857],[0,0],[-0.3999999931880406,0],[-0.1142857159887041,-0.3999999931880406],[0,0],[-0.2857142857142857,-0.05714285799435206],[0,0]],"o":[[0.3428571564810616,0.05714285799435206],[0,0.3428571564810616],[0,0],[-0.2857142857142857,0.05714285799435206],[0,0],[-0.05714285799435206,0.3428571564810616],[-0.3428571564810616,0],[0,0],[-0.05714285799435206,-0.2857142857142857],[0,0],[-0.3428571564810616,-0.05714285799435206],[0,-0.3428571564810616],[0,0],[0.2857142857142857,-0.05714285799435206],[0,0],[0.05714285799435206,-0.3428571564810616],[0.3428571564810616,0],[0,0],[0.05714285799435206,0.2857142857142857],[0,0],[0,0]]}}},{"ty":"fl","c":{"a":1,"k":[{"t":75,"s":[0.9764705882352941,0.7450980392156863,0.1019607843137255],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"t":100,"s":[0.5333333333333333,0.5333333333333333,0.5333333333333333],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}}],"ix":2},"o":{"a":1,"k":[{"t":75,"s":[100],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"t":100,"s":[20],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}}],"ix":2},"r":1,"bm":0},{"ty":"tm","s":{"a":0,"k":0,"ix":2},"e":{"a":0,"k":100,"ix":2},"o":{"a":0,"k":0,"ix":2},"m":1},{"ty":"tr","p":{"a":1,"k":[{"t":40,"s":[-1,-16.5],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"t":75,"s":[-57,-7.5],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}}],"ix":2},"a":{"a":0,"k":[4,4],"ix":2},"s":{"a":0,"k":[100,-100],"ix":2},"r":{"a":1,"k":[{"t":40,"s":[360],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"t":75,"s":[180],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"t":100,"s":[180],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"t":130,"s":[180],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"t":370,"s":[-180],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}}],"ix":2},"o":{"a":0,"k":100,"ix":2},"sk":{"a":0,"k":0,"ix":2},"sa":{"a":0,"k":0,"ix":2}}]}],"ip":0,"op":371,"st":0,"bm":0},{"ddd":0,"ind":28,"ty":4,"nm":"spark-Big","sr":1,"ks":{"p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":2},"s":{"a":0,"k":[100,100],"ix":2},"r":{"a":0,"k":0,"ix":2},"o":{"a":0,"k":100,"ix":2}},"ao":0,"parent":24,"shapes":[{"ty":"gr","it":[{"ty":"sh","d":1,"ks":{"a":0,"k":{"c":true,"v":[[11.05716378348214,4.799997929164549],[12,5.999999046325684],[11.05716378348214,7.200000163486817],[8.742867606026785,7.799997452327391],[7.799979073660714,8.74285313742543],[7.200020926339286,11.05714240755333],[6,11.99999809265137],[4.799979073660714,11.05714240755333],[4.200020926339286,8.74285313742543],[3.257132393973214,7.799997452327391],[0.9428362165178571,7.200000163486817],[0,5.999999046325684],[0.9428362165178571,4.799997929164549],[3.257132393973214,4.200000640323976],[4.200020926339286,3.257144955225937],[4.799979073660714,0.9428556850980385],[6,0],[7.200020926339286,0.9428556850980385],[7.799979073660714,3.257144955225937],[8.742867606026785,4.200000640323976],[11.05716378348214,4.799997929164549]],"i":[[0,0],[0,-0.5999998944146309],[0.5999999897820608,-0.1714285467352182],[0,0],[0.0857142869915281,-0.4285713604518345],[0,0],[0.5999999897820608,0],[0.1714285739830562,0.5999998944146309],[0,0],[0.4285714285714285,0.08571427336760909],[0,0],[0,0.5999998944146309],[-0.5999999897820608,0.1714285467352182],[0,0],[-0.0857142869915281,0.4285713604518345],[0,0],[-0.5999999897820608,0],[-0.1714285739830562,-0.5999998944146309],[0,0],[-0.4285714285714285,-0.08571427336760909],[0,0]],"o":[[0.5142857347215924,0.08571427336760909],[0,0.5142856529780764],[0,0],[-0.4285714285714285,0.08571427336760909],[0,0],[-0.0857142869915281,0.5142856529780764],[-0.5142857347215924,0],[0,0],[-0.0857142869915281,-0.4285713604518345],[0,0],[-0.5142857347215924,-0.08571427336760909],[0,-0.5142856529780764],[0,0],[0.4285714285714285,-0.08571427336760909],[0,0],[0.0857142869915281,-0.5142856529780764],[0.5142857347215924,0],[0,0],[0.0857142869915281,0.4285713604518345],[0,0],[0,0]]}}},{"ty":"fl","c":{"a":1,"k":[{"t":75,"s":[0.9764705882352941,0.7450980392156863,0.1019607843137255],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"t":100,"s":[0.5333333333333333,0.5333333333333333,0.5333333333333333],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}}],"ix":2},"o":{"a":1,"k":[{"t":75,"s":[100],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"t":100,"s":[20],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}}],"ix":2},"r":1,"bm":0},{"ty":"tm","s":{"a":0,"k":0,"ix":2},"e":{"a":0,"k":100,"ix":2},"o":{"a":0,"k":0,"ix":2},"m":1},{"ty":"tr","p":{"a":1,"k":[{"t":40,"s":[-1,-15.5],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"t":75,"s":[-43,-28.5],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"t":100,"s":[-43,-28.5],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}}],"ix":2},"a":{"a":0,"k":[6,5.999999046325684],"ix":2},"s":{"a":1,"k":[{"t":130,"s":[100,-100],"i":{"x":[0.8],"y":[1]},"o":{"x":[0.4],"y":[0]}},{"t":250,"s":[50,-50],"i":{"x":[0.8],"y":[1]},"o":{"x":[0.4],"y":[0]}},{"t":370,"s":[100,-100],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}}],"ix":2},"r":{"a":1,"k":[{"t":40,"s":[360],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"t":75,"s":[180],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"t":100,"s":[180],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}}],"ix":2},"o":{"a":0,"k":100,"ix":2},"sk":{"a":0,"k":0,"ix":2},"sa":{"a":0,"k":0,"ix":2}}]}],"ip":0,"op":371,"st":0,"bm":0},{"ddd":0,"ind":29,"ty":4,"nm":"spark-R","sr":1,"ks":{"p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":2},"s":{"a":0,"k":[100,100],"ix":2},"r":{"a":0,"k":0,"ix":2},"o":{"a":0,"k":100,"ix":2}},"ao":0,"parent":24,"shapes":[{"ty":"gr","it":[{"ty":"sh","d":1,"ks":{"a":0,"k":{"c":true,"v":[[7.371442794799805,3.199999173482259],[8,4],[7.371442794799805,4.80000082651774],[5.828578313191731,5.199999173482259],[5.199986139933268,5.828570048014322],[4.800013860066731,7.371429443359375],[4,8],[3.199986139933268,7.371429443359375],[2.800013860066731,5.828570048014322],[2.171421686808268,5.199999173482259],[0.6285574833552042,4.80000082651774],[0,4],[0.6285574833552042,3.199999173482259],[2.171421686808268,2.800000826517741],[2.800013860066731,2.171430269877116],[3.199986139933268,0.628570556640625],[4,0],[4.800013860066731,0.628570556640625],[5.199986139933268,2.171430269877116],[5.828578313191731,2.800000826517741],[7.371442794799805,3.199999173482259]],"i":[[0,0],[0,-0.4000000158945719],[0.4000000158945719,-0.1142857174078623],[0,0],[0.05714285870393117,-0.2857142885526021],[0,0],[0.4000000158945719,0],[0.1142857174078623,0.4000000158945719],[0,0],[0.2857142885526021,0.05714285870393117],[0,0],[0,0.4000000158945719],[-0.4000000158945719,0.1142857174078623],[0,0],[-0.05714285870393117,0.2857142885526021],[0,0],[-0.4000000158945719,0],[-0.1142857174078623,-0.4000000158945719],[0,0],[-0.2857142885526021,-0.05714285870393117],[0,0]],"o":[[0.3428571621576945,0.05714285870393117],[0,0.3428571621576945],[0,0],[-0.2857142885526021,0.05714285870393117],[0,0],[-0.05714285870393117,0.3428571621576945],[-0.3428571621576945,0],[0,0],[-0.05714285870393117,-0.2857142885526021],[0,0],[-0.3428571621576945,-0.05714285870393117],[0,-0.3428571621576945],[0,0],[0.2857142885526021,-0.05714285870393117],[0,0],[0.05714285870393117,-0.3428571621576945],[0.3428571621576945,0],[0,0],[0.05714285870393117,0.2857142885526021],[0,0],[0,0]]}}},{"ty":"fl","c":{"a":1,"k":[{"t":75,"s":[0.9764705882352941,0.7450980392156863,0.1019607843137255],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"t":100,"s":[0.5333333333333333,0.5333333333333333,0.5333333333333333],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}}],"ix":2},"o":{"a":1,"k":[{"t":75,"s":[100],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"t":100,"s":[20],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}}],"ix":2},"r":1,"bm":0},{"ty":"tm","s":{"a":0,"k":0,"ix":2},"e":{"a":0,"k":100,"ix":2},"o":{"a":0,"k":0,"ix":2},"m":1},{"ty":"tr","p":{"a":1,"k":[{"t":40,"s":[2,-14.5],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"t":75,"s":[45,-22.5],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"t":100,"s":[45,-22.5],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}}],"ix":2},"a":{"a":0,"k":[4,4],"ix":2},"s":{"a":1,"k":[{"t":130,"s":[100,-100],"i":{"x":[0.8],"y":[1]},"o":{"x":[0.4],"y":[0]}},{"t":250,"s":[250,-250],"i":{"x":[0.8],"y":[1]},"o":{"x":[0.4],"y":[0]}},{"t":370,"s":[100,-100],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}}],"ix":2},"r":{"a":1,"k":[{"t":40,"s":[0],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"t":75,"s":[180],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"t":100,"s":[180],"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}}],"ix":2},"o":{"a":0,"k":100,"ix":2},"sk":{"a":0,"k":0,"ix":2},"sa":{"a":0,"k":0,"ix":2}}]}],"ip":0,"op":371,"st":0,"bm":0}],"markers":[]}
diff --git a/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/EventMapping+NetworkProtectionError.swift b/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/EventMapping+NetworkProtectionError.swift
index 641c69c7f5..3a068bfed6 100644
--- a/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/EventMapping+NetworkProtectionError.swift
+++ b/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/EventMapping+NetworkProtectionError.swift
@@ -16,8 +16,6 @@
 //  limitations under the License.
 //
 
-#if NETWORK_PROTECTION
-
 import Common
 import Foundation
 import NetworkProtection
@@ -64,10 +62,10 @@ extension EventMapping where Event == NetworkProtectionError {
             frequency = .standard
         case .failedToFetchLocationList(let error):
             domainEvent = .networkProtectionClientFailedToFetchLocations(error)
-            frequency = .dailyAndContinuous
+            frequency = .dailyAndCount
         case .failedToParseLocationListResponse(let error):
             domainEvent = .networkProtectionClientFailedToParseLocationsResponse(error)
-            frequency = .dailyAndContinuous
+            frequency = .dailyAndCount
         case .noServerRegistrationInfo,
                 .couldNotSelectClosestServer,
                 .couldNotGetPeerPublicKey,
@@ -100,5 +98,3 @@ extension EventMapping where Event == NetworkProtectionError {
         PixelKit.fire(debugEvent, frequency: .standard, includeAppVersionParameter: true)
     }
 }
-
-#endif
diff --git a/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/Invite/NetworkProtectionInviteCodeViewModel.swift b/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/Invite/NetworkProtectionInviteCodeViewModel.swift
deleted file mode 100644
index 7307d53480..0000000000
--- a/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/Invite/NetworkProtectionInviteCodeViewModel.swift
+++ /dev/null
@@ -1,188 +0,0 @@
-//
-//  NetworkProtectionInviteCodeViewModel.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.
-//
-
-#if NETWORK_PROTECTION
-
-import Combine
-import NetworkProtection
-import SwiftUIExtensions
-
-enum NetworkProtectionInviteDialogKind {
-    case codeEntry, success
-}
-
-protocol NetworkProtectionInviteViewModelDelegate: AnyObject {
-    func didCancelInviteFlow()
-    func didCompleteInviteFlow()
-}
-
-final class NetworkProtectionInviteViewModel: ObservableObject {
-
-    @Published var currentDialog: NetworkProtectionInviteDialogKind? = .codeEntry
-    let inviteCodeViewModel: NetworkProtectionInviteCodeViewModel
-    let successCodeViewModel: NetworkProtectionInviteSuccessViewModel
-
-    private weak var delegate: NetworkProtectionInviteViewModelDelegate?
-
-    init(delegate: NetworkProtectionInviteViewModelDelegate, redemptionCoordinator: NetworkProtectionCodeRedeeming) {
-        self.delegate = delegate
-        inviteCodeViewModel = NetworkProtectionInviteCodeViewModel(redemptionCoordinator: redemptionCoordinator)
-        successCodeViewModel = NetworkProtectionInviteSuccessViewModel()
-
-        inviteCodeViewModel.delegate = self
-        successCodeViewModel.delegate = self
-    }
-
-    func getStarted() {
-        delegate?.didCompleteInviteFlow()
-    }
-
-    func cancel() {
-        delegate?.didCancelInviteFlow()
-        currentDialog = nil
-    }
-}
-
-extension NetworkProtectionInviteViewModel: NetworkProtectionInviteCodeViewModelDelegate {
-
-    func networkProtectionInviteCodeViewModelDidReedemSuccessfully(_ viewModel: NetworkProtectionInviteCodeViewModel) {
-        currentDialog = .success
-    }
-
-    func networkProtectionInviteCodeViewModelDidCancel(_ viewModel: NetworkProtectionInviteCodeViewModel) {
-        delegate?.didCancelInviteFlow()
-        currentDialog = nil
-    }
-}
-
-extension NetworkProtectionInviteViewModel: NetworkProtectionInviteSuccessViewModelDelegate {
-
-    func networkProtectionInviteSuccessViewModelDidConfirm(_ viewModel: NetworkProtectionInviteSuccessViewModel) {
-        delegate?.didCompleteInviteFlow()
-    }
-}
-
-protocol NetworkProtectionInviteCodeViewModelDelegate: AnyObject {
-    func networkProtectionInviteCodeViewModelDidReedemSuccessfully(_ viewModel: NetworkProtectionInviteCodeViewModel)
-    func networkProtectionInviteCodeViewModelDidCancel(_ viewModel: NetworkProtectionInviteCodeViewModel)
-}
-
-final class NetworkProtectionInviteCodeViewModel: InviteCodeViewModel {
-
-    weak var delegate: NetworkProtectionInviteCodeViewModelDelegate?
-
-    var titleText: String {
-        UserText.networkProtectionInviteDialogTitle
-    }
-
-    var messageText: String {
-        UserText.networkProtectionInviteDialogMessage
-    }
-
-    var textFieldPlaceholder: String {
-        UserText.networkProtectionInviteFieldPrompt
-    }
-
-    var cancelButtonText: String {
-        UserText.cancel
-    }
-
-    var confirmButtonText: String {
-        UserText.continue
-    }
-
-    @Published var textFieldText: String = "" {
-        didSet {
-            if oldValue != textFieldText {
-                textFieldText = textFieldText.uppercased()
-            }
-        }
-    }
-
-    @Published var errorText: String?
-
-    @Published var showProgressView = false
-
-    private let redemptionCoordinator: NetworkProtectionCodeRedeeming
-    private var textCancellable: AnyCancellable?
-
-    init(redemptionCoordinator: NetworkProtectionCodeRedeeming) {
-        self.redemptionCoordinator = redemptionCoordinator
-        textCancellable = $textFieldText.sink { [weak self] _ in
-            self?.errorText = nil
-        }
-    }
-
-    @MainActor
-    func onConfirm() async {
-        errorText = nil
-        showProgressView = true
-        do {
-            try await redemptionCoordinator.redeem(textFieldText.trimmingWhitespace())
-
-            // If the user bypassed the waitlist, then erase any existing waitlist state they already have to avoid confusing the app.
-            NetworkProtectionWaitlist().waitlistStorage.deleteWaitlistState()
-            UserDefaults().removeObject(forKey: UserDefaultsWrapper<Bool>.Key.networkProtectionTermsAndConditionsAccepted.rawValue)
-            UserDefaults().removeObject(forKey: UserDefaultsWrapper<Bool>.Key.networkProtectionWaitlistSignUpPromptDismissed.rawValue)
-            NotificationCenter.default.post(name: .networkProtectionWaitlistAccessChanged, object: nil)
-        } catch NetworkProtectionClientError.invalidInviteCode {
-            errorText = UserText.inviteDialogUnrecognizedCodeMessage
-            showProgressView = false
-            return
-        } catch {
-            errorText = UserText.unknownErrorTryAgainMessage
-            showProgressView = false
-            return
-        }
-        showProgressView = false
-        delegate?.networkProtectionInviteCodeViewModelDidReedemSuccessfully(self)
-    }
-
-    func onCancel() {
-        delegate?.networkProtectionInviteCodeViewModelDidCancel(self)
-    }
-
-}
-
-protocol NetworkProtectionInviteSuccessViewModelDelegate: AnyObject {
-    func networkProtectionInviteSuccessViewModelDidConfirm(_ viewModel: NetworkProtectionInviteSuccessViewModel)
-}
-
-final class NetworkProtectionInviteSuccessViewModel: InviteCodeSuccessViewModel {
-
-    weak var delegate: NetworkProtectionInviteSuccessViewModelDelegate?
-
-    var titleText: String {
-        UserText.networkProtectionInviteSuccessTitle
-    }
-
-    var messageText: String {
-        UserText.networkProtectionInviteSuccessMessage
-    }
-
-    var confirmButtonText: String {
-        UserText.inviteDialogGetStartedButton
-    }
-
-    func onConfirm() {
-        delegate?.networkProtectionInviteSuccessViewModelDidConfirm(self)
-    }
-
-}
-
-#endif
diff --git a/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/Invite/NetworkProtectionInvitePresenter.swift b/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/Invite/NetworkProtectionInvitePresenter.swift
deleted file mode 100644
index f80e5eb093..0000000000
--- a/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/Invite/NetworkProtectionInvitePresenter.swift
+++ /dev/null
@@ -1,68 +0,0 @@
-//
-//  NetworkProtectionInvitePresenter.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.
-//
-
-#if NETWORK_PROTECTION
-
-import Foundation
-import SwiftUI
-import NetworkProtection
-
-protocol NetworkProtectionInvitePresenting {
-    func present()
-}
-
-final class NetworkProtectionInvitePresenter: NetworkProtectionInvitePresenting, NetworkProtectionInviteViewModelDelegate {
-
-    private var presentedViewController: NSViewController?
-
-    // MARK: NetworkProtectionInvitePresenting
-
-    @MainActor func present() {
-        let viewModel = NetworkProtectionInviteViewModel(delegate: self, redemptionCoordinator: NetworkProtectionCodeRedemptionCoordinator())
-
-        let view = NetworkProtectionInviteDialog(model: viewModel)
-        let hostingVC = NSHostingController(rootView: view)
-        presentedViewController = hostingVC
-        let newWindowController = hostingVC.wrappedInWindowController()
-
-        guard let newWindow = newWindowController.window,
-              let parentWindowController = WindowControllersManager.shared.lastKeyMainWindowController
-        else {
-            assertionFailure("Failed to present \(hostingVC)")
-            return
-        }
-        parentWindowController.window?.beginSheet(newWindow)
-    }
-
-    // MARK: NetworkProtectionInviteViewModelDelegate
-
-    func didCancelInviteFlow() {
-        presentedViewController?.dismiss()
-        presentedViewController = nil
-    }
-
-    func didCompleteInviteFlow() {
-        presentedViewController?.dismiss()
-        presentedViewController = nil
-        Task {
-            await WindowControllersManager.shared.showNetworkProtectionStatus()
-        }
-    }
-}
-
-#endif
diff --git a/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/LoginItem+NetworkProtection.swift b/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/LoginItem+NetworkProtection.swift
index d08a236990..30d99488bf 100644
--- a/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/LoginItem+NetworkProtection.swift
+++ b/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/LoginItem+NetworkProtection.swift
@@ -16,8 +16,6 @@
 //  limitations under the License.
 //
 
-#if NETWORK_PROTECTION
-
 import Foundation
 import LoginItems
 
@@ -38,5 +36,3 @@ extension LoginItemsManager {
         return items
     }
 }
-
-#endif
diff --git a/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/NetworkProtection+ConvenienceInitializers.swift b/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/NetworkProtection+ConvenienceInitializers.swift
index 0beb6527cd..fe1993cb94 100644
--- a/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/NetworkProtection+ConvenienceInitializers.swift
+++ b/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/NetworkProtection+ConvenienceInitializers.swift
@@ -16,16 +16,12 @@
 //  limitations under the License.
 //
 
-#if NETWORK_PROTECTION
-
 import Foundation
 import NetworkProtection
 import NetworkProtectionIPC
 import Common
-
-#if SUBSCRIPTION
 import Subscription
-#endif
+import BrowserServicesKit
 
 extension NetworkProtectionDeviceManager {
 
@@ -58,11 +54,7 @@ extension NetworkProtectionKeychainTokenStore {
     }
 
     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: isSubscriptionEnabled,
@@ -95,5 +87,3 @@ extension TunnelControllerIPCClient {
         self.init(machServiceName: Bundle.main.vpnMenuAgentBundleId)
     }
 }
-
-#endif
diff --git a/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/NetworkProtectionAppEvents.swift b/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/NetworkProtectionAppEvents.swift
index 8830942459..fcc9929d18 100644
--- a/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/NetworkProtectionAppEvents.swift
+++ b/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/NetworkProtectionAppEvents.swift
@@ -16,7 +16,6 @@
 //  limitations under the License.
 //
 
-#if NETWORK_PROTECTION
 import Common
 import Foundation
 import LoginItems
@@ -73,7 +72,6 @@ final class NetworkProtectionAppEvents {
             }
 
             restartNetworkProtectionIfVersionChanged(using: loginItemsManager)
-            refreshNetworkProtectionServers()
         }
     }
 
@@ -82,10 +80,6 @@ final class NetworkProtectionAppEvents {
     func applicationDidBecomeActive() {
         Task { @MainActor in
             await featureVisibility.disableIfUserHasNoAccess()
-
-#if SUBSCRIPTION
-            await AccountManager(subscriptionAppGroup: Bundle.main.appGroup(bundle: .subs)).refreshSubscriptionAndEntitlements()
-#endif
         }
     }
 
@@ -102,21 +96,4 @@ final class NetworkProtectionAppEvents {
         loginItemsManager.restartLoginItems(LoginItemsManager.networkProtectionLoginItems, log: .networkProtection)
     }
 
-    /// Fetches a new list of VPN servers, and updates the existing set.
-    ///
-    private func refreshNetworkProtectionServers() {
-        Task {
-            let serverCount: Int
-            do {
-                serverCount = try await NetworkProtectionDeviceManager.create().refreshServerList().count
-            } catch {
-                os_log("Failed to update DuckDuckGo VPN servers", log: .networkProtection, type: .error)
-                return
-            }
-
-            os_log("Successfully updated DuckDuckGo VPN servers; total server count = %{public}d", log: .networkProtection, serverCount)
-        }
-    }
 }
-
-#endif
diff --git a/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/NetworkProtectionControllerErrorStore.swift b/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/NetworkProtectionControllerErrorStore.swift
index 62503023be..a5c6110338 100644
--- a/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/NetworkProtectionControllerErrorStore.swift
+++ b/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/NetworkProtectionControllerErrorStore.swift
@@ -16,8 +16,6 @@
 //  limitations under the License.
 //
 
-#if NETWORK_PROTECTION
-
 import Foundation
 import NetworkProtection
 
@@ -54,5 +52,3 @@ final class NetworkProtectionControllerErrorStore {
         distributedNotificationCenter.post(.controllerErrorChanged, object: errorMessage)
     }
 }
-
-#endif
diff --git a/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/NetworkProtectionDebugMenu.swift b/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/NetworkProtectionDebugMenu.swift
index 9495954da1..472b1f5275 100644
--- a/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/NetworkProtectionDebugMenu.swift
+++ b/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/NetworkProtectionDebugMenu.swift
@@ -16,8 +16,6 @@
 //  limitations under the License.
 //
 
-#if NETWORK_PROTECTION
-
 import AppKit
 import Common
 import Foundation
@@ -55,13 +53,6 @@ final class NetworkProtectionDebugMenu: NSMenu {
 
     private let excludeLocalNetworksMenuItem = NSMenuItem(title: "excludeLocalNetworks", action: #selector(NetworkProtectionDebugMenu.toggleShouldExcludeLocalRoutes))
 
-    private let enterWaitlistInviteCodeItem = NSMenuItem(title: "Enter Waitlist Invite Code", action: #selector(NetworkProtectionDebugMenu.showNetworkProtectionInviteCodePrompt))
-
-    private let waitlistTokenItem = NSMenuItem(title: "Waitlist Token:")
-    private let waitlistTimestampItem = NSMenuItem(title: "Waitlist Timestamp:")
-    private let waitlistInviteCodeItem = NSMenuItem(title: "Waitlist Invite Code:")
-    private let waitlistTermsAndConditionsAcceptedItem = NSMenuItem(title: "T&C Accepted:")
-
     // swiftlint:disable:next function_body_length
     init() {
         preferredServerMenu = NSMenu { [preferredServerAutomaticItem] in
@@ -146,28 +137,6 @@ final class NetworkProtectionDebugMenu: NSMenu {
                     .targetting(self)
             }
 
-            NSMenuItem(title: "NetP Waitlist") {
-                NSMenuItem(title: "Reset Waitlist State", action: #selector(NetworkProtectionDebugMenu.resetNetworkProtectionWaitlistState))
-                    .targetting(self)
-                NSMenuItem(title: "Reset T&C Acceptance", action: #selector(NetworkProtectionDebugMenu.resetNetworkProtectionTermsAndConditionsAcceptance))
-                    .targetting(self)
-
-                enterWaitlistInviteCodeItem
-                    .targetting(self)
-
-                NSMenuItem(title: "Send Waitlist Notification", action: #selector(NetworkProtectionDebugMenu.sendNetworkProtectionWaitlistAvailableNotification))
-                    .targetting(self)
-                NSMenuItem.separator()
-
-                waitlistTokenItem
-                waitlistTimestampItem
-                waitlistInviteCodeItem
-                waitlistTermsAndConditionsAcceptedItem
-            }
-
-            NSMenuItem(title: "NetP Waitlist Feature Flag Overrides")
-                .submenu(NetworkProtectionWaitlistFeatureFlagOverridesMenu())
-
             NSMenuItem.separator()
 
             NSMenuItem(title: "Kill Switch (alternative approach)") {
@@ -425,10 +394,6 @@ final class NetworkProtectionDebugMenu: NSMenu {
             excludedRoutesMenu.addItem(menuItem)
         }
 
-        // Only allow testers to enter a custom code if they're on the waitlist, to simulate the correct path through the flow
-        let waitlist = NetworkProtectionWaitlist()
-        enterWaitlistInviteCodeItem.isEnabled = waitlist.waitlistStorage.isOnWaitlist || waitlist.waitlistStorage.isInvited
-
     }
 
     // MARK: - Menu State Update
@@ -439,7 +404,6 @@ final class NetworkProtectionDebugMenu: NSMenu {
         updatePreferredServerMenu()
         updateRekeyValidityMenu()
         updateNetworkProtectionMenuItemsState()
-        updateNetworkProtectionItems()
     }
 
     private func updateEnvironmentMenu() {
@@ -506,27 +470,8 @@ final class NetworkProtectionDebugMenu: NSMenu {
         disableRekeyingMenuItem.state = settings.disableRekeying ? .on : .off
     }
 
-    private func updateNetworkProtectionItems() {
-        let waitlistStorage = WaitlistKeychainStore(waitlistIdentifier: NetworkProtectionWaitlist.identifier, keychainAppGroup: NetworkProtectionWaitlist.keychainAppGroup)
-        waitlistTokenItem.title = "Waitlist Token: \(waitlistStorage.getWaitlistToken() ?? "N/A")"
-        waitlistInviteCodeItem.title = "Waitlist Invite Code: \(waitlistStorage.getWaitlistInviteCode() ?? "N/A")"
-
-        if let timestamp = waitlistStorage.getWaitlistTimestamp() {
-            waitlistTimestampItem.title = "Waitlist Timestamp: \(String(describing: timestamp))"
-        } else {
-            waitlistTimestampItem.title = "Waitlist Timestamp: N/A"
-        }
-
-        let accepted = UserDefaults().bool(forKey: UserDefaultsWrapper<Bool>.Key.networkProtectionTermsAndConditionsAccepted.rawValue)
-        waitlistTermsAndConditionsAcceptedItem.title = "T&C Accepted: \(accepted ? "Yes" : "No")"
-    }
-
     // MARK: Waitlist
 
-    @objc func sendNetworkProtectionWaitlistAvailableNotification(_ sender: Any?) {
-        NetworkProtectionWaitlist().sendInviteCodeAvailableNotification(completion: nil)
-    }
-
     @objc func resetNetworkProtectionActivationDate(_ sender: Any?) {
         overrideNetworkProtectionActivationDate(to: nil)
     }
@@ -558,52 +503,6 @@ final class NetworkProtectionDebugMenu: NSMenu {
         }
     }
 
-    @objc func resetNetworkProtectionWaitlistState(_ sender: Any?) {
-        NetworkProtectionWaitlist().waitlistStorage.deleteWaitlistState()
-        UserDefaults().removeObject(forKey: UserDefaultsWrapper<Bool>.Key.networkProtectionTermsAndConditionsAccepted.rawValue)
-        UserDefaults().removeObject(forKey: UserDefaultsWrapper<Bool>.Key.networkProtectionWaitlistSignUpPromptDismissed.rawValue)
-        NotificationCenter.default.post(name: .networkProtectionWaitlistAccessChanged, object: nil)
-    }
-
-    @objc func resetNetworkProtectionTermsAndConditionsAcceptance(_ sender: Any?) {
-        UserDefaults().removeObject(forKey: UserDefaultsWrapper<Bool>.Key.networkProtectionTermsAndConditionsAccepted.rawValue)
-        NotificationCenter.default.post(name: .networkProtectionWaitlistAccessChanged, object: nil)
-    }
-
-    @objc func showNetworkProtectionInviteCodePrompt(_ sender: Any?) {
-        let code = getInviteCode()
-
-        Task {
-            do {
-                let redeemer = NetworkProtectionCodeRedemptionCoordinator()
-                try await redeemer.redeem(code)
-                NetworkProtectionWaitlist().waitlistStorage.store(inviteCode: code)
-                NotificationCenter.default.post(name: .networkProtectionWaitlistAccessChanged, object: nil)
-            } catch {
-                // Do nothing here, this is just a debug menu
-            }
-        }
-    }
-
-    private func getInviteCode() -> String {
-        let alert = NSAlert()
-        alert.addButton(withTitle: "Use Invite Code")
-        alert.addButton(withTitle: "Cancel")
-        alert.messageText = "Enter Invite Code"
-        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
-
-        let response = alert.runModal()
-
-        if response == .alertFirstButtonReturn {
-            return textField.stringValue
-        } else {
-            return ""
-        }
-    }
-
     // MARK: Environment
 
     @objc func setSelectedEnvironment(_ menuItem: NSMenuItem) {
@@ -668,5 +567,3 @@ extension NetworkProtectionDebugMenu: NSMenuDelegate {
     return MenuPreview(menu: NetworkProtectionDebugMenu())
 }
 #endif
-
-#endif
diff --git a/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/NetworkProtectionDebugUtilities.swift b/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/NetworkProtectionDebugUtilities.swift
index fe66a59959..721f194c0d 100644
--- a/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/NetworkProtectionDebugUtilities.swift
+++ b/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/NetworkProtectionDebugUtilities.swift
@@ -18,8 +18,6 @@
 
 import Common
 import Foundation
-
-#if NETWORK_PROTECTION
 import NetworkProtection
 import NetworkProtectionUI
 import NetworkExtension
@@ -57,7 +55,7 @@ final class NetworkProtectionDebugUtilities {
     // MARK: - Debug commands for the extension
 
     func resetAllState(keepAuthToken: Bool) async {
-        let uninstalledSuccessfully = await networkProtectionFeatureDisabler.disable(keepAuthToken: keepAuthToken, uninstallSystemExtension: true)
+        let uninstalledSuccessfully = await networkProtectionFeatureDisabler.disable(uninstallSystemExtension: true)
 
         guard uninstalledSuccessfully else {
             return
@@ -65,8 +63,6 @@ final class NetworkProtectionDebugUtilities {
 
         settings.resetToDefaults()
 
-        NetworkProtectionWaitlist().waitlistStorage.deleteWaitlistState()
-        DefaultWaitlistActivationDateStore(source: .netP).removeDates()
         DefaultHomePageRemoteMessagingStorage.networkProtection().removeStoredAndDismissedMessages()
 
         UserDefaults().removeObject(forKey: UserDefaultsWrapper<Bool>.Key.networkProtectionTermsAndConditionsAccepted.rawValue)
@@ -87,5 +83,3 @@ final class NetworkProtectionDebugUtilities {
         try await ipcClient.debugCommand(.expireRegistrationKey)
     }
 }
-
-#endif
diff --git a/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/NetworkProtectionNavBarButtonModel.swift b/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/NetworkProtectionNavBarButtonModel.swift
index 5ee8f863a0..e4742d3521 100644
--- a/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/NetworkProtectionNavBarButtonModel.swift
+++ b/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/NetworkProtectionNavBarButtonModel.swift
@@ -16,8 +16,6 @@
 //  limitations under the License.
 //
 
-#if NETWORK_PROTECTION
-
 import AppKit
 import Combine
 import Foundation
@@ -38,8 +36,9 @@ final class NetworkProtectionNavBarButtonModel: NSObject, ObservableObject {
 
     private var cancellables = Set<AnyCancellable>()
 
-    // MARK: - NetP Icon publisher
+    // MARK: - VPN
 
+    private let vpnVisibility: NetworkProtectionFeatureVisibility
     private let iconPublisher: NetworkProtectionIconPublisher
     private var iconPublisherCancellable: AnyCancellable?
 
@@ -72,10 +71,12 @@ final class NetworkProtectionNavBarButtonModel: NSObject, ObservableObject {
 
     init(popoverManager: NetPPopoverManager,
          pinningManager: PinningManager = LocalPinningManager.shared,
+         vpnVisibility: NetworkProtectionFeatureVisibility = DefaultNetworkProtectionVisibility(),
          statusReporter: NetworkProtectionStatusReporter,
          iconProvider: IconProvider = NavigationBarIconProvider()) {
 
         self.popoverManager = popoverManager
+        self.vpnVisibility = vpnVisibility
         self.networkProtectionStatusReporter = statusReporter
         self.iconPublisher = NetworkProtectionIconPublisher(statusReporter: networkProtectionStatusReporter, iconProvider: iconProvider)
         self.pinningManager = pinningManager
@@ -115,14 +116,6 @@ final class NetworkProtectionNavBarButtonModel: NSObject, ObservableObject {
         guard [.normal, .integrationTests].contains(NSApp.runType) else { return NSImage() }
 #endif
 
-        if NetworkProtectionWaitlist().readyToAcceptTermsAndConditions {
-            return .networkProtectionAvailableButton
-        }
-
-        if NetworkProtectionKeychainTokenStore().isFeatureActivated {
-            return .image(for: icon)!
-        }
-
         return .image(for: icon)!
     }
 
@@ -176,18 +169,6 @@ final class NetworkProtectionNavBarButtonModel: NSObject, ObservableObject {
 
     @MainActor
     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.isNetworkProtectionBetaVisible() {
-            if NetworkProtectionWaitlist().readyToAcceptTermsAndConditions {
-                DailyPixel.fire(pixel: .networkProtectionWaitlistEntryPointToolbarButtonDisplayed,
-                                frequency: .dailyOnly,
-                                includeAppVersionParameter: true)
-                showButton = true
-                return
-            }
-        }
-
         guard !isPinned,
               !popoverManager.isShown,
               !isHavingConnectivityIssues else {
@@ -225,5 +206,3 @@ extension NetworkProtectionNavBarButtonModel: NSPopoverDelegate {
         updateVisibility()
     }
 }
-
-#endif
diff --git a/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/NetworkProtectionNavBarPopoverManager.swift b/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/NetworkProtectionNavBarPopoverManager.swift
index 089a82f3f1..14e266a11c 100644
--- a/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/NetworkProtectionNavBarPopoverManager.swift
+++ b/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/NetworkProtectionNavBarPopoverManager.swift
@@ -23,26 +23,23 @@ import LoginItems
 import NetworkProtection
 import NetworkProtectionIPC
 import NetworkProtectionUI
-
-#if SUBSCRIPTION
 import Subscription
-#endif
-
-#if NETWORK_PROTECTION
 
 protocol NetworkProtectionIPCClient {
     var ipcStatusObserver: ConnectionStatusObserver { get }
     var ipcServerInfoObserver: ConnectionServerInfoObserver { get }
     var ipcConnectionErrorObserver: ConnectionErrorObserver { get }
+    var ipcDataVolumeObserver: DataVolumeObserver { get }
 
-    func start()
-    func stop()
+    func start(completion: @escaping (Error?) -> Void)
+    func stop(completion: @escaping (Error?) -> Void)
 }
 
 extension TunnelControllerIPCClient: NetworkProtectionIPCClient {
     public var ipcStatusObserver: any NetworkProtection.ConnectionStatusObserver { connectionStatusObserver }
     public var ipcServerInfoObserver: any NetworkProtection.ConnectionServerInfoObserver { serverInfoObserver }
     public var ipcConnectionErrorObserver: any NetworkProtection.ConnectionErrorObserver { connectionErrorObserver }
+    public var ipcDataVolumeObserver: any NetworkProtection.DataVolumeObserver { dataVolumeObserver }
 }
 
 final class NetworkProtectionNavBarPopoverManager: NetPPopoverManager {
@@ -57,16 +54,12 @@ final class NetworkProtectionNavBarPopoverManager: NetPPopoverManager {
     }
 
     var isShown: Bool {
-#if NETWORK_PROTECTION
         networkProtectionPopover?.isShown ?? false
-#else
-        return false
-#endif
     }
 
     // swiftlint:disable:next function_body_length
     func show(positionedBelow view: NSView, withDelegate delegate: NSPopoverDelegate) {
-        let popover = networkProtectionPopover ?? {
+        let popover = {
 
             let controller = NetworkProtectionIPCTunnelController(ipcClient: ipcClient)
 
@@ -75,7 +68,8 @@ final class NetworkProtectionNavBarPopoverManager: NetPPopoverManager {
                 serverInfoObserver: ipcClient.ipcServerInfoObserver,
                 connectionErrorObserver: ipcClient.ipcConnectionErrorObserver,
                 connectivityIssuesObserver: ConnectivityIssueObserverThroughDistributedNotifications(),
-                controllerErrorMessageObserver: ControllerErrorMesssageObserverThroughDistributedNotifications()
+                controllerErrorMessageObserver: ControllerErrorMesssageObserverThroughDistributedNotifications(),
+                dataVolumeObserver: ipcClient.ipcDataVolumeObserver
             )
 
             let onboardingStatusPublisher = UserDefaults.netP.networkProtectionOnboardingStatusPublisher
@@ -120,8 +114,9 @@ final class NetworkProtectionNavBarPopoverManager: NetPPopoverManager {
                                                    agentLoginItem: LoginItem.vpnMenu,
                                                    isMenuBarStatusView: false,
                                                    userDefaults: .netP,
+                                                   locationFormatter: DefaultVPNLocationFormatter(),
                                                    uninstallHandler: { [weak self] in
-                _ = await self?.networkProtectionFeatureDisabler.disable(keepAuthToken: false, uninstallSystemExtension: true)
+                _ = await self?.networkProtectionFeatureDisabler.disable(uninstallSystemExtension: true)
             })
             popover.delegate = delegate
 
@@ -141,19 +136,14 @@ final class NetworkProtectionNavBarPopoverManager: NetPPopoverManager {
     func toggle(positionedBelow view: NSView, withDelegate delegate: NSPopoverDelegate) {
         if let networkProtectionPopover, networkProtectionPopover.isShown {
             networkProtectionPopover.close()
+            self.networkProtectionPopover = nil
         } else {
-            let featureVisibility = DefaultNetworkProtectionVisibility()
-
-            if featureVisibility.isNetworkProtectionBetaVisible() {
-                show(positionedBelow: view, withDelegate: delegate)
-            } else {
-                featureVisibility.disableForWaitlistUsers()
-            }
+            show(positionedBelow: view, withDelegate: delegate)
         }
     }
 
     func close() {
         networkProtectionPopover?.close()
+        networkProtectionPopover = nil
     }
 }
-#endif
diff --git a/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/NetworkProtectionOnboardingMenu.swift b/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/NetworkProtectionOnboardingMenu.swift
index d9ca618427..7936e3ec09 100644
--- a/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/NetworkProtectionOnboardingMenu.swift
+++ b/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/NetworkProtectionOnboardingMenu.swift
@@ -16,8 +16,6 @@
 //  limitations under the License.
 //
 
-#if NETWORK_PROTECTION
-
 import AppKit
 import Foundation
 import NetworkProtection
@@ -81,5 +79,3 @@ final class NetworkProtectionOnboardingMenu: NSMenu {
     return MenuPreview(menu: NetworkProtectionOnboardingMenu())
 }
 #endif
-
-#endif
diff --git a/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/NetworkProtectionSimulateFailureMenu.swift b/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/NetworkProtectionSimulateFailureMenu.swift
index fa62d0ae6a..2f4fb420ee 100644
--- a/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/NetworkProtectionSimulateFailureMenu.swift
+++ b/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/NetworkProtectionSimulateFailureMenu.swift
@@ -16,8 +16,6 @@
 //  limitations under the License.
 //
 
-#if NETWORK_PROTECTION
-
 import AppKit
 import Foundation
 import NetworkProtection
@@ -98,5 +96,3 @@ final class NetworkProtectionSimulateFailureMenu: NSMenu {
         simulateConnectionInterruptionMenuItem.state = simulationOptions.isEnabled(.connectionInterruption) ? .on : .off
     }
 }
-
-#endif
diff --git a/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/NetworkProtectionTunnelController.swift b/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/NetworkProtectionTunnelController.swift
index 27833760c2..ed20ffef1d 100644
--- a/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/NetworkProtectionTunnelController.swift
+++ b/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/NetworkProtectionTunnelController.swift
@@ -16,8 +16,6 @@
 //  limitations under the License.
 //
 
-#if NETWORK_PROTECTION
-
 import Foundation
 import Combine
 import SwiftUI
@@ -34,9 +32,7 @@ import SystemExtensionManager
 import SystemExtensions
 #endif
 
-#if SUBSCRIPTION
 import Subscription
-#endif
 
 typealias NetworkProtectionStatusChangeHandler = (NetworkProtection.ConnectionStatus) -> Void
 typealias NetworkProtectionConfigChangeHandler = () -> Void
@@ -76,11 +72,9 @@ 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
 
@@ -420,16 +414,16 @@ final class NetworkProtectionTunnelController: TunnelController, TunnelSessionPr
                 controllerErrorStore.lastErrorMessage = UserText.networkProtectionSystemSettings
             case SystemExtensionRequestError.unknownRequestResult:
                 controllerErrorStore.lastErrorMessage = UserText.networkProtectionUnknownActivationError
-            case SystemExtensionRequestError.willActivateAfterReboot:
+            case OSSystemExtensionError.extensionNotFound,
+                SystemExtensionRequestError.willActivateAfterReboot:
                 controllerErrorStore.lastErrorMessage = UserText.networkProtectionPleaseReboot
             default:
                 controllerErrorStore.lastErrorMessage = error.localizedDescription
             }
 
             PixelKit.fire(
-                NetworkProtectionPixelEvent.networkProtectionSystemExtensionActivationFailure,
+                NetworkProtectionPixelEvent.networkProtectionSystemExtensionActivationFailure(error),
                 frequency: .standard,
-                withError: error,
                 includeAppVersionParameter: true
             )
 
@@ -454,14 +448,18 @@ final class NetworkProtectionTunnelController: TunnelController, TunnelSessionPr
 
     // MARK: - Starting & Stopping the VPN
 
-    enum StartError: LocalizedError {
+    enum StartError: LocalizedError, CustomNSError {
+        case cancelled
         case noAuthToken
         case connectionStatusInvalid
         case connectionAlreadyStarted
         case simulateControllerFailureError
+        case startTunnelFailure(_ error: Error)
 
         var errorDescription: String? {
             switch self {
+            case .cancelled:
+                return nil
             case .noAuthToken:
                 return "You need a subscription to start the VPN"
             case .connectionAlreadyStarted:
@@ -479,6 +477,34 @@ final class NetworkProtectionTunnelController: TunnelController, TunnelSessionPr
 #endif
             case .simulateControllerFailureError:
                 return "Simulated a controller error as requested"
+            case .startTunnelFailure(let error):
+                return error.localizedDescription
+            }
+        }
+
+        var errorCode: Int {
+            switch self {
+            case .cancelled: return 0
+                // MARK: Setup errors
+            case .noAuthToken: return 1
+            case .connectionStatusInvalid: return 2
+            case .connectionAlreadyStarted: return 3
+            case .simulateControllerFailureError: return 4
+                // MARK: Actual connection attempt issues
+            case .startTunnelFailure: return 100
+            }
+        }
+
+        var errorUserInfo: [String: Any] {
+            switch self {
+            case .cancelled,
+                    .noAuthToken,
+                    .connectionStatusInvalid,
+                    .connectionAlreadyStarted,
+                    .simulateControllerFailureError:
+                return [:]
+            case .startTunnelFailure(let error):
+                return [NSUnderlyingErrorKey: error]
             }
         }
     }
@@ -486,8 +512,9 @@ final class NetworkProtectionTunnelController: TunnelController, TunnelSessionPr
     /// Starts the VPN connection
     ///
     func start() async {
+        VPNOperationErrorRecorder().beginRecordingControllerStart()
         PixelKit.fire(NetworkProtectionPixelEvent.networkProtectionControllerStartAttempt,
-                      frequency: .dailyAndContinuous)
+                      frequency: .dailyAndCount)
         controllerErrorStore.lastErrorMessage = nil
 
         do {
@@ -507,6 +534,8 @@ final class NetworkProtectionTunnelController: TunnelController, TunnelSessionPr
             } catch {
                 if case NEVPNError.configurationReadWriteFailed = error {
                     onboardingStatusRawValue = OnboardingStatus.isOnboarding(step: .userNeedsToAllowVPNConfiguration).rawValue
+
+                    throw StartError.cancelled
                 }
 
                 throw error
@@ -528,14 +557,24 @@ final class NetworkProtectionTunnelController: TunnelController, TunnelSessionPr
                 // in the packet tunnel provider side that can be used to debug additional logic.
                 //
                 PixelKit.fire(NetworkProtectionPixelEvent.networkProtectionControllerStartSuccess,
-                              frequency: .dailyAndContinuous)
+                              frequency: .dailyAndCount)
             }
         } catch {
-            PixelKit.fire(
-                NetworkProtectionPixelEvent.networkProtectionControllerStartFailure(error), frequency: .dailyAndContinuous, includeAppVersionParameter: true
-            )
+            VPNOperationErrorRecorder().recordControllerStartFailure(error)
+
+            if case StartError.cancelled = error {
+                PixelKit.fire(
+                    NetworkProtectionPixelEvent.networkProtectionControllerStartCancelled, frequency: .dailyAndCount, includeAppVersionParameter: true
+                )
+            } else {
+                PixelKit.fire(
+                    NetworkProtectionPixelEvent.networkProtectionControllerStartFailure(error), frequency: .dailyAndCount, includeAppVersionParameter: true
+                )
+            }
 
-            await stop()
+            if await isConnected {
+                await stop()
+            }
 
             // Always keep the first error message shown, as it's the more actionable one.
             if controllerErrorStore.lastErrorMessage == nil {
@@ -580,11 +619,15 @@ final class NetworkProtectionTunnelController: TunnelController, TunnelSessionPr
             throw StartError.simulateControllerFailureError
         }
 
-        try tunnelManager.connection.startVPNTunnel(options: options)
+        do {
+            try tunnelManager.connection.startVPNTunnel(options: options)
+        } catch {
+            throw StartError.startTunnelFailure(error)
+        }
 
         PixelKit.fire(
             NetworkProtectionPixelEvent.networkProtectionNewUser,
-            frequency: .justOnce,
+            frequency: .unique,
             includeAppVersionParameter: true) { [weak self] fired, error in
                 guard let self, error == nil, fired else { return }
                 self.defaults.vpnFirstEnabled = PixelKit.pixelLastFireDate(event: NetworkProtectionPixelEvent.networkProtectionNewUser)
@@ -599,15 +642,12 @@ final class NetworkProtectionTunnelController: TunnelController, TunnelSessionPr
             return
         }
 
-        await stop(tunnelManager: manager, disableOnDemand: true)
+        await stop(tunnelManager: manager)
     }
 
     @MainActor
-    private func stop(tunnelManager: NETunnelProviderManager, disableOnDemand: Bool) async {
-        if disableOnDemand {
-            // disable reconnect on demand if requested to stop
-            try? await self.disableOnDemand(tunnelManager: tunnelManager)
-        }
+    private func stop(tunnelManager: NETunnelProviderManager) async {
+        try? await self.disableOnDemand(tunnelManager: tunnelManager)
 
         switch tunnelManager.connection.status {
         case .connected, .connecting, .reasserting:
@@ -625,8 +665,11 @@ final class NetworkProtectionTunnelController: TunnelController, TunnelSessionPr
             return
         }
 
-        await stop(tunnelManager: manager, disableOnDemand: false)
+        await stop(tunnelManager: manager)
         await start()
+
+        // When restarting the tunnel we enable on-demand optimistically
+        try? await enableOnDemand(tunnelManager: manager)
     }
 
     // MARK: - On Demand & Kill Switch
@@ -750,12 +793,10 @@ final class NetworkProtectionTunnelController: TunnelController, TunnelSessionPr
     }
 
     private func fetchAuthToken() throws -> NSString? {
-#if SUBSCRIPTION
-        if let accessToken = accountManager.accessToken  {
+        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?
     }
@@ -764,5 +805,3 @@ final class NetworkProtectionTunnelController: TunnelController, TunnelSessionPr
         "ddg:\(token)"
     }
 }
-
-#endif
diff --git a/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/NetworkProtectionWaitlistFeatureFlagOverridesMenu.swift b/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/NetworkProtectionWaitlistFeatureFlagOverridesMenu.swift
deleted file mode 100644
index dd0783b9c9..0000000000
--- a/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/NetworkProtectionWaitlistFeatureFlagOverridesMenu.swift
+++ /dev/null
@@ -1,170 +0,0 @@
-//
-//  NetworkProtectionWaitlistFeatureFlagOverridesMenu.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.
-//
-
-#if NETWORK_PROTECTION
-
-import AppKit
-import Foundation
-import NetworkProtection
-import NetworkProtectionUI
-import SwiftUI
-
-/// Implements the logic for the VPN's simulate failures menu.
-///
-@MainActor
-final class NetworkProtectionWaitlistFeatureFlagOverridesMenu: NSMenu {
-
-    // MARK: - Waitlist Active Properties
-
-    private let waitlistActiveUseRemoteValueMenuItem: NSMenuItem
-    private let waitlistActiveOverrideONMenuItem: NSMenuItem
-    private let waitlistActiveOverrideOFFMenuItem: NSMenuItem
-
-    @UserDefaultsWrapper(key: .networkProtectionWaitlistActiveOverrideRawValue,
-                         defaultValue: WaitlistOverride.default.rawValue,
-                         defaults: .netP)
-    private var waitlistActiveOverrideValue: Int
-
-    // MARK: - Waitlist Enabled Properties
-
-    private let waitlistEnabledUseRemoteValueMenuItem: NSMenuItem
-    private let waitlistEnabledOverrideONMenuItem: NSMenuItem
-    private let waitlistEnabledOverrideOFFMenuItem: NSMenuItem
-
-    @UserDefaultsWrapper(key: .networkProtectionWaitlistEnabledOverrideRawValue,
-                         defaultValue: WaitlistOverride.default.rawValue,
-                         defaults: .netP)
-    private var waitlistEnabledOverrideValue: Int
-
-    init() {
-        waitlistActiveUseRemoteValueMenuItem = NSMenuItem(title: "Remote Value", action: #selector(Self.waitlistEnabledUseRemoteValue))
-        waitlistActiveOverrideONMenuItem = NSMenuItem(title: "ON", action: #selector(Self.waitlistEnabledOverrideON))
-        waitlistActiveOverrideOFFMenuItem = NSMenuItem(title: "OFF", action: #selector(Self.waitlistEnabledOverrideOFF))
-
-        waitlistEnabledUseRemoteValueMenuItem = NSMenuItem(title: "Remote Value", action: #selector(Self.waitlistActiveUseRemoteValue))
-        waitlistEnabledOverrideONMenuItem = NSMenuItem(title: "ON", action: #selector(Self.waitlistActiveOverrideON))
-        waitlistEnabledOverrideOFFMenuItem = NSMenuItem(title: "OFF", action: #selector(Self.waitlistActiveOverrideOFF))
-
-        super.init(title: "")
-        buildItems {
-            NSMenuItem(title: "Reset Waitlist Overrides", action: #selector(Self.waitlistResetFeatureOverrides)).targetting(self)
-            NSMenuItem.separator()
-
-            NSMenuItem(title: "Waitlist Enabled") {
-                waitlistActiveUseRemoteValueMenuItem.targetting(self)
-                waitlistActiveOverrideONMenuItem.targetting(self)
-                waitlistActiveOverrideOFFMenuItem.targetting(self)
-            }
-
-            NSMenuItem(title: "Waitlist Active") {
-                waitlistEnabledUseRemoteValueMenuItem.targetting(self)
-                waitlistEnabledOverrideONMenuItem.targetting(self)
-                waitlistEnabledOverrideOFFMenuItem.targetting(self)
-            }
-        }
-    }
-
-    required init(coder: NSCoder) {
-        fatalError("init(coder:) has not been implemented")
-    }
-
-    // MARK: - Misc IBActions
-
-    @objc func waitlistResetFeatureOverrides(sender: NSMenuItem) {
-        waitlistActiveOverrideValue = WaitlistOverride.default.rawValue
-        waitlistEnabledOverrideValue = WaitlistOverride.default.rawValue
-    }
-
-    // MARK: - Waitlist Active IBActions
-
-    @objc func waitlistActiveUseRemoteValue(sender: NSMenuItem) {
-        waitlistActiveOverrideValue = WaitlistOverride.useRemoteValue.rawValue
-    }
-
-    @objc func waitlistActiveOverrideON(sender: NSMenuItem) {
-        waitlistActiveOverrideValue = WaitlistOverride.on.rawValue
-    }
-
-    @objc func waitlistActiveOverrideOFF(sender: NSMenuItem) {
-        Task { @MainActor in
-            guard case .alertFirstButtonReturn = await waitlistOFFAlert().runModal() else {
-                return
-            }
-
-            waitlistActiveOverrideValue = WaitlistOverride.off.rawValue
-        }
-    }
-
-    // MARK: - Waitlist Enabled IBActions
-
-    @objc func waitlistEnabledUseRemoteValue(sender: NSMenuItem) {
-        waitlistEnabledOverrideValue = WaitlistOverride.useRemoteValue.rawValue
-    }
-
-    @objc func waitlistEnabledOverrideON(sender: NSMenuItem) {
-        waitlistEnabledOverrideValue = WaitlistOverride.on.rawValue
-    }
-
-    @objc func waitlistEnabledOverrideOFF(sender: NSMenuItem) {
-        Task { @MainActor in
-            guard case .alertFirstButtonReturn = await waitlistOFFAlert().runModal() else {
-                return
-            }
-
-            waitlistEnabledOverrideValue = WaitlistOverride.off.rawValue
-        }
-    }
-
-    // MARK: - Updating the menu state
-
-    override func update() {
-        waitlistActiveUseRemoteValueMenuItem.state = waitlistActiveOverrideValue == WaitlistOverride.useRemoteValue.rawValue ? .on : .off
-        waitlistActiveOverrideONMenuItem.state = waitlistActiveOverrideValue == WaitlistOverride.on.rawValue ? .on : .off
-        waitlistActiveOverrideOFFMenuItem.state = waitlistActiveOverrideValue == WaitlistOverride.off.rawValue ? .on : .off
-
-        waitlistEnabledUseRemoteValueMenuItem.state = waitlistEnabledOverrideValue == WaitlistOverride.useRemoteValue.rawValue ? .on : .off
-        waitlistEnabledOverrideONMenuItem.state = waitlistEnabledOverrideValue == WaitlistOverride.on.rawValue ? .on : .off
-        waitlistEnabledOverrideOFFMenuItem.state = waitlistEnabledOverrideValue == WaitlistOverride.off.rawValue ? .on : .off
-    }
-
-    // MARK: - UI Additions
-
-    private func waitlistOFFAlert() -> NSAlert {
-        let alert = NSAlert()
-        alert.messageText = "Override to OFF value?"
-        alert.informativeText = """
-        This will potentially disable DuckDuckGo VPN and erase your invitation.
-
-        You can re-enable DuckDuckGo VPN after reverting this change.
-
-        Please click 'Cancel' if you're unsure.
-        """
-        alert.alertStyle = .warning
-        alert.addButton(withTitle: "Override")
-        alert.addButton(withTitle: UserText.cancel)
-        return alert
-    }
-}
-
-#if DEBUG
-#Preview {
-    return MenuPreview(menu: NetworkProtectionWaitlistFeatureFlagOverridesMenu())
-}
-#endif
-
-#endif
diff --git a/Configuration/App/DuckDuckGoPrivacyPro.xcconfig b/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/TunnelControllerProvider.swift
similarity index 53%
rename from Configuration/App/DuckDuckGoPrivacyPro.xcconfig
rename to DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/TunnelControllerProvider.swift
index eaa4fc8497..1d0c8efa53 100644
--- a/Configuration/App/DuckDuckGoPrivacyPro.xcconfig
+++ b/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/TunnelControllerProvider.swift
@@ -1,7 +1,7 @@
 //
-//  DuckDuckGoPrivacyPro.xcconfig
+//  TunnelControllerProvider.swift
 //
-//  Copyright © 2023 DuckDuckGo. All rights reserved.
+//  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.
@@ -16,11 +16,18 @@
 //  limitations under the License.
 //
 
-// Configuration settings file format documentation can be found at:
-// https://help.apple.com/xcode/#/dev745c5c974
+import Foundation
+import NetworkProtectionIPC
 
-#include "DuckDuckGo.xcconfig"
+final class TunnelControllerProvider {
+    static let shared = TunnelControllerProvider()
 
-FEATURE_FLAGS = FEEDBACK NETWORK_PROTECTION SPARKLE SUBSCRIPTION DBP SUBSCRIPTION_OVERRIDE_ENABLED STRIPE
-PRODUCT_NAME = $(PRODUCT_NAME_PREFIX) Privacy Pro
-PRODUCT_MODULE_NAME = $(PRIVACY_PRO_PRODUCT_MODULE_NAME_OVERRIDE:default=$(DEFAULT_PRODUCT_MODULE_NAME))
+    let tunnelController: NetworkProtectionIPCTunnelController
+
+    private init() {
+        let ipcClient = TunnelControllerIPCClient()
+        ipcClient.register()
+        tunnelController = NetworkProtectionIPCTunnelController(ipcClient: ipcClient)
+    }
+
+}
diff --git a/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/VPNLocation/DefaultVPNLocationFormatter.swift b/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/VPNLocation/DefaultVPNLocationFormatter.swift
new file mode 100644
index 0000000000..5f2bb50530
--- /dev/null
+++ b/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/VPNLocation/DefaultVPNLocationFormatter.swift
@@ -0,0 +1,104 @@
+//
+//  DefaultVPNLocationFormatter.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 NetworkProtection
+
+struct DefaultVPNLocationFormatter: VPNLocationFormatting {
+    func emoji(for country: String?,
+               preferredLocation someLocation: VPNSettings.SelectedLocation) -> String? {
+        if let country {
+            return NetworkProtectionVPNCountryLabelsModel(country: country, useFullCountryName: true).emoji
+        }
+
+        let preferredLocation = VPNLocationModel(selectedLocation: someLocation)
+        switch preferredLocation.icon {
+        case .defaultIcon:
+            return nil
+        case .emoji(let emoji):
+            return emoji
+        }
+    }
+
+    func string(from location: String?,
+                preferredLocation someLocation: VPNSettings.SelectedLocation) -> String {
+        let preferredLocation = VPNLocationModel(selectedLocation: someLocation)
+
+        if let location {
+            return preferredLocation.isNearest ? "\(location) (Nearest)" : location
+        }
+
+        return preferredLocation.title
+    }
+
+    @available(macOS 12, *)
+    func string(from location: String?,
+                preferredLocation someLocation: VPNSettings.SelectedLocation,
+                locationTextColor: Color,
+                preferredLocationTextColor: Color) -> AttributedString {
+        let preferredLocation = VPNLocationModel(selectedLocation: someLocation)
+
+        if let location {
+            var attributedString = AttributedString(
+                preferredLocation.isNearest ? "\(location) \(UserText.netPVPNLocationNearest)" : location
+            )
+            attributedString.foregroundColor = locationTextColor
+            if let range = attributedString.range(of: UserText.netPVPNLocationNearest) {
+                attributedString[range].foregroundColor = preferredLocationTextColor
+            }
+            return attributedString
+        }
+
+        var attributedString = AttributedString(preferredLocation.title)
+        attributedString.foregroundColor = locationTextColor
+        return attributedString
+    }
+}
+
+final class VPNLocationModel: ObservableObject {
+    enum LocationIcon {
+        case defaultIcon
+        case emoji(String)
+    }
+
+    let title: String
+    let icon: LocationIcon
+    let isNearest: Bool
+
+    init(selectedLocation: VPNSettings.SelectedLocation) {
+        switch selectedLocation {
+        case .nearest:
+            title = UserText.vpnLocationNearestAvailable
+            icon = .defaultIcon
+            isNearest = true
+        case .location(let location):
+            let countryLabelsModel = NetworkProtectionVPNCountryLabelsModel(country: location.country, useFullCountryName: true)
+            if let city = location.city {
+                title = UserText.netPVPNSettingsLocationSubtitleFormattedCityAndCountry(
+                    city: city,
+                    country: countryLabelsModel.title
+                )
+            } else {
+                title = countryLabelsModel.title
+            }
+            icon = .emoji(countryLabelsModel.emoji)
+            isNearest = false
+        }
+    }
+}
diff --git a/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/VPNLocation/NetworkProtectionVPNCountryLabelsModel.swift b/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/VPNLocation/NetworkProtectionVPNCountryLabelsModel.swift
index 12bfce37da..00a3f034ea 100644
--- a/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/VPNLocation/NetworkProtectionVPNCountryLabelsModel.swift
+++ b/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/VPNLocation/NetworkProtectionVPNCountryLabelsModel.swift
@@ -16,8 +16,6 @@
 //  limitations under the License.
 //
 
-#if NETWORK_PROTECTION
-
 import Foundation
 import NetworkProtection
 
@@ -25,8 +23,13 @@ struct NetworkProtectionVPNCountryLabelsModel {
     let emoji: String
     let title: String
 
-    init(country: String) {
-        self.title = Locale.current.localizedString(forRegionCode: country) ?? country.capitalized
+    init(country: String, useFullCountryName: Bool = true) {
+        if useFullCountryName {
+            self.title = Locale.current.localizedString(forRegionCode: country) ?? country.capitalized
+        } else {
+            self.title = country.localizedUppercase
+        }
+
         self.emoji = Self.flag(country: country)
     }
 
@@ -41,5 +44,3 @@ struct NetworkProtectionVPNCountryLabelsModel {
         return flag
     }
 }
-
-#endif
diff --git a/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/VPNLocation/VPNLocationPreferenceItem.swift b/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/VPNLocation/VPNLocationPreferenceItem.swift
index 17750d602b..8c898abbd7 100644
--- a/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/VPNLocation/VPNLocationPreferenceItem.swift
+++ b/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/VPNLocation/VPNLocationPreferenceItem.swift
@@ -16,8 +16,6 @@
 //  limitations under the License.
 //
 
-#if NETWORK_PROTECTION
-
 import Foundation
 import SwiftUI
 
@@ -63,5 +61,3 @@ struct VPNLocationPreferenceItem: View {
     }
 
 }
-
-#endif
diff --git a/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/VPNLocation/VPNLocationPreferenceItemModel.swift b/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/VPNLocation/VPNLocationPreferenceItemModel.swift
index dc8bda6885..c68ccc4154 100644
--- a/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/VPNLocation/VPNLocationPreferenceItemModel.swift
+++ b/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/VPNLocation/VPNLocationPreferenceItemModel.swift
@@ -16,8 +16,6 @@
 //  limitations under the License.
 //
 
-#if NETWORK_PROTECTION
-
 import Foundation
 import NetworkProtection
 
@@ -48,5 +46,3 @@ final class VPNLocationPreferenceItemModel: ObservableObject {
         }
     }
 }
-
-#endif
diff --git a/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/VPNLocation/VPNLocationView.swift b/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/VPNLocation/VPNLocationView.swift
index 15e6bcdc66..36fd86779a 100644
--- a/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/VPNLocation/VPNLocationView.swift
+++ b/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/VPNLocation/VPNLocationView.swift
@@ -16,8 +16,6 @@
 //  limitations under the License.
 //
 
-#if NETWORK_PROTECTION
-
 import PreferencesViews
 import SwiftUI
 import SwiftUIExtensions
@@ -285,5 +283,3 @@ private struct VPNLocationViewButtons: View {
     }
 
 }
-
-#endif
diff --git a/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/VPNLocation/VPNLocationViewModel.swift b/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/VPNLocation/VPNLocationViewModel.swift
index 24dfd9c4ab..e2e26d0e67 100644
--- a/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/VPNLocation/VPNLocationViewModel.swift
+++ b/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/VPNLocation/VPNLocationViewModel.swift
@@ -16,11 +16,10 @@
 //  limitations under the License.
 //
 
-#if NETWORK_PROTECTION
-
 import Foundation
 import Combine
 import NetworkProtection
+import PixelKit
 
 final class VPNLocationViewModel: ObservableObject {
     private static var cachedLocations: [VPNCountryItemModel]?
@@ -65,7 +64,7 @@ final class VPNLocationViewModel: ObservableObject {
     }
 
     func onViewAppeared() async {
-        Pixel.fire(.networkProtectionGeoswitchingOpened)
+        PixelKit.fire(GeneralPixel.networkProtectionGeoswitchingOpened)
         await reloadList()
     }
 
@@ -75,14 +74,15 @@ final class VPNLocationViewModel: ObservableObject {
     }
 
     func onNearestItemSelection() async {
-        DailyPixel.fire(pixel: .networkProtectionGeoswitchingSetNearest, frequency: .dailyAndCount)
+        PixelKit.fire(GeneralPixel.networkProtectionGeoswitchingSetNearest, frequency: .dailyAndCount)
         selectedLocation = .nearest
         await reloadList()
     }
 
     func onCountryItemSelection(id: String, cityId: String? = nil) async {
-        DailyPixel.fire(pixel: .networkProtectionGeoswitchingSetCustom, frequency: .dailyAndCount)
-        let location = NetworkProtectionSelectedLocation(country: id, city: cityId)
+        PixelKit.fire(GeneralPixel.networkProtectionGeoswitchingSetCustom, frequency: .dailyAndCount)
+        let city = cityId == VPNCityItemModel.nearest.id ? nil : cityId
+        let location = NetworkProtectionSelectedLocation(country: id, city: city)
         selectedLocation = .location(location)
         await reloadList()
     }
@@ -95,7 +95,7 @@ final class VPNLocationViewModel: ObservableObject {
     private func reloadList() async {
         guard let locations = try? await locationListRepository.fetchLocationList().sortedByName() else { return }
         if locations.isEmpty {
-            DailyPixel.fire(pixel: .networkProtectionGeoswitchingNoLocations, frequency: .dailyAndCount)
+            PixelKit.fire(GeneralPixel.networkProtectionGeoswitchingNoLocations, frequency: .dailyAndCount)
         }
         let isNearestSelected = selectedLocation == .nearest
         self.isNearestSelected = isNearestSelected
@@ -208,5 +208,3 @@ private extension String {
         Locale.current.localizedString(forRegionCode: self) ?? ""
     }
 }
-
-#endif
diff --git a/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/VPNLocation/VPNLocationsHostingViewController.swift b/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/VPNLocation/VPNLocationsHostingViewController.swift
index cf3d79d345..d678b0b9c0 100644
--- a/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/VPNLocation/VPNLocationsHostingViewController.swift
+++ b/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/VPNLocation/VPNLocationsHostingViewController.swift
@@ -16,8 +16,6 @@
 //  limitations under the License.
 //
 
-#if NETWORK_PROTECTION
-
 import AppKit
 import SwiftUI
 
@@ -44,5 +42,3 @@ final class VPNLocationsHostingViewController: NSHostingController<VPNLocationVi
         fatalError("init(coder:) has not been implemented")
     }
 }
-
-#endif
diff --git a/DuckDuckGo/NetworkProtection/AppTargets/DeveloperIDTarget/NetworkProtectionIPCTunnelController.swift b/DuckDuckGo/NetworkProtection/AppTargets/DeveloperIDTarget/NetworkProtectionIPCTunnelController.swift
index 1b03bfb3f8..a39fcb6de4 100644
--- a/DuckDuckGo/NetworkProtection/AppTargets/DeveloperIDTarget/NetworkProtectionIPCTunnelController.swift
+++ b/DuckDuckGo/NetworkProtection/AppTargets/DeveloperIDTarget/NetworkProtectionIPCTunnelController.swift
@@ -16,53 +16,122 @@
 //  limitations under the License.
 //
 
-#if NETWORK_PROTECTION
-
 import Common
 import Foundation
 import NetworkProtection
 import NetworkProtectionIPC
+import PixelKit
+
+/// VPN tunnel controller through IPC.
+///
+final class NetworkProtectionIPCTunnelController {
 
-final class NetworkProtectionIPCTunnelController: TunnelController {
+    enum RequestError: CustomNSError {
+        case notAuthorizedToEnableLoginItem
+        case internalLoginItemError(_ error: Error)
+
+        var errorCode: Int {
+            switch self {
+            case .notAuthorizedToEnableLoginItem: return 0
+            case .internalLoginItemError: return 1
+            }
+        }
+
+        var errorUserInfo: [String: Any] {
+            switch self {
+            case .notAuthorizedToEnableLoginItem:
+                return [:]
+            case .internalLoginItemError(let error):
+                return [NSUnderlyingErrorKey: error as NSError]
+            }
+        }
+    }
 
     private let featureVisibility: NetworkProtectionFeatureVisibility
-    private let loginItemsManager: LoginItemsManager
+    private let loginItemsManager: LoginItemsManaging
     private let ipcClient: NetworkProtectionIPCClient
+    private let pixelKit: PixelFiring?
+    private let errorRecorder: VPNOperationErrorRecorder
 
     init(featureVisibility: NetworkProtectionFeatureVisibility = DefaultNetworkProtectionVisibility(),
-         loginItemsManager: LoginItemsManager = LoginItemsManager(),
-         ipcClient: NetworkProtectionIPCClient) {
+         loginItemsManager: LoginItemsManaging = LoginItemsManager(),
+         ipcClient: NetworkProtectionIPCClient,
+         pixelKit: PixelFiring? = PixelKit.shared,
+         errorRecorder: VPNOperationErrorRecorder = VPNOperationErrorRecorder()) {
 
         self.featureVisibility = featureVisibility
         self.loginItemsManager = loginItemsManager
         self.ipcClient = ipcClient
+        self.pixelKit = pixelKit
+        self.errorRecorder = errorRecorder
+    }
+
+    // MARK: - Login Items Manager
+
+    private func enableLoginItems() async throws {
+        guard try await featureVisibility.canStartVPN() else {
+            throw RequestError.notAuthorizedToEnableLoginItem
+        }
+
+        do {
+            try loginItemsManager.throwingEnableLoginItems(LoginItemsManager.networkProtectionLoginItems, log: .networkProtection)
+        } catch {
+            throw RequestError.internalLoginItemError(error)
+        }
     }
+}
+
+// MARK: - TunnelController Conformance
+
+extension NetworkProtectionIPCTunnelController: TunnelController {
 
     @MainActor
     func start() async {
+        errorRecorder.beginRecordingIPCStart()
+        pixelKit?.fire(StartAttempt.begin)
+
+        func handleFailure(_ error: Error) {
+            errorRecorder.recordIPCStartFailure(error)
+            log(error)
+            pixelKit?.fire(StartAttempt.failure(error), frequency: .dailyAndCount)
+        }
+
         do {
-            guard try await enableLoginItems() else {
-                os_log("🔴 IPC Controller refusing to start the VPN menu app.  Not authorized.", log: .networkProtection)
-                return
+            try await enableLoginItems()
+
+            ipcClient.start { [pixelKit] error in
+                if let error {
+                    handleFailure(error)
+                } else {
+                    pixelKit?.fire(StartAttempt.success, frequency: .dailyAndCount)
+                }
             }
-
-            ipcClient.start()
         } catch {
-            os_log("🔴 IPC Controller found en error when starting the VPN: \(error)", log: .networkProtection)
+            handleFailure(error)
         }
     }
 
     @MainActor
     func stop() async {
+        pixelKit?.fire(StopAttempt.begin)
+
+        func handleFailure(_ error: Error) {
+            log(error)
+            pixelKit?.fire(StopAttempt.failure(error), frequency: .dailyAndCount)
+        }
+
         do {
-            guard try await enableLoginItems() else {
-                os_log("🔴 IPC Controller refusing to start the VPN.  Not authorized.", log: .networkProtection)
-                return
+            try await enableLoginItems()
+
+            ipcClient.stop { [pixelKit] error in
+                if let error {
+                    handleFailure(error)
+                } else {
+                    pixelKit?.fire(StopAttempt.success, frequency: .dailyAndCount)
+                }
             }
-
-            ipcClient.stop()
         } catch {
-            os_log("🔴 IPC Controller found en error when starting the VPN: \(error)", log: .networkProtection)
+            handleFailure(error)
         }
     }
 
@@ -80,17 +149,90 @@ final class NetworkProtectionIPCTunnelController: TunnelController {
         }
     }
 
-    // MARK: - Login Items Manager
+    private func log(_ error: Error) {
+        switch error {
+        case RequestError.notAuthorizedToEnableLoginItem:
+            os_log("🔴 IPC Controller not authorized to enable the login item", log: .networkProtection)
+        case RequestError.internalLoginItemError(let error):
+            os_log("🔴 IPC Controller found an error while enabling the login item: \(error)", log: .networkProtection)
+        default:
+            os_log("🔴 IPC Controller found an unknown error: \(error)", log: .networkProtection)
+        }
+    }
+}
 
-    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
+// MARK: - Start Attempts: Pixels
+
+extension NetworkProtectionIPCTunnelController {
+
+    enum StartAttempt: PixelKitEventV2 {
+        case begin
+        case success
+        case failure(_ error: Error)
+
+        var name: String {
+            switch self {
+            case .begin:
+                return "netp_browser_start_attempt"
+
+            case .success:
+                return "netp_browser_start_success"
+
+            case .failure:
+                return "netp_browser_start_failure"
+            }
         }
 
-        loginItemsManager.enableLoginItems(LoginItemsManager.networkProtectionLoginItems, log: .networkProtection)
-        return true
+        var parameters: [String: String]? {
+            return nil
+        }
+
+        var error: Error? {
+            switch self {
+            case .begin,
+                    .success:
+                return nil
+            case .failure(let error):
+                return error
+            }
+        }
     }
 }
 
-#endif
+// MARK: - Stop Attempts
+
+extension NetworkProtectionIPCTunnelController {
+
+    enum StopAttempt: PixelKitEventV2 {
+        case begin
+        case success
+        case failure(_ error: Error)
+
+        var name: String {
+            switch self {
+            case .begin:
+                return "netp_browser_stop_attempt"
+
+            case .success:
+                return "netp_browser_stop_success"
+
+            case .failure:
+                return "netp_browser_stop_failure"
+            }
+        }
+
+        var parameters: [String: String]? {
+            return nil
+        }
+
+        var error: Error? {
+            switch self {
+            case .begin,
+                    .success:
+                return nil
+            case .failure(let error):
+                return error
+            }
+        }
+    }
+}
diff --git a/DuckDuckGo/NetworkProtection/AppTargets/DeveloperIDTarget/NetworkProtectionRemoteMessaging/NetworkProtectionRemoteMessaging.swift b/DuckDuckGo/NetworkProtection/AppTargets/DeveloperIDTarget/NetworkProtectionRemoteMessaging/NetworkProtectionRemoteMessaging.swift
index 382a4f1bd8..6daeb90569 100644
--- a/DuckDuckGo/NetworkProtection/AppTargets/DeveloperIDTarget/NetworkProtectionRemoteMessaging/NetworkProtectionRemoteMessaging.swift
+++ b/DuckDuckGo/NetworkProtection/AppTargets/DeveloperIDTarget/NetworkProtectionRemoteMessaging/NetworkProtectionRemoteMessaging.swift
@@ -18,8 +18,7 @@
 
 import Foundation
 import Networking
-
-#if NETWORK_PROTECTION
+import PixelKit
 
 protocol NetworkProtectionRemoteMessaging {
 
@@ -92,7 +91,7 @@ final class DefaultNetworkProtectionRemoteMessaging: NetworkProtectionRemoteMess
                     try self.messageStorage.store(messages: messages)
                     self.updateLastRefreshDate() // Update last refresh date on success, otherwise let the app try again next time
                 } catch {
-                    Pixel.fire(.debug(event: .networkProtectionRemoteMessageStorageFailed, error: error))
+                    PixelKit.fire(DebugEvent(GeneralPixel.networkProtectionRemoteMessageStorageFailed, error: error))
                 }
             case .failure(let error):
                 // Ignore 403 errors, those happen when a file can't be found on S3
@@ -101,7 +100,7 @@ final class DefaultNetworkProtectionRemoteMessaging: NetworkProtectionRemoteMess
                     return
                 }
 
-                Pixel.fire(.debug(event: .networkProtectionRemoteMessageFetchingFailed, error: error))
+                PixelKit.fire(DebugEvent(GeneralPixel.networkProtectionRemoteMessageFetchingFailed, error: error))
             }
         }
 
@@ -133,7 +132,7 @@ final class DefaultNetworkProtectionRemoteMessaging: NetworkProtectionRemoteMess
             }
 
             // Next, check if the message requires access to NetP but it's not visible:
-            if message.requiresNetworkProtectionAccess, !networkProtectionVisibility.isNetworkProtectionBetaVisible() {
+            if message.requiresNetworkProtectionAccess, !networkProtectionVisibility.isVPNVisible() {
                 return false
             }
 
@@ -178,5 +177,3 @@ final class DefaultNetworkProtectionRemoteMessaging: NetworkProtectionRemoteMess
     }
 
 }
-
-#endif
diff --git a/DuckDuckGo/NetworkProtection/AppTargets/DeveloperIDTarget/NetworkProtectionSubscriptionEventHandler.swift b/DuckDuckGo/NetworkProtection/AppTargets/DeveloperIDTarget/NetworkProtectionSubscriptionEventHandler.swift
index 6a9cc26537..31795df3a3 100644
--- a/DuckDuckGo/NetworkProtection/AppTargets/DeveloperIDTarget/NetworkProtectionSubscriptionEventHandler.swift
+++ b/DuckDuckGo/NetworkProtection/AppTargets/DeveloperIDTarget/NetworkProtectionSubscriptionEventHandler.swift
@@ -16,9 +16,8 @@
 //  limitations under the License.
 //
 
-#if NETWORK_PROTECTION && SUBSCRIPTION
-
 import Combine
+import Common
 import Foundation
 import Subscription
 import NetworkProtection
@@ -27,19 +26,16 @@ import NetworkProtectionUI
 final class NetworkProtectionSubscriptionEventHandler {
 
     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: AccountManager = AccountManager(subscriptionAppGroup: Bundle.main.appGroup(bundle: .subs)),
-         networkProtectionRedemptionCoordinator: NetworkProtectionCodeRedeeming = NetworkProtectionCodeRedemptionCoordinator(),
          networkProtectionTokenStorage: NetworkProtectionTokenStore = NetworkProtectionKeychainTokenStore(),
          networkProtectionFeatureDisabler: NetworkProtectionFeatureDisabling = NetworkProtectionFeatureDisabler(),
          userDefaults: UserDefaults = .netP) {
         self.accountManager = accountManager
-        self.networkProtectionRedemptionCoordinator = networkProtectionRedemptionCoordinator
         self.networkProtectionTokenStorage = networkProtectionTokenStorage
         self.networkProtectionFeatureDisabler = networkProtectionFeatureDisabler
         self.userDefaults = userDefaults
@@ -110,10 +106,8 @@ final class NetworkProtectionSubscriptionEventHandler {
         print("[NetP Subscription] Deleted NetP auth token after signing out from Privacy Pro")
 
         Task {
-            await networkProtectionFeatureDisabler.disable(keepAuthToken: false, uninstallSystemExtension: false)
+            await networkProtectionFeatureDisabler.disable(uninstallSystemExtension: false)
         }
     }
 
 }
-
-#endif
diff --git a/DuckDuckGo/NetworkProtection/NetworkExtensionTargets/AppExtensionAndNotificationTargets/NetworkProtectionUNNotificationsPresenter.swift b/DuckDuckGo/NetworkProtection/NetworkExtensionTargets/AppExtensionAndNotificationTargets/NetworkProtectionUNNotificationsPresenter.swift
index 3977fccef5..80ac5013fc 100644
--- a/DuckDuckGo/NetworkProtection/NetworkExtensionTargets/AppExtensionAndNotificationTargets/NetworkProtectionUNNotificationsPresenter.swift
+++ b/DuckDuckGo/NetworkProtection/NetworkExtensionTargets/AppExtensionAndNotificationTargets/NetworkProtectionUNNotificationsPresenter.swift
@@ -20,6 +20,7 @@ import Foundation
 import UserNotifications
 import NetworkProtection
 import NetworkProtectionUI
+import PixelKit
 
 extension UNNotificationAction {
 
@@ -159,6 +160,20 @@ final class NetworkProtectionUNNotificationsPresenter: NSObject, NetworkProtecti
             _=self.registerNotificationCategoriesOnce
             self.userNotificationCenter.removeDeliveredNotifications(withIdentifiers: [identifier.rawValue])
             self.userNotificationCenter.add(request)
+
+            switch identifier {
+            case .disconnected:
+                PixelKit.fire(NetworkProtectionPixelEvent.networkProtectionDisconnectedNotificationDisplayed, frequency: .dailyAndCount)
+            case .reconnecting:
+                PixelKit.fire(NetworkProtectionPixelEvent.networkProtectionReconnectingNotificationDisplayed, frequency: .dailyAndCount)
+            case .connected:
+                PixelKit.fire(NetworkProtectionPixelEvent.networkProtectionConnectedNotificationDisplayed, frequency: .dailyAndCount)
+            case .superseded:
+                PixelKit.fire(NetworkProtectionPixelEvent.networkProtectionSupersededNotificationDisplayed, frequency: .dailyAndCount)
+            case .expiredEntitlement:
+                PixelKit.fire(NetworkProtectionPixelEvent.networkProtectionExpiredEntitlementNotificationDisplayed, frequency: .dailyAndCount)
+            case .test: break
+            }
         }
     }
 
diff --git a/DuckDuckGo/NetworkProtection/NetworkExtensionTargets/NetworkExtensionTargets/MacPacketTunnelProvider.swift b/DuckDuckGo/NetworkProtection/NetworkExtensionTargets/NetworkExtensionTargets/MacPacketTunnelProvider.swift
index c9a8819faa..5623af1f0c 100644
--- a/DuckDuckGo/NetworkProtection/NetworkExtensionTargets/NetworkExtensionTargets/MacPacketTunnelProvider.swift
+++ b/DuckDuckGo/NetworkProtection/NetworkExtensionTargets/NetworkExtensionTargets/MacPacketTunnelProvider.swift
@@ -23,10 +23,7 @@ import NetworkProtection
 import NetworkExtension
 import Networking
 import PixelKit
-
-#if SUBSCRIPTION
 import Subscription
-#endif
 
 final class MacPacketTunnelProvider: PacketTunnelProvider {
 
@@ -129,7 +126,7 @@ final class MacPacketTunnelProvider: PacketTunnelProvider {
                 return
             }
 
-            PixelKit.fire(domainEvent, frequency: .dailyAndContinuous, includeAppVersionParameter: true)
+            PixelKit.fire(domainEvent, frequency: .dailyAndCount, includeAppVersionParameter: true)
         }
     }
 
@@ -150,25 +147,25 @@ final class MacPacketTunnelProvider: PacketTunnelProvider {
         case .userBecameActive:
             PixelKit.fire(
                 NetworkProtectionPixelEvent.networkProtectionActiveUser,
-                frequency: .dailyOnly,
-                withAdditionalParameters: ["cohort": PixelKit.dateString(for: defaults.vpnFirstEnabled)],
+                frequency: .legacyDaily,
+                withAdditionalParameters: [PixelKit.Parameters.vpnCohort: PixelKit.cohort(from: defaults.vpnFirstEnabled)],
                 includeAppVersionParameter: true)
         case .reportConnectionAttempt(attempt: let attempt):
             switch attempt {
             case .connecting:
                 PixelKit.fire(
                     NetworkProtectionPixelEvent.networkProtectionEnableAttemptConnecting,
-                    frequency: .dailyAndContinuous,
+                    frequency: .dailyAndCount,
                     includeAppVersionParameter: true)
             case .success:
                 PixelKit.fire(
                     NetworkProtectionPixelEvent.networkProtectionEnableAttemptSuccess,
-                    frequency: .dailyAndContinuous,
+                    frequency: .dailyAndCount,
                     includeAppVersionParameter: true)
             case .failure:
                 PixelKit.fire(
                     NetworkProtectionPixelEvent.networkProtectionEnableAttemptFailure,
-                    frequency: .dailyAndContinuous,
+                    frequency: .dailyAndCount,
                     includeAppVersionParameter: true)
             }
         case .reportTunnelFailure(result: let result):
@@ -176,12 +173,12 @@ final class MacPacketTunnelProvider: PacketTunnelProvider {
             case .failureDetected:
                 PixelKit.fire(
                     NetworkProtectionPixelEvent.networkProtectionTunnelFailureDetected,
-                    frequency: .dailyAndContinuous,
+                    frequency: .dailyAndCount,
                     includeAppVersionParameter: true)
             case .failureRecovered:
                 PixelKit.fire(
                     NetworkProtectionPixelEvent.networkProtectionTunnelFailureRecovered,
-                    frequency: .dailyAndContinuous,
+                    frequency: .dailyAndCount,
                     includeAppVersionParameter: true)
             case .networkPathChanged:
                 break
@@ -191,13 +188,13 @@ final class MacPacketTunnelProvider: PacketTunnelProvider {
             case .error:
                 PixelKit.fire(
                     NetworkProtectionPixelEvent.networkProtectionLatencyError,
-                    frequency: .dailyOnly,
+                    frequency: .legacyDaily,
                     includeAppVersionParameter: true)
             case .quality(let quality):
                 guard quality != .unknown else { return }
                 PixelKit.fire(
                     NetworkProtectionPixelEvent.networkProtectionLatency(quality: quality),
-                    frequency: .dailyAndContinuous,
+                    frequency: .dailyAndCount,
                     includeAppVersionParameter: true)
             }
         case .rekeyAttempt(let step):
@@ -205,17 +202,17 @@ final class MacPacketTunnelProvider: PacketTunnelProvider {
             case .begin:
                 PixelKit.fire(
                     NetworkProtectionPixelEvent.networkProtectionRekeyAttempt,
-                    frequency: .dailyAndContinuous,
+                    frequency: .dailyAndCount,
                     includeAppVersionParameter: true)
             case .failure(let error):
                 PixelKit.fire(
                     NetworkProtectionPixelEvent.networkProtectionRekeyFailure(error),
-                    frequency: .dailyAndContinuous,
+                    frequency: .dailyAndCount,
                     includeAppVersionParameter: true)
             case .success:
                 PixelKit.fire(
                     NetworkProtectionPixelEvent.networkProtectionRekeyCompleted,
-                    frequency: .dailyAndContinuous,
+                    frequency: .dailyAndCount,
                     includeAppVersionParameter: true)
             }
         case .tunnelStartAttempt(let step):
@@ -223,17 +220,35 @@ final class MacPacketTunnelProvider: PacketTunnelProvider {
             case .begin:
                 PixelKit.fire(
                     NetworkProtectionPixelEvent.networkProtectionTunnelStartAttempt,
-                    frequency: .dailyAndContinuous,
+                    frequency: .dailyAndCount,
                     includeAppVersionParameter: true)
             case .failure(let error):
                 PixelKit.fire(
                     NetworkProtectionPixelEvent.networkProtectionTunnelStartFailure(error),
-                    frequency: .dailyAndContinuous,
+                    frequency: .dailyAndCount,
                     includeAppVersionParameter: true)
             case .success:
                 PixelKit.fire(
                     NetworkProtectionPixelEvent.networkProtectionTunnelStartSuccess,
-                    frequency: .dailyAndContinuous,
+                    frequency: .dailyAndCount,
+                    includeAppVersionParameter: true)
+            }
+        case .tunnelStopAttempt(let step):
+            switch step {
+            case .begin:
+                PixelKit.fire(
+                    NetworkProtectionPixelEvent.networkProtectionTunnelStopAttempt,
+                    frequency: .standard,
+                    includeAppVersionParameter: true)
+            case .failure(let error):
+                PixelKit.fire(
+                    NetworkProtectionPixelEvent.networkProtectionTunnelStopFailure(error),
+                    frequency: .dailyAndCount,
+                    includeAppVersionParameter: true)
+            case .success:
+                PixelKit.fire(
+                    NetworkProtectionPixelEvent.networkProtectionTunnelStopSuccess,
+                    frequency: .dailyAndCount,
                     includeAppVersionParameter: true)
             }
         case .tunnelUpdateAttempt(let step):
@@ -241,19 +256,64 @@ final class MacPacketTunnelProvider: PacketTunnelProvider {
             case .begin:
                 PixelKit.fire(
                     NetworkProtectionPixelEvent.networkProtectionTunnelUpdateAttempt,
-                    frequency: .dailyAndContinuous,
+                    frequency: .dailyAndCount,
                     includeAppVersionParameter: true)
             case .failure(let error):
                 PixelKit.fire(
                     NetworkProtectionPixelEvent.networkProtectionTunnelUpdateFailure(error),
-                    frequency: .dailyAndContinuous,
+                    frequency: .dailyAndCount,
                     includeAppVersionParameter: true)
             case .success:
                 PixelKit.fire(
                     NetworkProtectionPixelEvent.networkProtectionTunnelUpdateSuccess,
-                    frequency: .dailyAndContinuous,
+                    frequency: .dailyAndCount,
+                    includeAppVersionParameter: true)
+            }
+        case .tunnelWakeAttempt(let step):
+            switch step {
+            case .begin:
+                PixelKit.fire(
+                    NetworkProtectionPixelEvent.networkProtectionTunnelWakeAttempt,
+                    frequency: .dailyAndCount,
+                    includeAppVersionParameter: true)
+            case .failure(let error):
+                PixelKit.fire(
+                    NetworkProtectionPixelEvent.networkProtectionTunnelWakeFailure(error),
+                    frequency: .dailyAndCount,
+                    includeAppVersionParameter: true)
+            case .success:
+                PixelKit.fire(
+                    NetworkProtectionPixelEvent.networkProtectionTunnelWakeSuccess,
+                    frequency: .dailyAndCount,
                     includeAppVersionParameter: true)
             }
+        case .failureRecoveryAttempt(let step):
+            switch step {
+            case .started:
+                PixelKit.fire(
+                    VPNFailureRecoveryPixel.vpnFailureRecoveryStarted,
+                    frequency: .dailyAndCount,
+                    includeAppVersionParameter: true
+                )
+            case .completed(.healthy):
+                PixelKit.fire(
+                    VPNFailureRecoveryPixel.vpnFailureRecoveryCompletedHealthy,
+                    frequency: .dailyAndCount,
+                    includeAppVersionParameter: true
+                )
+            case .completed(.unhealthy):
+                PixelKit.fire(
+                    VPNFailureRecoveryPixel.vpnFailureRecoveryCompletedUnhealthy,
+                    frequency: .dailyAndCount,
+                    includeAppVersionParameter: true
+                )
+            case .failed(let error):
+                PixelKit.fire(
+                    VPNFailureRecoveryPixel.vpnFailureRecoveryFailed(error),
+                    frequency: .dailyAndCount,
+                    includeAppVersionParameter: true
+                )
+            }
         }
     }
 
@@ -267,6 +327,7 @@ final class MacPacketTunnelProvider: PacketTunnelProvider {
 
     // MARK: - Initialization
 
+    @MainActor
     @objc public init() {
         let isSubscriptionEnabled = false
 
@@ -275,6 +336,9 @@ final class MacPacketTunnelProvider: PacketTunnelProvider {
 #else
         let defaults = UserDefaults.netP
 #endif
+
+        NetworkProtectionLastVersionRunStore(userDefaults: defaults).lastExtensionVersionRun = AppVersion.shared.versionAndBuildNumber
+
         let settings = VPNSettings(defaults: defaults)
         let tunnelHealthStore = NetworkProtectionTunnelHealthStore(notificationCenter: notificationCenter)
         let controllerErrorStore = NetworkProtectionTunnelErrorStore(notificationCenter: notificationCenter)
@@ -286,7 +350,6 @@ final class MacPacketTunnelProvider: PacketTunnelProvider {
                                                                            isSubscriptionEnabled: isSubscriptionEnabled,
                                                                            accessTokenProvider: { nil }
         )
-#if SUBSCRIPTION
 
         let accountManager = AccountManager(subscriptionAppGroup: Self.subscriptionsAppGroup, accessTokenStorage: tokenStore)
 
@@ -294,9 +357,6 @@ final class MacPacketTunnelProvider: PacketTunnelProvider {
         let entitlementsCheck = {
             await accountManager.hasEntitlement(for: .networkProtection, cachePolicy: .reloadIgnoringLocalCacheData)
         }
-#else
-        let entitlementsCheck: (() async -> Result<Bool, Error>)? = nil
-#endif
 
         super.init(notificationsPresenter: notificationsPresenter,
                    tunnelHealthStore: tunnelHealthStore,
@@ -328,6 +388,7 @@ final class MacPacketTunnelProvider: PacketTunnelProvider {
 
     /// Observe server changes to broadcast those changes through distributed notifications.
     ///
+    @MainActor
     private func observeServerChanges() {
         lastSelectedServerInfoPublisher.sink { [weak self] server in
             self?.lastStatusChangeDate = Date()
@@ -372,6 +433,7 @@ final class MacPacketTunnelProvider: PacketTunnelProvider {
 
     /// Broadcasts the current server information.
     ///
+    @MainActor
     private func broadcastLastSelectedServerInfo() {
         broadcast(lastSelectedServerInfo)
     }
@@ -428,30 +490,6 @@ final class MacPacketTunnelProvider: PacketTunnelProvider {
         try? loadDefaultPixelHeaders(from: options)
     }
 
-    // MARK: - Start/Stop Tunnel
-
-    override func stopTunnel(with reason: NEProviderStopReason, completionHandler: @escaping () -> Void) {
-        super.stopTunnel(with: reason) {
-            Task {
-                completionHandler()
-
-                // From what I'm seeing in my tests the next call to start the tunnel is MUCH
-                // less likely to fail if we force this extension to exit when the tunnel is killed.
-                //
-                // Ref: https://app.asana.com/0/72649045549333/1204668639086684/f
-                //
-                exit(EXIT_SUCCESS)
-            }
-        }
-    }
-
-    override func cancelTunnelWithError(_ error: Error?) {
-        Task {
-            super.cancelTunnelWithError(error)
-            exit(EXIT_SUCCESS)
-        }
-    }
-
     // MARK: - Pixels
 
     private func setupPixels(defaultHeaders: [String: String] = [:]) {
@@ -474,7 +512,6 @@ final class MacPacketTunnelProvider: PacketTunnelProvider {
                        appVersion: AppVersion.shared.versionNumber,
                        source: source,
                        defaultHeaders: defaultHeaders,
-                       log: .networkProtectionPixel,
                        defaults: .netP) { (pixelName: String, headers: [String: String], parameters: [String: String], _, _, onComplete: @escaping PixelKit.CompletionBlock) in
 
             let url = URL.pixelUrl(forPixelNamed: pixelName)
diff --git a/DuckDuckGo/NetworkProtection/NetworkExtensionTargets/NetworkExtensionTargets/MacTransparentProxyProvider.swift b/DuckDuckGo/NetworkProtection/NetworkExtensionTargets/NetworkExtensionTargets/MacTransparentProxyProvider.swift
index d300309ec6..1c4993210e 100644
--- a/DuckDuckGo/NetworkProtection/NetworkExtensionTargets/NetworkExtensionTargets/MacTransparentProxyProvider.swift
+++ b/DuckDuckGo/NetworkProtection/NetworkExtensionTargets/NetworkExtensionTargets/MacTransparentProxyProvider.swift
@@ -27,7 +27,7 @@ import PixelKit
 
 final class MacTransparentProxyProvider: TransparentProxyProvider {
 
-    static var vpnProxyLogger = Logger(subsystem: OSLog.subsystem, category: "VPN Proxy")
+    static var vpnProxyLogger = Logger(subsystem: Bundle.main.bundleIdentifier ?? "DuckDuckGo", category: "VPN Proxy")
 
     private var cancellables = Set<AnyCancellable>()
 
@@ -73,7 +73,6 @@ final class MacTransparentProxyProvider: TransparentProxyProvider {
                        appVersion: AppVersion.shared.versionNumber,
                        source: "vpnProxyExtension",
                        defaultHeaders: [:],
-                       log: .networkProtectionPixel,
                        defaults: .netP) { (pixelName: String, headers: [String: String], parameters: [String: String], _, _, onComplete: @escaping PixelKit.CompletionBlock) in
 
             let url = URL.pixelUrl(forPixelNamed: pixelName)
diff --git a/DuckDuckGo/NetworkProtection/NetworkExtensionTargets/NetworkExtensionTargets/NetworkProtectionTokenStore+SubscriptionTokenKeychainStorage.swift b/DuckDuckGo/NetworkProtection/NetworkExtensionTargets/NetworkExtensionTargets/NetworkProtectionTokenStore+SubscriptionTokenKeychainStorage.swift
index 2987ab2ff9..497ce84c7b 100644
--- a/DuckDuckGo/NetworkProtection/NetworkExtensionTargets/NetworkExtensionTargets/NetworkProtectionTokenStore+SubscriptionTokenKeychainStorage.swift
+++ b/DuckDuckGo/NetworkProtection/NetworkExtensionTargets/NetworkExtensionTargets/NetworkProtectionTokenStore+SubscriptionTokenKeychainStorage.swift
@@ -16,8 +16,6 @@
 //  limitations under the License.
 //
 
-#if SUBSCRIPTION
-
 import Foundation
 import Subscription
 import NetworkProtection
@@ -41,5 +39,3 @@ extension NetworkProtectionKeychainTokenStore: SubscriptionTokenStorage {
         try deleteToken()
     }
 }
-
-#endif
diff --git a/DuckDuckGo/NetworkProtection/NetworkExtensionTargets/NetworkExtensionTargets/Pixels/VPNFailureRecoveryPixel.swift b/DuckDuckGo/NetworkProtection/NetworkExtensionTargets/NetworkExtensionTargets/Pixels/VPNFailureRecoveryPixel.swift
new file mode 100644
index 0000000000..3fdae85a54
--- /dev/null
+++ b/DuckDuckGo/NetworkProtection/NetworkExtensionTargets/NetworkExtensionTargets/Pixels/VPNFailureRecoveryPixel.swift
@@ -0,0 +1,67 @@
+//
+//  VPNFailureRecoveryPixel.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/1206939413299475/f
+///
+public enum VPNFailureRecoveryPixel: PixelKitEventV2 {
+
+    /// This pixel is emitted when the last handshake diff is greater than n minutes and an attempt to recover is made (/register is called with failureRecovery)
+    ///
+    case vpnFailureRecoveryStarted
+
+    /// This pixel is emitted when the recovery attempt failed due to any reason.
+    ///
+    case vpnFailureRecoveryFailed(Error)
+
+    /// This pixel is emitted when the recovery attempt completed and the server was healthy and no further action needs to be taken.
+    ///
+    case vpnFailureRecoveryCompletedHealthy
+
+    /// This pixel is emitted when the recovery attempt completed and the server was unhealthy resulting to reconnecting to a different server.
+    ///
+    case vpnFailureRecoveryCompletedUnhealthy
+
+    public var name: String {
+        switch self {
+        case .vpnFailureRecoveryStarted:
+            return "m_mac_netp_ev_failure_recovery_started"
+        case .vpnFailureRecoveryFailed:
+            return "m_mac_netp_ev_failure_recovery_failed"
+        case .vpnFailureRecoveryCompletedHealthy:
+            return "m_mac_netp_ev_failure_recovery_completed_server_healthy"
+        case .vpnFailureRecoveryCompletedUnhealthy:
+            return "m_mac_netp_ev_failure_recovery_completed_server_unhealthy"
+        }
+    }
+
+    public var error: Error? {
+        switch self {
+        case .vpnFailureRecoveryStarted, .vpnFailureRecoveryCompletedHealthy, .vpnFailureRecoveryCompletedUnhealthy: return nil
+        case .vpnFailureRecoveryFailed(let error): return error
+        }
+    }
+
+    public var parameters: [String: String]? {
+        nil
+    }
+}
diff --git a/DuckDuckGo/PasswordManager/Bitwarden/Model/BWManager.swift b/DuckDuckGo/PasswordManager/Bitwarden/Model/BWManager.swift
index 24be234ef2..f04f5f91a7 100644
--- a/DuckDuckGo/PasswordManager/Bitwarden/Model/BWManager.swift
+++ b/DuckDuckGo/PasswordManager/Bitwarden/Model/BWManager.swift
@@ -20,6 +20,7 @@ import Common
 import Foundation
 import SwiftUI
 import OpenSSL
+import PixelKit
 
 final class BWManager: BWManagement, ObservableObject {
 
@@ -82,6 +83,10 @@ final class BWManager: BWManagement, ObservableObject {
             status = .oldVersion
             scheduleConnectionAttempt()
             return
+        case .incompatible:
+            status = .incompatible
+            scheduleConnectionAttempt()
+            return
         case .installed:
             break
         }
@@ -121,7 +126,7 @@ final class BWManager: BWManagement, ObservableObject {
             try communicator.runProxyProcess()
         } catch {
             os_log("BWManagement: Running of proxy process failed", type: .error)
-            Pixel.fire(.debug(event: .bitwardenNotResponding))
+            PixelKit.fire(DebugEvent(GeneralPixel.bitwardenNotResponding))
             status = .error(error: .runningOfProxyProcessFailed)
             scheduleConnectionAttempt()
         }
@@ -191,7 +196,7 @@ final class BWManager: BWManagement, ObservableObject {
             if let sharedKey = sharedKey {
                 guard let sharedKeyData = Data(base64Encoded: sharedKey),
                       encryption.setSharedKey(sharedKeyData) else {
-                    Pixel.fire(.debug(event: .bitwardenSharedKeyInjectionFailed))
+                    PixelKit.fire(DebugEvent(GeneralPixel.bitwardenSharedKeyInjectionFailed))
                     status = .error(error: .sharedKeyInjectionFailed)
                     return
                 }
@@ -222,7 +227,7 @@ final class BWManager: BWManagement, ObservableObject {
             self?.verificationTimer = nil
 
             if self?.status == .waitingForStatusResponse {
-                Pixel.fire(.debug(event: .bitwardenNotResponding))
+                PixelKit.fire(DebugEvent(GeneralPixel.bitwardenNotResponding))
                 BWNotRespondingAlert.show()
             }
         }
@@ -232,10 +237,7 @@ final class BWManager: BWManagement, ObservableObject {
         switch error {
         case "cannot-decrypt":
             logOrAssertionFailure("BWManagement: Bitwarden error - cannot decrypt")
-
-            if Pixel.Event.Repetition(key: "bitwardenRespondedCannotDecryptUnique", update: false) != .repetitive {
-                Pixel.fire(.debug(event: .bitwardenRespondedCannotDecryptUnique()))
-            }
+            PixelKit.fire(DebugEvent(GeneralPixel.bitwardenRespondedCannotDecrypt), frequency: .daily)
         case "locked":
             if case let .connected(vault) = status {
                 status = .connected(vault: vault.locked)
@@ -244,20 +246,20 @@ final class BWManager: BWManagement, ObservableObject {
             }
             return
         default: logOrAssertionFailure("BWManager: Unhandled error")
-            Pixel.fire(.debug(event: .bitwardenRespondedWithError))
+            PixelKit.fire(DebugEvent(GeneralPixel.bitwardenRespondedWithError))
         }
     }
 
     private func handleHandshakeResponse(encryptedSharedKey: String, status: String) {
         guard status == "success" else {
-            Pixel.fire(.debug(event: .bitwardenHandshakeFailed))
+            PixelKit.fire(DebugEvent(GeneralPixel.bitwardenHandshakeFailed))
             self.status = .error(error: .handshakeFailed)
             cancelConnectionAndScheduleNextAttempt()
             return
         }
 
         guard let sharedKey = encryption.decryptSharedKey(encryptedSharedKey) else {
-            Pixel.fire(.debug(event: .bitwardenDecryptionOfSharedKeyFailed))
+            PixelKit.fire(DebugEvent(GeneralPixel.bitwardenDecryptionOfSharedKeyFailed))
             self.status = .error(error: .decryptionOfSharedKeyFailed)
             cancelConnectionAndScheduleNextAttempt()
             return
@@ -266,7 +268,7 @@ final class BWManager: BWManagement, ObservableObject {
         do {
             try keyStorage.save(sharedKey: sharedKey)
         } catch {
-            Pixel.fire(.debug(event: .bitwardenStoringOfTheSharedKeyFailed))
+            PixelKit.fire(DebugEvent(GeneralPixel.bitwardenStoringOfTheSharedKeyFailed))
             self.status = .error(error: .storingOfTheSharedKeyFailed)
             return
         }
@@ -284,7 +286,7 @@ final class BWManager: BWManagement, ObservableObject {
               let hmacString = encryptedPayload.mac,
               let hmac = Data(base64Encoded: hmacString)
         else {
-            Pixel.fire(.debug(event: .bitwardenParsingFailed))
+            PixelKit.fire(DebugEvent(GeneralPixel.bitwardenParsingFailed))
             status = .error(error: .parsingFailed)
             return
         }
@@ -292,20 +294,20 @@ final class BWManager: BWManagement, ObservableObject {
         // Compare HMAC
         let ourHmac = encryption.computeHmac(data, iv: ivData)
         guard ourHmac == hmac else {
-            Pixel.fire(.debug(event: .bitwardenHmacComparisonFailed))
+            PixelKit.fire(DebugEvent(GeneralPixel.bitwardenHmacComparisonFailed))
             logOrAssertionFailure("BWManager: HMAC comparison failed")
             return
         }
 
         let decryptedData = encryption.decryptData(data, andIv: ivData)
         guard decryptedData.count > 0 else {
-            Pixel.fire(.debug(event: .bitwardenDecryptionFailed))
+            PixelKit.fire(DebugEvent(GeneralPixel.bitwardenDecryptionFailed))
             status = .error(error: .decryptionOfDataFailed)
             return
         }
 
         guard let response = BWResponse(from: decryptedData) else {
-            Pixel.fire(.debug(event: .bitwardenParsingFailed))
+            PixelKit.fire(DebugEvent(GeneralPixel.bitwardenParsingFailed))
             status = .error(error: .parsingFailed)
             return
         }
@@ -343,7 +345,7 @@ final class BWManager: BWManagement, ObservableObject {
     private func handleStatusResponse(payloadItemArray: [BWResponse.PayloadItem]) {
         // Find the active vault
         guard let activePayloadItem = payloadItemArray.filter({ $0.active ?? false }).first else {
-            Pixel.fire(.debug(event: .bitwardenNoActiveVault))
+            PixelKit.fire(DebugEvent(GeneralPixel.bitwardenNoActiveVault))
             status = .error(error: .noActiveVault)
             return
         }
@@ -369,7 +371,7 @@ final class BWManager: BWManagement, ObservableObject {
             }
 
             handleError(error)
-            Pixel.fire(.debug(event: .bitwardenCredentialRetrievalFailed))
+            PixelKit.fire(DebugEvent(GeneralPixel.bitwardenCredentialRetrievalFailed))
             completion([], BWError.credentialRetrievalFailed)
         }
     }
@@ -385,7 +387,7 @@ final class BWManager: BWManagement, ObservableObject {
         if payloadItem.status == "success" {
             completion(nil)
         } else {
-            Pixel.fire(.debug(event: .bitwardenCredentialCreationFailed))
+            PixelKit.fire(DebugEvent(GeneralPixel.bitwardenCredentialCreationFailed))
             completion(BWError.credentialCreationFailed)
         }
     }
@@ -401,7 +403,7 @@ final class BWManager: BWManagement, ObservableObject {
         if payloadItem.status == "success" {
             completion(nil)
         } else {
-            Pixel.fire(.debug(event: .bitwardenCredentialUpdateFailed))
+            PixelKit.fire(DebugEvent(GeneralPixel.bitwardenCredentialUpdateFailed))
             completion(BWError.credentialUpdateFailed)
         }
     }
@@ -431,7 +433,7 @@ final class BWManager: BWManagement, ObservableObject {
               let messageData = BWRequest.makeEncryptedCommandRequest(encryptedCommand: encryptedCommand,
                                                                       messageId: messageIdGenerator.generateMessageId()).data else {
             logOrAssertionFailure("BWManager: Making the status message failed")
-            Pixel.fire(.debug(event: .bitwardenSendingOfMessageFailed))
+            PixelKit.fire(DebugEvent(GeneralPixel.bitwardenSendingOfMessageFailed))
             status = .error(error: .sendingOfMessageFailed)
             return
         }
@@ -447,7 +449,7 @@ final class BWManager: BWManagement, ObservableObject {
               let messageData = BWRequest.makeEncryptedCommandRequest(encryptedCommand: encryptedCommand,
                                                                       messageId: messageId).data else {
             logOrAssertionFailure("BWManager: Making the credential retrieval message failed")
-            Pixel.fire(.debug(event: .bitwardenSendingOfMessageFailed))
+            PixelKit.fire(DebugEvent(GeneralPixel.bitwardenSendingOfMessageFailed))
             status = .error(error: .sendingOfMessageFailed)
             return
         }
@@ -467,7 +469,7 @@ final class BWManager: BWManagement, ObservableObject {
               let messageData = BWRequest.makeEncryptedCommandRequest(encryptedCommand: encryptedCommand,
                                                                       messageId: messageId).data else {
             logOrAssertionFailure("BWManager: Making the credential creation message failed")
-            Pixel.fire(.debug(event: .bitwardenSendingOfMessageFailed))
+            PixelKit.fire(DebugEvent(GeneralPixel.bitwardenSendingOfMessageFailed))
             status = .error(error: .sendingOfMessageFailed)
             return
         }
@@ -488,7 +490,7 @@ final class BWManager: BWManagement, ObservableObject {
               let messageData = BWRequest.makeEncryptedCommandRequest(encryptedCommand: encryptedCommand,
                                                                       messageId: messageId).data else {
             logOrAssertionFailure("BWManager: Making the credential update message failed")
-            Pixel.fire(.debug(event: .bitwardenSendingOfMessageFailed))
+            PixelKit.fire(DebugEvent(GeneralPixel.bitwardenSendingOfMessageFailed))
             status = .error(error: .sendingOfMessageFailed)
             return
         }
@@ -546,7 +548,7 @@ final class BWManager: BWManagement, ObservableObject {
               let email = payloadItem.email,
               let statusString = payloadItem.status,
               let status = BWVault.Status(rawValue: statusString) else {
-            Pixel.fire(.debug(event: .bitwardenStatusParsingFailed))
+            PixelKit.fire(DebugEvent(GeneralPixel.bitwardenStatusParsingFailed))
             self.status = .error(error: .statusParsingFailed)
             return
         }
diff --git a/DuckDuckGo/PasswordManager/Bitwarden/Model/BWStatus.swift b/DuckDuckGo/PasswordManager/Bitwarden/Model/BWStatus.swift
index 05b1193940..7f08701240 100644
--- a/DuckDuckGo/PasswordManager/Bitwarden/Model/BWStatus.swift
+++ b/DuckDuckGo/PasswordManager/Bitwarden/Model/BWStatus.swift
@@ -28,6 +28,7 @@ enum BWStatus: Equatable {
 
     // Installed Bitwarden doesn't support the integration
     case oldVersion
+    case incompatible
 
     // Bitwarden application isn't running
     case notRunning
diff --git a/DuckDuckGo/PasswordManager/Bitwarden/Services/BWInstallationService.swift b/DuckDuckGo/PasswordManager/Bitwarden/Services/BWInstallationService.swift
index 7e44aea40d..a1184661bc 100644
--- a/DuckDuckGo/PasswordManager/Bitwarden/Services/BWInstallationService.swift
+++ b/DuckDuckGo/PasswordManager/Bitwarden/Services/BWInstallationService.swift
@@ -23,6 +23,7 @@ enum BWInstallationState {
 
     case notInstalled
     case oldVersion
+    case incompatible
     case installed
 
 }
@@ -41,6 +42,7 @@ final class LocalBitwardenInstallationService: BWInstallationService {
     static var bundlePath = "/Applications/Bitwarden.app"
     private lazy var bundleUrl = URL(fileURLWithPath: Self.bundlePath)
     static var minimumVersion = "2022.10.1"
+    static var incompatibleVersions = ["2024.3.0", "2024.3.2", "2024.4.0", "2024.4.1"]
 
     private lazy var manifestPath: String = {
 #if DEBUG
@@ -75,6 +77,10 @@ final class LocalBitwardenInstallationService: BWInstallationService {
             return .oldVersion
         }
 
+        guard !Self.incompatibleVersions.contains(version) else {
+            return .incompatible
+        }
+
         return .installed
     }
 
@@ -124,7 +130,7 @@ final class LocalBitwardenInstallationService: BWInstallationService {
     private func isIntegrationEnabled(in dataFileURL: URL) -> Bool {
         do {
             let dataFile = try String(contentsOf: dataFileURL)
-            return dataFile.range(of: "\"enableDuckDuckGoBrowserIntegration\": true") != nil
+            return dataFile.range(of: "enableDuckDuckGoBrowserIntegration\": true") != nil
         } catch {
             return false
         }
diff --git a/DuckDuckGo/PasswordManager/Bitwarden/View/ConnectBitwardenView.swift b/DuckDuckGo/PasswordManager/Bitwarden/View/ConnectBitwardenView.swift
index 6373dee683..62ff8c586c 100644
--- a/DuckDuckGo/PasswordManager/Bitwarden/View/ConnectBitwardenView.swift
+++ b/DuckDuckGo/PasswordManager/Bitwarden/View/ConnectBitwardenView.swift
@@ -94,9 +94,10 @@ struct ConnectBitwardenView: View {
     @ViewBuilder private func bodyView(for state: ConnectBitwardenViewModel.ViewState) -> some View {
         switch viewModel.viewState {
         case .disclaimer: ConnectToBitwardenDisclaimerView()
-        case .lookingForBitwarden: BitwardenInstallationDetectionView(bitwardenDetected: false, bitwardenNeedsUpdate: false)
-        case .oldVersion: BitwardenInstallationDetectionView(bitwardenDetected: true, bitwardenNeedsUpdate: true)
-        case .bitwardenFound: BitwardenInstallationDetectionView(bitwardenDetected: true, bitwardenNeedsUpdate: false)
+        case .lookingForBitwarden: BitwardenInstallationDetectionView(bitwardenDetected: false, bitwardenNeedsUpdate: false, bitwardenIsIncompatible: false)
+        case .incompatible: BitwardenInstallationDetectionView(bitwardenDetected: true, bitwardenNeedsUpdate: false, bitwardenIsIncompatible: true)
+        case .oldVersion: BitwardenInstallationDetectionView(bitwardenDetected: true, bitwardenNeedsUpdate: true, bitwardenIsIncompatible: false)
+        case .bitwardenFound: BitwardenInstallationDetectionView(bitwardenDetected: true, bitwardenNeedsUpdate: false, bitwardenIsIncompatible: false)
         case .accessToContainersNotApproved: ConnectToBitwardenView(canConnect: false, canNotAccessSandboxContainers: true)
         case .waitingForConnectionPermission: ConnectToBitwardenView(canConnect: false, canNotAccessSandboxContainers: false)
         case .connectToBitwarden: ConnectToBitwardenView(canConnect: true, canNotAccessSandboxContainers: false)
@@ -155,37 +156,37 @@ private struct BitwardenInstallationDetectionView: View {
 
     let bitwardenDetected: Bool
     let bitwardenNeedsUpdate: Bool
+    let bitwardenIsIncompatible: Bool
 
     var body: some View {
 
         VStack(alignment: .leading, spacing: 10) {
-            Text(UserText.installBitwarden)
-                .font(.system(size: 13, weight: .bold))
-
-            HStack {
-                NumberedBadge(value: 1)
 
-                Text(UserText.installBitwardenInfo)
+            if !bitwardenIsIncompatible {
+                Text(UserText.installBitwarden)
+                    .font(.system(size: 13, weight: .bold))
 
-                Spacer()
-            }
-
-            HStack {
-                NumberedBadge(value: 2)
+                HStack {
+                    NumberedBadge(value: 1)
+                    Text(UserText.installBitwardenInfo)
+                    Spacer()
+                }
 
-                Text(UserText.afterBitwardenInstallationInfo)
+                HStack {
+                    NumberedBadge(value: 2)
+                    Text(UserText.afterBitwardenInstallationInfo)
+                    Spacer()
+                }
 
-                Spacer()
+                Button(action: {
+                    viewModel.process(action: .openBitwardenProductPage)
+                }, label: {
+                    Image(.macAppStoreButton)
+                })
+                .buttonStyle(PlainButtonStyle())
+                .frame(width: 156, height: 40)
             }
 
-            Button(action: {
-                viewModel.process(action: .openBitwardenProductPage)
-            }, label: {
-                Image(.macAppStoreButton)
-            })
-            .buttonStyle(PlainButtonStyle())
-            .frame(width: 156, height: 40)
-
             if bitwardenDetected {
                 if bitwardenNeedsUpdate {
                     HStack {
@@ -193,6 +194,17 @@ private struct BitwardenInstallationDetectionView: View {
 
                         Text(UserText.bitwardenOldVersion)
                     }
+                } else if bitwardenIsIncompatible {
+                    HStack {
+                        ActivityIndicator(isAnimating: .constant(true), style: .spinning)
+
+                        VStack(alignment: .leading) {
+                            Text(UserText.bitwardenIncompatible)
+                                .lineLimit(nil)
+                                .fixedSize(horizontal: false, vertical: true)
+                            BitwardenDowngradeInfoView()
+                        }
+                    }
                 } else {
                     HStack {
                         Image(.successCheckmark)
diff --git a/DuckDuckGo/PasswordManager/Bitwarden/View/ConnectBitwardenViewModel.swift b/DuckDuckGo/PasswordManager/Bitwarden/View/ConnectBitwardenViewModel.swift
index bdfc261732..be12ac247d 100644
--- a/DuckDuckGo/PasswordManager/Bitwarden/View/ConnectBitwardenViewModel.swift
+++ b/DuckDuckGo/PasswordManager/Bitwarden/View/ConnectBitwardenViewModel.swift
@@ -36,6 +36,7 @@ final class ConnectBitwardenViewModel: ObservableObject {
         // Bitwarden installation:
         case lookingForBitwarden
         case oldVersion
+        case incompatible
         case bitwardenFound
 
         // Bitwarden connection:
@@ -48,14 +49,14 @@ final class ConnectBitwardenViewModel: ObservableObject {
 
         var canContinue: Bool {
             switch self {
-            case .lookingForBitwarden, .oldVersion, .waitingForConnectionPermission: return false
+            case .lookingForBitwarden, .oldVersion, .incompatible, .waitingForConnectionPermission: return false
             default: return true
             }
         }
 
         var confirmButtonTitle: String {
             switch self {
-            case .disclaimer, .lookingForBitwarden, .oldVersion, .bitwardenFound: return "Next"
+            case .disclaimer, .lookingForBitwarden, .oldVersion, .incompatible, .bitwardenFound: return "Next"
             case .waitingForConnectionPermission, .connectToBitwarden: return "Connect"
             case .accessToContainersNotApproved: return "Open System Settings"
             case .connectedToBitwarden: return "OK"
@@ -106,6 +107,8 @@ final class ConnectBitwardenViewModel: ObservableObject {
             }
         case .oldVersion:
             self.viewState = .oldVersion
+        case .incompatible:
+            self.viewState = .incompatible
         case .notRunning:
             self.viewState = .waitingForConnectionPermission
         case .integrationNotApproved:
@@ -126,7 +129,6 @@ final class ConnectBitwardenViewModel: ObservableObject {
             self.viewState = .connectedToBitwarden
         case .error(error: let error):
             self.error = error
-
         }
     }
     // swiftlint:enable cyclomatic_complexity
diff --git a/DuckDuckGo/PasswordManager/PasswordManagerCoordinator.swift b/DuckDuckGo/PasswordManager/PasswordManagerCoordinator.swift
index 39c5b222df..ca7145d88d 100644
--- a/DuckDuckGo/PasswordManager/PasswordManagerCoordinator.swift
+++ b/DuckDuckGo/PasswordManager/PasswordManagerCoordinator.swift
@@ -20,6 +20,7 @@ import Foundation
 import BrowserServicesKit
 import Combine
 import Common
+import PixelKit
 
 protocol PasswordManagerCoordinating: BrowserServicesKit.PasswordManager {
 
@@ -91,7 +92,7 @@ final class PasswordManagerCoordinator: PasswordManagerCoordinating {
 
     func askToUnlock(completionHandler: @escaping () -> Void) {
         switch bitwardenManagement.status {
-        case .disabled, .notInstalled, .oldVersion, .missingHandshake, .handshakeNotApproved, .error, .accessToContainersNotApproved:
+        case .disabled, .notInstalled, .oldVersion, .incompatible, .missingHandshake, .handshakeNotApproved, .error, .accessToContainersNotApproved:
             Task {
                 await WindowControllersManager.shared.showPreferencesTab(withSelectedPane: .autofill)
             }
@@ -247,7 +248,7 @@ final class PasswordManagerCoordinator: PasswordManagerCoordinating {
             return
         }
 
-        Pixel.fire(.bitwardenPasswordAutofilled)
+        PixelKit.fire(GeneralPixel.bitwardenPasswordAutofilled)
     }
 
     func reportPasswordSave() {
@@ -255,7 +256,7 @@ final class PasswordManagerCoordinator: PasswordManagerCoordinating {
             return
         }
 
-        Pixel.fire(.bitwardenPasswordSaved)
+        PixelKit.fire(GeneralPixel.bitwardenPasswordSaved)
     }
 
     // MARK: - Cache
diff --git a/DuckDuckGo/Permissions/Model/StoredPermission.swift b/DuckDuckGo/Permissions/Model/StoredPermission.swift
index 5fb8ee39ad..6a73f71f1e 100644
--- a/DuckDuckGo/Permissions/Model/StoredPermission.swift
+++ b/DuckDuckGo/Permissions/Model/StoredPermission.swift
@@ -17,6 +17,7 @@
 //
 
 import Foundation
+import PixelKit
 
 enum PersistedPermissionDecision {
     case deny
@@ -64,7 +65,7 @@ struct PermissionEntity: Equatable {
         guard let domain = managedObject.domainEncrypted as? String,
               let permissionTypeString = managedObject.permissionType,
               let permissionType = PermissionType(rawValue: permissionTypeString) else {
-            Pixel.fire(.debug(event: .permissionDecryptionFailedUnique), limitTo: .dailyFirst)
+            PixelKit.fire(DebugEvent(GeneralPixel.permissionDecryptionFailedUnique), frequency: .daily)
             assertionFailure("\(#file): Failed to create PermissionEntity from PermissionManagedObject")
             return nil
         }
diff --git a/DuckDuckGo/Permissions/View/PermissionAuthorizationViewController.swift b/DuckDuckGo/Permissions/View/PermissionAuthorizationViewController.swift
index 5d8221c0e3..aeef6142a5 100644
--- a/DuckDuckGo/Permissions/View/PermissionAuthorizationViewController.swift
+++ b/DuckDuckGo/Permissions/View/PermissionAuthorizationViewController.swift
@@ -83,6 +83,7 @@ final class PermissionAuthorizationViewController: NSViewController {
         } else {
             denyButton.title = UserText.permissionPopoverDenyButton
         }
+        denyButton.setAccessibilityIdentifier("PermissionAuthorizationViewController.denyButton")
     }
 
     private func updateText() {
@@ -116,6 +117,7 @@ final class PermissionAuthorizationViewController: NSViewController {
         buttonsBottomConstraint.isActive = !learnMoreBottomConstraint.isActive
         linkButton.title = UserText.permissionPopupLearnMoreLink
         allowButton.title = UserText.permissionPopupAllowButton
+        allowButton.setAccessibilityIdentifier("PermissionAuthorizationViewController.allowButton")
     }
 
     @IBAction func alwaysAllowLabelClick(_ sender: Any) {
diff --git a/DuckDuckGo/Permissions/View/PermissionButton.swift b/DuckDuckGo/Permissions/View/PermissionButton.swift
index 87e665adb5..dbfae82eac 100644
--- a/DuckDuckGo/Permissions/View/PermissionButton.swift
+++ b/DuckDuckGo/Permissions/View/PermissionButton.swift
@@ -40,18 +40,23 @@ final class PermissionButton: AddressBarButton {
             case .active:
                 self.image = activeImage ?? defaultImage
                 self.normalTintColor = activeTintColor
+                self.setAccessibilityValue("active")
             case .paused:
                 self.image = mutedImage ?? defaultImage
                 self.normalTintColor = mutedTintColor
+                self.setAccessibilityValue("paused")
             case .disabled, .denied, .revoking:
                 self.image = disabledImage ?? defaultImage
                 self.normalTintColor = disabledTintColor
+                self.setAccessibilityValue("disabled-denied-revoking")
             case .requested:
                 self.image = defaultImage
                 self.normalTintColor = defaultTint
+                self.setAccessibilityValue("requested")
             case .inactive:
                 self.image = inactiveImage ?? defaultImage
                 self.normalTintColor = inactiveTintColor ?? defaultTint
+                self.setAccessibilityValue("inactive")
             }
             self.isHidden = isHidden
         }
diff --git a/DuckDuckGo/Permissions/View/PermissionContextMenu.swift b/DuckDuckGo/Permissions/View/PermissionContextMenu.swift
index e207d95d01..308e5c3cc2 100644
--- a/DuckDuckGo/Permissions/View/PermissionContextMenu.swift
+++ b/DuckDuckGo/Permissions/View/PermissionContextMenu.swift
@@ -57,6 +57,7 @@ final class PermissionContextMenu: NSMenu {
         setupOtherPermissionMenuItems(for: remainingPermission)
         setupPopupsPermissionsMenuItems()
         addPersistenceItems()
+        self.setAccessibilityIdentifier("PermissionContextMenu")
     }
 
     private func setupCameraPermissionsMenuItems(_ permissions: Permissions) -> Permissions {
@@ -279,6 +280,8 @@ private extension NSMenuItem {
         if isChecked {
             item.state = .on
         }
+        item.setAccessibilityIdentifier("PermissionContextMenu.alwaysAllow")
+        item.setAccessibilityValue(item.state == .on ? "selected" : "unselected")
         return item
     }
 
@@ -299,6 +302,8 @@ private extension NSMenuItem {
         if isChecked {
             item.state = .on
         }
+        item.setAccessibilityIdentifier("PermissionContextMenu.alwaysAsk")
+        item.setAccessibilityValue(item.state == .on ? "selected" : "unselected")
         return item
     }
 
@@ -312,6 +317,8 @@ private extension NSMenuItem {
         if isChecked {
             item.state = .on
         }
+        item.setAccessibilityIdentifier("PermissionContextMenu.alwaysDeny")
+        item.setAccessibilityValue(item.state == .on ? "selected" : "unselected")
         return item
     }
 
@@ -325,7 +332,10 @@ private extension NSMenuItem {
                            permission.localizedDescription,
                            Bundle.main.displayName ?? "DuckDuckGo")
         }
-        return NSMenuItem(title: title, action: nil, keyEquivalent: "")
+        let item = NSMenuItem(title: title, action: nil, keyEquivalent: "")
+        item.setAccessibilityIdentifier("PermissionContextMenu.permissionDisabled")
+        item.setAccessibilityValue(item.state == .on ? "selected" : "unselected")
+        return item
     }
 
     static func openSystemPreferences(for permission: PermissionType, target: PermissionContextMenu) -> NSMenuItem {
diff --git a/DuckDuckGo/PinnedTabs/Model/PinnedTabsViewModel.swift b/DuckDuckGo/PinnedTabs/Model/PinnedTabsViewModel.swift
index ee5c9f0c91..7324862828 100644
--- a/DuckDuckGo/PinnedTabs/Model/PinnedTabsViewModel.swift
+++ b/DuckDuckGo/PinnedTabs/Model/PinnedTabsViewModel.swift
@@ -122,7 +122,7 @@ final class PinnedTabsViewModel: ObservableObject {
             audioStateView = .muted
         case .unmuted:
             audioStateView = .unmuted
-        case .notSupported:
+        case .none:
             audioStateView = .notSupported
         }
     }
diff --git a/DuckDuckGo/PinnedTabs/View/PinnedTabView.swift b/DuckDuckGo/PinnedTabs/View/PinnedTabView.swift
index 40768d20a3..c9a0c87f8b 100644
--- a/DuckDuckGo/PinnedTabs/View/PinnedTabView.swift
+++ b/DuckDuckGo/PinnedTabs/View/PinnedTabView.swift
@@ -212,7 +212,7 @@ struct PinnedTabInnerView: View {
                     .renderingMode(.template)
                     .frame(width: 12, height: 12)
             }.offset(x: 8, y: -8)
-        default: EmptyView()
+        case .unmuted, .none: EmptyView()
         }
     }
 
@@ -224,7 +224,9 @@ struct PinnedTabInnerView: View {
                     .resizable()
                 mutedTabIndicator
             }
-        } else if let domain = model.content.url?.host, let eTLDplus1 = ContentBlocking.shared.tld.eTLDplus1(domain), let firstLetter = eTLDplus1.capitalized.first.flatMap(String.init) {
+        } else if let domain = model.content.userEditableUrl?.host,
+                  let eTLDplus1 = ContentBlocking.shared.tld.eTLDplus1(domain),
+                  let firstLetter = eTLDplus1.capitalized.first.flatMap(String.init) {
             ZStack {
                 Rectangle()
                     .foregroundColor(.forString(eTLDplus1))
diff --git a/DuckDuckGo/Preferences/Model/AboutModel.swift b/DuckDuckGo/Preferences/Model/AboutModel.swift
index 52508bd9cb..ed2e0a914d 100644
--- a/DuckDuckGo/Preferences/Model/AboutModel.swift
+++ b/DuckDuckGo/Preferences/Model/AboutModel.swift
@@ -22,18 +22,6 @@ import Common
 final class AboutModel: ObservableObject, PreferencesTabOpening {
     let appVersion = AppVersion()
 
-#if NETWORK_PROTECTION
-    private let netPInvitePresenter: NetworkProtectionInvitePresenting
-#endif
-
-#if NETWORK_PROTECTION
-    init(netPInvitePresenter: NetworkProtectionInvitePresenting) {
-        self.netPInvitePresenter = netPInvitePresenter
-    }
-#else
-    init() {}
-#endif
-
     let displayableAboutURL: String = URL.aboutDuckDuckGo
         .toString(decodePunycode: false, dropScheme: true, dropTrailingSlash: false)
 
@@ -45,10 +33,4 @@ final class AboutModel: ObservableObject, PreferencesTabOpening {
     func copy(_ value: String) {
         NSPasteboard.general.copy(value)
     }
-
-#if NETWORK_PROTECTION
-    func displayNetPInvite() {
-        netPInvitePresenter.present()
-    }
-#endif
 }
diff --git a/DuckDuckGo/Preferences/Model/AppearancePreferences.swift b/DuckDuckGo/Preferences/Model/AppearancePreferences.swift
index 833bab73f0..c037a9c75c 100644
--- a/DuckDuckGo/Preferences/Model/AppearancePreferences.swift
+++ b/DuckDuckGo/Preferences/Model/AppearancePreferences.swift
@@ -20,6 +20,7 @@ import Foundation
 import AppKit
 import Bookmarks
 import Common
+import PixelKit
 
 protocol AppearancePreferencesPersistor {
     var showFullURL: Bool { get set }
@@ -135,6 +136,7 @@ final class AppearancePreferences: ObservableObject {
 
     struct Notifications {
         static let showBookmarksBarSettingChanged = NSNotification.Name("ShowBookmarksBarSettingChanged")
+        static let bookmarksBarSettingAppearanceChanged = NSNotification.Name("BookmarksBarSettingAppearanceChanged")
     }
 
     static let shared = AppearancePreferences()
@@ -163,7 +165,7 @@ final class AppearancePreferences: ObservableObject {
             persistor.isFavoriteVisible = isFavoriteVisible
             // Temporary Pixel
             if !isFavoriteVisible {
-                Pixel.fire(.favoriteSectionHidden)
+                PixelKit.fire(GeneralPixel.favoriteSectionHidden)
             }
         }
     }
@@ -173,7 +175,7 @@ final class AppearancePreferences: ObservableObject {
             persistor.isContinueSetUpVisible = isContinueSetUpVisible
             // Temporary Pixel
             if !isContinueSetUpVisible {
-                Pixel.fire(.continueSetUpSectionHidden)
+                PixelKit.fire(GeneralPixel.continueSetUpSectionHidden)
             }
         }
     }
@@ -183,7 +185,7 @@ final class AppearancePreferences: ObservableObject {
             persistor.isRecentActivityVisible = isRecentActivityVisible
             // Temporary Pixel
             if !isRecentActivityVisible {
-                Pixel.fire(.recentActivitySectionHidden)
+                PixelKit.fire(GeneralPixel.recentActivitySectionHidden)
             }
         }
     }
@@ -197,6 +199,7 @@ final class AppearancePreferences: ObservableObject {
     @Published var bookmarksBarAppearance: BookmarksBarAppearance {
         didSet {
             persistor.bookmarksBarAppearance = bookmarksBarAppearance
+            NotificationCenter.default.post(name: Notifications.bookmarksBarSettingAppearanceChanged, object: nil)
         }
     }
 
diff --git a/DuckDuckGo/Preferences/Model/DataClearingPreferences.swift b/DuckDuckGo/Preferences/Model/DataClearingPreferences.swift
index e336ab7cbd..26c2647981 100644
--- a/DuckDuckGo/Preferences/Model/DataClearingPreferences.swift
+++ b/DuckDuckGo/Preferences/Model/DataClearingPreferences.swift
@@ -29,6 +29,27 @@ final class DataClearingPreferences: ObservableObject, PreferencesTabOpening {
         }
     }
 
+    @Published
+    var isAutoClearEnabled: Bool {
+        didSet {
+            persistor.autoClearEnabled = isAutoClearEnabled
+            NotificationCenter.default.post(name: .autoClearDidChange,
+                                            object: nil,
+                                            userInfo: nil)
+        }
+    }
+
+    @Published
+    var isWarnBeforeClearingEnabled: Bool {
+        didSet {
+            persistor.warnBeforeClearingEnabled = isWarnBeforeClearingEnabled
+        }
+    }
+
+    @objc func toggleWarnBeforeClearing() {
+        isWarnBeforeClearingEnabled.toggle()
+    }
+
     @MainActor
     func presentManageFireproofSitesDialog() {
         let fireproofDomainsWindowController = FireproofDomainsViewController.create().wrappedInWindowController()
@@ -46,6 +67,8 @@ final class DataClearingPreferences: ObservableObject, PreferencesTabOpening {
     init(persistor: FireButtonPreferencesPersistor = FireButtonPreferencesUserDefaultsPersistor()) {
         self.persistor = persistor
         isLoginDetectionEnabled = persistor.loginDetectionEnabled
+        isAutoClearEnabled = persistor.autoClearEnabled
+        isWarnBeforeClearingEnabled = persistor.warnBeforeClearingEnabled
     }
 
     private var persistor: FireButtonPreferencesPersistor
@@ -53,6 +76,8 @@ final class DataClearingPreferences: ObservableObject, PreferencesTabOpening {
 
 protocol FireButtonPreferencesPersistor {
     var loginDetectionEnabled: Bool { get set }
+    var autoClearEnabled: Bool { get set }
+    var warnBeforeClearingEnabled: Bool { get set }
 }
 
 struct FireButtonPreferencesUserDefaultsPersistor: FireButtonPreferencesPersistor {
@@ -60,4 +85,14 @@ struct FireButtonPreferencesUserDefaultsPersistor: FireButtonPreferencesPersisto
     @UserDefaultsWrapper(key: .loginDetectionEnabled, defaultValue: false)
     var loginDetectionEnabled: Bool
 
+    @UserDefaultsWrapper(key: .autoClearEnabled, defaultValue: false)
+    var autoClearEnabled: Bool
+
+    @UserDefaultsWrapper(key: .warnBeforeClearingEnabled, defaultValue: false)
+    var warnBeforeClearingEnabled: Bool
+
+}
+
+extension Notification.Name {
+    static let autoClearDidChange = Notification.Name("autoClearDidChange")
 }
diff --git a/DuckDuckGo/Preferences/Model/DefaultBrowserPreferences.swift b/DuckDuckGo/Preferences/Model/DefaultBrowserPreferences.swift
index a40e390510..a5495827fe 100644
--- a/DuckDuckGo/Preferences/Model/DefaultBrowserPreferences.swift
+++ b/DuckDuckGo/Preferences/Model/DefaultBrowserPreferences.swift
@@ -20,6 +20,7 @@ import Combine
 import Common
 import Foundation
 import SwiftUI
+import PixelKit
 
 protocol DefaultBrowserProvider {
     var bundleIdentifier: String { get }
@@ -76,11 +77,13 @@ final class DefaultBrowserPreferences: ObservableObject {
     @Published private(set) var isDefault: Bool = false {
         didSet {
             // Temporary pixel for first time user import data
+            DispatchQueue.main.async {
 #if DEBUG
-            guard NSApp.runType.requiresEnvironment else { return }
+                guard NSApp.runType.requiresEnvironment else { return }
 #endif
-            if Pixel.isNewUser && isDefault {
-                Pixel.fire(.setAsDefaultInitial, limitTo: .initial)
+                if AppDelegate.isNewUser && self.isDefault {
+                    PixelKit.fire(GeneralPixel.setAsDefaultInitial, frequency: .legacyInitial)
+                }
             }
         }
     }
diff --git a/DuckDuckGo/Preferences/Model/DownloadsPreferences.swift b/DuckDuckGo/Preferences/Model/DownloadsPreferences.swift
index ce6962e4bf..e8e435c447 100644
--- a/DuckDuckGo/Preferences/Model/DownloadsPreferences.swift
+++ b/DuckDuckGo/Preferences/Model/DownloadsPreferences.swift
@@ -16,6 +16,7 @@
 //  limitations under the License.
 //
 
+import Common
 import Foundation
 
 protocol DownloadsPreferencesPersistor {
@@ -65,17 +66,19 @@ final class DownloadsPreferences: ObservableObject {
 
     static let shared = DownloadsPreferences(persistor: DownloadsPreferencesUserDefaultsPersistor())
 
-    private func validatedDownloadLocation(_ location: String?) -> URL? {
-        if let selectedLocation = location,
-           let selectedLocationURL = URL(string: selectedLocation),
-           Self.isDownloadLocationValid(selectedLocationURL) {
-            return selectedLocationURL
+    private func validatedDownloadLocation(_ selectedLocation: URL?) -> URL? {
+        if let selectedLocation, Self.isDownloadLocationValid(selectedLocation) {
+            return selectedLocation
         }
         return nil
     }
 
     var effectiveDownloadLocation: URL? {
-        if let selectedLocationURL = alwaysRequestDownloadLocation ? validatedDownloadLocation(persistor.lastUsedCustomDownloadLocation) : validatedDownloadLocation(persistor.selectedDownloadLocation) {
+        if alwaysRequestDownloadLocation {
+            if let lastUsedCustomDownloadLocation = validatedDownloadLocation(persistor.lastUsedCustomDownloadLocation.flatMap(URL.init(string:))) {
+                return lastUsedCustomDownloadLocation
+            }
+        } else if let selectedLocationURL = validatedDownloadLocation(selectedDownloadLocation) {
             return selectedLocationURL
         }
         return Self.defaultDownloadLocation()
@@ -94,37 +97,54 @@ final class DownloadsPreferences: ObservableObject {
             defer {
                 objectWillChange.send()
             }
-            guard let newDownloadLocation = newValue else {
-                persistor.lastUsedCustomDownloadLocation = nil
-                return
-            }
 
-            if Self.isDownloadLocationValid(newDownloadLocation) {
-                persistor.lastUsedCustomDownloadLocation = newDownloadLocation.absoluteString
-            }
+            persistor.lastUsedCustomDownloadLocation = newValue?.absoluteString
         }
     }
 
+    private var selectedDownloadLocationController: SecurityScopedFileURLController?
+
     var selectedDownloadLocation: URL? {
         get {
-            persistor.selectedDownloadLocation?.url
+            if let selectedDownloadLocation = selectedDownloadLocationController?.url {
+                return selectedDownloadLocation
+            }
+#if APPSTORE
+            var isStale = false
+            if let bookmarkData = persistor.selectedDownloadLocation.flatMap({ Data(base64Encoded: $0) }),
+               let url = try? URL(resolvingBookmarkData: bookmarkData, options: .withSecurityScope, relativeTo: nil, bookmarkDataIsStale: &isStale) {
+                if isStale {
+                    setSelectedDownloadLocation(url) // update bookmark data and selectedDownloadLocationController
+                } else {
+                    selectedDownloadLocationController = SecurityScopedFileURLController(url: url, logger: OSLog.downloads)
+                }
+                return url
+            }
+#endif
+            guard let url = persistor.selectedDownloadLocation.flatMap(URL.init(string:)),
+                  url.isFileURL else { return nil }
+            return url.resolvingSymlinksInPath()
         }
-
         set {
             defer {
                 objectWillChange.send()
             }
-            guard let newDownloadLocation = newValue else {
-                persistor.selectedDownloadLocation = nil
-                return
-            }
 
-            if Self.isDownloadLocationValid(newDownloadLocation) {
-                persistor.selectedDownloadLocation = newDownloadLocation.absoluteString
-            }
+            setSelectedDownloadLocation(validatedDownloadLocation(newValue))
         }
     }
 
+    private func setSelectedDownloadLocation(_ url: URL?) {
+        selectedDownloadLocationController = url.map { SecurityScopedFileURLController(url: $0, logger: OSLog.downloads) }
+        let locationString: String?
+#if APPSTORE
+        locationString = (try? url?.bookmarkData(options: .withSecurityScope).base64EncodedString()) ?? url?.absoluteString
+#else
+        locationString = url?.absoluteString
+#endif
+        persistor.selectedDownloadLocation = locationString
+    }
+
     var alwaysRequestDownloadLocation: Bool {
         get {
             persistor.alwaysRequestDownloadLocation
diff --git a/DuckDuckGo/Preferences/Model/PreferencesSection.swift b/DuckDuckGo/Preferences/Model/PreferencesSection.swift
index d1d1a8ebfd..f9dbccd5b7 100644
--- a/DuckDuckGo/Preferences/Model/PreferencesSection.swift
+++ b/DuckDuckGo/Preferences/Model/PreferencesSection.swift
@@ -18,10 +18,8 @@
 
 import Foundation
 import SwiftUI
-
-#if SUBSCRIPTION
 import Subscription
-#endif
+import BrowserServicesKit
 
 struct PreferencesSection: Hashable, Identifiable {
     let id: PreferencesSectionIdentifier
@@ -31,11 +29,9 @@ struct PreferencesSection: Hashable, Identifiable {
     static func defaultSections(includingDuckPlayer: Bool, includingSync: Bool, includingVPN: Bool) -> [PreferencesSection] {
         var privacyPanes: [PreferencePaneIdentifier] = [.defaultBrowser, .privateSearch, .webTrackingProtection, .cookiePopupProtection, .emailProtection]
 
-#if NETWORK_PROTECTION
         if includingVPN {
             privacyPanes.append(.vpn)
         }
-#endif
 
         let regularPanes: [PreferencePaneIdentifier] = {
             var panes: [PreferencePaneIdentifier] = [.general, .appearance, .autofill, .accessibility, .dataClearing]
@@ -51,7 +47,12 @@ struct PreferencesSection: Hashable, Identifiable {
             return panes
         }()
 
+#if APPSTORE
+        // App Store guidelines don't allow references to other platforms, so the Mac App Store build omits the otherPlatforms section.
+        let otherPanes: [PreferencePaneIdentifier] = [.about]
+#else
         let otherPanes: [PreferencePaneIdentifier] = [.about, .otherPlatforms]
+#endif
 
         var sections: [PreferencesSection] = [
             .init(id: .privacyProtections, panes: privacyPanes),
@@ -59,7 +60,6 @@ struct PreferencesSection: Hashable, Identifiable {
             .init(id: .about, panes: otherPanes)
         ]
 
-#if SUBSCRIPTION
         if DefaultSubscriptionFeatureAvailability().isFeatureAvailable {
 
             var shouldHidePrivacyProDueToNoProducts = SubscriptionPurchaseEnvironment.current == .appStore && SubscriptionPurchaseEnvironment.canPurchase == false
@@ -73,7 +73,6 @@ struct PreferencesSection: Hashable, Identifiable {
                 sections.insert(.init(id: .privacyPro, panes: subscriptionPanes), at: 1)
             }
         }
-#endif
 
         return sections
     }
@@ -100,7 +99,7 @@ enum PreferencesSectionIdentifier: Hashable, CaseIterable {
 
 }
 
-enum PreferencePaneIdentifier: String, Equatable, Hashable, Identifiable {
+enum PreferencePaneIdentifier: String, Equatable, Hashable, Identifiable, CaseIterable {
     case defaultBrowser
     case privateSearch
     case webTrackingProtection
@@ -111,12 +110,8 @@ enum PreferencePaneIdentifier: String, Equatable, Hashable, Identifiable {
     case sync
     case appearance
     case dataClearing
-#if NETWORK_PROTECTION
     case vpn
-#endif
-#if SUBSCRIPTION
     case subscription
-#endif
     case autofill
     case accessibility
     case duckPlayer = "duckplayer"
@@ -168,14 +163,10 @@ enum PreferencePaneIdentifier: String, Equatable, Hashable, Identifiable {
             return UserText.appearance
         case .dataClearing:
             return UserText.dataClearing
-#if NETWORK_PROTECTION
         case .vpn:
             return UserText.vpn
-#endif
-#if SUBSCRIPTION
         case .subscription:
             return UserText.subscription
-#endif
         case .autofill:
             return UserText.autofill
         case .accessibility:
@@ -209,14 +200,10 @@ enum PreferencePaneIdentifier: String, Equatable, Hashable, Identifiable {
             return "Appearance"
         case .dataClearing:
             return "FireSettings"
-#if NETWORK_PROTECTION
         case .vpn:
             return "VPN"
-#endif
-#if SUBSCRIPTION
         case .subscription:
             return "PrivacyPro"
-#endif
         case .autofill:
             return "Autofill"
         case .accessibility:
diff --git a/DuckDuckGo/Preferences/Model/PreferencesSidebarModel.swift b/DuckDuckGo/Preferences/Model/PreferencesSidebarModel.swift
index b5ba825f14..1bcd647e37 100644
--- a/DuckDuckGo/Preferences/Model/PreferencesSidebarModel.swift
+++ b/DuckDuckGo/Preferences/Model/PreferencesSidebarModel.swift
@@ -20,10 +20,7 @@ import BrowserServicesKit
 import Combine
 import DDGSync
 import SwiftUI
-
-#if SUBSCRIPTION
 import Subscription
-#endif
 
 final class PreferencesSidebarModel: ObservableObject {
 
@@ -32,6 +29,7 @@ final class PreferencesSidebarModel: ObservableObject {
     @Published private(set) var sections: [PreferencesSection] = []
     @Published var selectedTabIndex: Int = 0
     @Published private(set) var selectedPane: PreferencePaneIdentifier = .defaultBrowser
+    private let vpnVisibility: NetworkProtectionFeatureVisibility
 
     var selectedTabContent: AnyPublisher<Tab.TabContent, Never> {
         $selectedTabIndex.map { [tabSwitcherTabs] in tabSwitcherTabs[$0] }.eraseToAnyPublisher()
@@ -43,10 +41,12 @@ final class PreferencesSidebarModel: ObservableObject {
         loadSections: @escaping () -> [PreferencesSection],
         tabSwitcherTabs: [Tab.TabContent],
         privacyConfigurationManager: PrivacyConfigurationManaging,
-        syncService: DDGSyncing
+        syncService: DDGSyncing,
+        vpnVisibility: NetworkProtectionFeatureVisibility = DefaultNetworkProtectionVisibility()
     ) {
         self.loadSections = loadSections
         self.tabSwitcherTabs = tabSwitcherTabs
+        self.vpnVisibility = vpnVisibility
 
         resetTabSelectionIfNeeded()
         refreshSections()
@@ -69,9 +69,7 @@ final class PreferencesSidebarModel: ObservableObject {
             }
             .store(in: &cancellables)
 
-#if NETWORK_PROTECTION
         setupVPNPaneVisibility()
-#endif
     }
 
     @MainActor
@@ -79,15 +77,12 @@ final class PreferencesSidebarModel: ObservableObject {
         tabSwitcherTabs: [Tab.TabContent] = Tab.TabContent.displayableTabTypes,
         privacyConfigurationManager: PrivacyConfigurationManaging = ContentBlocking.shared.privacyConfigurationManager,
         syncService: DDGSyncing,
+        vpnVisibility: NetworkProtectionFeatureVisibility = DefaultNetworkProtectionVisibility(),
         includeDuckPlayer: Bool,
         userDefaults: UserDefaults = .netP
     ) {
         let loadSections = {
-#if NETWORK_PROTECTION
-            let includingVPN = DefaultNetworkProtectionVisibility().isInstalled
-#else
-            let includingVPN = false
-#endif
+            let includingVPN = vpnVisibility.isInstalled
 
             return PreferencesSection.defaultSections(
                 includingDuckPlayer: includeDuckPlayer,
@@ -99,14 +94,14 @@ final class PreferencesSidebarModel: ObservableObject {
         self.init(loadSections: loadSections,
                   tabSwitcherTabs: tabSwitcherTabs,
                   privacyConfigurationManager: privacyConfigurationManager,
-                  syncService: syncService)
+                  syncService: syncService,
+                  vpnVisibility: vpnVisibility)
     }
 
     // MARK: - Setup
 
-#if NETWORK_PROTECTION
     private func setupVPNPaneVisibility() {
-        DefaultNetworkProtectionVisibility().onboardStatusPublisher
+        vpnVisibility.onboardStatusPublisher
             .receive(on: DispatchQueue.main)
             .sink { [weak self] _ in
                 guard let self else { return }
@@ -115,7 +110,6 @@ final class PreferencesSidebarModel: ObservableObject {
             }
             .store(in: &cancellables)
     }
-#endif
 
     // MARK: - Refreshing logic
 
diff --git a/DuckDuckGo/Preferences/Model/SearchPreferences.swift b/DuckDuckGo/Preferences/Model/SearchPreferences.swift
index bbe5cfb70c..65d385d72b 100644
--- a/DuckDuckGo/Preferences/Model/SearchPreferences.swift
+++ b/DuckDuckGo/Preferences/Model/SearchPreferences.swift
@@ -61,4 +61,9 @@ extension PreferencesTabOpening {
         WindowControllersManager.shared.show(url: url, source: .ui, newTab: true)
     }
 
+    @MainActor
+    func show(url: URL) {
+        WindowControllersManager.shared.show(url: url, source: .ui, newTab: false)
+    }
+
 }
diff --git a/DuckDuckGo/Preferences/Model/StartupPreferences.swift b/DuckDuckGo/Preferences/Model/StartupPreferences.swift
index 6e46f9b729..9bdafbacf3 100644
--- a/DuckDuckGo/Preferences/Model/StartupPreferences.swift
+++ b/DuckDuckGo/Preferences/Model/StartupPreferences.swift
@@ -40,22 +40,28 @@ struct StartupPreferencesUserDefaultsPersistor: StartupPreferencesPersistor {
 
 }
 
-final class StartupPreferences: ObservableObject {
+final class StartupPreferences: ObservableObject, PreferencesTabOpening {
 
     static let shared = StartupPreferences()
     private let pinningManager: LocalPinningManager
     private var persistor: StartupPreferencesPersistor
     private var pinnedViewsNotificationCancellable: AnyCancellable?
+    private var dataClearingPreferences: DataClearingPreferences
+    private var dataClearingPreferencesNotificationCancellable: AnyCancellable?
 
     init(pinningManager: LocalPinningManager = LocalPinningManager.shared,
-         persistor: StartupPreferencesPersistor = StartupPreferencesUserDefaultsPersistor(appearancePrefs: AppearancePreferences.shared)) {
+         persistor: StartupPreferencesPersistor = StartupPreferencesUserDefaultsPersistor(appearancePrefs: AppearancePreferences.shared),
+         dataClearingPreferences: DataClearingPreferences = DataClearingPreferences.shared) {
         self.pinningManager = pinningManager
         self.persistor = persistor
+        self.dataClearingPreferences = dataClearingPreferences
         restorePreviousSession = persistor.restorePreviousSession
         launchToCustomHomePage = persistor.launchToCustomHomePage
         customHomePageURL = persistor.customHomePageURL
         updateHomeButtonState()
         listenToPinningManagerNotifications()
+        listenToDataClearingPreferencesNotifications()
+        checkDataClearingStatus()
     }
 
     @Published var restorePreviousSession: Bool {
@@ -129,6 +135,21 @@ final class StartupPreferences: ObservableObject {
         }
     }
 
+    private func checkDataClearingStatus() {
+        if dataClearingPreferences.isAutoClearEnabled {
+            restorePreviousSession = false
+        }
+    }
+
+    private func listenToDataClearingPreferencesNotifications() {
+        dataClearingPreferencesNotificationCancellable = NotificationCenter.default.publisher(for: .autoClearDidChange).sink { [weak self] _ in
+            guard let self = self else {
+                return
+            }
+            self.checkDataClearingStatus()
+        }
+    }
+
     private func urlWithScheme(_ urlString: String) -> String? {
         guard var urlWithScheme = urlString.url else {
             return nil
diff --git a/DuckDuckGo/Preferences/Model/SyncPreferences.swift b/DuckDuckGo/Preferences/Model/SyncPreferences.swift
index 28be6ba74d..7781247f6c 100644
--- a/DuckDuckGo/Preferences/Model/SyncPreferences.swift
+++ b/DuckDuckGo/Preferences/Model/SyncPreferences.swift
@@ -172,17 +172,15 @@ 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)
-        }
+        syncService.isSyncInProgressPublisher
+            .removeDuplicates()
+            .filter { !$0 }
+            .asVoid()
+            .receive(on: DispatchQueue.main)
+            .sink { [weak self] in
+                self?.updateInvalidObjects()
+            }
+            .store(in: &cancellables)
 
         $syncErrorMessage
             .map { $0 != nil }
@@ -244,7 +242,7 @@ final class SyncPreferences: ObservableObject, SyncUI.ManagementViewModel {
                 UserDefaults.standard.set(false, forKey: UserDefaultsWrapper<Bool>.Key.syncCredentialsPaused.rawValue)
             } catch {
                 managementDialogModel.syncErrorMessage = SyncErrorMessage(type: .unableToTurnSyncOff, description: error.localizedDescription)
-                firePixelIfNeeded(event: .debug(event: .syncLogoutError, error: error))
+                PixelKit.fire(DebugEvent(GeneralPixel.syncLogoutError(error: error)))
             }
         }
     }
@@ -396,7 +394,7 @@ extension SyncPreferences: ManagementDialogModelDelegate {
                 UserDefaults.standard.set(false, forKey: UserDefaultsWrapper<Bool>.Key.syncCredentialsPaused.rawValue)
             } catch {
                 managementDialogModel.syncErrorMessage = SyncErrorMessage(type: .unableToDeleteData, description: error.localizedDescription)
-                firePixelIfNeeded(event: .debug(event: .syncDeleteAccountError, error: error))
+                PixelKit.fire(DebugEvent(GeneralPixel.syncDeleteAccountError(error: error)))
             }
         }
     }
@@ -411,7 +409,7 @@ extension SyncPreferences: ManagementDialogModelDelegate {
                 mapDevices(devices)
             } catch {
                 managementDialogModel.syncErrorMessage = SyncErrorMessage(type: .unableToUpdateDeviceName, description: error.localizedDescription)
-                firePixelIfNeeded(event: .debug(event: .syncUpdateDeviceError, error: error))
+                PixelKit.fire(DebugEvent(GeneralPixel.syncUpdateDeviceError(error: error)))
             }
             syncService.scheduler.resumeSyncQueue()
         }
@@ -427,7 +425,7 @@ extension SyncPreferences: ManagementDialogModelDelegate {
         let device = deviceInfo()
         let devices = try await syncService.login(recoveryKey, deviceName: device.name, deviceType: device.type)
         mapDevices(devices)
-        Pixel.fire(.syncLogin)
+        PixelKit.fire(GeneralPixel.syncLogin)
         DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) {
             if isRecovery {
                 self.showDevicesSynced()
@@ -449,11 +447,11 @@ extension SyncPreferences: ManagementDialogModelDelegate {
                 let device = deviceInfo()
                 presentDialog(for: .prepareToSync)
                 try await syncService.createAccount(deviceName: device.name, deviceType: device.type)
-                Pixel.fire(.syncSignupDirect)
+                PixelKit.fire(GeneralPixel.syncSignupDirect)
                 presentDialog(for: .saveRecoveryCode(recoveryCode ?? ""))
             } catch {
                 managementDialogModel.syncErrorMessage = SyncErrorMessage(type: .unableToSyncToServer, description: error.localizedDescription)
-                firePixelIfNeeded(event: .debug(event: .syncSignupError, error: error))
+                PixelKit.fire(DebugEvent(GeneralPixel.syncSignupError(error: error)))
             }
         }
     }
@@ -489,7 +487,7 @@ extension SyncPreferences: ManagementDialogModelDelegate {
                             description: error.localizedDescription
                         )
                     }
-                    firePixelIfNeeded(event: .debug(event: .syncLoginError, error: error))
+                    PixelKit.fire(DebugEvent(GeneralPixel.syncLoginError(error: error)))
                 }
             }
         }
@@ -512,14 +510,14 @@ extension SyncPreferences: ManagementDialogModelDelegate {
                     try await loginAndShowPresentedDialog(recoveryKey, isRecovery: fromRecoveryScreen)
                 } catch {
                     managementDialogModel.syncErrorMessage = SyncErrorMessage(type: .unableToMergeTwoAccounts, description: "")
-                    firePixelIfNeeded(event: .debug(event: .syncLoginExistingAccountError, error: error))
+                    PixelKit.fire(DebugEvent(GeneralPixel.syncLoginExistingAccountError(error: error)))
                 }
             } else if let connectKey = syncCode.connect {
                 do {
                     if syncService.account == nil {
                         let device = deviceInfo()
                         try await syncService.createAccount(deviceName: device.name, deviceType: device.type)
-                        Pixel.fire(.syncSignupConnect)
+                        PixelKit.fire(GeneralPixel.syncSignupConnect)
                         presentDialog(for: .saveRecoveryCode(recoveryCode))
                     }
 
@@ -538,7 +536,7 @@ extension SyncPreferences: ManagementDialogModelDelegate {
                         type: .unableToSyncToOtherDevice,
                         description: error.localizedDescription
                     )
-                    firePixelIfNeeded(event: .debug(event: .syncLoginError, error: error))
+                    PixelKit.fire(DebugEvent(GeneralPixel.syncLoginError(error: error)))
                 }
             } else {
                 managementDialogModel.syncErrorMessage = SyncErrorMessage(type: .invalidCode, description: "")
@@ -559,15 +557,19 @@ extension SyncPreferences: ManagementDialogModelDelegate {
             return
         }
 
-        let data = RecoveryPDFGenerator()
-            .generate(recoveryCode)
-
         Task { @MainActor in
             let authenticationResult = await userAuthenticator.authenticateUser(reason: .syncSettings)
             guard authenticationResult.authenticated else {
+                if authenticationResult == .noAuthAvailable {
+                    presentDialog(for: .empty)
+                    managementDialogModel.syncErrorMessage = SyncErrorMessage(type: .unableToAuthenticateOnDevice, description: "")
+                }
                 return
             }
 
+            let data = RecoveryPDFGenerator()
+                .generate(recoveryCode)
+
             let panel = NSSavePanel.savePanelWithFileTypeChooser(fileTypes: [.pdf], suggestedFilename: "Sync Data Recovery - DuckDuckGo.pdf")
             let response = await panel.begin()
 
@@ -580,7 +582,7 @@ extension SyncPreferences: ManagementDialogModelDelegate {
                 }
             } catch {
                 managementDialogModel.syncErrorMessage = SyncErrorMessage(type: .unableCreateRecoveryPDF, description: error.localizedDescription)
-                firePixelIfNeeded(event: .debug(event: .syncCannotCreateRecoveryPDF, error: nil))
+                PixelKit.fire(DebugEvent(GeneralPixel.syncCannotCreateRecoveryPDF))
             }
         }
 
@@ -595,7 +597,7 @@ extension SyncPreferences: ManagementDialogModelDelegate {
                 managementDialogModel.endFlow()
             } catch {
                 managementDialogModel.syncErrorMessage = SyncErrorMessage(type: .unableToRemoveDevice, description: error.localizedDescription)
-                firePixelIfNeeded(event: .debug(event: .syncRemoveDeviceError, error: error))
+                PixelKit.fire(DebugEvent(GeneralPixel.syncRemoveDeviceError(error: error)))
             }
         }
     }
@@ -607,7 +609,12 @@ extension SyncPreferences: ManagementDialogModelDelegate {
 
     @MainActor
     func syncWithAnotherDevicePressed() async {
-        guard await userAuthenticator.authenticateUser(reason: .syncSettings).authenticated else {
+        let authenticationResult = await userAuthenticator.authenticateUser(reason: .syncSettings)
+        guard authenticationResult.authenticated else {
+            if authenticationResult == .noAuthAvailable {
+                presentDialog(for: .empty)
+                managementDialogModel.syncErrorMessage = SyncErrorMessage(type: .unableToAuthenticateOnDevice, description: "")
+            }
             return
         }
         if isSyncEnabled {
@@ -619,7 +626,12 @@ extension SyncPreferences: ManagementDialogModelDelegate {
 
     @MainActor
     func syncWithServerPressed() async {
-        guard await userAuthenticator.authenticateUser(reason: .syncSettings).authenticated else {
+        let authenticationResult = await userAuthenticator.authenticateUser(reason: .syncSettings)
+        guard authenticationResult.authenticated else {
+            if authenticationResult == .noAuthAvailable {
+                presentDialog(for: .empty)
+                managementDialogModel.syncErrorMessage = SyncErrorMessage(type: .unableToAuthenticateOnDevice, description: "")
+            }
             return
         }
         presentDialog(for: .syncWithServer)
@@ -627,7 +639,12 @@ extension SyncPreferences: ManagementDialogModelDelegate {
 
     @MainActor
     func recoverDataPressed() async {
-        guard await userAuthenticator.authenticateUser(reason: .syncSettings).authenticated else {
+        let authenticationResult = await userAuthenticator.authenticateUser(reason: .syncSettings)
+        guard authenticationResult.authenticated else {
+            if authenticationResult == .noAuthAvailable {
+                presentDialog(for: .empty)
+                managementDialogModel.syncErrorMessage = SyncErrorMessage(type: .unableToAuthenticateOnDevice, description: "")
+            }
             return
         }
         presentDialog(for: .recoverSyncedData)
@@ -652,6 +669,11 @@ extension SyncPreferences: ManagementDialogModelDelegate {
         showDevicesSynced()
     }
 
+    @MainActor
+    func openSystemPasswordSettings() {
+        NSWorkspace.shared.open(URL.touchIDAndPassword)
+    }
+
     @MainActor
     private func showDevicesSynced() {
         presentDialog(for: .nowSyncing)
@@ -664,16 +686,4 @@ extension SyncPreferences: ManagementDialogModelDelegate {
     func recoveryCodePasted(_ code: String, fromRecoveryScreen: Bool) {
         recoverDevice(recoveryCode: code, fromRecoveryScreen: fromRecoveryScreen)
     }
-
-    private func firePixelIfNeeded(event: Pixel.Event) {
-        if case let .debug(_, debugError) = event {
-            if debugError == nil {
-                Pixel.fire(event)
-            }
-            if let syncError = debugError as? SyncError, !syncError.isServerError {
-                Pixel.fire(event, withAdditionalParameters: syncError.errorParameters)
-            }
-        }
-    }
-
 }
diff --git a/DuckDuckGo/Preferences/Model/TabsPreferences.swift b/DuckDuckGo/Preferences/Model/TabsPreferences.swift
new file mode 100644
index 0000000000..f407cc2db1
--- /dev/null
+++ b/DuckDuckGo/Preferences/Model/TabsPreferences.swift
@@ -0,0 +1,73 @@
+//
+//  TabsPreferences.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 TabsPreferencesPersistor {
+    var switchToNewTabWhenOpened: Bool { get set }
+    var preferNewTabsToWindows: Bool { get set }
+    var newTabPosition: NewTabPosition { get set }
+}
+
+struct TabsPreferencesUserDefaultsPersistor: TabsPreferencesPersistor {
+    @UserDefaultsWrapper(key: .preferNewTabsToWindows, defaultValue: true)
+    var preferNewTabsToWindows: Bool
+
+    @UserDefaultsWrapper(key: .switchToNewTabWhenOpened, defaultValue: false)
+    var switchToNewTabWhenOpened: Bool
+
+    @UserDefaultsWrapper(key: .newTabPosition, defaultValue: .atEnd)
+    var newTabPosition: NewTabPosition
+}
+
+final class TabsPreferences: ObservableObject, PreferencesTabOpening {
+
+    static let shared = TabsPreferences()
+
+    @Published var preferNewTabsToWindows: Bool {
+        didSet {
+            persistor.preferNewTabsToWindows = preferNewTabsToWindows
+        }
+    }
+
+    @Published var switchToNewTabWhenOpened: Bool {
+        didSet {
+            persistor.switchToNewTabWhenOpened = switchToNewTabWhenOpened
+        }
+    }
+
+    @Published var newTabPosition: NewTabPosition {
+        didSet {
+            persistor.newTabPosition = newTabPosition
+        }
+    }
+
+    init(persistor: TabsPreferencesPersistor = TabsPreferencesUserDefaultsPersistor()) {
+        self.persistor = persistor
+        preferNewTabsToWindows = persistor.preferNewTabsToWindows
+        switchToNewTabWhenOpened = persistor.switchToNewTabWhenOpened
+        newTabPosition = persistor.newTabPosition
+    }
+
+    private var persistor: TabsPreferencesPersistor
+}
+
+enum NewTabPosition: String, CaseIterable {
+    case atEnd
+    case nextToCurrent
+}
diff --git a/DuckDuckGo/Preferences/Model/VPNPreferencesModel.swift b/DuckDuckGo/Preferences/Model/VPNPreferencesModel.swift
index 54ead02220..c79ef7a8e2 100644
--- a/DuckDuckGo/Preferences/Model/VPNPreferencesModel.swift
+++ b/DuckDuckGo/Preferences/Model/VPNPreferencesModel.swift
@@ -16,8 +16,6 @@
 //  limitations under the License.
 //
 
-#if NETWORK_PROTECTION
-
 import AppKit
 import Combine
 import Foundation
@@ -111,7 +109,7 @@ final class VPNPreferencesModel: ObservableObject {
 
         switch response {
         case .OK:
-            await NetworkProtectionFeatureDisabler().disable(keepAuthToken: true, uninstallSystemExtension: true)
+            await NetworkProtectionFeatureDisabler().disable(uninstallSystemExtension: true)
         default:
             // intentional no-op
             break
@@ -134,5 +132,3 @@ final class VPNPreferencesModel: ObservableObject {
         return alert
     }
 }
-
-#endif
diff --git a/DuckDuckGo/Preferences/View/PreferencesAboutView.swift b/DuckDuckGo/Preferences/View/PreferencesAboutView.swift
index d298ef89fd..e4e8900df9 100644
--- a/DuckDuckGo/Preferences/View/PreferencesAboutView.swift
+++ b/DuckDuckGo/Preferences/View/PreferencesAboutView.swift
@@ -55,11 +55,6 @@ extension Preferences {
                                 .multilineTextAlignment(.leading)
 
                             Text(UserText.versionLabel(version: model.appVersion.versionNumber, build: model.appVersion.buildNumber))
-                                .onTapGesture(count: 12) {
-#if NETWORK_PROTECTION
-                                    model.displayNetPInvite()
-#endif
-                                }
                                 .contextMenu(ContextMenu(menuItems: {
                                     Button(UserText.copy, action: {
                                         model.copy(UserText.versionLabel(version: model.appVersion.versionNumber, build: model.appVersion.buildNumber))
diff --git a/DuckDuckGo/Preferences/View/PreferencesAppearanceView.swift b/DuckDuckGo/Preferences/View/PreferencesAppearanceView.swift
index be30d68da2..c44ff7c3bd 100644
--- a/DuckDuckGo/Preferences/View/PreferencesAppearanceView.swift
+++ b/DuckDuckGo/Preferences/View/PreferencesAppearanceView.swift
@@ -106,7 +106,7 @@ extension Preferences {
                     if model.isContinueSetUpAvailable {
                         ToggleMenuItem(UserText.newTabSetUpSectionTitle, isOn: $model.isContinueSetUpVisible)
                     }
-                    ToggleMenuItem(UserText.newTabFavoriteSectionTitle, isOn: $model.isFavoriteVisible)
+                    ToggleMenuItem(UserText.newTabFavoriteSectionTitle, isOn: $model.isFavoriteVisible).accessibilityIdentifier("Preferences.AppearanceView.showFavoritesToggle")
                     ToggleMenuItem(UserText.newTabRecentActivitySectionTitle, isOn: $model.isRecentActivityVisible)
                 }
 
@@ -115,15 +115,19 @@ extension Preferences {
 
                     HStack {
                         ToggleMenuItem(UserText.showBookmarksBarPreference, isOn: $model.showBookmarksBar)
+                            .accessibilityIdentifier("Preferences.AppearanceView.showBookmarksBarPreferenceToggle")
                         NSPopUpButtonView(selection: $model.bookmarksBarAppearance) {
                             let button = NSPopUpButton()
                             button.setContentHuggingPriority(.defaultHigh, for: .horizontal)
+                            button.setAccessibilityIdentifier("Preferences.AppearanceView.showBookmarksBarPopUp")
 
                             let alwaysOn = button.menu?.addItem(withTitle: UserText.showBookmarksBarAlways, action: nil, keyEquivalent: "")
                             alwaysOn?.representedObject = BookmarksBarAppearance.alwaysOn
+                            alwaysOn?.setAccessibilityIdentifier("Preferences.AppearanceView.showBookmarksBarAlways")
 
                             let newTabOnly = button.menu?.addItem(withTitle: UserText.showBookmarksBarNewTabOnly, action: nil, keyEquivalent: "")
                             newTabOnly?.representedObject = BookmarksBarAppearance.newTabOnly
+                            newTabOnly?.setAccessibilityIdentifier("Preferences.AppearanceView.showBookmarksBarNewTabOnly")
 
                             return button
                         }
diff --git a/DuckDuckGo/Preferences/View/PreferencesAutofillView.swift b/DuckDuckGo/Preferences/View/PreferencesAutofillView.swift
index 63cdb989d5..cb36a0d227 100644
--- a/DuckDuckGo/Preferences/View/PreferencesAutofillView.swift
+++ b/DuckDuckGo/Preferences/View/PreferencesAutofillView.swift
@@ -19,6 +19,7 @@
 import PreferencesViews
 import SwiftUI
 import SwiftUIExtensions
+import PixelKit
 
 fileprivate extension Preferences.Const {
     static let autoLockWarningOffset: CGFloat = {
@@ -133,7 +134,7 @@ extension Preferences {
                         Button(UserText.autofillExcludedSitesReset) {
                             showingResetNeverPromptSitesSheet.toggle()
                             if showingResetNeverPromptSitesSheet {
-                                Pixel.fire(.autofillLoginsSettingsResetExcludedDisplayed)
+                                PixelKit.fire(GeneralPixel.autofillLoginsSettingsResetExcludedDisplayed)
                             }
                         }
                     }.sheet(isPresented: $showingResetNeverPromptSitesSheet) {
@@ -197,14 +198,18 @@ extension Preferences {
                 .offset(x: Preferences.Const.autoLockWarningOffset)
             case .notInstalled:
                 BitwardenStatusView(iconType: .warning,
-                                    title: UserText.bitwardenNotInstalled,
-                                    buttonValue: nil)
+                                    title: UserText.bitwardenNotInstalled)
                 .offset(x: Preferences.Const.autoLockWarningOffset)
             case .oldVersion:
                 BitwardenStatusView(iconType: .warning,
-                                    title: UserText.bitwardenOldVersion,
-                                    buttonValue: nil)
+                                    title: UserText.bitwardenOldVersion)
+                .offset(x: Preferences.Const.autoLockWarningOffset)
+            case .incompatible:
+                BitwardenStatusView(iconType: .warning,
+                                    title: UserText.bitwardenIncompatible,
+                                    content: AnyView(BitwardenDowngradeInfoView()))
                 .offset(x: Preferences.Const.autoLockWarningOffset)
+                    .offset(x: Preferences.Const.autoLockWarningOffset)
             case .notRunning:
                 BitwardenStatusView(iconType: .warning,
                                     title: UserText.bitwardenPreferencesRun,
@@ -273,6 +278,13 @@ extension Preferences {
 
 private struct BitwardenStatusView: View {
 
+    internal init(iconType: BitwardenStatusView.IconType, title: String, buttonValue: BitwardenStatusView.ButtonValue? = nil, content: AnyView? = nil) {
+        self.iconType = iconType
+        self.title = title
+        self.buttonValue = buttonValue
+        self.content = content
+    }
+
     struct ButtonValue {
         let title: String
         let action: () -> Void
@@ -295,6 +307,7 @@ private struct BitwardenStatusView: View {
     let iconType: IconType
     let title: String
     let buttonValue: ButtonValue?
+    let content: AnyView?
 
     var body: some View {
 
@@ -302,10 +315,15 @@ private struct BitwardenStatusView: View {
             HStack(alignment: .top) {
                 Image(iconType.imageName)
                     .padding(.top, 2)
-                Text(title)
-                    .lineLimit(nil)
-                    .fixedSize(horizontal: false, vertical: true)
-                    .padding([.top, .bottom], 2)
+                VStack(alignment: .leading) {
+                    Text(title)
+                        .lineLimit(nil)
+                        .fixedSize(horizontal: false, vertical: true)
+                        .padding([.top, .bottom], 2)
+                    if let content {
+                        content.padding([.top, .bottom], 2)
+                    }
+                }
             }
             .padding([.leading, .trailing], 6)
             .padding([.top, .bottom], 2)
@@ -325,6 +343,25 @@ private struct BitwardenStatusView: View {
 
 }
 
+struct BitwardenDowngradeInfoView: View, PreferencesTabOpening {
+
+    var body: some View {
+        VStack(alignment: .leading) {
+            VStack(alignment: .leading) {
+                HStack {
+                    Text("1.")
+                    Button(UserText.bitwardenIncompatibleStep1, action: {
+                        openNewTab(with: URL(string: "https://github.com/bitwarden/clients/releases/download/desktop-v2024.2.1/Bitwarden-2024.2.1-universal.dmg")!)
+                    }).foregroundColor(.accentColor)
+                }
+                Text(UserText.bitwardenIncompatibleStep2)
+                    .lineLimit(nil)
+                    .fixedSize(horizontal: false, vertical: true)
+            }
+        }
+    }
+}
+
 struct ResetNeverPromptSitesSheet: View {
 
     @ObservedObject var autofillPreferencesModel: AutofillPreferencesModel
@@ -348,7 +385,7 @@ struct ResetNeverPromptSitesSheet: View {
                 Spacer()
                 Button(UserText.cancel) {
                     isSheetPresented.toggle()
-                    Pixel.fire(.autofillLoginsSettingsResetExcludedDismissed)
+                    PixelKit.fire(GeneralPixel.autofillLoginsSettingsResetExcludedDismissed)
                 }
                 Button(action: {
                     saveChanges()
@@ -365,7 +402,7 @@ struct ResetNeverPromptSitesSheet: View {
     private func saveChanges() {
         autofillPreferencesModel.resetNeverPromptWebsites()
         isSheetPresented.toggle()
-        Pixel.fire(.autofillLoginsSettingsResetExcludedConfirmed)
+        PixelKit.fire(GeneralPixel.autofillLoginsSettingsResetExcludedConfirmed)
     }
 
 }
diff --git a/DuckDuckGo/Preferences/View/PreferencesDataClearingView.swift b/DuckDuckGo/Preferences/View/PreferencesDataClearingView.swift
index dc3f28607c..1680fb2e69 100644
--- a/DuckDuckGo/Preferences/View/PreferencesDataClearingView.swift
+++ b/DuckDuckGo/Preferences/View/PreferencesDataClearingView.swift
@@ -28,7 +28,20 @@ extension Preferences {
         var body: some View {
             PreferencePane(UserText.dataClearing) {
 
-                // SECTION 1: Fireproof Site
+                // SECTION 1: Automatically Clear Data
+                PreferencePaneSection(UserText.autoClear) {
+
+                    PreferencePaneSubSection {
+                        ToggleMenuItem(UserText.automaticallyClearData, isOn: $model.isAutoClearEnabled)
+                        ToggleMenuItem(UserText.warnBeforeQuit,
+                                       isOn: $model.isWarnBeforeClearingEnabled)
+                        .disabled(!model.isAutoClearEnabled)
+                        .padding(.leading, 16)
+                    }
+
+                }
+
+                // SECTION 2: Fireproof Site
                 PreferencePaneSection(UserText.fireproofSites) {
 
                     PreferencePaneSubSection {
diff --git a/DuckDuckGo/Preferences/View/PreferencesDefaultBrowserView.swift b/DuckDuckGo/Preferences/View/PreferencesDefaultBrowserView.swift
index cc7692b366..8cc530b171 100644
--- a/DuckDuckGo/Preferences/View/PreferencesDefaultBrowserView.swift
+++ b/DuckDuckGo/Preferences/View/PreferencesDefaultBrowserView.swift
@@ -21,6 +21,7 @@ import Combine
 import PreferencesViews
 import SwiftUI
 import SwiftUIExtensions
+import PixelKit
 
 extension Preferences {
 
@@ -52,7 +53,7 @@ extension Preferences {
                                 }
                                 .padding(.trailing, 8)
                                 Button(action: {
-                                    Pixel.fire(.defaultRequestedFromSettings)
+                                    PixelKit.fire(GeneralPixel.defaultRequestedFromSettings)
                                     defaultBrowserModel.becomeDefault()
                                 }) {
                                     Text(UserText.makeDefaultBrowser)
diff --git a/DuckDuckGo/Preferences/View/PreferencesGeneralView.swift b/DuckDuckGo/Preferences/View/PreferencesGeneralView.swift
index 591961ee75..41e92b6886 100644
--- a/DuckDuckGo/Preferences/View/PreferencesGeneralView.swift
+++ b/DuckDuckGo/Preferences/View/PreferencesGeneralView.swift
@@ -28,6 +28,8 @@ extension Preferences {
         @ObservedObject var startupModel: StartupPreferences
         @ObservedObject var downloadsModel: DownloadsPreferences
         @ObservedObject var searchModel: SearchPreferences
+        @ObservedObject var tabsModel: TabsPreferences
+        @ObservedObject var dataClearingModel: DataClearingPreferences
         @State private var showingCustomHomePageSheet = false
 
         var body: some View {
@@ -39,15 +41,46 @@ extension Preferences {
                     PreferencePaneSubSection {
                         Picker(selection: $startupModel.restorePreviousSession, content: {
                             Text(UserText.showHomePage).tag(false)
-                                .padding(.bottom, 4)
+                                .padding(.bottom, 4).accessibilityIdentifier("PreferencesGeneralView.stateRestorePicker.openANewWindow")
                             Text(UserText.reopenAllWindowsFromLastSession).tag(true)
+                                .accessibilityIdentifier("PreferencesGeneralView.stateRestorePicker.reopenAllWindowsFromLastSession")
                         }, label: {})
                         .pickerStyle(.radioGroup)
+                        .disabled(dataClearingModel.isAutoClearEnabled)
                         .offset(x: PreferencesViews.Const.pickerHorizontalOffset)
+                        .accessibilityIdentifier("PreferencesGeneralView.stateRestorePicker")
+                        if dataClearingModel.isAutoClearEnabled {
+                            VStack(alignment: .leading, spacing: 1) {
+                                TextMenuItemCaption(UserText.disableAutoClearToEnableSessionRestore)
+                                TextButton(UserText.showDataClearingSettings) {
+                                    startupModel.show(url: .settingsPane(.dataClearing))
+                                }
+                            }
+                            .padding(.leading, 19)
+                        }
                     }
                 }
 
-                // SECTION 2: Home Page
+                // SECTION 2: Tabs
+                PreferencePaneSection(UserText.tabs) {
+                    PreferencePaneSubSection {
+                        ToggleMenuItem(UserText.preferNewTabsToWindows, isOn: $tabsModel.preferNewTabsToWindows)
+                        ToggleMenuItem(UserText.switchToNewTabWhenOpened, isOn: $tabsModel.switchToNewTabWhenOpened)
+                    }
+
+                    PreferencePaneSubSection {
+                        HStack {
+                            Picker(UserText.newTabPositionTitle, selection: $tabsModel.newTabPosition) {
+                                ForEach(NewTabPosition.allCases, id: \.self) { position in
+                                    Text(UserText.newTabPositionMode(for: position)).tag(position)
+                                }
+                            }
+                            .fixedSize()
+                        }
+                    }
+                }
+
+                // SECTION 3: Home Page
                 PreferencePaneSection(UserText.homePage) {
 
                     PreferencePaneSubSection {
@@ -91,12 +124,12 @@ extension Preferences {
                     CustomHomePageSheet(startupModel: startupModel, isSheetPresented: $showingCustomHomePageSheet)
                 }
 
-                // SECTION 3: Search Settings
+                // SECTION 4: Search Settings
                 PreferencePaneSection(UserText.privateSearch) {
-                    ToggleMenuItem(UserText.showAutocompleteSuggestions, isOn: $searchModel.showAutocompleteSuggestions)
+                    ToggleMenuItem(UserText.showAutocompleteSuggestions, isOn: $searchModel.showAutocompleteSuggestions).accessibilityIdentifier("PreferencesGeneralView.showAutocompleteSuggestions")
                 }
 
-                // SECTION 4: Downloads
+                // SECTION 5: Downloads
                 PreferencePaneSection(UserText.downloads) {
                     PreferencePaneSubSection {
                         ToggleMenuItem(UserText.downloadsOpenPopupOnCompletion,
@@ -106,15 +139,15 @@ extension Preferences {
                     // 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/PreferencesRootView.swift b/DuckDuckGo/Preferences/View/PreferencesRootView.swift
index 922b2fe501..1f4fc03135 100644
--- a/DuckDuckGo/Preferences/View/PreferencesRootView.swift
+++ b/DuckDuckGo/Preferences/View/PreferencesRootView.swift
@@ -22,11 +22,9 @@ import SwiftUI
 import SwiftUIExtensions
 import SyncUI
 import BrowserServicesKit
-
-#if SUBSCRIPTION
+import PixelKit
 import Subscription
 import SubscriptionUI
-#endif
 
 enum Preferences {
 
@@ -48,16 +46,11 @@ enum Preferences {
 
         @ObservedObject var model: PreferencesSidebarModel
 
-#if SUBSCRIPTION
         var subscriptionModel: PreferencesSubscriptionModel?
-#endif
 
         init(model: PreferencesSidebarModel) {
             self.model = model
-
-#if SUBSCRIPTION
             self.subscriptionModel = makeSubscriptionViewModel()
-#endif
         }
 
         var body: some View {
@@ -94,23 +87,19 @@ enum Preferences {
                 case .general:
                     GeneralView(startupModel: StartupPreferences.shared,
                                 downloadsModel: DownloadsPreferences.shared,
-                                searchModel: SearchPreferences.shared)
+                                searchModel: SearchPreferences.shared,
+                                tabsModel: TabsPreferences.shared,
+                                dataClearingModel: DataClearingPreferences.shared)
                 case .sync:
                     SyncView()
                 case .appearance:
                     AppearanceView(model: .shared)
                 case .dataClearing:
                     DataClearingView(model: DataClearingPreferences.shared)
-
-#if NETWORK_PROTECTION
                 case .vpn:
                     VPNView(model: VPNPreferencesModel())
-#endif
-
-#if SUBSCRIPTION
                 case .subscription:
                     SubscriptionUI.PreferencesSubscriptionView(model: subscriptionModel!)
-#endif
                 case .autofill:
                     AutofillView(model: AutofillPreferencesModel())
                 case .accessibility:
@@ -121,12 +110,7 @@ enum Preferences {
                     // Opens a new tab
                     Spacer()
                 case .about:
-#if NETWORK_PROTECTION
-                    let netPInvitePresenter = NetworkProtectionInvitePresenter()
-                    AboutView(model: AboutModel(netPInvitePresenter: netPInvitePresenter))
-#else
                     AboutView(model: AboutModel())
-#endif
                 }
             }
             .frame(maxWidth: Const.paneContentWidth, maxHeight: .infinity, alignment: .topLeading)
@@ -134,7 +118,6 @@ enum Preferences {
             .padding(.horizontal, Const.panePaddingHorizontal)
         }
 
-#if SUBSCRIPTION
         // swiftlint:disable:next cyclomatic_complexity function_body_length
         private func makeSubscriptionViewModel() -> PreferencesSubscriptionModel {
             let openURL: (URL) -> Void = { url in
@@ -147,32 +130,32 @@ enum Preferences {
                 DispatchQueue.main.async {
                     switch event {
                     case .openVPN:
-                        Pixel.fire(.privacyProVPNSettings)
+                        PixelKit.fire(PrivacyProPixel.privacyProVPNSettings)
                         NotificationCenter.default.post(name: .ToggleNetworkProtectionInMainWindow, object: self, userInfo: nil)
                     case .openDB:
-                        Pixel.fire(.privacyProPersonalInformationRemovalSettings)
+                        PixelKit.fire(PrivacyProPixel.privacyProPersonalInformationRemovalSettings)
                         WindowControllersManager.shared.showTab(with: .dataBrokerProtection)
                     case .openITR:
-                        Pixel.fire(.privacyProIdentityRestorationSettings)
+                        PixelKit.fire(PrivacyProPixel.privacyProIdentityRestorationSettings)
                         WindowControllersManager.shared.showTab(with: .identityTheftRestoration(.identityTheftRestoration))
                     case .iHaveASubscriptionClick:
-                        Pixel.fire(.privacyProRestorePurchaseClick)
+                        PixelKit.fire(PrivacyProPixel.privacyProRestorePurchaseClick)
                     case .activateAddEmailClick:
-                        DailyPixel.fire(pixel: .privacyProRestorePurchaseEmailStart, frequency: .dailyAndCount)
+                        PixelKit.fire(PrivacyProPixel.privacyProRestorePurchaseEmailStart, frequency: .dailyAndCount)
                     case .postSubscriptionAddEmailClick:
-                        Pixel.fire(.privacyProWelcomeAddDevice, limitTo: .initial)
+                        PixelKit.fire(PrivacyProPixel.privacyProWelcomeAddDevice, frequency: .unique)
                     case .restorePurchaseStoreClick:
-                        DailyPixel.fire(pixel: .privacyProRestorePurchaseStoreStart, frequency: .dailyAndCount)
+                        PixelKit.fire(PrivacyProPixel.privacyProRestorePurchaseStoreStart, frequency: .dailyAndCount)
                     case .addToAnotherDeviceClick:
-                        Pixel.fire(.privacyProSettingsAddDevice)
+                        PixelKit.fire(PrivacyProPixel.privacyProSettingsAddDevice)
                     case .addDeviceEnterEmail:
-                        Pixel.fire(.privacyProAddDeviceEnterEmail)
+                        PixelKit.fire(PrivacyProPixel.privacyProAddDeviceEnterEmail)
                     case .activeSubscriptionSettingsClick:
-                        Pixel.fire(.privacyProSubscriptionSettings)
+                        PixelKit.fire(PrivacyProPixel.privacyProSubscriptionSettings)
                     case .changePlanOrBillingClick:
-                        Pixel.fire(.privacyProSubscriptionManagementPlanBilling)
+                        PixelKit.fire(PrivacyProPixel.privacyProSubscriptionManagementPlanBilling)
                     case .removeSubscriptionClick:
-                        Pixel.fire(.privacyProSubscriptionManagementRemoval)
+                        PixelKit.fire(PrivacyProPixel.privacyProSubscriptionManagementRemoval)
                     }
                 }
             }
@@ -197,6 +180,5 @@ enum Preferences {
                                                 sheetActionHandler: sheetActionHandler,
                                                 subscriptionAppGroup: Bundle.main.appGroup(bundle: .subs))
         }
-#endif
     }
 }
diff --git a/DuckDuckGo/Preferences/View/PreferencesSidebar.swift b/DuckDuckGo/Preferences/View/PreferencesSidebar.swift
index b6f65c0a44..1b234a1c49 100644
--- a/DuckDuckGo/Preferences/View/PreferencesSidebar.swift
+++ b/DuckDuckGo/Preferences/View/PreferencesSidebar.swift
@@ -66,6 +66,7 @@ extension Preferences {
                 }
             }
             .buttonStyle(SidebarItemButtonStyle(isSelected: isSelected))
+            .accessibilityIdentifier("PreferencesSidebar.\(pane.id.rawValue)Button")
         }
     }
 
diff --git a/DuckDuckGo/Preferences/View/PreferencesVPNView.swift b/DuckDuckGo/Preferences/View/PreferencesVPNView.swift
index 2485bbb6c5..5cce49df31 100644
--- a/DuckDuckGo/Preferences/View/PreferencesVPNView.swift
+++ b/DuckDuckGo/Preferences/View/PreferencesVPNView.swift
@@ -16,8 +16,6 @@
 //  limitations under the License.
 //
 
-#if NETWORK_PROTECTION
-
 import PreferencesViews
 import SwiftUI
 import SwiftUIExtensions
@@ -105,5 +103,3 @@ extension Preferences {
         }
     }
 }
-
-#endif
diff --git a/DuckDuckGo/Preferences/View/PreferencesViewController.swift b/DuckDuckGo/Preferences/View/PreferencesViewController.swift
index fa20ea57c6..37d63c320f 100644
--- a/DuckDuckGo/Preferences/View/PreferencesViewController.swift
+++ b/DuckDuckGo/Preferences/View/PreferencesViewController.swift
@@ -21,10 +21,7 @@ import SwiftUI
 import SwiftUIExtensions
 import Combine
 import DDGSync
-
-#if NETWORK_PROTECTION
 import NetworkProtection
-#endif
 
 final class PreferencesViewController: NSViewController {
 
diff --git a/DuckDuckGo/PrivacyDashboard/PrivacyDashboardPermissionHandler.swift b/DuckDuckGo/PrivacyDashboard/PrivacyDashboardPermissionHandler.swift
index f1734c4a6f..fe991eade4 100644
--- a/DuckDuckGo/PrivacyDashboard/PrivacyDashboardPermissionHandler.swift
+++ b/DuckDuckGo/PrivacyDashboard/PrivacyDashboardPermissionHandler.swift
@@ -60,7 +60,7 @@ final class PrivacyDashboardPermissionHandler {
             assertionFailure("PrivacyDashboardViewController: tabViewModel not set")
             return
         }
-        guard let domain = tabViewModel?.tab.content.url?.host else {
+        guard let domain = tabViewModel?.tab.content.urlForWebView?.host else {
             onPermissionChange?([])
             return
         }
diff --git a/DuckDuckGo/PrivacyDashboard/View/PrivacyDashboardViewController.swift b/DuckDuckGo/PrivacyDashboard/View/PrivacyDashboardViewController.swift
index 4a5d5113f3..befe61b87a 100644
--- a/DuckDuckGo/PrivacyDashboard/View/PrivacyDashboardViewController.swift
+++ b/DuckDuckGo/PrivacyDashboard/View/PrivacyDashboardViewController.swift
@@ -22,6 +22,7 @@ import Combine
 import BrowserServicesKit
 import PrivacyDashboard
 import Common
+import PixelKit
 
 protocol PrivacyDashboardViewControllerSizeDelegate: AnyObject {
 
@@ -44,30 +45,27 @@ final class PrivacyDashboardViewController: NSViewController {
 
     private let brokenSiteReporter: BrokenSiteReporter = {
         BrokenSiteReporter(pixelHandler: { parameters in
-            Pixel.fire(
-                .brokenSiteReport,
-                withAdditionalParameters: parameters,
-                allowedQueryReservedCharacters: BrokenSiteReport.allowedQueryReservedCharacters
-            )
+            PixelKit.fire(GeneralPixel.brokenSiteReport,
+                          withAdditionalParameters: parameters,
+                          allowedQueryReservedCharacters: BrokenSiteReport.allowedQueryReservedCharacters)
         }, keyValueStoring: UserDefaults.standard)
     }()
 
     private let toggleProtectionsOffReporter: BrokenSiteReporter = {
         BrokenSiteReporter(pixelHandler: { parameters in
-            Pixel.fire(
-                .protectionToggledOffBreakageReport,
-                withAdditionalParameters: parameters,
-                allowedQueryReservedCharacters: BrokenSiteReport.allowedQueryReservedCharacters)
+            PixelKit.fire(GeneralPixel.protectionToggledOffBreakageReport,
+                          withAdditionalParameters: parameters,
+                          allowedQueryReservedCharacters: BrokenSiteReport.allowedQueryReservedCharacters)
         }, keyValueStoring: UserDefaults.standard)
     }()
 
     private let toggleReportEvents = EventMapping<ToggleReportEvents> { event, _, parameters, _ in
-        let domainEvent: Pixel.Event
+        let domainEvent: GeneralPixel
         switch event {
         case .toggleReportDismiss: domainEvent = .toggleReportDismiss
         case .toggleReportDoNotSend: domainEvent = .toggleReportDoNotSend
         }
-        Pixel.fire(domainEvent, withAdditionalParameters: parameters)
+        PixelKit.fire(domainEvent, withAdditionalParameters: parameters)
     }
 
     private let permissionHandler = PrivacyDashboardPermissionHandler()
@@ -177,10 +175,10 @@ final class PrivacyDashboardViewController: NSViewController {
         let configuration = ContentBlocking.shared.privacyConfigurationManager.privacyConfig
         if state.isProtected && configuration.isUserUnprotected(domain: domain) {
             configuration.userEnabledProtection(forDomain: domain)
-            Pixel.fire(.dashboardProtectionAllowlistRemove(triggerOrigin: state.eventOrigin.screen.rawValue), includeAppVersionParameter: false)
+            PixelKit.fire(GeneralPixel.dashboardProtectionAllowlistRemove(triggerOrigin: state.eventOrigin.screen.rawValue), includeAppVersionParameter: false)
         } else {
             configuration.userDisabledProtection(forDomain: domain)
-            Pixel.fire(.dashboardProtectionAllowlistAdd(triggerOrigin: state.eventOrigin.screen.rawValue), includeAppVersionParameter: false)
+            PixelKit.fire(GeneralPixel.dashboardProtectionAllowlistAdd(triggerOrigin: state.eventOrigin.screen.rawValue), includeAppVersionParameter: false)
         }
 
         let completionToken = ContentBlocking.shared.contentBlockingManager.scheduleCompilation()
@@ -193,7 +191,7 @@ final class PrivacyDashboardViewController: NSViewController {
 extension PrivacyDashboardViewController: PrivacyDashboardControllerDelegate {
 
     func privacyDashboardControllerDidRequestShowReportBrokenSite(_ privacyDashboardController: PrivacyDashboard.PrivacyDashboardController) {
-        // Not used in macOS: Pixel.fire(.privacyDashboardReportBrokenSite)
+        // Not used in macOS: PixelKit.fire(GeneralPixel.privacyDashboardReportBrokenSite)
     }
 
     func privacyDashboardController(_ privacyDashboardController: PrivacyDashboardController,
@@ -327,7 +325,7 @@ extension PrivacyDashboardViewController {
 
         // ⚠️ To limit privacy risk, site URL is trimmed to not include query and fragment
         guard let currentTab = tabViewModel?.tab,
-            let currentURL = currentTab.content.url?.trimmingQueryItemsAndFragment() else {
+            let currentURL = currentTab.content.urlForWebView?.trimmingQueryItemsAndFragment() else {
             throw BrokenSiteReportError.failedToFetchTheCurrentURL
         }
         let blockedTrackerDomains = currentTab.privacyInfo?.trackerInfo.trackersBlocked.compactMap { $0.domain } ?? []
@@ -337,16 +335,16 @@ extension PrivacyDashboardViewController {
 
         // current domain's protection status
         let configuration = ContentBlocking.shared.privacyConfigurationManager.privacyConfig
-        let protectionsState = configuration.isFeature(.contentBlocking, enabledForDomain: currentTab.content.url?.host)
+        let protectionsState = configuration.isFeature(.contentBlocking, enabledForDomain: currentTab.content.urlForWebView?.host)
 
-        let webVitals = await calculateWebVitals(performanceMetrics: currentTab.performanceMetrics, privacyConfig: configuration)
+        let webVitals = await calculateWebVitals(performanceMetrics: currentTab.brokenSiteInfo?.performanceMetrics, privacyConfig: configuration)
 
         var errors: [Error]?
         var statusCodes: [Int]?
-        if let error = currentTab.lastWebError {
+        if let error = currentTab.brokenSiteInfo?.lastWebError {
             errors = [error]
         }
-        if let httpStatusCode = currentTab.lastHttpStatusCode {
+        if let httpStatusCode = currentTab.brokenSiteInfo?.lastHttpStatusCode {
             statusCodes = [httpStatusCode]
         }
 
@@ -366,10 +364,10 @@ extension PrivacyDashboardViewController {
                                                reportFlow: source,
                                                errors: errors,
                                                httpStatusCodes: statusCodes,
-                                               openerContext: currentTab.inferredOpenerContext,
-                                               vpnOn: currentTab.tunnelController?.isConnected ?? false,
+                                               openerContext: currentTab.brokenSiteInfo?.inferredOpenerContext,
+                                               vpnOn: currentTab.networkProtection?.tunnelController.isConnected ?? false,
                                                jsPerformance: webVitals,
-                                               userRefreshCount: currentTab.refreshCountSinceLoad,
+                                               userRefreshCount: currentTab.brokenSiteInfo?.refreshCountSinceLoad ?? -1,
                                                didOpenReportInfo: didOpenReportInfo,
                                                toggleReportCounter: toggleReportCounter)
         return websiteBreakage
diff --git a/DuckDuckGo/RecentlyClosed/Model/RecentlyClosedCacheItem.swift b/DuckDuckGo/RecentlyClosed/Model/RecentlyClosedCacheItem.swift
index 3314b3da2a..2d313b152c 100644
--- a/DuckDuckGo/RecentlyClosed/Model/RecentlyClosedCacheItem.swift
+++ b/DuckDuckGo/RecentlyClosed/Model/RecentlyClosedCacheItem.swift
@@ -35,7 +35,7 @@ extension RecentlyClosedTab: RecentlyClosedCacheItemBurning {
     }
 
     private func contentContainsDomains(_ baseDomains: Set<String>, tld: TLD) -> Bool {
-        if let host = tabContent.url?.host, let baseDomain = tld.eTLDplus1(host), baseDomains.contains(baseDomain) {
+        if let host = tabContent.urlForWebView?.host, let baseDomain = tld.eTLDplus1(host), baseDomains.contains(baseDomain) {
             return true
         } else {
             return false
diff --git a/DuckDuckGo/RecentlyClosed/View/RecentlyClosedMenu.swift b/DuckDuckGo/RecentlyClosed/View/RecentlyClosedMenu.swift
index cdbeec8739..798e5f153f 100644
--- a/DuckDuckGo/RecentlyClosed/View/RecentlyClosedMenu.swift
+++ b/DuckDuckGo/RecentlyClosed/View/RecentlyClosedMenu.swift
@@ -71,15 +71,15 @@ private extension NSMenuItem {
             image = TabViewModel.Favicon.home
             title = UserText.tabHomeTitle
         case .settings:
-            image = TabViewModel.Favicon.preferences
+            image = TabViewModel.Favicon.settings
             title = UserText.tabPreferencesTitle
         case .bookmarks:
-            image = TabViewModel.Favicon.preferences
+            image = TabViewModel.Favicon.bookmarks
             title = UserText.tabPreferencesTitle
         case .url, .subscription, .identityTheftRestoration:
             image = recentlyClosedTab.favicon
             image?.size = NSSize.faviconSize
-            title = recentlyClosedTab.title ?? recentlyClosedTab.tabContent.url?.absoluteString ?? ""
+            title = recentlyClosedTab.title ?? recentlyClosedTab.tabContent.userEditableUrl?.absoluteString ?? ""
 
             if title.count > MainMenu.Constants.maxTitleLength {
                 title = String(title.truncated(length: MainMenu.Constants.maxTitleLength))
diff --git a/DuckDuckGo/SecureVault/Model/AutofillNeverPromptWebsitesManager.swift b/DuckDuckGo/SecureVault/Model/AutofillNeverPromptWebsitesManager.swift
index 60d8eb0309..0e69ffd6dc 100644
--- a/DuckDuckGo/SecureVault/Model/AutofillNeverPromptWebsitesManager.swift
+++ b/DuckDuckGo/SecureVault/Model/AutofillNeverPromptWebsitesManager.swift
@@ -18,6 +18,7 @@
 
 import Foundation
 import BrowserServicesKit
+import PixelKit
 
 final class AutofillNeverPromptWebsitesManager {
 
@@ -27,7 +28,7 @@ final class AutofillNeverPromptWebsitesManager {
 
     private let secureVault: (any AutofillSecureVault)?
 
-    public init(secureVault: (any AutofillSecureVault)? = try? AutofillSecureVaultFactory.makeVault(errorReporter: SecureVaultErrorReporter.shared)) {
+    public init(secureVault: (any AutofillSecureVault)? = try? AutofillSecureVaultFactory.makeVault(reporter: SecureVaultReporter.shared)) {
         self.secureVault = secureVault
 
         fetchNeverPromptWebsites()
@@ -48,7 +49,7 @@ final class AutofillNeverPromptWebsitesManager {
             fetchNeverPromptWebsites()
             return id
         } catch {
-            Pixel.fire(.debug(event: .secureVaultError, error: error))
+            PixelKit.fire(DebugEvent(GeneralPixel.secureVaultError(error: error)))
             throw error
         }
     }
@@ -64,7 +65,7 @@ final class AutofillNeverPromptWebsitesManager {
             fetchNeverPromptWebsites()
             return true
         } catch {
-            Pixel.fire(.debug(event: .secureVaultError, error: error))
+            PixelKit.fire(DebugEvent(GeneralPixel.secureVaultError(error: error)))
             return false
         }
     }
@@ -77,7 +78,7 @@ final class AutofillNeverPromptWebsitesManager {
         do {
             neverPromptWebsites = try secureVault.neverPromptWebsites()
         } catch {
-            Pixel.fire(.debug(event: .secureVaultError, error: error))
+            PixelKit.fire(DebugEvent(GeneralPixel.secureVaultError(error: error)))
             neverPromptWebsites = []
         }
     }
diff --git a/DuckDuckGo/SecureVault/Model/PasswordManagementCreditCardModel.swift b/DuckDuckGo/SecureVault/Model/PasswordManagementCreditCardModel.swift
index 9330a76820..967069d21e 100644
--- a/DuckDuckGo/SecureVault/Model/PasswordManagementCreditCardModel.swift
+++ b/DuckDuckGo/SecureVault/Model/PasswordManagementCreditCardModel.swift
@@ -27,7 +27,7 @@ final class PasswordManagementCreditCardModel: ObservableObject, PasswordManagem
         let dateFormatter = DateFormatter()
         dateFormatter.dateFormat = "MMMM, yyyy"
         return dateFormatter
-    } ()
+    }()
 
     var onDirtyChanged: (Bool) -> Void
     var onSaveRequested: (Model) -> Void
diff --git a/DuckDuckGo/SecureVault/Model/PasswordManagementIdentityModel.swift b/DuckDuckGo/SecureVault/Model/PasswordManagementIdentityModel.swift
index 6b656d3642..a4c0a9a597 100644
--- a/DuckDuckGo/SecureVault/Model/PasswordManagementIdentityModel.swift
+++ b/DuckDuckGo/SecureVault/Model/PasswordManagementIdentityModel.swift
@@ -28,7 +28,7 @@ final class PasswordManagementIdentityModel: ObservableObject, PasswordManagemen
         dateFormatter.dateStyle = .medium
         dateFormatter.timeStyle = .none
         return dateFormatter
-    } ()
+    }()
 
     var onDirtyChanged: (Bool) -> Void
     var onSaveRequested: (SecureVaultModels.Identity) -> Void
diff --git a/DuckDuckGo/SecureVault/Model/PasswordManagementLoginModel.swift b/DuckDuckGo/SecureVault/Model/PasswordManagementLoginModel.swift
index 12cc2ac135..defe6b5029 100644
--- a/DuckDuckGo/SecureVault/Model/PasswordManagementLoginModel.swift
+++ b/DuckDuckGo/SecureVault/Model/PasswordManagementLoginModel.swift
@@ -29,7 +29,7 @@ final class PasswordManagementLoginModel: ObservableObject, PasswordManagementIt
         dateFormatter.dateStyle = .medium
         dateFormatter.timeStyle = .medium
         return dateFormatter
-    } ()
+    }()
 
     var onSaveRequested: (SecureVaultModels.WebsiteCredentials) -> Void
     var onDeleteRequested: (SecureVaultModels.WebsiteCredentials) -> Void
diff --git a/DuckDuckGo/SecureVault/Model/PasswordManagementNoteModel.swift b/DuckDuckGo/SecureVault/Model/PasswordManagementNoteModel.swift
index 894c2a48ff..2c7a00364f 100644
--- a/DuckDuckGo/SecureVault/Model/PasswordManagementNoteModel.swift
+++ b/DuckDuckGo/SecureVault/Model/PasswordManagementNoteModel.swift
@@ -28,7 +28,7 @@ final class PasswordManagementNoteModel: ObservableObject, PasswordManagementIte
         dateFormatter.dateStyle = .medium
         dateFormatter.timeStyle = .medium
         return dateFormatter
-    } ()
+    }()
 
     var onDirtyChanged: (Bool) -> Void
     var onSaveRequested: (SecureVaultModels.Note) -> Void
diff --git a/DuckDuckGo/SecureVault/SecureVaultErrorReporter.swift b/DuckDuckGo/SecureVault/SecureVaultErrorReporter.swift
index 5b5722bf34..0a76643d88 100644
--- a/DuckDuckGo/SecureVault/SecureVaultErrorReporter.swift
+++ b/DuckDuckGo/SecureVault/SecureVaultErrorReporter.swift
@@ -19,6 +19,7 @@
 import Foundation
 import BrowserServicesKit
 import SecureStorage
+import PixelKit
 
 final class SecureVaultErrorReporter: SecureVaultErrorReporting {
     static let shared = SecureVaultErrorReporter()
@@ -29,9 +30,9 @@ final class SecureVaultErrorReporter: SecureVaultErrorReporting {
 
         switch error {
         case .initFailed, .failedToOpenDatabase:
-            Pixel.fire(.debug(event: .secureVaultInitError, error: error))
+            PixelKit.fire(DebugEvent(GeneralPixel.secureVaultInitError(error: error)))
         default:
-            Pixel.fire(.debug(event: .secureVaultError, error: error))
+            PixelKit.fire(DebugEvent(GeneralPixel.secureVaultError(error: error)))
         }
     }
 
diff --git a/DuckDuckGo/SecureVault/SecureVaultReporter.swift b/DuckDuckGo/SecureVault/SecureVaultReporter.swift
new file mode 100644
index 0000000000..af50ce3e84
--- /dev/null
+++ b/DuckDuckGo/SecureVault/SecureVaultReporter.swift
@@ -0,0 +1,65 @@
+//
+//  SecureVaultReporter.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 Common
+import Foundation
+import BrowserServicesKit
+import PixelKit
+import SecureStorage
+
+final class SecureVaultKeyStoreEventMapper: EventMapping<SecureStorageKeyStoreEvent> {
+    public init() {
+        super.init { event, _, _, _ in
+            switch event {
+            case .l1KeyMigration:
+                PixelKit.fire(DebugEvent(GeneralPixel.secureVaultKeystoreEventL1KeyMigration))
+            case .l2KeyMigration:
+                PixelKit.fire(DebugEvent(GeneralPixel.secureVaultKeystoreEventL2KeyMigration))
+            case .l2KeyPasswordMigration:
+                PixelKit.fire(DebugEvent(GeneralPixel.secureVaultKeystoreEventL2KeyPasswordMigration))
+            }
+        }
+    }
+
+    override init(mapping: @escaping EventMapping<SecureStorageKeyStoreEvent>.Mapping) {
+        fatalError("Use init()")
+    }
+}
+
+final class SecureVaultReporter: SecureVaultReporting {
+    static let shared = SecureVaultReporter()
+    private var keyStoreMapper: SecureVaultKeyStoreEventMapper
+    private init(keyStoreMapper: SecureVaultKeyStoreEventMapper = SecureVaultKeyStoreEventMapper()) {
+        self.keyStoreMapper = keyStoreMapper
+    }
+
+    func secureVaultError(_ error: SecureStorageError) {
+        guard NSApp.runType.requiresEnvironment else { return }
+
+        switch error {
+        case .initFailed, .failedToOpenDatabase:
+            PixelKit.fire(DebugEvent(GeneralPixel.secureVaultInitError(error: error)))
+        default:
+            PixelKit.fire(DebugEvent(GeneralPixel.secureVaultError(error: error)))
+        }
+    }
+
+    func secureVaultKeyStoreEvent(_ event: SecureStorageKeyStoreEvent) {
+        keyStoreMapper.fire(event)
+    }
+}
diff --git a/DuckDuckGo/SecureVault/View/PasswordManagementBitwardenItemView.swift b/DuckDuckGo/SecureVault/View/PasswordManagementBitwardenItemView.swift
index aad40477d2..3126331628 100644
--- a/DuckDuckGo/SecureVault/View/PasswordManagementBitwardenItemView.swift
+++ b/DuckDuckGo/SecureVault/View/PasswordManagementBitwardenItemView.swift
@@ -28,7 +28,7 @@ struct PasswordManagementBitwardenItemView: View {
 
             VStack(spacing: 2) {
                 Text(UserText.passwordManagerPopoverTitle(managerName: manager.displayName))
-                HStack (spacing: 3) {
+                HStack(spacing: 3) {
                     Text(UserText.passwordManagerPopoverChangeInSettingsLabel)
                     Button {
                         WindowControllersManager.shared.showPreferencesTab(withSelectedPane: .autofill)
diff --git a/DuckDuckGo/SecureVault/View/PasswordManagementCreditCardItemView.swift b/DuckDuckGo/SecureVault/View/PasswordManagementCreditCardItemView.swift
index c758fb88ce..367314c279 100644
--- a/DuckDuckGo/SecureVault/View/PasswordManagementCreditCardItemView.swift
+++ b/DuckDuckGo/SecureVault/View/PasswordManagementCreditCardItemView.swift
@@ -52,7 +52,11 @@ struct PasswordManagementCreditCardItemView: View {
 
                     EditableCreditCardField(textFieldValue: $model.cardNumber, title: UserText.pmCardNumber)
                     EditableCreditCardField(textFieldValue: $model.cardholderName, title: UserText.pmCardholderName)
-                    EditableCreditCardField(textFieldValue: $model.cardSecurityCode, title: UserText.pmCardVerificationValue)
+                    SecureEditableCreditCardField(textFieldValue: $model.cardSecurityCode,
+                                                  title: UserText.pmCardVerificationValue,
+                                                  hiddenTextLength: 3,
+                                                  toolTipHideText: UserText.autofillHideCardCvvTooltip,
+                                                  toolTipShowText: UserText.autofillShowCardCvvTooltip)
 
                     // Expiration:
 
@@ -237,5 +241,69 @@ private struct EditableCreditCardField: View {
 
         }
     }
+}
+
+private struct SecureEditableCreditCardField: View {
+
+    @EnvironmentObject var model: PasswordManagementCreditCardModel
+
+    @Binding var textFieldValue: String
+
+    @State private var isHovering = false
+    @State private var isVisible = false
+
+    let title: String
+    let hiddenTextLength: Int
+    let toolTipHideText: String
+    let toolTipShowText: String
+
+    var body: some View {
+
+        if model.isInEditMode || !textFieldValue.isEmpty {
+
+            VStack(alignment: .leading, spacing: 0) {
+
+                Text(title)
+                    .bold()
+                    .padding(.bottom, 5)
+
+                if model.isEditing || model.isNew {
+
+                    HStack {
+
+                        TextField("", text: $textFieldValue)
+                            .textFieldStyle(RoundedBorderTextFieldStyle())
+                            .padding(.bottom, interItemSpacing)
+
+                    }
+                    .padding(.bottom, interItemSpacing)
+
+                } else {
+
+                    HStack(spacing: 6) {
+
+                        HiddenText(isVisible: isVisible, text: textFieldValue, hiddenTextLength: hiddenTextLength)
+
+                        if (isHovering || isVisible) && textFieldValue != "" {
+                            SecureTextFieldButton(isVisible: $isVisible, toolTipHideText: toolTipHideText, toolTipShowText: toolTipShowText)
+                        }
+
+                        if isHovering {
+                            CopyButton {
+                                model.copy(textFieldValue)
+                            }
+                        }
 
+                        Spacer()
+                    }
+                    .padding(.bottom, interItemSpacing)
+                }
+
+            }
+            .onHover {
+                isHovering = $0
+            }
+
+        }
+    }
 }
diff --git a/DuckDuckGo/SecureVault/View/PasswordManagementLoginItemView.swift b/DuckDuckGo/SecureVault/View/PasswordManagementLoginItemView.swift
index cf1bb663e2..b6970449d5 100644
--- a/DuckDuckGo/SecureVault/View/PasswordManagementLoginItemView.swift
+++ b/DuckDuckGo/SecureVault/View/PasswordManagementLoginItemView.swift
@@ -360,25 +360,9 @@ private struct PasswordView: View {
 
                 HStack {
 
-                    if isPasswordVisible {
+                    SecureTextField(textValue: $model.password, isVisible: isPasswordVisible)
 
-                        TextField("", text: $model.password)
-                            .textFieldStyle(RoundedBorderTextFieldStyle())
-
-                    } else {
-
-                        SecureField("", text: $model.password)
-                            .textFieldStyle(RoundedBorderTextFieldStyle())
-
-                    }
-
-                    Button {
-                        isPasswordVisible = !isPasswordVisible
-                    } label: {
-                        Image(.secureEyeToggle)
-                    }
-                    .buttonStyle(PlainButtonStyle())
-                    .tooltip(isPasswordVisible ? UserText.hidePasswordTooltip : UserText.showPasswordTooltip)
+                    SecureTextFieldButton(isVisible: $isPasswordVisible, toolTipHideText: UserText.hidePasswordTooltip, toolTipShowText: UserText.showPasswordTooltip)
                     .padding(.trailing, 10)
 
                 }
@@ -388,29 +372,16 @@ private struct PasswordView: View {
 
                 HStack(alignment: .center, spacing: 6) {
 
-                    if isPasswordVisible {
-                        Text(model.password)
-                    } else {
-                        Text(model.password.isEmpty ? "" : "••••••••••••")
-                    }
+                    HiddenText(isVisible: isPasswordVisible, text: model.password, hiddenTextLength: 12)
 
                     if (isHovering || isPasswordVisible) && model.password != "" {
-                        Button {
-                            isPasswordVisible = !isPasswordVisible
-                        } label: {
-                            Image(.secureEyeToggle)
-                        }
-                        .buttonStyle(PlainButtonStyle())
-                        .tooltip(isPasswordVisible ? UserText.hidePasswordTooltip : UserText.showPasswordTooltip)
+                        SecureTextFieldButton(isVisible: $isPasswordVisible, toolTipHideText: UserText.hidePasswordTooltip, toolTipShowText: UserText.showPasswordTooltip)
                     }
 
                     if isHovering && model.password != "" {
-                        Button {
+                        CopyButton {
                             model.copy(model.password)
-                        } label: {
-                            Image(.copy)
                         }
-                        .buttonStyle(PlainButtonStyle())
                         .tooltip(UserText.copyPasswordTooltip)
                     }
 
diff --git a/DuckDuckGo/SecureVault/View/PasswordManagementViewController.swift b/DuckDuckGo/SecureVault/View/PasswordManagementViewController.swift
index ab6ea02921..f18a2478de 100644
--- a/DuckDuckGo/SecureVault/View/PasswordManagementViewController.swift
+++ b/DuckDuckGo/SecureVault/View/PasswordManagementViewController.swift
@@ -24,6 +24,7 @@ import DDGSync
 import Foundation
 import SecureStorage
 import SwiftUI
+import PixelKit
 
 protocol PasswordManagementDelegate: AnyObject {
 
@@ -152,7 +153,7 @@ final class PasswordManagementViewController: NSViewController {
     }
 
     var secureVault: (any AutofillSecureVault)? {
-        try? AutofillSecureVaultFactory.makeVault(errorReporter: SecureVaultErrorReporter.shared)
+        try? AutofillSecureVaultFactory.makeVault(reporter: SecureVaultReporter.shared)
     }
 
     private let passwordManagerCoordinator: PasswordManagerCoordinating = PasswordManagerCoordinator.shared
@@ -548,7 +549,7 @@ final class PasswordManagementViewController: NSViewController {
             if case SecureStorageError.duplicateRecord = error {
                 showDuplicateAlert()
             } else {
-                Pixel.fire(.debug(event: .secureVaultError, error: error))
+                PixelKit.fire(DebugEvent(GeneralPixel.secureVaultError(error: error)))
             }
         }
     }
@@ -571,7 +572,7 @@ final class PasswordManagementViewController: NSViewController {
             postChange()
 
         } catch {
-            Pixel.fire(.debug(event: .secureVaultError, error: error))
+            PixelKit.fire(DebugEvent(GeneralPixel.secureVaultError(error: error)))
         }
     }
 
@@ -615,7 +616,7 @@ final class PasswordManagementViewController: NSViewController {
             postChange()
 
         } catch {
-            Pixel.fire(.debug(event: .secureVaultError, error: error))
+            PixelKit.fire(DebugEvent(GeneralPixel.secureVaultError(error: error)))
         }
     }
 
@@ -634,7 +635,7 @@ final class PasswordManagementViewController: NSViewController {
                     self.requestSync()
                     self.refreshData()
                 } catch {
-                    Pixel.fire(.debug(event: .secureVaultError, error: error))
+                    PixelKit.fire(DebugEvent(GeneralPixel.secureVaultError(error: error)))
                 }
 
             default:
@@ -657,7 +658,7 @@ final class PasswordManagementViewController: NSViewController {
                     try self.secureVault?.deleteIdentityFor(identityId: id)
                     self.refreshData()
                 } catch {
-                    Pixel.fire(.debug(event: .secureVaultError, error: error))
+                    PixelKit.fire(DebugEvent(GeneralPixel.secureVaultError(error: error)))
                 }
 
             default:
@@ -699,7 +700,7 @@ final class PasswordManagementViewController: NSViewController {
                     try self.secureVault?.deleteCreditCardFor(cardId: id)
                     self.refreshData()
                 } catch {
-                    Pixel.fire(.debug(event: .secureVaultError, error: error))
+                    PixelKit.fire(DebugEvent(GeneralPixel.secureVaultError(error: error)))
                 }
 
             default:
@@ -753,7 +754,7 @@ final class PasswordManagementViewController: NSViewController {
                         self?.syncModelsOnNote(note)
                     }
                 } catch {
-                    Pixel.fire(.debug(event: .secureVaultError, error: error))
+                    PixelKit.fire(DebugEvent(GeneralPixel.secureVaultError(error: error)))
                 }
             }
 
@@ -818,10 +819,10 @@ final class PasswordManagementViewController: NSViewController {
     // swiftlint:enable function_body_length
 
     private func createNewSecureVaultItemMenu() -> NSMenu {
-        NSMenu {
-            NSMenuItem(title: UserText.pmNewLogin, action: #selector(createNewLogin)).withImage(.loginGlyph)
-            NSMenuItem(title: UserText.pmNewIdentity, action: #selector(createNewIdentity)).withImage(.identityGlyph)
-            NSMenuItem(title: UserText.pmNewCard, action: #selector(createNewCreditCard)).withImage(.creditCardGlyph)
+        return NSMenu {
+            NSMenuItem(title: UserText.pmNewLogin, action: #selector(createNewLogin), target: self).withImage(.loginGlyph)
+            NSMenuItem(title: UserText.pmNewIdentity, action: #selector(createNewIdentity), target: self).withImage(.identityGlyph)
+            NSMenuItem(title: UserText.pmNewCard, action: #selector(createNewCreditCard), target: self).withImage(.creditCardGlyph)
         }
     }
 
@@ -857,7 +858,7 @@ final class PasswordManagementViewController: NSViewController {
                     items = cards.map(SecureVaultItem.card)
                 }
             } catch {
-                Pixel.fire(.debug(event: .secureVaultError, error: error))
+                PixelKit.fire(DebugEvent(GeneralPixel.secureVaultError(error: error)))
             }
 
             DispatchQueue.main.async {
@@ -1073,7 +1074,7 @@ extension PasswordManagementViewController: NSMenuItemValidation {
     }
 
     private var haveDuckDuckGoPasswords: Bool {
-        guard let vault = try? AutofillSecureVaultFactory.makeVault(errorReporter: SecureVaultErrorReporter.shared) else { return false }
+        guard let vault = try? AutofillSecureVaultFactory.makeVault(reporter: SecureVaultReporter.shared) else { return false }
         let accounts = (try? vault.accounts()) ?? []
         return !accounts.isEmpty
     }
diff --git a/DuckDuckGo/SecureVault/View/SaveCredentialsViewController.swift b/DuckDuckGo/SecureVault/View/SaveCredentialsViewController.swift
index 4647fd79a8..02a5595240 100644
--- a/DuckDuckGo/SecureVault/View/SaveCredentialsViewController.swift
+++ b/DuckDuckGo/SecureVault/View/SaveCredentialsViewController.swift
@@ -20,6 +20,7 @@ import AppKit
 import BrowserServicesKit
 import Combine
 import Common
+import PixelKit
 
 protocol SaveCredentialsDelegate: AnyObject {
 
@@ -221,16 +222,16 @@ final class SaveCredentialsViewController: NSViewController {
                     }
                 }
             } else {
-                _ = try AutofillSecureVaultFactory.makeVault(errorReporter: SecureVaultErrorReporter.shared).storeWebsiteCredentials(credentials)
+                _ = try AutofillSecureVaultFactory.makeVault(reporter: SecureVaultReporter.shared).storeWebsiteCredentials(credentials)
                 NSApp.delegateTyped.syncService?.scheduler.notifyDataChanged()
                 os_log(.debug, log: OSLog.sync, "Requesting sync if enabled")
             }
         } catch {
             os_log("%s:%s: failed to store credentials %s", type: .error, className, #function, error.localizedDescription)
-            Pixel.fire(.debug(event: .secureVaultError, error: error))
+            PixelKit.fire(DebugEvent(GeneralPixel.secureVaultError(error: error)))
         }
 
-        Pixel.fire(.autofillItemSaved(kind: .password))
+        PixelKit.fire(GeneralPixel.autofillItemSaved(kind: .password))
 
         if passwordManagerCoordinator.isEnabled {
             passwordManagerCoordinator.reportPasswordSave()
@@ -313,7 +314,7 @@ final class SaveCredentialsViewController: NSViewController {
         } catch {
             os_log("%: failed to save never prompt for website %s", type: .error, #function, error.localizedDescription)
         }
-        Pixel.fire(.autofillLoginsSaveLoginModalExcludeSiteConfirmed)
+        PixelKit.fire(GeneralPixel.autofillLoginsSaveLoginModalExcludeSiteConfirmed)
 
         onNotNowClicked(sender: nil)
     }
diff --git a/DuckDuckGo/SecureVault/View/SaveIdentityViewController.swift b/DuckDuckGo/SecureVault/View/SaveIdentityViewController.swift
index 075e31befd..61ce88b628 100644
--- a/DuckDuckGo/SecureVault/View/SaveIdentityViewController.swift
+++ b/DuckDuckGo/SecureVault/View/SaveIdentityViewController.swift
@@ -20,6 +20,7 @@ import AppKit
 import BrowserServicesKit
 import Combine
 import Common
+import PixelKit
 
 protocol SaveIdentityDelegate: AnyObject {
 
@@ -70,11 +71,11 @@ final class SaveIdentityViewController: NSViewController {
         identity.title = UserText.pmDefaultIdentityAutofillTitle
 
         do {
-            try AutofillSecureVaultFactory.makeVault(errorReporter: SecureVaultErrorReporter.shared).storeIdentity(identity)
-            Pixel.fire(.autofillItemSaved(kind: .identity))
+            try AutofillSecureVaultFactory.makeVault(reporter: SecureVaultReporter.shared).storeIdentity(identity)
+            PixelKit.fire(GeneralPixel.autofillItemSaved(kind: .identity))
         } catch {
             os_log("%s:%s: failed to store identity %s", type: .error, className, #function, error.localizedDescription)
-            Pixel.fire(.debug(event: .secureVaultError, error: error))
+            PixelKit.fire(DebugEvent(GeneralPixel.secureVaultError(error: error)))
         }
     }
 
diff --git a/DuckDuckGo/SecureVault/View/SavePaymentMethodViewController.swift b/DuckDuckGo/SecureVault/View/SavePaymentMethodViewController.swift
index 652c0aa6ae..31c9d6a3b3 100644
--- a/DuckDuckGo/SecureVault/View/SavePaymentMethodViewController.swift
+++ b/DuckDuckGo/SecureVault/View/SavePaymentMethodViewController.swift
@@ -20,6 +20,7 @@ import Foundation
 import BrowserServicesKit
 import Combine
 import Common
+import PixelKit
 
 protocol SavePaymentMethodDelegate: AnyObject {
 
@@ -91,10 +92,10 @@ final class SavePaymentMethodViewController: NSViewController {
         paymentMethod.title = CreditCardValidation.type(for: paymentMethod.cardNumber).displayName
 
         do {
-            try AutofillSecureVaultFactory.makeVault(errorReporter: SecureVaultErrorReporter.shared).storeCreditCard(paymentMethod)
+            try AutofillSecureVaultFactory.makeVault(reporter: SecureVaultReporter.shared).storeCreditCard(paymentMethod)
         } catch {
             os_log("%s:%s: failed to store payment method %s", type: .error, className, #function, error.localizedDescription)
-            Pixel.fire(.debug(event: .secureVaultError, error: error))
+            PixelKit.fire(DebugEvent(GeneralPixel.secureVaultError(error: error)))
         }
     }
 
diff --git a/DuckDuckGo/Sharing/SharingMenu.swift b/DuckDuckGo/Sharing/SharingMenu.swift
index 992ddb6103..bdb91d56bf 100644
--- a/DuckDuckGo/Sharing/SharingMenu.swift
+++ b/DuckDuckGo/Sharing/SharingMenu.swift
@@ -49,7 +49,7 @@ final class SharingMenu: NSMenu {
         guard let tabViewModel = WindowControllersManager.shared.lastKeyMainWindowController?.mainViewController.tabCollectionViewModel.selectedTabViewModel,
               tabViewModel.canReload,
               !tabViewModel.isShowingErrorPage,
-              let url = tabViewModel.tab.content.url else { return nil }
+              let url = tabViewModel.tab.content.userEditableUrl else { return nil }
 
         let sharingData = DuckPlayer.shared.sharingData(for: tabViewModel.title, url: url) ?? (tabViewModel.title, url)
 
diff --git a/DuckDuckGo/SmarterEncryption/PrivacyFeatures.swift b/DuckDuckGo/SmarterEncryption/PrivacyFeatures.swift
index e76155b196..cb16b2bcef 100644
--- a/DuckDuckGo/SmarterEncryption/PrivacyFeatures.swift
+++ b/DuckDuckGo/SmarterEncryption/PrivacyFeatures.swift
@@ -20,6 +20,7 @@ import BrowserServicesKit
 import Common
 import Foundation
 import Persistence
+import PixelKit
 
 protocol PrivacyFeaturesProtocol {
     var contentBlocking: AnyContentBlocking { get }
@@ -42,22 +43,31 @@ final class AppPrivacyFeatures: PrivacyFeaturesProtocol {
     let httpsUpgrade: HTTPSUpgrade
 
     private static let httpsUpgradeDebugEvents = EventMapping<AppHTTPSUpgradeStore.ErrorEvents> { event, error, parameters, onComplete in
-        let domainEvent: Pixel.Event.Debug
+        let domainEvent: GeneralPixel
         let dailyAndCount: Bool
 
         switch event {
         case .dbSaveBloomFilterError:
-            domainEvent = .dbSaveBloomFilterError
+            domainEvent = GeneralPixel.dbSaveBloomFilterError(error: error)
             dailyAndCount = true
         case .dbSaveExcludedHTTPSDomainsError:
-            domainEvent = .dbSaveExcludedHTTPSDomainsError
+            domainEvent = GeneralPixel.dbSaveExcludedHTTPSDomainsError(error: error)
             dailyAndCount = false
         }
 
         if dailyAndCount {
-            DailyPixel.fire(pixel: .debug(event: domainEvent, error: error), frequency: .dailyAndCount, includeAppVersionParameter: true, withAdditionalParameters: parameters ?? [:], onComplete: onComplete)
+            PixelKit.fire(DebugEvent(domainEvent, error: error),
+                          frequency: .dailyAndCount,
+                          withAdditionalParameters: parameters ?? [:],
+                          includeAppVersionParameter: true) { _, error in
+                onComplete(error)
+            }
         } else {
-            Pixel.fire(.debug(event: domainEvent, error: error), withAdditionalParameters: parameters, onComplete: onComplete)
+            PixelKit.fire(DebugEvent(domainEvent, error: error),
+                          frequency: .dailyAndCount,
+                          withAdditionalParameters: parameters ?? [:]) { _, error in
+                onComplete(error)
+            }
         }
     }
     private static var embeddedBloomFilterResources: EmbeddedBloomFilterResources {
diff --git a/DuckDuckGo/StateRestoration/AppStateRestorationManager.swift b/DuckDuckGo/StateRestoration/AppStateRestorationManager.swift
index 521b01b490..e99fd44f8c 100644
--- a/DuckDuckGo/StateRestoration/AppStateRestorationManager.swift
+++ b/DuckDuckGo/StateRestoration/AppStateRestorationManager.swift
@@ -19,6 +19,7 @@
 import Foundation
 import Combine
 import Common
+import PixelKit
 
 @MainActor
 final class AppStateRestorationManager: NSObject {
@@ -71,10 +72,8 @@ final class AppStateRestorationManager: NSObject {
             // ignore
         } catch {
             os_log("App state could not be decoded: %s", "\(error)")
-            Pixel.fire(
-                .debug(event: .appStateRestorationFailed, error: error),
-                withAdditionalParameters: ["interactive": String(interactive)]
-            )
+            PixelKit.fire(DebugEvent(GeneralPixel.appStateRestorationFailed, error: error),
+                          withAdditionalParameters: ["interactive": String(interactive)])
         }
 
         return state
@@ -140,7 +139,7 @@ final class AppStateRestorationManager: NSObject {
             // ignore
         } catch {
             os_log("Pinned tabs state could not be decoded: %s", "\(error)")
-            Pixel.fire(.debug(event: .appStateRestorationFailed, error: error))
+            PixelKit.fire(DebugEvent(GeneralPixel.appStateRestorationFailed, error: error))
         }
     }
 
diff --git a/DuckDuckGo/StateRestoration/StatePersistenceService.swift b/DuckDuckGo/StateRestoration/StatePersistenceService.swift
index 6aed78934a..5d65a2c1d0 100644
--- a/DuckDuckGo/StateRestoration/StatePersistenceService.swift
+++ b/DuckDuckGo/StateRestoration/StatePersistenceService.swift
@@ -65,6 +65,7 @@ final class StatePersistenceService {
 
     func removeLastSessionState() {
         lastSessionStateArchive = nil
+        fileStore.remove(fileAtURL: URL.persistenceLocation(for: self.fileName))
     }
 
     @MainActor
diff --git a/DuckDuckGo/StateRestoration/WindowManager+StateRestoration.swift b/DuckDuckGo/StateRestoration/WindowManager+StateRestoration.swift
index f9c84e5055..aaa38da89c 100644
--- a/DuckDuckGo/StateRestoration/WindowManager+StateRestoration.swift
+++ b/DuckDuckGo/StateRestoration/WindowManager+StateRestoration.swift
@@ -52,7 +52,7 @@ extension WindowsManager {
     }
 
     private class func setUpWindow(from item: WindowRestorationItem) {
-        guard let window = openNewWindow(with: item.model, showWindow: true) else { return }
+        guard let window = openNewWindow(with: item.model, showWindow: !item.isMiniaturized, isMiniaturized: item.isMiniaturized) else { return }
         window.setContentSize(item.frame.size)
         window.setFrameOrigin(item.frame.origin)
     }
@@ -135,11 +135,13 @@ final class WindowRestorationItem: NSObject, NSSecureCoding {
     private enum NSSecureCodingKeys {
         static let frame = "frame"
         static let model = "model"
+        static let isMiniaturized = "isMiniaturized"
 
     }
 
     let model: TabCollectionViewModel
     let frame: NSRect
+    let isMiniaturized: Bool
 
     @MainActor
     init?(windowController: MainWindowController) {
@@ -150,6 +152,7 @@ final class WindowRestorationItem: NSObject, NSSecureCoding {
 
         self.frame = windowController.window!.frame
         self.model = windowController.mainViewController.tabCollectionViewModel
+        self.isMiniaturized = windowController.window!.isMiniaturized
     }
 
     static var supportsSecureCoding: Bool { true }
@@ -161,10 +164,12 @@ final class WindowRestorationItem: NSObject, NSSecureCoding {
         }
         self.model = model
         self.frame = coder.decodeRect(forKey: NSSecureCodingKeys.frame)
+        self.isMiniaturized = coder.decodeBool(forKey: NSSecureCodingKeys.isMiniaturized)
     }
 
     func encode(with coder: NSCoder) {
         coder.encode(frame, forKey: NSSecureCodingKeys.frame)
         coder.encode(model, forKey: NSSecureCodingKeys.model)
+        coder.encode(isMiniaturized, forKey: NSSecureCodingKeys.isMiniaturized)
     }
 }
diff --git a/DuckDuckGo/Statistics/ATB/AttributionOriginFileProvider.swift b/DuckDuckGo/Statistics/ATB/AttributionOriginFileProvider.swift
new file mode 100644
index 0000000000..53a223e3e5
--- /dev/null
+++ b/DuckDuckGo/Statistics/ATB/AttributionOriginFileProvider.swift
@@ -0,0 +1,47 @@
+//
+//  AttributionOriginFileProvider.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
+
+/// A type that provides the `origin` used to track installations without tracking retention.
+protocol AttributionOriginProvider: AnyObject {
+    /// A string representing the acquisition funnel.
+    var origin: String? { get }
+}
+
+final class AttributionOriginFileProvider: AttributionOriginProvider {
+    let origin: String?
+
+    /// Creates an instance with the given file name and `Bundle`.
+    /// - Parameters:
+    ///   - name: The name of the Txt file to extract the origin from.
+    ///   - bundle: The bundle where the file is located. In tests pass replace this with the test bundle.
+    init(resourceName name: String = "Origin", bundle: Bundle = .main) {
+        let url = bundle.url(forResource: name, withExtension: "txt")
+        origin = try? url
+            .flatMap(String.init(contentsOf:))?
+            .trimmingCharacters(in: .whitespacesAndNewlines)
+            .nilIfEmpty
+    }
+}
+
+private extension String {
+    var nilIfEmpty: String? {
+        return isEmpty ? nil : self
+    }
+}
diff --git a/DuckDuckGo/Statistics/ATB/InstallationAttributionPixelHandler.swift b/DuckDuckGo/Statistics/ATB/InstallationAttributionPixelHandler.swift
new file mode 100644
index 0000000000..b26f411d9c
--- /dev/null
+++ b/DuckDuckGo/Statistics/ATB/InstallationAttributionPixelHandler.swift
@@ -0,0 +1,91 @@
+//
+//  InstallationAttributionPixelHandler.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
+
+/// A type that handles Pixels for acquisition attributions.
+protocol AttributionsPixelHandler: AnyObject {
+    /// Fire the Pixel to track the App install.
+    func fireInstallationAttributionPixel()
+}
+
+final class InstallationAttributionPixelHandler: AttributionsPixelHandler {
+    enum Parameters {
+        static let origin = "origin"
+        static let locale = "locale"
+    }
+
+    private let fireRequest: FireRequest
+    private let originProvider: AttributionOriginProvider
+    private let locale: Locale
+
+    /// Creates an instance with the specified fire request, origin provider and locale.
+    /// - Parameters:
+    ///   - fireRequest: A function for sending the Pixel request.
+    ///   - originProvider: A provider for the origin used to track the acquisition funnel.
+    ///   - locale: The locale of the device.
+    init(
+        fireRequest: @escaping FireRequest = PixelKit.fire,
+        originProvider: AttributionOriginProvider = AttributionOriginFileProvider(),
+        locale: Locale = .current
+    ) {
+        self.fireRequest = fireRequest
+        self.originProvider = originProvider
+        self.locale = locale
+    }
+
+    func fireInstallationAttributionPixel() {
+        fireRequest(
+            GeneralPixel.installationAttribution,
+            .legacyInitial,
+            [:],
+            additionalParameters(origin: originProvider.origin, locale: locale.identifier),
+            nil,
+            nil,
+            true, { _, _ in }
+        )
+    }
+}
+
+// MARK: - Parameter
+
+private extension InstallationAttributionPixelHandler {
+    func additionalParameters(origin: String?, locale: String) -> [String: String] {
+        var dictionary = [Self.Parameters.locale: locale]
+        if let origin {
+            dictionary[Self.Parameters.origin] = origin
+        }
+        return dictionary
+    }
+}
+
+// MARK: - FireRequest
+
+extension InstallationAttributionPixelHandler {
+    typealias FireRequest = (
+        _ event: PixelKit.Event,
+        _ frequency: PixelKit.Frequency,
+        _ headers: [String: String],
+        _ parameters: [String: String]?,
+        _ error: Error?,
+        _ allowedQueryReservedCharacters: CharacterSet?,
+        _ includeAppVersionParameter: Bool,
+        _ onComplete: @escaping (Bool, Error?) -> Void
+    ) -> Void
+}
diff --git a/DuckDuckGo/Statistics/PixelDataModel.xcdatamodeld/PixelDataModel.xcdatamodel/contents b/DuckDuckGo/Statistics/ATB/PixelDataModel.xcdatamodeld/PixelDataModel.xcdatamodel/contents
similarity index 100%
rename from DuckDuckGo/Statistics/PixelDataModel.xcdatamodeld/PixelDataModel.xcdatamodel/contents
rename to DuckDuckGo/Statistics/ATB/PixelDataModel.xcdatamodeld/PixelDataModel.xcdatamodel/contents
diff --git a/DuckDuckGo/Statistics/PixelDataRecord.swift b/DuckDuckGo/Statistics/ATB/PixelDataRecord.swift
similarity index 100%
rename from DuckDuckGo/Statistics/PixelDataRecord.swift
rename to DuckDuckGo/Statistics/ATB/PixelDataRecord.swift
diff --git a/DuckDuckGo/Statistics/PixelDataStore.swift b/DuckDuckGo/Statistics/ATB/PixelDataStore.swift
similarity index 100%
rename from DuckDuckGo/Statistics/PixelDataStore.swift
rename to DuckDuckGo/Statistics/ATB/PixelDataStore.swift
diff --git a/DuckDuckGo/Statistics/ATB/StatisticsLoader.swift b/DuckDuckGo/Statistics/ATB/StatisticsLoader.swift
index 296f67e901..744f4b6071 100644
--- a/DuckDuckGo/Statistics/ATB/StatisticsLoader.swift
+++ b/DuckDuckGo/Statistics/ATB/StatisticsLoader.swift
@@ -20,6 +20,7 @@ import Common
 import Foundation
 import BrowserServicesKit
 import Networking
+import PixelKit
 
 final class StatisticsLoader {
 
@@ -29,12 +30,18 @@ final class StatisticsLoader {
 
     private let statisticsStore: StatisticsStore
     private let emailManager: EmailManager
+    private let attributionPixelHandler: AttributionsPixelHandler
     private let parser = AtbParser()
     private var isAppRetentionRequestInProgress = false
 
-    init(statisticsStore: StatisticsStore = LocalStatisticsStore(), emailManager: EmailManager = EmailManager()) {
+    init(
+        statisticsStore: StatisticsStore = LocalStatisticsStore(),
+        emailManager: EmailManager = EmailManager(),
+        attributionPixelHandler: AttributionsPixelHandler = InstallationAttributionPixelHandler()
+    ) {
         self.statisticsStore = statisticsStore
         self.emailManager = emailManager
+        self.attributionPixelHandler = attributionPixelHandler
     }
 
     func refreshRetentionAtb(isSearch: Bool, completion: @escaping Completion = {}) {
@@ -53,7 +60,7 @@ final class StatisticsLoader {
                         completion()
                     }
                 }
-                Pixel.fire(.serp)
+                PixelKit.fire(GeneralPixel.serp)
                 self.fireDailyOsVersionCounterPixel()
             } else if !self.statisticsStore.isAppRetentionFiredToday {
                 self.refreshAppRetentionAtb(completion: completion)
@@ -94,6 +101,7 @@ final class StatisticsLoader {
 
             if let data = response?.data, let atb = try? self.parser.convert(fromJsonData: data) {
                 self.requestExti(atb: atb, completion: completion)
+                self.attributionPixelHandler.fireInstallationAttributionPixel()
             } else {
                 completion()
             }
@@ -217,9 +225,9 @@ final class StatisticsLoader {
         let randomDelay = Double.random(in: 0.5...5)
 
         DispatchQueue.global().asyncAfter(deadline: .now() + randomDelay) {
-            Pixel.fire(.dailyOsVersionCounter,
-                       limitTo: .dailyFirst,
-                       includeAppVersionParameter: false)
+            PixelKit.fire(GeneralPixel.dailyOsVersionCounter,
+                          frequency: .legacyDaily,
+                          includeAppVersionParameter: false)
         }
     }
 
diff --git a/DuckDuckGo/Statistics/DailyPixel.swift b/DuckDuckGo/Statistics/DailyPixel.swift
deleted file mode 100644
index e436d453ba..0000000000
--- a/DuckDuckGo/Statistics/DailyPixel.swift
+++ /dev/null
@@ -1,85 +0,0 @@
-//
-//  DailyPixel.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
-
-final class DailyPixel {
-
-    public enum PixelFrequency {
-        /// Sent once per day. The last timestamp for this pixel is stored and compared to the current date. Pixels of this type will have `_d` appended to their name.
-        case dailyOnly
-
-        /// Sent once per day with a `_d` suffix, in addition to every time it is called with a `_c` suffix.
-        /// This means a pixel will get sent twice the first time it is called per-day, and subsequent calls that day will only send the `_c` variant.
-        /// This is useful in situations where pixels receive spikes in volume, as the daily pixel can be used to determine how many users are actually affected.
-        case dailyAndCount
-    }
-
-    enum Error: Swift.Error {
-        case alreadyFired
-    }
-
-    enum Constant {
-        static let dailyPixelStorageIdentifier = "com.duckduckgo.daily.pixel.storage"
-    }
-
-    private static let storage: UserDefaults = UserDefaults(suiteName: Constant.dailyPixelStorageIdentifier)!
-
-    static func fire(pixel: Pixel.Event,
-                     frequency: PixelFrequency,
-                     includeAppVersionParameter includeAppVersion: Bool = true,
-                     withAdditionalParameters params: [String: String] = [:],
-                     onComplete: @escaping (Swift.Error?) -> Void = { _ in }) {
-        switch frequency {
-        case .dailyOnly:
-            if !pixel.hasBeenFiredToday(dailyPixelStorage: storage) {
-                Pixel.shared?.fire(.dailyPixel(pixel, isFirst: true), withAdditionalParameters: params, includeAppVersionParameter: includeAppVersion)
-                updatePixelLastFireDate(pixel: pixel)
-            }
-        case .dailyAndCount:
-            if !pixel.hasBeenFiredToday(dailyPixelStorage: storage) {
-                Pixel.shared?.fire(.dailyPixel(pixel, isFirst: true), withAdditionalParameters: params, includeAppVersionParameter: includeAppVersion)
-                updatePixelLastFireDate(pixel: pixel)
-            }
-
-            Pixel.shared?.fire(.dailyPixel(pixel, isFirst: false), withAdditionalParameters: params, includeAppVersionParameter: includeAppVersion)
-        }
-    }
-
-    private static func updatePixelLastFireDate(pixel: Pixel.Event) {
-        storage.set(Date(), forKey: pixel.name)
-    }
-
-    static func clearLastFireDate(pixel: Pixel.Event) {
-        storage.removeObject(forKey: pixel.name)
-    }
-
-}
-
-private extension Pixel.Event {
-
-    func hasBeenFiredToday(dailyPixelStorage: UserDefaults) -> Bool {
-        if let lastFireDate = dailyPixelStorage.object(forKey: name) as? Date {
-            return Calendar.current.isDate(Date(), inSameDayAs: lastFireDate)
-        }
-
-        return false
-    }
-
-}
diff --git a/DuckDuckGo/Statistics/Experiment/PixelExperiment.swift b/DuckDuckGo/Statistics/Experiment/PixelExperiment.swift
index 64af60e55b..eb0f07b592 100644
--- a/DuckDuckGo/Statistics/Experiment/PixelExperiment.swift
+++ b/DuckDuckGo/Statistics/Experiment/PixelExperiment.swift
@@ -16,7 +16,13 @@
 //  limitations under the License.
 //
 
+/*
+ WARNING: This component doesn't work anymore, re-implementation needed
+ https://app.asana.com/0/0/1207002879349166/f
+ */
+
 import Foundation
+import PixelKit
 
 enum PixelExperiment: String, CaseIterable {
 
@@ -54,7 +60,7 @@ enum PixelExperiment: String, CaseIterable {
     case control
 }
 
-/// These functions contain the business logic for determining if the pixel should be fired or not.
+// These functions contain the business logic for determining if the pixel should be fired or not.
 extension PixelExperiment {
 
     static func fireEnrollmentPixel() {
@@ -128,7 +134,7 @@ final internal class PixelExperimentLogic {
         isInstalled = true
     }
 
-    // You'll need additional pixels for your experiment.  Pass the cohort as a paramter.
+    // You'll need additional pixels for your experiment.  Pass the cohort as a parameter.
     func fireEnrollmentPixel() {
         // You'll probably need this at least.
     }
@@ -136,15 +142,18 @@ final internal class PixelExperimentLogic {
     // Often used
     func fireFirstSerpPixel() {
         guard allocatedCohort != nil, let cohort else { return }
-        Pixel.fire(.serpInitial(cohort: cohort.rawValue), limitTo: .initial, includeAppVersionParameter: false)
+        PixelKit.fire(GeneralPixel.serpInitial(cohort: cohort.rawValue), frequency: .legacyInitial, includeAppVersionParameter: false)
     }
 
     // Often used for retention experiments
     func fireDay21To27SerpPixel() {
         guard allocatedCohort != nil, let cohort else { return }
 
-        if now() >= Pixel.firstLaunchDate.adding(.days(21)) && now() <= Pixel.firstLaunchDate.adding(.days(27)) {
-            Pixel.fire(.serpDay21to27(cohort: cohort.rawValue), limitTo: .initial, includeAppVersionParameter: false)
+        DispatchQueue.main.async {
+            let now = self.now()
+            if now >= AppDelegate.firstLaunchDate.adding(.days(21)) && now <= AppDelegate.firstLaunchDate.adding(.days(27)) {
+                PixelKit.fire(GeneralPixel.serpDay21to27(cohort: cohort.rawValue), frequency: .legacyInitial, includeAppVersionParameter: false)
+            }
         }
     }
 
diff --git a/DuckDuckGo/Statistics/GeneralPixel.swift b/DuckDuckGo/Statistics/GeneralPixel.swift
new file mode 100644
index 0000000000..e2eeb8d192
--- /dev/null
+++ b/DuckDuckGo/Statistics/GeneralPixel.swift
@@ -0,0 +1,943 @@
+//
+//  GeneralPixel.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 PixelKit
+import BrowserServicesKit
+import DDGSync
+import Configuration
+
+// swiftlint:disable:next type_body_length
+enum GeneralPixel: PixelKitEventV2 {
+
+    case crash
+    case brokenSiteReport
+    case compileRulesWait(onboardingShown: OnboardingShown, waitTime: CompileRulesWaitTime, result: WaitResult)
+    case launchInitial(cohort: String)
+
+    case serp
+    case serpInitial(cohort: String)
+    case serpDay21to27(cohort: String)
+
+    case dailyOsVersionCounter
+
+    case dataImportFailed(source: DataImport.Source, sourceVersion: String?, error: any DataImportError)
+
+    case formAutofilled(kind: FormAutofillKind)
+    case autofillItemSaved(kind: FormAutofillKind)
+
+    case autofillLoginsSaveLoginModalExcludeSiteConfirmed
+    case autofillLoginsSettingsResetExcludedDisplayed
+    case autofillLoginsSettingsResetExcludedConfirmed
+    case autofillLoginsSettingsResetExcludedDismissed
+
+    case bitwardenPasswordAutofilled
+    case bitwardenPasswordSaved
+
+    case ampBlockingRulesCompilationFailed
+
+    case adClickAttributionDetected
+    case adClickAttributionActive
+    case adClickAttributionPageLoads
+
+    case emailEnabled
+    case emailDisabled
+    case emailUserPressedUseAddress
+    case emailUserPressedUseAlias
+    case emailUserCreatedAlias
+
+    case jsPixel(_ pixel: AutofillUserScript.JSPixel)
+
+    // Activation Points
+    case newTabInitial
+    case emailEnabledInitial
+    case watchInDuckPlayerInitial
+    case setAsDefaultInitial
+    case importDataInitial
+
+    // New Tab section removed
+    case favoriteSectionHidden
+    case recentActivitySectionHidden
+    case continueSetUpSectionHidden
+
+    // Fire Button
+    case fireButtonFirstBurn
+    case fireButton(option: FireButtonOption)
+
+    // Duck Player
+    case duckPlayerDailyUniqueView
+    case duckPlayerViewFromYoutubeViaMainOverlay
+    case duckPlayerViewFromYoutubeViaHoverButton
+    case duckPlayerViewFromYoutubeAutomatic
+    case duckPlayerViewFromSERP
+    case duckPlayerViewFromOther
+    case duckPlayerSettingAlways
+    case duckPlayerSettingNever
+    case duckPlayerSettingBackToDefault
+
+    // Dashboard
+    case dashboardProtectionAllowlistAdd(triggerOrigin: String?)
+    case dashboardProtectionAllowlistRemove(triggerOrigin: String?)
+
+    // VPN
+    case vpnBreakageReport(category: String, description: String, metadata: String)
+
+    // VPN
+    case networkProtectionRemoteMessageDisplayed(messageID: String)
+    case networkProtectionRemoteMessageDismissed(messageID: String)
+    case networkProtectionRemoteMessageOpened(messageID: String)
+    case networkProtectionEnabledOnSearch
+    case networkProtectionGeoswitchingOpened
+    case networkProtectionGeoswitchingSetNearest
+    case networkProtectionGeoswitchingSetCustom
+    case networkProtectionGeoswitchingNoLocations
+
+    // Sync
+    case syncSignupDirect
+    case syncSignupConnect
+    case syncLogin
+    case syncDaily
+    case syncDuckAddressOverride
+    case syncSuccessRateDaily
+    case syncLocalTimestampResolutionTriggered(Feature)
+    case syncBookmarksCountLimitExceededDaily
+    case syncCredentialsCountLimitExceededDaily
+    case syncBookmarksRequestSizeLimitExceededDaily
+    case syncCredentialsRequestSizeLimitExceededDaily
+
+    // DataBroker Protection Waitlist
+    case dataBrokerProtectionWaitlistUserActive
+    case dataBrokerProtectionWaitlistEntryPointMenuItemDisplayed
+    case dataBrokerProtectionWaitlistIntroDisplayed
+    case dataBrokerProtectionWaitlistNotificationShown
+    case dataBrokerProtectionWaitlistNotificationTapped
+    case dataBrokerProtectionWaitlistCardUITapped
+    case dataBrokerProtectionWaitlistTermsAndConditionsDisplayed
+    case dataBrokerProtectionWaitlistTermsAndConditionsAccepted
+    case dataBrokerProtectionRemoteMessageDisplayed(messageID: String)
+    case dataBrokerProtectionRemoteMessageDismissed(messageID: String)
+    case dataBrokerProtectionRemoteMessageOpened(messageID: String)
+
+    // Login Item events
+    case dataBrokerEnableLoginItemDaily
+    case dataBrokerDisableLoginItemDaily
+    case dataBrokerResetLoginItemDaily
+    case dataBrokerDisableAndDeleteDaily
+
+    // DataBrokerProtection Other
+    case dataBrokerProtectionErrorWhenFetchingSubscriptionAuthTokenAfterSignIn
+
+    // 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
+
+    // MARK: - Debug
+
+    case assertionFailure(message: String, file: StaticString, line: UInt)
+
+    case dbMakeDatabaseError(error: Error?)
+    case dbContainerInitializationError(error: Error)
+    case dbInitializationError(error: Error)
+    case dbSaveExcludedHTTPSDomainsError(error: Error?)
+    case dbSaveBloomFilterError(error: Error?)
+
+    case configurationFetchError(error: Error)
+
+    case trackerDataParseFailed
+    case trackerDataReloadFailed
+    case trackerDataCouldNotBeLoaded
+
+    case privacyConfigurationParseFailed
+    case privacyConfigurationReloadFailed
+    case privacyConfigurationCouldNotBeLoaded
+
+    case fileStoreWriteFailed
+    case fileMoveToDownloadsFailed
+    case fileAccessRelatedItemFailed
+    case fileGetDownloadLocationFailed
+    case fileDownloadCreatePresentersFailed
+    case downloadResumeDataCodingFailed
+
+    case suggestionsFetchFailed
+    case appOpenURLFailed
+    case appStateRestorationFailed
+
+    case contentBlockingErrorReportingIssue
+
+    case contentBlockingCompilationFailed(listType: CompileRulesListType, component: ContentBlockerDebugEvents.Component)
+
+    case contentBlockingCompilationTime
+
+    case secureVaultInitError(error: Error)
+    case secureVaultError(error: Error)
+
+    case feedbackReportingFailed
+
+    case blankNavigationOnBurnFailed
+
+    case historyRemoveFailed
+    case historyReloadFailed
+    case historyCleanEntriesFailed
+    case historyCleanVisitsFailed
+    case historySaveFailed
+    case historySaveFailedDaily
+    case historyInsertVisitFailed
+    case historyRemoveVisitsFailed
+
+    case emailAutofillKeychainError
+
+    case bookmarksStoreRootFolderMigrationFailed
+    case bookmarksStoreFavoritesFolderMigrationFailed
+
+    case adAttributionCompilationFailedForAttributedRulesList
+    case adAttributionGlobalAttributedRulesDoNotExist
+    case adAttributionDetectionHeuristicsDidNotMatchDomain
+    case adAttributionLogicUnexpectedStateOnRulesCompiled
+    case adAttributionLogicUnexpectedStateOnInheritedAttribution
+    case adAttributionLogicUnexpectedStateOnRulesCompilationFailed
+    case adAttributionDetectionInvalidDomainInParameter
+    case adAttributionLogicRequestingAttributionTimedOut
+    case adAttributionLogicWrongVendorOnSuccessfulCompilation
+    case adAttributionLogicWrongVendorOnFailedCompilation
+
+    case webKitDidTerminate
+
+    case removedInvalidBookmarkManagedObjects
+
+    case bitwardenNotResponding
+    case bitwardenRespondedCannotDecrypt
+    case bitwardenHandshakeFailed
+    case bitwardenDecryptionOfSharedKeyFailed
+    case bitwardenStoringOfTheSharedKeyFailed
+    case bitwardenCredentialRetrievalFailed
+    case bitwardenCredentialCreationFailed
+    case bitwardenCredentialUpdateFailed
+    case bitwardenRespondedWithError
+    case bitwardenNoActiveVault
+    case bitwardenParsingFailed
+    case bitwardenStatusParsingFailed
+    case bitwardenHmacComparisonFailed
+    case bitwardenDecryptionFailed
+    case bitwardenSendingOfMessageFailed
+    case bitwardenSharedKeyInjectionFailed
+
+    case updaterAborted
+    case userSelectedToSkipUpdate
+    case userSelectedToInstallUpdate
+    case userSelectedToDismissUpdate
+
+    case faviconDecryptionFailedUnique
+    case downloadListItemDecryptionFailedUnique
+    case historyEntryDecryptionFailedUnique
+    case permissionDecryptionFailedUnique
+
+    // Errors from Bookmarks Module
+    case missingParent
+    case bookmarksSaveFailed
+    case bookmarksSaveFailedOnImport
+
+    case bookmarksCouldNotLoadDatabase(error: Error?)
+    case bookmarksCouldNotPrepareDatabase
+    case bookmarksMigrationAlreadyPerformed
+    case bookmarksMigrationFailed
+    case bookmarksMigrationCouldNotPrepareDatabase
+    case bookmarksMigrationCouldNotPrepareDatabaseOnFailedMigration
+    case bookmarksMigrationCouldNotRemoveOldStore
+    case bookmarksMigrationCouldNotPrepareMultipleFavoriteFolders
+
+    case syncSentUnauthenticatedRequest
+    case syncMetadataCouldNotLoadDatabase
+    case syncBookmarksProviderInitializationFailed
+    case syncBookmarksFailed
+    case syncCredentialsProviderInitializationFailed
+    case syncCredentialsFailed
+    case syncSettingsFailed
+    case syncSettingsMetadataUpdateFailed
+    case syncSignupError(error: Error)
+    case syncLoginError(error: Error)
+    case syncLogoutError(error: Error)
+    case syncUpdateDeviceError(error: Error)
+    case syncRemoveDeviceError(error: Error)
+    case syncDeleteAccountError(error: Error)
+    case syncLoginExistingAccountError(error: Error)
+    case syncCannotCreateRecoveryPDF
+
+    case bookmarksCleanupFailed
+    case bookmarksCleanupAttemptedWhileSyncWasEnabled
+    case favoritesCleanupFailed
+    case bookmarksFaviconsFetcherStateStoreInitializationFailed
+    case bookmarksFaviconsFetcherFailed
+
+    case credentialsDatabaseCleanupFailed
+    case credentialsCleanupAttemptedWhileSyncWasEnabled
+
+    case invalidPayload(Configuration) // BSK>Configuration
+
+    case burnerTabMisplaced
+
+    case networkProtectionRemoteMessageFetchingFailed
+    case networkProtectionRemoteMessageStorageFailed
+    case dataBrokerProtectionRemoteMessageFetchingFailed
+    case dataBrokerProtectionRemoteMessageStorageFailed
+
+    case loginItemUpdateError(loginItemBundleID: String, action: String, buildType: String, osVersion: String)
+
+    // Tracks installation without tracking retention.
+    case installationAttribution
+
+    case secureVaultKeystoreEventL1KeyMigration
+    case secureVaultKeystoreEventL2KeyMigration
+    case secureVaultKeystoreEventL2KeyPasswordMigration
+
+    var name: String {
+        switch self {
+
+        case .crash:
+            return "m_mac_crash"
+
+        case .brokenSiteReport:
+            return "epbf_macos_desktop"
+
+        case .compileRulesWait(onboardingShown: let onboardingShown, waitTime: let waitTime, result: let result):
+            return "m_mac_cbr-wait_\(onboardingShown)_\(waitTime)_\(result)"
+
+        case .serp:
+            return "m_mac_navigation_search"
+
+        case .dailyOsVersionCounter:
+            return "m_mac_daily-os-version-counter"
+
+        case .dataImportFailed(source: let source, sourceVersion: _, error: let error) where error.action == .favicons:
+            return "m_mac_favicon-import-failed_\(source)"
+        case .dataImportFailed(source: let source, sourceVersion: _, error: let error):
+            return "m_mac_data-import-failed_\(error.action)_\(source)"
+
+        case .formAutofilled(kind: let kind):
+            return "m_mac_autofill_\(kind)"
+
+        case .autofillItemSaved(kind: let kind):
+            return "m_mac_save_\(kind)"
+
+        case .autofillLoginsSaveLoginModalExcludeSiteConfirmed:
+            return "m_mac_autofill_logins_save_login_exclude_site_confirmed"
+        case .autofillLoginsSettingsResetExcludedDisplayed:
+            return "m_mac_autofill_settings_reset_excluded_displayed"
+        case .autofillLoginsSettingsResetExcludedConfirmed:
+            return "m_mac_autofill_settings_reset_excluded_confirmed"
+        case .autofillLoginsSettingsResetExcludedDismissed:
+            return "m_mac_autofill_settings_reset_excluded_dismissed"
+
+        case .bitwardenPasswordAutofilled:
+            return "m_mac_bitwarden_autofill_password"
+
+        case .bitwardenPasswordSaved:
+            return "m_mac_bitwarden_save_password"
+
+        case .ampBlockingRulesCompilationFailed:
+            return "m_mac_amp_rules_compilation_failed"
+
+        case .adClickAttributionDetected:
+            return "m_mac_ad_click_detected"
+
+        case .adClickAttributionActive:
+            return "m_mac_ad_click_active"
+
+        case .adClickAttributionPageLoads:
+            return "m_mac_ad_click_page_loads"
+
+            // Deliberately omit the `m_mac_` prefix in order to format these pixels the same way as other platforms
+        case .emailEnabled: return "email_enabled_macos_desktop"
+        case .emailDisabled: return "email_disabled_macos_desktop"
+        case .emailUserPressedUseAddress: return "email_filled_main_macos_desktop"
+        case .emailUserPressedUseAlias: return "email_filled_random_macos_desktop"
+        case .emailUserCreatedAlias: return "email_generated_button_macos_desktop"
+
+        case .jsPixel(let pixel):
+            // Email pixels deliberately avoid using the `m_mac_` prefix.
+            if pixel.isEmailPixel {
+                return "\(pixel.pixelName)_macos_desktop"
+            } else {
+                return "m_mac_\(pixel.pixelName)"
+            }
+        case .emailEnabledInitial:
+            return "m_mac.enable-email-protection.initial"
+
+        case .watchInDuckPlayerInitial:
+            return "m_mac.watch-in-duckplayer.initial"
+        case .setAsDefaultInitial:
+            return "m_mac.set-as-default.initial"
+        case .importDataInitial:
+            return "m_mac.import-data.initial"
+        case .newTabInitial:
+            return "m_mac.new-tab-opened.initial"
+        case .favoriteSectionHidden:
+            return "m_mac.favorite-section-hidden"
+        case .recentActivitySectionHidden:
+            return "m_mac.recent-activity-section-hidden"
+        case .continueSetUpSectionHidden:
+            return "m_mac.continue-setup-section-hidden"
+
+            // Fire Button
+        case .fireButtonFirstBurn:
+            return "m_mac_fire_button_first_burn"
+        case .fireButton(option: let option):
+            return "m_mac_fire_button_\(option)"
+
+        case .duckPlayerDailyUniqueView:
+            return "m_mac_duck-player_daily-unique-view"
+        case .duckPlayerViewFromYoutubeViaMainOverlay:
+            return "m_mac_duck-player_view-from_youtube_main-overlay"
+        case .duckPlayerViewFromYoutubeViaHoverButton:
+            return "m_mac_duck-player_view-from_youtube_hover-button"
+        case .duckPlayerViewFromYoutubeAutomatic:
+            return "m_mac_duck-player_view-from_youtube_automatic"
+        case .duckPlayerViewFromSERP:
+            return "m_mac_duck-player_view-from_serp"
+        case .duckPlayerViewFromOther:
+            return "m_mac_duck-player_view-from_other"
+        case .duckPlayerSettingAlways:
+            return "m_mac_duck-player_setting_always"
+        case .duckPlayerSettingNever:
+            return "m_mac_duck-player_setting_never"
+        case .duckPlayerSettingBackToDefault:
+            return "m_mac_duck-player_setting_back-to-default"
+
+        case .dashboardProtectionAllowlistAdd:
+            return "m_mac_mp_wla"
+        case .dashboardProtectionAllowlistRemove:
+            return "m_mac_mp_wlr"
+
+        case .launchInitial:
+            return "m.mac.first-launch"
+        case .serpInitial:
+            return "m.mac.navigation.first-search"
+        case .serpDay21to27:
+            return "m.mac.search-day-21-27.initial"
+
+        case .vpnBreakageReport:
+            return "m_mac_vpn_breakage_report"
+
+        case .networkProtectionRemoteMessageDisplayed(let messageID):
+            return "m_mac_netp_remote_message_displayed_\(messageID)"
+        case .networkProtectionRemoteMessageDismissed(let messageID):
+            return "m_mac_netp_remote_message_dismissed_\(messageID)"
+        case .networkProtectionRemoteMessageOpened(let messageID):
+            return "m_mac_netp_remote_message_opened_\(messageID)"
+        case .networkProtectionEnabledOnSearch:
+            return "m_mac_netp_ev_enabled_on_search"
+
+            // Sync
+        case .syncSignupDirect:
+            return "m_mac_sync_signup_direct"
+        case .syncSignupConnect:
+            return "m_mac_sync_signup_connect"
+        case .syncLogin:
+            return "m_mac_sync_login"
+        case .syncDaily:
+            return "m_mac_sync_daily"
+        case .syncDuckAddressOverride:
+            return "m_mac_sync_duck_address_override"
+        case .syncSuccessRateDaily:
+            return "m_mac_sync_success_rate_daily"
+        case .syncLocalTimestampResolutionTriggered(let feature):
+            return "m_mac_sync_\(feature.name)_local_timestamp_resolution_triggered"
+        case .syncBookmarksCountLimitExceededDaily: return "m_mac_sync_bookmarks_count_limit_exceeded_daily"
+        case .syncCredentialsCountLimitExceededDaily: return "m_mac_sync_credentials_count_limit_exceeded_daily"
+        case .syncBookmarksRequestSizeLimitExceededDaily: return "m_mac_sync_bookmarks_request_size_limit_exceeded_daily"
+        case .syncCredentialsRequestSizeLimitExceededDaily: return "m_mac_sync_credentials_request_size_limit_exceeded_daily"
+
+        case .dataBrokerProtectionWaitlistUserActive:
+            return "m_mac_dbp_waitlist_user_active"
+        case .dataBrokerProtectionWaitlistEntryPointMenuItemDisplayed:
+            return "m_mac_dbp_imp_settings_entry_menu_item"
+        case .dataBrokerProtectionWaitlistIntroDisplayed:
+            return "m_mac_dbp_imp_intro_screen"
+        case .dataBrokerProtectionWaitlistNotificationShown:
+            return "m_mac_dbp_ev_waitlist_notification_shown"
+        case .dataBrokerProtectionWaitlistNotificationTapped:
+            return "m_mac_dbp_ev_waitlist_notification_launched"
+        case .dataBrokerProtectionWaitlistCardUITapped:
+            return "m_mac_dbp_ev_waitlist_card_ui_launched"
+        case .dataBrokerProtectionWaitlistTermsAndConditionsDisplayed:
+            return "m_mac_dbp_imp_terms"
+        case .dataBrokerProtectionWaitlistTermsAndConditionsAccepted:
+            return "m_mac_dbp_ev_terms_accepted"
+        case .dataBrokerProtectionErrorWhenFetchingSubscriptionAuthTokenAfterSignIn:
+            return "m_mac_dbp_error_when_fetching_subscription_auth_token_after_sign_in"
+        case .dataBrokerProtectionRemoteMessageDisplayed(let messageID):
+            return "m_mac_dbp_remote_message_displayed_\(messageID)"
+        case .dataBrokerProtectionRemoteMessageDismissed(let messageID):
+            return "m_mac_dbp_remote_message_dismissed_\(messageID)"
+        case .dataBrokerProtectionRemoteMessageOpened(let messageID):
+            return "m_mac_dbp_remote_message_opened_\(messageID)"
+
+        case .dataBrokerEnableLoginItemDaily: return "m_mac_dbp_daily_login-item_enable"
+        case .dataBrokerDisableLoginItemDaily: return "m_mac_dbp_daily_login-item_disable"
+        case .dataBrokerResetLoginItemDaily: return "m_mac_dbp_daily_login-item_reset"
+        case .dataBrokerDisableAndDeleteDaily: return "m_mac_dbp_daily_disable-and-delete"
+
+        case .networkProtectionGeoswitchingOpened:
+            return "m_mac_netp_imp_geoswitching_c"
+        case .networkProtectionGeoswitchingSetNearest:
+            return "m_mac_netp_ev_geoswitching_set_nearest"
+        case .networkProtectionGeoswitchingSetCustom:
+            return "m_mac_netp_ev_geoswitching_set_custom"
+        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"
+
+        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"
+
+            // DEBUG
+        case .assertionFailure:
+            return "assertion_failure"
+
+        case .dbMakeDatabaseError:
+            return "database_make_database_error"
+        case .dbContainerInitializationError:
+            return "database_container_error"
+        case .dbInitializationError:
+            return "dbie"
+        case .dbSaveExcludedHTTPSDomainsError:
+            return "dbsw"
+        case .dbSaveBloomFilterError:
+            return "dbsb"
+
+        case .configurationFetchError:
+            return "cfgfetch"
+
+        case .trackerDataParseFailed:
+            return "tds_p"
+        case .trackerDataReloadFailed:
+            return "tds_r"
+        case .trackerDataCouldNotBeLoaded:
+            return "tds_l"
+
+        case .privacyConfigurationParseFailed:
+            return "pcf_p"
+        case .privacyConfigurationReloadFailed:
+            return "pcf_r"
+        case .privacyConfigurationCouldNotBeLoaded:
+            return "pcf_l"
+
+        case .fileStoreWriteFailed:
+            return "fswf"
+        case .fileMoveToDownloadsFailed:
+            return "df"
+        case .fileGetDownloadLocationFailed:
+            return "dl"
+        case .fileAccessRelatedItemFailed:
+            return "dari"
+        case .fileDownloadCreatePresentersFailed:
+            return "dfpf"
+        case .downloadResumeDataCodingFailed:
+            return "drdc"
+
+        case .suggestionsFetchFailed:
+            return "sgf"
+        case .appOpenURLFailed:
+            return "url"
+        case .appStateRestorationFailed:
+            return "srf"
+
+        case .contentBlockingErrorReportingIssue:
+            return "content_blocking_error_reporting_issue"
+
+        case .contentBlockingCompilationFailed(let listType, let component):
+            let componentString: String
+            switch component {
+            case .tds:
+                componentString = "fetched_tds"
+            case .allowlist:
+                componentString = "allow_list"
+            case .tempUnprotected:
+                componentString = "temp_list"
+            case .localUnprotected:
+                componentString = "unprotected_list"
+            case .fallbackTds:
+                componentString = "fallback_tds"
+            }
+            return "content_blocking_\(listType)_compilation_error_\(componentString)"
+
+        case .contentBlockingCompilationTime:
+            return "content_blocking_compilation_time"
+
+        case .secureVaultInitError:
+            return "secure_vault_init_error"
+        case .secureVaultError:
+            return "secure_vault_error"
+
+        case .feedbackReportingFailed:
+            return "feedback_reporting_failed"
+
+        case .blankNavigationOnBurnFailed:
+            return "blank_navigation_on_burn_failed"
+
+        case .historyRemoveFailed:
+            return "history_remove_failed"
+        case .historyReloadFailed:
+            return "history_reload_failed"
+        case .historyCleanEntriesFailed:
+            return "history_clean_entries_failed"
+        case .historyCleanVisitsFailed:
+            return "history_clean_visits_failed"
+        case .historySaveFailed:
+            return "history_save_failed"
+        case .historySaveFailedDaily:
+            return "history_save_failed_daily"
+        case .historyInsertVisitFailed:
+            return "history_insert_visit_failed"
+        case .historyRemoveVisitsFailed:
+            return "history_remove_visits_failed"
+
+        case .emailAutofillKeychainError:
+            return "email_autofill_keychain_error"
+
+        case .bookmarksStoreRootFolderMigrationFailed:
+            return "bookmarks_store_root_folder_migration_failed"
+        case .bookmarksStoreFavoritesFolderMigrationFailed:
+            return "bookmarks_store_favorites_folder_migration_failed"
+
+        case .adAttributionCompilationFailedForAttributedRulesList:
+            return "ad_attribution_compilation_failed_for_attributed_rules_list"
+        case .adAttributionGlobalAttributedRulesDoNotExist:
+            return "ad_attribution_global_attributed_rules_do_not_exist"
+        case .adAttributionDetectionHeuristicsDidNotMatchDomain:
+            return "ad_attribution_detection_heuristics_did_not_match_domain"
+        case .adAttributionLogicUnexpectedStateOnRulesCompiled:
+            return "ad_attribution_logic_unexpected_state_on_rules_compiled"
+        case .adAttributionLogicUnexpectedStateOnInheritedAttribution:
+            return "ad_attribution_logic_unexpected_state_on_inherited_attribution_2"
+        case .adAttributionLogicUnexpectedStateOnRulesCompilationFailed:
+            return "ad_attribution_logic_unexpected_state_on_rules_compilation_failed"
+        case .adAttributionDetectionInvalidDomainInParameter:
+            return "ad_attribution_detection_invalid_domain_in_parameter"
+        case .adAttributionLogicRequestingAttributionTimedOut:
+            return "ad_attribution_logic_requesting_attribution_timed_out"
+        case .adAttributionLogicWrongVendorOnSuccessfulCompilation:
+            return "ad_attribution_logic_wrong_vendor_on_successful_compilation"
+        case .adAttributionLogicWrongVendorOnFailedCompilation:
+            return "ad_attribution_logic_wrong_vendor_on_failed_compilation"
+
+        case .webKitDidTerminate:
+            return "webkit_did_terminate"
+
+        case .removedInvalidBookmarkManagedObjects:
+            return "removed_invalid_bookmark_managed_objects"
+
+        case .bitwardenNotResponding:
+            return "bitwarden_not_responding"
+        case .bitwardenRespondedCannotDecrypt:
+            return "bitwarden_responded_cannot_decrypt_d"
+        case .bitwardenHandshakeFailed:
+            return "bitwarden_handshake_failed"
+        case .bitwardenDecryptionOfSharedKeyFailed:
+            return "bitwarden_decryption_of_shared_key_failed"
+        case .bitwardenStoringOfTheSharedKeyFailed:
+            return "bitwarden_storing_of_the_shared_key_failed"
+        case .bitwardenCredentialRetrievalFailed:
+            return "bitwarden_credential_retrieval_failed"
+        case .bitwardenCredentialCreationFailed:
+            return "bitwarden_credential_creation_failed"
+        case .bitwardenCredentialUpdateFailed:
+            return "bitwarden_credential_update_failed"
+        case .bitwardenRespondedWithError:
+            return "bitwarden_responded_with_error"
+        case .bitwardenNoActiveVault:
+            return "bitwarden_no_active_vault"
+        case .bitwardenParsingFailed:
+            return "bitwarden_parsing_failed"
+        case .bitwardenStatusParsingFailed:
+            return "bitwarden_status_parsing_failed"
+        case .bitwardenHmacComparisonFailed:
+            return "bitwarden_hmac_comparison_failed"
+        case .bitwardenDecryptionFailed:
+            return "bitwarden_decryption_failed"
+        case .bitwardenSendingOfMessageFailed:
+            return "bitwarden_sending_of_message_failed"
+        case .bitwardenSharedKeyInjectionFailed:
+            return "bitwarden_shared_key_injection_failed"
+
+        case .updaterAborted:
+            return "updater_aborted"
+        case .userSelectedToSkipUpdate:
+            return "user_selected_to_skip_update"
+        case .userSelectedToInstallUpdate:
+            return "user_selected_to_install_update"
+        case .userSelectedToDismissUpdate:
+            return "user_selected_to_dismiss_update"
+
+        case .faviconDecryptionFailedUnique:
+            return "favicon_decryption_failed_unique"
+        case .downloadListItemDecryptionFailedUnique:
+            return "download_list_item_decryption_failed_unique"
+        case .historyEntryDecryptionFailedUnique:
+            return "history_entry_decryption_failed_unique"
+        case .permissionDecryptionFailedUnique:
+            return "permission_decryption_failed_unique"
+
+        case .missingParent: return "bookmark_missing_parent"
+        case .bookmarksSaveFailed: return "bookmarks_save_failed"
+        case .bookmarksSaveFailedOnImport: return "bookmarks_save_failed_on_import"
+
+        case .bookmarksCouldNotLoadDatabase: return "bookmarks_could_not_load_database"
+        case .bookmarksCouldNotPrepareDatabase: return "bookmarks_could_not_prepare_database"
+        case .bookmarksMigrationAlreadyPerformed: return "bookmarks_migration_already_performed"
+        case .bookmarksMigrationFailed: return "bookmarks_migration_failed"
+        case .bookmarksMigrationCouldNotPrepareDatabase: return "bookmarks_migration_could_not_prepare_database"
+        case .bookmarksMigrationCouldNotPrepareDatabaseOnFailedMigration:
+            return "bookmarks_migration_could_not_prepare_database_on_failed_migration"
+        case .bookmarksMigrationCouldNotRemoveOldStore: return "bookmarks_migration_could_not_remove_old_store"
+        case .bookmarksMigrationCouldNotPrepareMultipleFavoriteFolders:
+            return "bookmarks_migration_could_not_prepare_multiple_favorite_folders"
+        case .syncSentUnauthenticatedRequest: return "sync_sent_unauthenticated_request"
+        case .syncMetadataCouldNotLoadDatabase: return "sync_metadata_could_not_load_database"
+        case .syncBookmarksProviderInitializationFailed: return "sync_bookmarks_provider_initialization_failed"
+        case .syncBookmarksFailed: return "sync_bookmarks_failed"
+        case .syncCredentialsProviderInitializationFailed: return "sync_credentials_provider_initialization_failed"
+        case .syncCredentialsFailed: return "sync_credentials_failed"
+        case .syncSettingsFailed: return "sync_settings_failed"
+        case .syncSettingsMetadataUpdateFailed: return "sync_settings_metadata_update_failed"
+        case .syncSignupError: return "sync_signup_error"
+        case .syncLoginError: return "sync_login_error"
+        case .syncLogoutError: return "sync_logout_error"
+        case .syncUpdateDeviceError: return "sync_update_device_error"
+        case .syncRemoveDeviceError: return "sync_remove_device_error"
+        case .syncDeleteAccountError: return "sync_delete_account_error"
+        case .syncLoginExistingAccountError: return "sync_login_existing_account_error"
+        case .syncCannotCreateRecoveryPDF: return "sync_cannot_create_recovery_pdf"
+
+        case .bookmarksCleanupFailed: return "bookmarks_cleanup_failed"
+        case .bookmarksCleanupAttemptedWhileSyncWasEnabled: return "bookmarks_cleanup_attempted_while_sync_was_enabled"
+        case .favoritesCleanupFailed: return "favorites_cleanup_failed"
+        case .bookmarksFaviconsFetcherStateStoreInitializationFailed: return "bookmarks_favicons_fetcher_state_store_initialization_failed"
+        case .bookmarksFaviconsFetcherFailed: return "bookmarks_favicons_fetcher_failed"
+
+        case .credentialsDatabaseCleanupFailed: return "credentials_database_cleanup_failed"
+        case .credentialsCleanupAttemptedWhileSyncWasEnabled: return "credentials_cleanup_attempted_while_sync_was_enabled"
+
+        case .invalidPayload(let configuration): return "m_d_\(configuration.rawValue)_invalid_payload".lowercased()
+
+        case .burnerTabMisplaced: return "burner_tab_misplaced"
+
+        case .networkProtectionRemoteMessageFetchingFailed: return "netp_remote_message_fetching_failed"
+        case .networkProtectionRemoteMessageStorageFailed: return "netp_remote_message_storage_failed"
+
+        case .dataBrokerProtectionRemoteMessageFetchingFailed: return "dbp_remote_message_fetching_failed"
+        case .dataBrokerProtectionRemoteMessageStorageFailed: return "dbp_remote_message_storage_failed"
+
+        case .loginItemUpdateError: return "login-item_update-error"
+
+            // Installation Attribution
+        case .installationAttribution: return "m_mac_install"
+
+        case .secureVaultKeystoreEventL1KeyMigration: return "m_mac_secure_vault_keystore_event_l1-key-migration"
+        case .secureVaultKeystoreEventL2KeyMigration: return "m_mac_secure_vault_keystore_event_l2-key-migration"
+        case .secureVaultKeystoreEventL2KeyPasswordMigration: return "m_mac_secure_vault_keystore_event_l2-key-password-migration"
+        }
+    }
+
+    var error: (any Error)? {
+        switch self {
+        case .dbMakeDatabaseError(let error?),
+                .dbContainerInitializationError(let error),
+                .dbInitializationError(let error),
+                .dbSaveExcludedHTTPSDomainsError(let error?),
+                .dbSaveBloomFilterError(let error?),
+                .configurationFetchError(let error),
+                .secureVaultInitError(let error),
+                .secureVaultError(let error),
+                .syncSignupError(let error),
+                .syncLoginError(let error),
+                .syncLogoutError(let error),
+                .syncUpdateDeviceError(let error),
+                .syncRemoveDeviceError(let error),
+                .syncDeleteAccountError(let error),
+                .syncLoginExistingAccountError(let error),
+                .bookmarksCouldNotLoadDatabase(let error?):
+            return error
+        default: return nil
+        }
+    }
+
+    var parameters: [String: String]? {
+        switch self {
+        case .loginItemUpdateError(let loginItemBundleID, let action, let buildType, let osVersion):
+            return ["loginItemBundleID": loginItemBundleID, "action": action, "buildType": buildType, "macosVersion": osVersion]
+
+        case .dataImportFailed(source: _, sourceVersion: let version, error: let error):
+            var params = error.pixelParameters
+
+            if let version {
+                params[PixelKit.Parameters.sourceBrowserVersion] = version
+            }
+            return params
+
+        case .launchInitial(let cohort):
+            return [PixelKit.Parameters.experimentCohort: cohort]
+
+        case .serpInitial(let cohort):
+            return [PixelKit.Parameters.experimentCohort: cohort]
+
+        case .serpDay21to27(let cohort):
+            return [PixelKit.Parameters.experimentCohort: cohort]
+
+        case .dailyOsVersionCounter:
+            return [PixelKit.Parameters.osMajorVersion: "\(ProcessInfo.processInfo.operatingSystemVersion.majorVersion)"]
+
+        case .dashboardProtectionAllowlistAdd(let triggerOrigin):
+            guard let trigger = triggerOrigin else { return nil }
+            return [PixelKit.Parameters.dashboardTriggerOrigin: trigger]
+
+        case .dashboardProtectionAllowlistRemove(let triggerOrigin):
+            guard let trigger = triggerOrigin else { return nil }
+            return [PixelKit.Parameters.dashboardTriggerOrigin: trigger]
+
+        case .syncSuccessRateDaily:
+            return nil
+
+        case .vpnBreakageReport(let category, let description, let metadata):
+            return [
+                PixelKit.Parameters.vpnBreakageCategory: category,
+                PixelKit.Parameters.vpnBreakageDescription: description,
+                PixelKit.Parameters.vpnBreakageMetadata: metadata
+            ]
+        default: return nil
+        }
+    }
+
+    public enum CompileRulesListType: String, CustomStringConvertible {
+
+        public var description: String { rawValue }
+
+        case tds = "tracker_data"
+        case clickToLoad = "click_to_load"
+        case blockingAttribution = "blocking_attribution"
+        case attributed = "attributed"
+        case unknown = "unknown"
+
+    }
+
+    enum OnboardingShown: String, CustomStringConvertible {
+        var description: String { rawValue }
+
+        init(_ value: Bool) {
+            if value {
+                self = .onboardingShown
+            } else {
+                self = .regularNavigation
+            }
+        }
+        case onboardingShown = "onboarding-shown"
+        case regularNavigation = "regular-nav"
+    }
+
+    enum WaitResult: String, CustomStringConvertible {
+        var description: String { rawValue }
+
+        case closed
+        case quit
+        case success
+    }
+
+    enum CompileRulesWaitTime: String, CustomStringConvertible {
+        var description: String { rawValue }
+
+        case noWait = "0"
+        case lessThan1s = "1"
+        case lessThan5s = "5"
+        case lessThan10s = "10"
+        case lessThan20s = "20"
+        case lessThan40s = "40"
+        case more = "more"
+    }
+
+    enum FormAutofillKind: String, CustomStringConvertible {
+        var description: String { rawValue }
+
+        case password
+        case card
+        case identity
+    }
+
+    enum FireButtonOption: String, CustomStringConvertible {
+        var description: String { rawValue }
+
+        case tab
+        case window
+        case allSites = "all-sites"
+    }
+
+    enum AccessPoint: String, CustomStringConvertible {
+        var description: String { rawValue }
+
+        case button = "source-button"
+        case mainMenu = "source-menu"
+        case tabMenu = "source-tab-menu"
+        case hotKey = "source-keyboard"
+        case moreMenu = "source-more-menu"
+        case newTab = "source-new-tab"
+
+        init(sender: Any, default: AccessPoint, mainMenuCheck: (NSMenu?) -> Bool = { $0 is MainMenu }) {
+            switch sender {
+            case let menuItem as NSMenuItem:
+                if mainMenuCheck(menuItem.topMenu) {
+                    if let event = NSApp.currentEvent,
+                       case .keyDown = event.type,
+                       event.characters == menuItem.keyEquivalent {
+
+                        self = .hotKey
+                    } else {
+                        self = .mainMenu
+                    }
+                } else {
+                    self = `default`
+                }
+
+            case is NSButton:
+                self = .button
+
+            default:
+                self = `default`
+            }
+        }
+
+    }
+}
diff --git a/DuckDuckGo/Statistics/Pixel.swift b/DuckDuckGo/Statistics/Pixel.swift
deleted file mode 100644
index aa30eace74..0000000000
--- a/DuckDuckGo/Statistics/Pixel.swift
+++ /dev/null
@@ -1,168 +0,0 @@
-//
-//  Pixel.swift
-//
-//  Copyright © 2018 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 Networking
-import Common
-import PixelKit
-
-final class Pixel {
-
-    static private(set) var shared: Pixel?
-
-    static func setUp(dryRun: Bool = false) {
-#if DEBUG
-        if dryRun {
-            shared = Pixel(store: LocalPixelDataStore.shared) { event, params, _, _, onComplete in
-                let params = params.filter { key, _ in !["appVersion", "test"].contains(key) }
-                os_log(.debug, log: .pixel, "Pixel dry fire: %{public}@ %{public}@", event.name.replacingOccurrences(of: "_", with: "."), params.isEmpty ? "" : params.debugDescription)
-                // simulate server response time for Dry Run mode
-                DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) {
-                    onComplete(nil)
-                }
-            }
-            return
-        }
-#endif
-        shared = Pixel(store: LocalPixelDataStore.shared, requestSender: Pixel.defaultRequestSender)
-    }
-
-#if DEBUG
-    static func setUp(store: @escaping @autoclosure () -> PixelDataStore = { fatalError("provide test store") }(),
-                      pixelFired: @escaping (Pixel.Event) -> Void) {
-        shared = Pixel(store: store()) { event, _, _, _, onComplete in
-            pixelFired(event)
-            onComplete(nil)
-        }
-    }
-#endif
-
-    static func tearDown() {
-        shared?.store = nil
-        shared = nil
-    }
-
-    typealias RequestSender = (Pixel.Event, [String: String], CharacterSet?, APIRequest.Headers, @escaping (Error?) -> Void) -> Void
-    private let sendRequest: RequestSender
-
-    private var store: (() -> PixelDataStore)!
-
-    static var isNewUser: Bool {
-        let oneWeekAgo = Calendar.current.date(byAdding: .weekOfYear, value: -1, to: Date())!
-        return firstLaunchDate >= oneWeekAgo
-    }
-
-    static var defaultRequestSender: RequestSender {
-        { event, params, allowedQueryReservedCharacters, headers, onComplete in
-            let configuration = APIRequest.Configuration(url: URL.pixelUrl(forPixelNamed: event.name),
-                                                         queryParameters: params,
-                                                         allowedQueryReservedCharacters: allowedQueryReservedCharacters,
-                                                         headers: headers)
-            let request = APIRequest(configuration: configuration, urlSession: URLSession.session(useMainThreadCallbackQueue: true))
-            request.fetch { (_, error) in
-                onComplete(error)
-            }
-        }
-    }
-
-    private let appVersion: String
-
-    init(appVersion: String = AppVersion.shared.versionNumber,
-         store: @escaping @autoclosure () -> PixelDataStore,
-         requestSender: @escaping RequestSender) {
-
-        self.appVersion = appVersion
-        self.store = store
-        self.sendRequest = requestSender
-    }
-
-    private static let pixelRequestHeaders: HTTPHeaders = [
-        APIRequest.HTTPHeaderField.moreInfo: "See " + URL.duckDuckGoMorePrivacyInfo.absoluteString,
-        "X-DuckDuckGo-Client": "macOS"
-    ]
-
-    // Temporary for activation pixels
-    static private var aMonthAgo = Calendar.current.date(byAdding: .month, value: -1, to: Date())!
-    @UserDefaultsWrapper(key: .firstLaunchDate, defaultValue: aMonthAgo)
-    static var firstLaunchDate: Date
-
-    func fire(_ event: Pixel.Event,
-              limitTo limit: Pixel.Event.Repetition = .repetitive,
-              withAdditionalParameters parameters: [String: String]? = nil,
-              allowedQueryReservedCharacters: CharacterSet? = nil,
-              includeAppVersionParameter: Bool = true,
-              withHeaders headers: APIRequest.Headers = APIRequest.Headers(additionalHeaders: pixelRequestHeaders),
-              onComplete: @escaping (Error?) -> Void = {_ in }) {
-
-        func repetition() -> Event.Repetition {
-            Event.Repetition(key: event.name, store: self.store())
-        }
-        switch limit {
-        case .initial:
-            if repetition() != .initial { return }
-        case .dailyFirst:
-            if repetition() == .repetitive { return } // Pixel already fired today
-        case .repetitive: break
-        }
-
-        var newParams: [String: String]
-        switch (event.parameters, parameters) {
-        case (.some(let parameters), .none):
-            newParams = parameters
-        case (.none, .some(let parameters)):
-            newParams = parameters
-        case (.some(let params1), .some(let params2)):
-            newParams = params1.merging(params2) { $1 }
-        case (.none, .none):
-            newParams = [:]
-        }
-
-        if includeAppVersionParameter {
-            newParams[PixelKit.Parameters.appVersion] = appVersion
-        }
-#if DEBUG
-        newParams[PixelKit.Parameters.test] = PixelKit.Values.test
-#endif
-
-        sendRequest(event, newParams, allowedQueryReservedCharacters, headers, onComplete)
-    }
-
-    static func fire(_ event: Pixel.Event,
-                     limitTo limit: Pixel.Event.Repetition = .repetitive,
-                     withAdditionalParameters parameters: [String: String]? = nil,
-                     allowedQueryReservedCharacters: CharacterSet? = nil,
-                     includeAppVersionParameter: Bool = true,
-                     onComplete: @escaping (Error?) -> Void = {_ in }) {
-
-        Self.shared?.fire(event,
-                          limitTo: limit,
-                          withAdditionalParameters: parameters,
-                          allowedQueryReservedCharacters: allowedQueryReservedCharacters,
-                          includeAppVersionParameter: includeAppVersionParameter,
-                          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) {
-    Pixel.fire(.debug(event: Pixel.Event.Debug.assertionFailure(message: message(), file: file, line: line)))
-    Swift.assertionFailure(message(), file: file, line: line)
-}
diff --git a/DuckDuckGo/Statistics/PixelArguments.swift b/DuckDuckGo/Statistics/PixelArguments.swift
deleted file mode 100644
index 987491bcf7..0000000000
--- a/DuckDuckGo/Statistics/PixelArguments.swift
+++ /dev/null
@@ -1,156 +0,0 @@
-//
-//  PixelArguments.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 AppKit
-
-extension Pixel.Event {
-
-    enum Repetition: String, CustomStringConvertible {
-        var description: String { rawValue }
-
-        /// fires once ever
-        case initial = "initial"
-
-        /// fires at most once per day
-        case dailyFirst = "first-in-a-day"
-
-        /// fires every time
-        case repetitive = "repetitive"
-
-        init(key: String, store: PixelDataStore = LocalPixelDataStore.shared, now: Date = Date(), update: Bool = true) {
-            defer {
-                if update {
-                    store.set(now.daySinceReferenceDate, forKey: key)
-                }
-            }
-
-            guard let lastUsedDay: Int = store.value(forKey: key) else {
-                self = .initial
-                return
-            }
-            if lastUsedDay == now.daySinceReferenceDate {
-                self = .repetitive
-                return
-            }
-            self = .dailyFirst
-        }
-    }
-
-    enum AccessPoint: String, CustomStringConvertible {
-        var description: String { rawValue }
-
-        case button = "source-button"
-        case mainMenu = "source-menu"
-        case tabMenu = "source-tab-menu"
-        case hotKey = "source-keyboard"
-        case moreMenu = "source-more-menu"
-        case newTab = "source-new-tab"
-
-        init(sender: Any, default: AccessPoint, mainMenuCheck: (NSMenu?) -> Bool = { $0 is MainMenu }) {
-            switch sender {
-            case let menuItem as NSMenuItem:
-                if mainMenuCheck(menuItem.topMenu) {
-                    if let event = NSApp.currentEvent,
-                       case .keyDown = event.type,
-                       event.characters == menuItem.keyEquivalent {
-
-                        self = .hotKey
-                    } else {
-                        self = .mainMenu
-                    }
-                } else {
-                    self = `default`
-                }
-
-            case is NSButton:
-                self = .button
-
-            default:
-                assertionFailure("AccessPoint: Unexpected type of sender: \(type(of: sender))")
-                self = `default`
-            }
-        }
-
-    }
-
-    enum FormAutofillKind: String, CustomStringConvertible {
-        var description: String { rawValue }
-
-        case password
-        case card
-        case identity
-    }
-
-    public enum CompileRulesListType: String, CustomStringConvertible {
-
-        public var description: String { rawValue }
-
-        case tds = "tracker_data"
-        case clickToLoad = "click_to_load"
-        case blockingAttribution = "blocking_attribution"
-        case attributed = "attributed"
-        case unknown = "unknown"
-
-    }
-
-    enum FireButtonOption: String, CustomStringConvertible {
-        var description: String { rawValue }
-
-        case tab
-        case window
-        case allSites = "all-sites"
-    }
-}
-
-extension DataImportAction: CustomStringConvertible {
-    var description: String {
-        switch self {
-        case .bookmarks: return "bookmarks"
-        case .passwords: return "logins"
-        case .favicons: return "favicons"
-        case .generic: return "generic"
-        }
-    }
-}
-
-extension DataImport.Source: CustomStringConvertible {
-    var description: String {
-        switch self {
-        case .brave: return "source-brave"
-        case .chrome: return "source-chrome"
-        case .chromium: return "source-chromium"
-        case .coccoc: return "source-coccoc"
-        case .csv: return "source-csv"
-        case .bitwarden: return "source-bitwarden"
-        case .lastPass: return "source-lastpass"
-        case .onePassword7: return "source-1password"
-        case .onePassword8: return "source-1password-8"
-        case .edge: return "source-edge"
-        case .firefox: return "source-firefox"
-        case .safari: return "source-safari"
-        case .safariTechnologyPreview: return "source-safari-technology-preview"
-        case .bookmarksHTML: return "source-bookmarks-html"
-        case .opera: return "source-opera"
-        case .operaGX: return "source-operagx"
-        case .tor: return "source-tor"
-        case .vivaldi: return "source-vivaldi"
-        case .yandex: return "source-yandex"
-        }
-    }
-}
diff --git a/DuckDuckGo/Statistics/PixelEvent.swift b/DuckDuckGo/Statistics/PixelEvent.swift
deleted file mode 100644
index 96b9540699..0000000000
--- a/DuckDuckGo/Statistics/PixelEvent.swift
+++ /dev/null
@@ -1,982 +0,0 @@
-//
-//  PixelEvent.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 BrowserServicesKit
-import Bookmarks
-import Configuration
-import DDGSync
-import PixelKit
-
-extension Pixel {
-
-    indirect enum Event {
-        /// 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
-        /// nothing breaks in the migration towards `PixelKit`.
-        case pixelKitEvent(_ event: PixelKitEvent)
-
-        case crash
-
-        case brokenSiteReport
-
-        enum OnboardingShown: String, CustomStringConvertible {
-            var description: String { rawValue }
-
-            init(_ value: Bool) {
-                if value {
-                    self = .onboardingShown
-                } else {
-                    self = .regularNavigation
-                }
-            }
-            case onboardingShown = "onboarding-shown"
-            case regularNavigation = "regular-nav"
-        }
-
-        enum WaitResult: String, CustomStringConvertible {
-            var description: String { rawValue }
-
-            case closed
-            case quit
-            case success
-        }
-
-        enum CompileRulesWaitTime: String, CustomStringConvertible {
-            var description: String { rawValue }
-
-            case noWait = "0"
-            case lessThan1s = "1"
-            case lessThan5s = "5"
-            case lessThan10s = "10"
-            case lessThan20s = "20"
-            case lessThan40s = "40"
-            case more = "more"
-        }
-
-        case compileRulesWait(onboardingShown: OnboardingShown, waitTime: CompileRulesWaitTime, result: WaitResult)
-        static func compileRulesWait(onboardingShown: Bool, waitTime interval: TimeInterval, result: WaitResult) -> Event {
-            let waitTime: CompileRulesWaitTime
-            switch interval {
-            case 0:
-                waitTime = .noWait
-            case ...1:
-                waitTime = .lessThan1s
-            case ...5:
-                waitTime = .lessThan5s
-            case ...10:
-                waitTime = .lessThan10s
-            case ...20:
-                waitTime = .lessThan20s
-            case ...40:
-                waitTime = .lessThan40s
-            default:
-                waitTime = .more
-            }
-            return .compileRulesWait(onboardingShown: OnboardingShown(onboardingShown),
-                                     waitTime: waitTime,
-                                     result: result)
-        }
-
-        case launchInitial(cohort: String)
-
-        case serp
-        case serpInitial(cohort: String)
-        case serpDay21to27(cohort: String)
-
-        case dailyOsVersionCounter
-
-        case dataImportFailed(source: DataImport.Source, sourceVersion: String?, error: any DataImportError)
-
-        case formAutofilled(kind: FormAutofillKind)
-        case autofillItemSaved(kind: FormAutofillKind)
-
-        case autofillLoginsSaveLoginModalExcludeSiteConfirmed
-        case autofillLoginsSettingsResetExcludedDisplayed
-        case autofillLoginsSettingsResetExcludedConfirmed
-        case autofillLoginsSettingsResetExcludedDismissed
-
-        case bitwardenPasswordAutofilled
-        case bitwardenPasswordSaved
-
-        case ampBlockingRulesCompilationFailed
-
-        case adClickAttributionDetected
-        case adClickAttributionActive
-        case adClickAttributionPageLoads
-
-        case emailEnabled
-        case emailDisabled
-        case emailUserPressedUseAddress
-        case emailUserPressedUseAlias
-        case emailUserCreatedAlias
-
-        case jsPixel(_ pixel: AutofillUserScript.JSPixel)
-
-        case debug(event: Debug, error: Error? = nil)
-
-        // Activation Points
-        case newTabInitial
-        case emailEnabledInitial
-        case watchInDuckPlayerInitial
-        case setAsDefaultInitial
-        case importDataInitial
-
-        // New Tab section removed
-        case favoriteSectionHidden
-        case recentActivitySectionHidden
-        case continueSetUpSectionHidden
-
-        // Fire Button
-        case fireButtonFirstBurn
-        case fireButton(option: FireButtonOption)
-
-        // Duck Player
-        case duckPlayerDailyUniqueView
-        case duckPlayerViewFromYoutubeViaMainOverlay
-        case duckPlayerViewFromYoutubeViaHoverButton
-        case duckPlayerViewFromYoutubeAutomatic
-        case duckPlayerViewFromSERP
-        case duckPlayerViewFromOther
-        case duckPlayerSettingAlways
-        case duckPlayerSettingNever
-        case duckPlayerSettingBackToDefault
-
-        // Dashboard
-        case dashboardProtectionAllowlistAdd(triggerOrigin: String?)
-        case dashboardProtectionAllowlistRemove(triggerOrigin: String?)
-
-        // VPN
-        case vpnBreakageReport(category: String, description: String, metadata: String)
-
-        // VPN
-        case networkProtectionWaitlistUserActive
-        case networkProtectionWaitlistEntryPointMenuItemDisplayed
-        case networkProtectionWaitlistEntryPointToolbarButtonDisplayed
-        case networkProtectionWaitlistIntroDisplayed
-        case networkProtectionWaitlistNotificationShown
-        case networkProtectionWaitlistNotificationTapped
-        case networkProtectionWaitlistTermsAndConditionsDisplayed
-        case networkProtectionWaitlistTermsAndConditionsAccepted
-        case networkProtectionRemoteMessageDisplayed(messageID: String)
-        case networkProtectionRemoteMessageDismissed(messageID: String)
-        case networkProtectionRemoteMessageOpened(messageID: String)
-        case networkProtectionEnabledOnSearch
-        case networkProtectionGeoswitchingOpened
-        case networkProtectionGeoswitchingSetNearest
-        case networkProtectionGeoswitchingSetCustom
-        case networkProtectionGeoswitchingNoLocations
-
-        // Sync
-        case syncSignupDirect
-        case syncSignupConnect
-        case syncLogin
-        case syncDaily
-        case syncDuckAddressOverride
-        case syncSuccessRateDaily
-        case syncLocalTimestampResolutionTriggered(Feature)
-        case syncBookmarksCountLimitExceededDaily
-        case syncCredentialsCountLimitExceededDaily
-        case syncBookmarksRequestSizeLimitExceededDaily
-        case syncCredentialsRequestSizeLimitExceededDaily
-
-        // DataBroker Protection Waitlist
-        case dataBrokerProtectionWaitlistUserActive
-        case dataBrokerProtectionWaitlistEntryPointMenuItemDisplayed
-        case dataBrokerProtectionWaitlistIntroDisplayed
-        case dataBrokerProtectionWaitlistNotificationShown
-        case dataBrokerProtectionWaitlistNotificationTapped
-        case dataBrokerProtectionWaitlistCardUITapped
-        case dataBrokerProtectionWaitlistTermsAndConditionsDisplayed
-        case dataBrokerProtectionWaitlistTermsAndConditionsAccepted
-        case dataBrokerProtectionRemoteMessageDisplayed(messageID: String)
-        case dataBrokerProtectionRemoteMessageDismissed(messageID: String)
-        case dataBrokerProtectionRemoteMessageOpened(messageID: String)
-
-        // Login Item events
-        case dataBrokerEnableLoginItemDaily
-        case dataBrokerDisableLoginItemDaily
-        case dataBrokerResetLoginItemDaily
-        case dataBrokerDisableAndDeleteDaily
-
-        // DataBrokerProtection Other
-        case dataBrokerProtectionErrorWhenFetchingSubscriptionAuthTokenAfterSignIn
-
-        // Subscription
-        case privacyProFeatureEnabled
-        case privacyProBetaUserThankYouVPN
-        case privacyProBetaUserThankYouDBP
-        case privacyProSubscriptionActive
-        case privacyProOfferScreenImpression
-        case privacyProPurchaseAttempt
-        case privacyProPurchaseFailure
-        case privacyProPurchaseFailureStoreError
-        case privacyProPurchaseFailureBackendError
-        case privacyProPurchaseFailureAccountNotCreated
-        case privacyProPurchaseSuccess
-        case privacyProRestorePurchaseOfferPageEntry
-        case privacyProRestorePurchaseClick
-        case privacyProRestorePurchaseSettingsMenuEntry
-        case privacyProRestorePurchaseEmailStart
-        case privacyProRestorePurchaseStoreStart
-        case privacyProRestorePurchaseEmailSuccess
-        case privacyProRestorePurchaseStoreSuccess
-        case privacyProRestorePurchaseStoreFailureNotFound
-        case privacyProRestorePurchaseStoreFailureOther
-        case privacyProRestoreAfterPurchaseAttempt
-        case privacyProSubscriptionActivated
-        case privacyProWelcomeAddDevice
-        case privacyProSettingsAddDevice
-        case privacyProAddDeviceEnterEmail
-        case privacyProWelcomeVPN
-        case privacyProWelcomePersonalInformationRemoval
-        case privacyProWelcomeIdentityRestoration
-        case privacyProSubscriptionSettings
-        case privacyProVPNSettings
-        case privacyProPersonalInformationRemovalSettings
-        case privacyProIdentityRestorationSettings
-        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
-            /// nothing breaks in the migration towards `PixelKit`.
-            case pixelKitEvent(_ event: PixelKitEvent)
-
-            case assertionFailure(message: String, file: StaticString, line: UInt)
-
-            case dbMakeDatabaseError
-            case dbContainerInitializationError
-            case dbInitializationError
-            case dbSaveExcludedHTTPSDomainsError
-            case dbSaveBloomFilterError
-
-            case configurationFetchError
-
-            case trackerDataParseFailed
-            case trackerDataReloadFailed
-            case trackerDataCouldNotBeLoaded
-
-            case privacyConfigurationParseFailed
-            case privacyConfigurationReloadFailed
-            case privacyConfigurationCouldNotBeLoaded
-
-            case fileStoreWriteFailed
-            case fileMoveToDownloadsFailed
-            case fileAccessRelatedItemFailed
-            case fileGetDownloadLocationFailed
-            case fileDownloadCreatePresentersFailed
-            case downloadResumeDataCodingFailed
-
-            case suggestionsFetchFailed
-            case appOpenURLFailed
-            case appStateRestorationFailed
-
-            case contentBlockingErrorReportingIssue
-
-            case contentBlockingCompilationFailed(listType: CompileRulesListType,
-                                                  component: ContentBlockerDebugEvents.Component)
-
-            case contentBlockingCompilationTime
-
-            case secureVaultInitError
-            case secureVaultError
-
-            case feedbackReportingFailed
-
-            case blankNavigationOnBurnFailed
-
-            case historyRemoveFailed
-            case historyReloadFailed
-            case historyCleanEntriesFailed
-            case historyCleanVisitsFailed
-            case historySaveFailed
-            case historyInsertVisitFailed
-            case historyRemoveVisitsFailed
-
-            case emailAutofillKeychainError
-
-            case bookmarksStoreRootFolderMigrationFailed
-            case bookmarksStoreFavoritesFolderMigrationFailed
-
-            case adAttributionCompilationFailedForAttributedRulesList
-            case adAttributionGlobalAttributedRulesDoNotExist
-            case adAttributionDetectionHeuristicsDidNotMatchDomain
-            case adAttributionLogicUnexpectedStateOnRulesCompiled
-            case adAttributionLogicUnexpectedStateOnInheritedAttribution
-            case adAttributionLogicUnexpectedStateOnRulesCompilationFailed
-            case adAttributionDetectionInvalidDomainInParameter
-            case adAttributionLogicRequestingAttributionTimedOut
-            case adAttributionLogicWrongVendorOnSuccessfulCompilation
-            case adAttributionLogicWrongVendorOnFailedCompilation
-
-            case webKitDidTerminate
-
-            case removedInvalidBookmarkManagedObjects
-
-            case bitwardenNotResponding
-            case bitwardenRespondedCannotDecryptUnique(repetition: Repetition = .init(key: "bitwardenRespondedCannotDecryptUnique"))
-            case bitwardenHandshakeFailed
-            case bitwardenDecryptionOfSharedKeyFailed
-            case bitwardenStoringOfTheSharedKeyFailed
-            case bitwardenCredentialRetrievalFailed
-            case bitwardenCredentialCreationFailed
-            case bitwardenCredentialUpdateFailed
-            case bitwardenRespondedWithError
-            case bitwardenNoActiveVault
-            case bitwardenParsingFailed
-            case bitwardenStatusParsingFailed
-            case bitwardenHmacComparisonFailed
-            case bitwardenDecryptionFailed
-            case bitwardenSendingOfMessageFailed
-            case bitwardenSharedKeyInjectionFailed
-
-            case updaterAborted
-            case userSelectedToSkipUpdate
-            case userSelectedToInstallUpdate
-            case userSelectedToDismissUpdate
-
-            case faviconDecryptionFailedUnique
-            case downloadListItemDecryptionFailedUnique
-            case historyEntryDecryptionFailedUnique
-            case permissionDecryptionFailedUnique
-
-            // Errors from Bookmarks Module
-            case missingParent
-            case bookmarksSaveFailed
-            case bookmarksSaveFailedOnImport
-
-            case bookmarksCouldNotLoadDatabase
-            case bookmarksCouldNotPrepareDatabase
-            case bookmarksMigrationAlreadyPerformed
-            case bookmarksMigrationFailed
-            case bookmarksMigrationCouldNotPrepareDatabase
-            case bookmarksMigrationCouldNotPrepareDatabaseOnFailedMigration
-            case bookmarksMigrationCouldNotRemoveOldStore
-            case bookmarksMigrationCouldNotPrepareMultipleFavoriteFolders
-
-            case syncSentUnauthenticatedRequest
-            case syncMetadataCouldNotLoadDatabase
-            case syncBookmarksProviderInitializationFailed
-            case syncBookmarksFailed
-            case syncCredentialsProviderInitializationFailed
-            case syncCredentialsFailed
-            case syncSettingsFailed
-            case syncSettingsMetadataUpdateFailed
-            case syncSignupError
-            case syncLoginError
-            case syncLogoutError
-            case syncUpdateDeviceError
-            case syncRemoveDeviceError
-            case syncDeleteAccountError
-            case syncLoginExistingAccountError
-            case syncCannotCreateRecoveryPDF
-
-            case bookmarksCleanupFailed
-            case bookmarksCleanupAttemptedWhileSyncWasEnabled
-            case favoritesCleanupFailed
-            case bookmarksFaviconsFetcherStateStoreInitializationFailed
-            case bookmarksFaviconsFetcherFailed
-
-            case credentialsDatabaseCleanupFailed
-            case credentialsCleanupAttemptedWhileSyncWasEnabled
-
-            case invalidPayload(Configuration)
-
-            case burnerTabMisplaced
-
-            case networkProtectionRemoteMessageFetchingFailed
-            case networkProtectionRemoteMessageStorageFailed
-            case dataBrokerProtectionRemoteMessageFetchingFailed
-            case dataBrokerProtectionRemoteMessageStorageFailed
-
-            case loginItemUpdateError(loginItemBundleID: String, action: String, buildType: String, osVersion: String)
-        }
-    }
-}
-
-extension Pixel.Event {
-
-    var name: String {
-        switch self {
-        case .pixelKitEvent(let event):
-            return event.name
-
-        case .crash:
-            return "m_mac_crash"
-
-        case .brokenSiteReport:
-            return "epbf_macos_desktop"
-
-        case .compileRulesWait(onboardingShown: let onboardingShown, waitTime: let waitTime, result: let result):
-            return "m_mac_cbr-wait_\(onboardingShown)_\(waitTime)_\(result)"
-
-        case .serp:
-            return "m_mac_navigation_search"
-
-        case .dailyOsVersionCounter:
-            return "m_mac_daily-os-version-counter"
-
-        case .dataImportFailed(source: let source, sourceVersion: _, error: let error) where error.action == .favicons:
-            return "m_mac_favicon-import-failed_\(source)"
-        case .dataImportFailed(source: let source, sourceVersion: _, error: let error):
-            return "m_mac_data-import-failed_\(error.action)_\(source)"
-
-        case .formAutofilled(kind: let kind):
-            return "m_mac_autofill_\(kind)"
-
-        case .autofillItemSaved(kind: let kind):
-            return "m_mac_save_\(kind)"
-
-        case .autofillLoginsSaveLoginModalExcludeSiteConfirmed:
-            return "m_mac_autofill_logins_save_login_exclude_site_confirmed"
-        case .autofillLoginsSettingsResetExcludedDisplayed:
-            return "m_mac_autofill_settings_reset_excluded_displayed"
-        case .autofillLoginsSettingsResetExcludedConfirmed:
-            return "m_mac_autofill_settings_reset_excluded_confirmed"
-        case .autofillLoginsSettingsResetExcludedDismissed:
-            return "m_mac_autofill_settings_reset_excluded_dismissed"
-
-        case .bitwardenPasswordAutofilled:
-            return "m_mac_bitwarden_autofill_password"
-
-        case .bitwardenPasswordSaved:
-            return "m_mac_bitwarden_save_password"
-
-        case .debug(event: let event, error: _):
-            return "m_mac_debug_\(event.name)"
-
-        case .ampBlockingRulesCompilationFailed:
-            return "m_mac_amp_rules_compilation_failed"
-
-        case .adClickAttributionDetected:
-            return "m_mac_ad_click_detected"
-
-        case .adClickAttributionActive:
-            return "m_mac_ad_click_active"
-
-        case .adClickAttributionPageLoads:
-            return "m_mac_ad_click_page_loads"
-
-            // Deliberately omit the `m_mac_` prefix in order to format these pixels the same way as other platforms
-        case .emailEnabled: return "email_enabled_macos_desktop"
-        case .emailDisabled: return "email_disabled_macos_desktop"
-        case .emailUserPressedUseAddress: return "email_filled_main_macos_desktop"
-        case .emailUserPressedUseAlias: return "email_filled_random_macos_desktop"
-        case .emailUserCreatedAlias: return "email_generated_button_macos_desktop"
-
-        case .jsPixel(let pixel):
-            // Email pixels deliberately avoid using the `m_mac_` prefix.
-            if pixel.isEmailPixel {
-                return "\(pixel.pixelName)_macos_desktop"
-            } else {
-                return "m_mac_\(pixel.pixelName)"
-            }
-        case .emailEnabledInitial:
-            return "m_mac.enable-email-protection.initial"
-
-        case .watchInDuckPlayerInitial:
-            return "m_mac.watch-in-duckplayer.initial"
-        case .setAsDefaultInitial:
-            return "m_mac.set-as-default.initial"
-        case .importDataInitial:
-            return "m_mac.import-data.initial"
-        case .newTabInitial:
-            return "m_mac.new-tab-opened.initial"
-        case .favoriteSectionHidden:
-            return "m_mac.favorite-section-hidden"
-        case .recentActivitySectionHidden:
-            return "m_mac.recent-activity-section-hidden"
-        case .continueSetUpSectionHidden:
-            return "m_mac.continue-setup-section-hidden"
-
-            // Fire Button
-        case .fireButtonFirstBurn:
-            return "m_mac_fire_button_first_burn"
-        case .fireButton(option: let option):
-            return "m_mac_fire_button_\(option)"
-
-        case .duckPlayerDailyUniqueView:
-            return "m_mac_duck-player_daily-unique-view"
-        case .duckPlayerViewFromYoutubeViaMainOverlay:
-            return "m_mac_duck-player_view-from_youtube_main-overlay"
-        case .duckPlayerViewFromYoutubeViaHoverButton:
-            return "m_mac_duck-player_view-from_youtube_hover-button"
-        case .duckPlayerViewFromYoutubeAutomatic:
-            return "m_mac_duck-player_view-from_youtube_automatic"
-        case .duckPlayerViewFromSERP:
-            return "m_mac_duck-player_view-from_serp"
-        case .duckPlayerViewFromOther:
-            return "m_mac_duck-player_view-from_other"
-        case .duckPlayerSettingAlways:
-            return "m_mac_duck-player_setting_always"
-        case .duckPlayerSettingNever:
-            return "m_mac_duck-player_setting_never"
-        case .duckPlayerSettingBackToDefault:
-            return "m_mac_duck-player_setting_back-to-default"
-
-        case .dashboardProtectionAllowlistAdd:
-            return "m_mac_mp_wla"
-        case .dashboardProtectionAllowlistRemove:
-            return "m_mac_mp_wlr"
-
-        case .launchInitial:
-            return "m.mac.first-launch"
-        case .serpInitial:
-            return "m.mac.navigation.first-search"
-        case .serpDay21to27:
-            return "m.mac.search-day-21-27.initial"
-
-        case .vpnBreakageReport:
-            return "m_mac_vpn_breakage_report"
-
-        case .networkProtectionWaitlistUserActive:
-            return "m_mac_netp_waitlist_user_active"
-        case .networkProtectionWaitlistEntryPointMenuItemDisplayed:
-            return "m_mac_netp_imp_settings_entry_menu_item"
-        case .networkProtectionWaitlistEntryPointToolbarButtonDisplayed:
-            return "m_mac_netp_imp_settings_entry_toolbar_button"
-        case .networkProtectionWaitlistIntroDisplayed:
-            return "m_mac_netp_imp_intro_screen"
-        case .networkProtectionWaitlistNotificationShown:
-            return "m_mac_netp_ev_waitlist_notification_shown"
-        case .networkProtectionWaitlistNotificationTapped:
-            return "m_mac_netp_ev_waitlist_notification_launched"
-        case .networkProtectionWaitlistTermsAndConditionsDisplayed:
-            return "m_mac_netp_imp_terms"
-        case .networkProtectionWaitlistTermsAndConditionsAccepted:
-            return "m_mac_netp_ev_terms_accepted"
-        case .networkProtectionRemoteMessageDisplayed(let messageID):
-            return "m_mac_netp_remote_message_displayed_\(messageID)"
-        case .networkProtectionRemoteMessageDismissed(let messageID):
-            return "m_mac_netp_remote_message_dismissed_\(messageID)"
-        case .networkProtectionRemoteMessageOpened(let messageID):
-            return "m_mac_netp_remote_message_opened_\(messageID)"
-        case .networkProtectionEnabledOnSearch:
-            return "m_mac_netp_ev_enabled_on_search"
-
-            // Sync
-        case .syncSignupDirect:
-            return "m_mac_sync_signup_direct"
-        case .syncSignupConnect:
-            return "m_mac_sync_signup_connect"
-        case .syncLogin:
-            return "m_mac_sync_login"
-        case .syncDaily:
-            return "m_mac_sync_daily"
-        case .syncDuckAddressOverride:
-            return "m_mac_sync_duck_address_override"
-        case .syncSuccessRateDaily:
-            return "m_mac_sync_success_rate_daily"
-        case .syncLocalTimestampResolutionTriggered(let feature):
-            return "m_mac_sync_\(feature.name)_local_timestamp_resolution_triggered"
-        case .syncBookmarksCountLimitExceededDaily: return "m_mac_sync_bookmarks_count_limit_exceeded_daily"
-        case .syncCredentialsCountLimitExceededDaily: return "m_mac_sync_credentials_count_limit_exceeded_daily"
-        case .syncBookmarksRequestSizeLimitExceededDaily: return "m_mac_sync_bookmarks_request_size_limit_exceeded_daily"
-        case .syncCredentialsRequestSizeLimitExceededDaily: return "m_mac_sync_credentials_request_size_limit_exceeded_daily"
-
-        case .dataBrokerProtectionWaitlistUserActive:
-            return "m_mac_dbp_waitlist_user_active"
-        case .dataBrokerProtectionWaitlistEntryPointMenuItemDisplayed:
-            return "m_mac_dbp_imp_settings_entry_menu_item"
-        case .dataBrokerProtectionWaitlistIntroDisplayed:
-            return "m_mac_dbp_imp_intro_screen"
-        case .dataBrokerProtectionWaitlistNotificationShown:
-            return "m_mac_dbp_ev_waitlist_notification_shown"
-        case .dataBrokerProtectionWaitlistNotificationTapped:
-            return "m_mac_dbp_ev_waitlist_notification_launched"
-        case .dataBrokerProtectionWaitlistCardUITapped:
-            return "m_mac_dbp_ev_waitlist_card_ui_launched"
-        case .dataBrokerProtectionWaitlistTermsAndConditionsDisplayed:
-            return "m_mac_dbp_imp_terms"
-        case .dataBrokerProtectionWaitlistTermsAndConditionsAccepted:
-            return "m_mac_dbp_ev_terms_accepted"
-        case .dataBrokerProtectionErrorWhenFetchingSubscriptionAuthTokenAfterSignIn:
-            return "m_mac_dbp_error_when_fetching_subscription_auth_token_after_sign_in"
-        case .dataBrokerProtectionRemoteMessageDisplayed(let messageID):
-            return "m_mac_dbp_remote_message_displayed_\(messageID)"
-        case .dataBrokerProtectionRemoteMessageDismissed(let messageID):
-            return "m_mac_dbp_remote_message_dismissed_\(messageID)"
-        case .dataBrokerProtectionRemoteMessageOpened(let messageID):
-            return "m_mac_dbp_remote_message_opened_\(messageID)"
-
-        case .dataBrokerEnableLoginItemDaily: return "m_mac_dbp_daily_login-item_enable"
-        case .dataBrokerDisableLoginItemDaily: return "m_mac_dbp_daily_login-item_disable"
-        case .dataBrokerResetLoginItemDaily: return "m_mac_dbp_daily_login-item_reset"
-        case .dataBrokerDisableAndDeleteDaily: return "m_mac_dbp_daily_disable-and-delete"
-
-        case .dailyPixel(let pixel, isFirst: let isFirst):
-            return pixel.name + (isFirst ? "_d" : "_c")
-        case .networkProtectionGeoswitchingOpened:
-            return "m_mac_netp_imp_geoswitching_c"
-        case .networkProtectionGeoswitchingSetNearest:
-            return "m_mac_netp_ev_geoswitching_set_nearest"
-        case .networkProtectionGeoswitchingSetCustom:
-            return "m_mac_netp_ev_geoswitching_set_custom"
-        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"
-        case .privacyProPurchaseFailure: return "m_mac_\(appDistribution)_privacy-pro_app_subscription-purchase_failure_other"
-        case .privacyProPurchaseFailureStoreError: return "m_mac_\(appDistribution)_privacy-pro_app_subscription-purchase_failure_store"
-        case .privacyProPurchaseFailureBackendError: return "m_mac_\(appDistribution)_privacy-pro_app_subscription-purchase_failure_backend"
-        case .privacyProPurchaseFailureAccountNotCreated: return "m_mac_\(appDistribution)_privacy-pro_app_subscription-purchase_failure_account-creation"
-        case .privacyProPurchaseSuccess: return "m_mac_\(appDistribution)_privacy-pro_app_subscription-purchase_success"
-        case .privacyProRestorePurchaseOfferPageEntry: return "m_mac_\(appDistribution)_privacy-pro_offer_restore-purchase_click"
-        case .privacyProRestorePurchaseClick: return "m_mac_\(appDistribution)_privacy-pro_settings_restore-purchase_click"
-        case .privacyProRestorePurchaseSettingsMenuEntry: return "m_mac_\(appDistribution)_privacy-pro_settings_restore-purchase_click"
-        case .privacyProRestorePurchaseEmailStart: return "m_mac_\(appDistribution)_privacy-pro_activate-subscription_enter-email_click"
-        case .privacyProRestorePurchaseStoreStart: return "m_mac_\(appDistribution)_privacy-pro_activate-subscription_restore-purchase_click"
-        case .privacyProRestorePurchaseEmailSuccess: return "m_mac_\(appDistribution)_privacy-pro_app_subscription-restore-using-email_success"
-        case .privacyProRestorePurchaseStoreSuccess: return "m_mac_\(appDistribution)_privacy-pro_app_subscription-restore-using-store_success"
-        case .privacyProRestorePurchaseStoreFailureNotFound: return "m_mac_\(appDistribution)_privacy-pro_subscription-restore-using-store_failure_not-found"
-        case .privacyProRestorePurchaseStoreFailureOther: return "m_mac_\(appDistribution)_privacy-pro_app_subscription-restore-using-store_failure_other"
-        case .privacyProRestoreAfterPurchaseAttempt: return "m_mac_\(appDistribution)_privacy-pro_app_subscription-restore-after-purchase-attempt_success"
-        case .privacyProSubscriptionActivated: return "m_mac_\(appDistribution)_privacy-pro_app_subscription_activated_u"
-        case .privacyProWelcomeAddDevice: return "m_mac_\(appDistribution)_privacy-pro_welcome_add-device_click_u"
-        case .privacyProSettingsAddDevice: return "m_mac_\(appDistribution)_privacy-pro_settings_add-device_click"
-        case .privacyProAddDeviceEnterEmail: return "m_mac_\(appDistribution)_privacy-pro_add-device_enter-email_click"
-        case .privacyProWelcomeVPN: return "m_mac_\(appDistribution)_privacy-pro_welcome_vpn_click_u"
-        case .privacyProWelcomePersonalInformationRemoval: return "m_mac_\(appDistribution)_privacy-pro_welcome_personal-information-removal_click_u"
-        case .privacyProWelcomeIdentityRestoration: return "m_mac_\(appDistribution)_privacy-pro_welcome_identity-theft-restoration_click_u"
-        case .privacyProSubscriptionSettings: return "m_mac_\(appDistribution)_privacy-pro_settings_screen_impression"
-        case .privacyProVPNSettings: return "m_mac_\(appDistribution)_privacy-pro_settings_vpn_click"
-        case .privacyProPersonalInformationRemovalSettings: return "m_mac_\(appDistribution)_privacy-pro_settings_personal-information-removal_click"
-        case .privacyProIdentityRestorationSettings: return "m_mac_\(appDistribution)_privacy-pro_settings_identity-theft-restoration_click"
-        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"
-        }
-    }
-}
-
-// swiftlint:disable private_over_fileprivate
-#if APPSTORE
-fileprivate let appDistribution = "store"
-#else
-fileprivate let appDistribution = "direct"
-#endif
-// swiftlint:enable private_over_fileprivate
-
-extension Pixel.Event: Equatable {
-
-    static func == (lhs: Pixel.Event, rhs: Pixel.Event) -> Bool {
-        lhs.name == rhs.name && lhs.parameters == rhs.parameters
-    }
-
-}
-
-extension Pixel.Event.Debug {
-
-    var name: String {
-        switch self {
-        case .pixelKitEvent(let event):
-            return event.name
-
-        case .assertionFailure:
-            return "assertion_failure"
-
-        case .dbMakeDatabaseError:
-            return "database_make_database_error"
-        case .dbContainerInitializationError:
-            return "database_container_error"
-        case .dbInitializationError:
-            return "dbie"
-        case .dbSaveExcludedHTTPSDomainsError:
-            return "dbsw"
-        case .dbSaveBloomFilterError:
-            return "dbsb"
-
-        case .configurationFetchError:
-            return "cfgfetch"
-
-        case .trackerDataParseFailed:
-            return "tds_p"
-        case .trackerDataReloadFailed:
-            return "tds_r"
-        case .trackerDataCouldNotBeLoaded:
-            return "tds_l"
-
-        case .privacyConfigurationParseFailed:
-            return "pcf_p"
-        case .privacyConfigurationReloadFailed:
-            return "pcf_r"
-        case .privacyConfigurationCouldNotBeLoaded:
-            return "pcf_l"
-
-        case .fileStoreWriteFailed:
-            return "fswf"
-        case .fileMoveToDownloadsFailed:
-            return "df"
-        case .fileGetDownloadLocationFailed:
-            return "dl"
-        case .fileAccessRelatedItemFailed:
-            return "dari"
-        case .fileDownloadCreatePresentersFailed:
-            return "dfpf"
-        case .downloadResumeDataCodingFailed:
-            return "drdc"
-
-        case .suggestionsFetchFailed:
-            return "sgf"
-        case .appOpenURLFailed:
-            return "url"
-        case .appStateRestorationFailed:
-            return "srf"
-
-        case .contentBlockingErrorReportingIssue:
-            return "content_blocking_error_reporting_issue"
-
-        case .contentBlockingCompilationFailed(let listType, let component):
-            let componentString: String
-            switch component {
-            case .tds:
-                componentString = "fetched_tds"
-            case .allowlist:
-                componentString = "allow_list"
-            case .tempUnprotected:
-                componentString = "temp_list"
-            case .localUnprotected:
-                componentString = "unprotected_list"
-            case .fallbackTds:
-                componentString = "fallback_tds"
-            }
-            return "content_blocking_\(listType)_compilation_error_\(componentString)"
-
-        case .contentBlockingCompilationTime:
-            return "content_blocking_compilation_time"
-
-        case .secureVaultInitError:
-            return "secure_vault_init_error"
-        case .secureVaultError:
-            return "secure_vault_error"
-
-        case .feedbackReportingFailed:
-            return "feedback_reporting_failed"
-
-        case .blankNavigationOnBurnFailed:
-            return "blank_navigation_on_burn_failed"
-
-        case .historyRemoveFailed:
-            return "history_remove_failed"
-        case .historyReloadFailed:
-            return "history_reload_failed"
-        case .historyCleanEntriesFailed:
-            return "history_clean_entries_failed"
-        case .historyCleanVisitsFailed:
-            return "history_clean_visits_failed"
-        case .historySaveFailed:
-            return "history_save_failed"
-        case .historyInsertVisitFailed:
-            return "history_insert_visit_failed"
-        case .historyRemoveVisitsFailed:
-            return "history_remove_visits_failed"
-
-        case .emailAutofillKeychainError:
-            return "email_autofill_keychain_error"
-
-        case .bookmarksStoreRootFolderMigrationFailed:
-            return "bookmarks_store_root_folder_migration_failed"
-        case .bookmarksStoreFavoritesFolderMigrationFailed:
-            return "bookmarks_store_favorites_folder_migration_failed"
-
-        case .adAttributionCompilationFailedForAttributedRulesList:
-            return "ad_attribution_compilation_failed_for_attributed_rules_list"
-        case .adAttributionGlobalAttributedRulesDoNotExist:
-            return "ad_attribution_global_attributed_rules_do_not_exist"
-        case .adAttributionDetectionHeuristicsDidNotMatchDomain:
-            return "ad_attribution_detection_heuristics_did_not_match_domain"
-        case .adAttributionLogicUnexpectedStateOnRulesCompiled:
-            return "ad_attribution_logic_unexpected_state_on_rules_compiled"
-        case .adAttributionLogicUnexpectedStateOnInheritedAttribution:
-            return "ad_attribution_logic_unexpected_state_on_inherited_attribution_2"
-        case .adAttributionLogicUnexpectedStateOnRulesCompilationFailed:
-            return "ad_attribution_logic_unexpected_state_on_rules_compilation_failed"
-        case .adAttributionDetectionInvalidDomainInParameter:
-            return "ad_attribution_detection_invalid_domain_in_parameter"
-        case .adAttributionLogicRequestingAttributionTimedOut:
-            return "ad_attribution_logic_requesting_attribution_timed_out"
-        case .adAttributionLogicWrongVendorOnSuccessfulCompilation:
-            return "ad_attribution_logic_wrong_vendor_on_successful_compilation"
-        case .adAttributionLogicWrongVendorOnFailedCompilation:
-            return "ad_attribution_logic_wrong_vendor_on_failed_compilation"
-
-        case .webKitDidTerminate:
-            return "webkit_did_terminate"
-
-        case .removedInvalidBookmarkManagedObjects:
-            return "removed_invalid_bookmark_managed_objects"
-
-        case .bitwardenNotResponding:
-            return "bitwarden_not_responding"
-        case .bitwardenRespondedCannotDecryptUnique:
-            return "bitwarden_responded_cannot_decrypt_unique"
-        case .bitwardenHandshakeFailed:
-            return "bitwarden_handshake_failed"
-        case .bitwardenDecryptionOfSharedKeyFailed:
-            return "bitwarden_decryption_of_shared_key_failed"
-        case .bitwardenStoringOfTheSharedKeyFailed:
-            return "bitwarden_storing_of_the_shared_key_failed"
-        case .bitwardenCredentialRetrievalFailed:
-            return "bitwarden_credential_retrieval_failed"
-        case .bitwardenCredentialCreationFailed:
-            return "bitwarden_credential_creation_failed"
-        case .bitwardenCredentialUpdateFailed:
-            return "bitwarden_credential_update_failed"
-        case .bitwardenRespondedWithError:
-            return "bitwarden_responded_with_error"
-        case .bitwardenNoActiveVault:
-            return "bitwarden_no_active_vault"
-        case .bitwardenParsingFailed:
-            return "bitwarden_parsing_failed"
-        case .bitwardenStatusParsingFailed:
-            return "bitwarden_status_parsing_failed"
-        case .bitwardenHmacComparisonFailed:
-            return "bitwarden_hmac_comparison_failed"
-        case .bitwardenDecryptionFailed:
-            return "bitwarden_decryption_failed"
-        case .bitwardenSendingOfMessageFailed:
-            return "bitwarden_sending_of_message_failed"
-        case .bitwardenSharedKeyInjectionFailed:
-            return "bitwarden_shared_key_injection_failed"
-
-        case .updaterAborted:
-            return "updater_aborted"
-        case .userSelectedToSkipUpdate:
-            return "user_selected_to_skip_update"
-        case .userSelectedToInstallUpdate:
-            return "user_selected_to_install_update"
-        case .userSelectedToDismissUpdate:
-            return "user_selected_to_dismiss_update"
-
-        case .faviconDecryptionFailedUnique:
-            return "favicon_decryption_failed_unique"
-        case .downloadListItemDecryptionFailedUnique:
-            return "download_list_item_decryption_failed_unique"
-        case .historyEntryDecryptionFailedUnique:
-            return "history_entry_decryption_failed_unique"
-        case .permissionDecryptionFailedUnique:
-            return "permission_decryption_failed_unique"
-
-        case .missingParent: return "bookmark_missing_parent"
-        case .bookmarksSaveFailed: return "bookmarks_save_failed"
-        case .bookmarksSaveFailedOnImport: return "bookmarks_save_failed_on_import"
-
-        case .bookmarksCouldNotLoadDatabase: return "bookmarks_could_not_load_database"
-        case .bookmarksCouldNotPrepareDatabase: return "bookmarks_could_not_prepare_database"
-        case .bookmarksMigrationAlreadyPerformed: return "bookmarks_migration_already_performed"
-        case .bookmarksMigrationFailed: return "bookmarks_migration_failed"
-        case .bookmarksMigrationCouldNotPrepareDatabase: return "bookmarks_migration_could_not_prepare_database"
-        case .bookmarksMigrationCouldNotPrepareDatabaseOnFailedMigration:
-            return "bookmarks_migration_could_not_prepare_database_on_failed_migration"
-        case .bookmarksMigrationCouldNotRemoveOldStore: return "bookmarks_migration_could_not_remove_old_store"
-        case .bookmarksMigrationCouldNotPrepareMultipleFavoriteFolders:
-            return "bookmarks_migration_could_not_prepare_multiple_favorite_folders"
-
-        case .syncSentUnauthenticatedRequest: return "sync_sent_unauthenticated_request"
-        case .syncMetadataCouldNotLoadDatabase: return "sync_metadata_could_not_load_database"
-        case .syncBookmarksProviderInitializationFailed: return "sync_bookmarks_provider_initialization_failed"
-        case .syncBookmarksFailed: return "sync_bookmarks_failed"
-        case .syncCredentialsProviderInitializationFailed: return "sync_credentials_provider_initialization_failed"
-        case .syncCredentialsFailed: return "sync_credentials_failed"
-        case .syncSettingsFailed: return "sync_settings_failed"
-        case .syncSettingsMetadataUpdateFailed: return "sync_settings_metadata_update_failed"
-        case .syncSignupError: return "sync_signup_error"
-        case .syncLoginError: return "sync_login_error"
-        case .syncLogoutError: return "sync_logout_error"
-        case .syncUpdateDeviceError: return "sync_update_device_error"
-        case .syncRemoveDeviceError: return "sync_remove_device_error"
-        case .syncDeleteAccountError: return "sync_delete_account_error"
-        case .syncLoginExistingAccountError: return "sync_login_existing_account_error"
-        case .syncCannotCreateRecoveryPDF: return "sync_cannot_create_recovery_pdf"
-
-        case .bookmarksCleanupFailed: return "bookmarks_cleanup_failed"
-        case .bookmarksCleanupAttemptedWhileSyncWasEnabled: return "bookmarks_cleanup_attempted_while_sync_was_enabled"
-        case .favoritesCleanupFailed: return "favorites_cleanup_failed"
-        case .bookmarksFaviconsFetcherStateStoreInitializationFailed: return "bookmarks_favicons_fetcher_state_store_initialization_failed"
-        case .bookmarksFaviconsFetcherFailed: return "bookmarks_favicons_fetcher_failed"
-
-        case .credentialsDatabaseCleanupFailed: return "credentials_database_cleanup_failed"
-        case .credentialsCleanupAttemptedWhileSyncWasEnabled: return "credentials_cleanup_attempted_while_sync_was_enabled"
-
-        case .invalidPayload(let configuration): return "m_d_\(configuration.rawValue)_invalid_payload".lowercased()
-
-        case .burnerTabMisplaced: return "burner_tab_misplaced"
-
-        case .networkProtectionRemoteMessageFetchingFailed: return "netp_remote_message_fetching_failed"
-        case .networkProtectionRemoteMessageStorageFailed: return "netp_remote_message_storage_failed"
-
-        case .dataBrokerProtectionRemoteMessageFetchingFailed: return "dbp_remote_message_fetching_failed"
-        case .dataBrokerProtectionRemoteMessageStorageFailed: return "dbp_remote_message_storage_failed"
-
-        case .loginItemUpdateError: return "login-item_update-error"
-        }
-    }
-}
diff --git a/LocalPackages/PixelKit/Sources/PixelKit/Extensions/URL+PixelKit.swift b/DuckDuckGo/Statistics/PixelKit+Assertion.swift
similarity index 59%
rename from LocalPackages/PixelKit/Sources/PixelKit/Extensions/URL+PixelKit.swift
rename to DuckDuckGo/Statistics/PixelKit+Assertion.swift
index 98bb77c2c4..e76dd74ef2 100644
--- a/LocalPackages/PixelKit/Sources/PixelKit/Extensions/URL+PixelKit.swift
+++ b/DuckDuckGo/Statistics/PixelKit+Assertion.swift
@@ -1,7 +1,7 @@
 //
-//  URL+PixelKit.swift
+//  PixelKit+Assertion.swift
 //
-//  Copyright © 2023 DuckDuckGo. All rights reserved.
+//  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.
@@ -17,14 +17,9 @@
 //
 
 import Foundation
+import PixelKit
 
-extension URL {
-
-    static let pixelBase = ProcessInfo.processInfo.environment["PIXEL_BASE_URL", default: "https://improving.duckduckgo.com"]
-
-    public static func pixelUrl(forPixelNamed pixelName: String) -> URL {
-        let urlString = "\(Self.pixelBase)/t/\(pixelName)"
-        return URL(string: urlString)!
-    }
-
+public func pixelAssertionFailure(_ message: @autoclosure () -> String = String(), file: StaticString = #fileID, line: UInt = #line) {
+    PixelKit.fire(DebugEvent(GeneralPixel.assertionFailure(message: message(), file: file, line: line)))
+    Swift.assertionFailure(message(), file: file, line: line)
 }
diff --git a/DuckDuckGo/Statistics/PixelParameters.swift b/DuckDuckGo/Statistics/PixelParameters.swift
deleted file mode 100644
index d6f9496add..0000000000
--- a/DuckDuckGo/Statistics/PixelParameters.swift
+++ /dev/null
@@ -1,383 +0,0 @@
-//
-//  PixelParameters.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 PixelKit
-
-extension Pixel.Event {
-
-    var parameters: [String: String]? {
-        switch self {
-        case .pixelKitEvent(let event):
-            return event.parameters
-
-        case .debug(event: let debugEvent, error: let error):
-            var params = error?.pixelParameters ?? [:]
-
-            if let debugParams = debugEvent.parameters {
-                params.merge(debugParams) { (current, _) in current }
-            }
-
-            if case let .assertionFailure(message, file, line) = debugEvent {
-                params[PixelKit.Parameters.assertionMessage] = message
-                params[PixelKit.Parameters.assertionFile] = String(file)
-                params[PixelKit.Parameters.assertionLine] = String(line)
-            }
-
-            return params
-
-        case .dataImportFailed(source: _, sourceVersion: let version, error: let error):
-            var params = error.pixelParameters
-
-            if let version {
-                params[PixelKit.Parameters.sourceBrowserVersion] = version
-            }
-            return params
-
-        case .launchInitial(let cohort):
-            return [PixelKit.Parameters.experimentCohort: cohort]
-
-        case .serpInitial(let cohort):
-            return [PixelKit.Parameters.experimentCohort: cohort]
-
-        case .serpDay21to27(let cohort):
-            return [PixelKit.Parameters.experimentCohort: cohort]
-
-        case .dailyPixel(let pixel, isFirst: _):
-            return pixel.parameters
-
-        case .dailyOsVersionCounter:
-            return [PixelKit.Parameters.osMajorVersion: "\(ProcessInfo.processInfo.operatingSystemVersion.majorVersion)"]
-
-        case .dashboardProtectionAllowlistAdd(let triggerOrigin):
-            guard let trigger = triggerOrigin else { return nil }
-            return [PixelKit.Parameters.dashboardTriggerOrigin: trigger]
-
-        case .dashboardProtectionAllowlistRemove(let triggerOrigin):
-            guard let trigger = triggerOrigin else { return nil }
-            return [PixelKit.Parameters.dashboardTriggerOrigin: trigger]
-
-        case .syncSuccessRateDaily:
-            return nil
-
-        case .vpnBreakageReport(let category, let description, let metadata):
-            return [
-                PixelKit.Parameters.vpnBreakageCategory: category,
-                PixelKit.Parameters.vpnBreakageDescription: description,
-                PixelKit.Parameters.vpnBreakageMetadata: metadata
-            ]
-
-        // Don't use default to force new items to be thought about
-        case .crash,
-             .brokenSiteReport,
-             .compileRulesWait,
-             .serp,
-             .formAutofilled,
-             .autofillItemSaved,
-             .autofillLoginsSaveLoginModalExcludeSiteConfirmed,
-             .autofillLoginsSettingsResetExcludedDisplayed,
-             .autofillLoginsSettingsResetExcludedConfirmed,
-             .autofillLoginsSettingsResetExcludedDismissed,
-             .bitwardenPasswordAutofilled,
-             .bitwardenPasswordSaved,
-             .ampBlockingRulesCompilationFailed,
-             .adClickAttributionDetected,
-             .adClickAttributionActive,
-             .adClickAttributionPageLoads,
-             .emailEnabled,
-             .emailDisabled,
-             .emailUserCreatedAlias,
-             .emailUserPressedUseAlias,
-             .emailUserPressedUseAddress,
-             .jsPixel,
-             .emailEnabledInitial,
-             .watchInDuckPlayerInitial,
-             .importDataInitial,
-             .newTabInitial,
-             .setAsDefaultInitial,
-             .favoriteSectionHidden,
-             .recentActivitySectionHidden,
-             .continueSetUpSectionHidden,
-             .fireButtonFirstBurn,
-             .fireButton,
-             .duckPlayerDailyUniqueView,
-             .duckPlayerViewFromYoutubeViaMainOverlay,
-             .duckPlayerViewFromYoutubeViaHoverButton,
-             .duckPlayerViewFromYoutubeAutomatic,
-             .duckPlayerViewFromSERP,
-             .duckPlayerViewFromOther,
-             .duckPlayerSettingAlways,
-             .duckPlayerSettingNever,
-             .duckPlayerSettingBackToDefault,
-             .networkProtectionWaitlistEntryPointMenuItemDisplayed,
-             .networkProtectionWaitlistEntryPointToolbarButtonDisplayed,
-             .networkProtectionWaitlistNotificationShown,
-             .networkProtectionWaitlistNotificationTapped,
-             .networkProtectionWaitlistTermsAndConditionsDisplayed,
-             .networkProtectionWaitlistTermsAndConditionsAccepted,
-             .networkProtectionWaitlistUserActive,
-             .networkProtectionWaitlistIntroDisplayed,
-             .networkProtectionRemoteMessageDisplayed,
-             .networkProtectionRemoteMessageDismissed,
-             .networkProtectionRemoteMessageOpened,
-             .networkProtectionEnabledOnSearch,
-             .networkProtectionGeoswitchingOpened,
-             .networkProtectionGeoswitchingSetNearest,
-             .networkProtectionGeoswitchingSetCustom,
-             .networkProtectionGeoswitchingNoLocations,
-             .syncSignupDirect,
-             .syncSignupConnect,
-             .syncLogin,
-             .syncDaily,
-             .syncDuckAddressOverride,
-             .syncLocalTimestampResolutionTriggered,
-             .syncBookmarksCountLimitExceededDaily,
-             .syncCredentialsCountLimitExceededDaily,
-             .syncBookmarksRequestSizeLimitExceededDaily,
-             .syncCredentialsRequestSizeLimitExceededDaily,
-             .dataBrokerProtectionWaitlistUserActive,
-             .dataBrokerProtectionWaitlistEntryPointMenuItemDisplayed,
-             .dataBrokerProtectionWaitlistIntroDisplayed,
-             .dataBrokerProtectionWaitlistNotificationShown,
-             .dataBrokerProtectionWaitlistNotificationTapped,
-             .dataBrokerProtectionWaitlistCardUITapped,
-             .dataBrokerProtectionWaitlistTermsAndConditionsDisplayed,
-             .dataBrokerProtectionWaitlistTermsAndConditionsAccepted,
-             .dataBrokerProtectionErrorWhenFetchingSubscriptionAuthTokenAfterSignIn,
-             .dataBrokerProtectionRemoteMessageOpened,
-             .dataBrokerProtectionRemoteMessageDisplayed,
-             .dataBrokerProtectionRemoteMessageDismissed,
-             .dataBrokerDisableAndDeleteDaily,
-             .dataBrokerEnableLoginItemDaily,
-             .dataBrokerDisableLoginItemDaily,
-             .dataBrokerResetLoginItemDaily,
-             .defaultRequestedFromHomepage,
-             .defaultRequestedFromHomepageSetupView,
-             .defaultRequestedFromSettings,
-             .defaultRequestedFromOnboarding,
-             .privacyProFeatureEnabled,
-             .privacyProBetaUserThankYouVPN,
-             .privacyProBetaUserThankYouDBP,
-             .privacyProSubscriptionActive,
-             .privacyProOfferScreenImpression,
-             .privacyProPurchaseAttempt,
-             .privacyProPurchaseFailure,
-             .privacyProPurchaseFailureStoreError,
-             .privacyProPurchaseFailureBackendError,
-             .privacyProPurchaseFailureAccountNotCreated,
-             .privacyProPurchaseSuccess,
-             .privacyProRestorePurchaseOfferPageEntry,
-             .privacyProRestorePurchaseSettingsMenuEntry,
-             .privacyProRestorePurchaseEmailStart,
-             .privacyProRestorePurchaseStoreStart,
-             .privacyProRestorePurchaseEmailSuccess,
-             .privacyProRestorePurchaseStoreSuccess,
-             .privacyProRestorePurchaseStoreFailureNotFound,
-             .privacyProRestorePurchaseStoreFailureOther,
-             .privacyProRestoreAfterPurchaseAttempt,
-             .privacyProSubscriptionActivated,
-             .privacyProWelcomeAddDevice,
-             .privacyProSettingsAddDevice,
-             .privacyProAddDeviceEnterEmail,
-             .privacyProWelcomeVPN,
-             .privacyProWelcomePersonalInformationRemoval,
-             .privacyProWelcomeIdentityRestoration,
-             .privacyProSubscriptionSettings,
-             .privacyProVPNSettings,
-             .privacyProPersonalInformationRemovalSettings,
-             .privacyProIdentityRestorationSettings,
-             .privacyProSubscriptionManagementEmail,
-             .privacyProSubscriptionManagementPlanBilling,
-             .privacyProSubscriptionManagementRemoval,
-             .privacyProRestorePurchaseClick,
-             .protectionToggledOffBreakageReport,
-             .toggleProtectionsDailyCount,
-             .toggleReportDoNotSend,
-             .toggleReportDismiss,
-             .privacyProOfferMonthlyPriceClick,
-             .privacyProOfferYearlyPriceClick,
-             .privacyProAddEmailSuccess,
-             .privacyProWelcomeFAQClick,
-             .privacyProPurchaseStripeSuccess,
-             .passwordImportKeychainPrompt,
-             .passwordImportKeychainPromptDenied:
-            return nil
-        }
-    }
-
-}
-
-extension Pixel.Event.Debug {
-
-    var parameters: [String: String]? {
-        switch self {
-        case .loginItemUpdateError(let loginItemBundleID, let action, let buildType, let osVersion):
-            return ["loginItemBundleID": loginItemBundleID, "action": action, "buildType": buildType, "macosVersion": osVersion]
-        case .pixelKitEvent,
-                .assertionFailure,
-                .dbMakeDatabaseError,
-                .dbContainerInitializationError,
-                .dbInitializationError,
-                .dbSaveExcludedHTTPSDomainsError,
-                .dbSaveBloomFilterError,
-                .configurationFetchError,
-                .trackerDataParseFailed,
-                .trackerDataReloadFailed,
-                .trackerDataCouldNotBeLoaded,
-                .privacyConfigurationParseFailed,
-                .privacyConfigurationReloadFailed,
-                .privacyConfigurationCouldNotBeLoaded,
-                .fileStoreWriteFailed,
-                .fileMoveToDownloadsFailed,
-                .fileGetDownloadLocationFailed,
-                .fileAccessRelatedItemFailed,
-                .fileDownloadCreatePresentersFailed,
-                .downloadResumeDataCodingFailed,
-                .suggestionsFetchFailed,
-                .appOpenURLFailed,
-                .appStateRestorationFailed,
-                .contentBlockingErrorReportingIssue,
-                .contentBlockingCompilationFailed,
-                .contentBlockingCompilationTime,
-                .secureVaultInitError,
-                .secureVaultError,
-                .feedbackReportingFailed,
-                .blankNavigationOnBurnFailed,
-                .historyRemoveFailed,
-                .historyReloadFailed,
-                .historyCleanEntriesFailed,
-                .historyCleanVisitsFailed,
-                .historySaveFailed,
-                .historyInsertVisitFailed,
-                .historyRemoveVisitsFailed,
-                .emailAutofillKeychainError,
-                .bookmarksStoreRootFolderMigrationFailed,
-                .bookmarksStoreFavoritesFolderMigrationFailed,
-                .adAttributionCompilationFailedForAttributedRulesList,
-                .adAttributionGlobalAttributedRulesDoNotExist,
-                .adAttributionDetectionHeuristicsDidNotMatchDomain,
-                .adAttributionLogicUnexpectedStateOnRulesCompiled,
-                .adAttributionLogicUnexpectedStateOnInheritedAttribution,
-                .adAttributionLogicUnexpectedStateOnRulesCompilationFailed,
-                .adAttributionDetectionInvalidDomainInParameter,
-                .adAttributionLogicRequestingAttributionTimedOut,
-                .adAttributionLogicWrongVendorOnSuccessfulCompilation,
-                .adAttributionLogicWrongVendorOnFailedCompilation,
-                .webKitDidTerminate,
-                .removedInvalidBookmarkManagedObjects,
-                .bitwardenNotResponding,
-                .bitwardenRespondedCannotDecryptUnique,
-                .bitwardenHandshakeFailed,
-                .bitwardenDecryptionOfSharedKeyFailed,
-                .bitwardenStoringOfTheSharedKeyFailed,
-                .bitwardenCredentialRetrievalFailed,
-                .bitwardenCredentialCreationFailed,
-                .bitwardenCredentialUpdateFailed,
-                .bitwardenRespondedWithError,
-                .bitwardenNoActiveVault,
-                .bitwardenParsingFailed,
-                .bitwardenStatusParsingFailed,
-                .bitwardenHmacComparisonFailed,
-                .bitwardenDecryptionFailed,
-                .bitwardenSendingOfMessageFailed,
-                .bitwardenSharedKeyInjectionFailed,
-                .updaterAborted,
-                .userSelectedToSkipUpdate,
-                .userSelectedToInstallUpdate,
-                .userSelectedToDismissUpdate,
-                .faviconDecryptionFailedUnique,
-                .downloadListItemDecryptionFailedUnique,
-                .historyEntryDecryptionFailedUnique,
-                .permissionDecryptionFailedUnique,
-                .missingParent,
-                .bookmarksSaveFailed,
-                .bookmarksSaveFailedOnImport,
-                .bookmarksCouldNotLoadDatabase,
-                .bookmarksCouldNotPrepareDatabase,
-                .bookmarksMigrationAlreadyPerformed,
-                .bookmarksMigrationFailed,
-                .bookmarksMigrationCouldNotPrepareDatabase,
-                .bookmarksMigrationCouldNotPrepareDatabaseOnFailedMigration,
-                .bookmarksMigrationCouldNotRemoveOldStore,
-                .bookmarksMigrationCouldNotPrepareMultipleFavoriteFolders,
-                .syncSentUnauthenticatedRequest,
-                .syncMetadataCouldNotLoadDatabase,
-                .syncBookmarksProviderInitializationFailed,
-                .syncBookmarksFailed,
-                .syncCredentialsProviderInitializationFailed,
-                .syncCredentialsFailed,
-                .syncSettingsFailed,
-                .syncSettingsMetadataUpdateFailed,
-                .syncSignupError,
-                .syncLoginError,
-                .syncLogoutError,
-                .syncUpdateDeviceError,
-                .syncRemoveDeviceError,
-                .syncDeleteAccountError,
-                .syncLoginExistingAccountError,
-                .syncCannotCreateRecoveryPDF,
-                .bookmarksCleanupFailed,
-                .bookmarksCleanupAttemptedWhileSyncWasEnabled,
-                .favoritesCleanupFailed,
-                .bookmarksFaviconsFetcherStateStoreInitializationFailed,
-                .bookmarksFaviconsFetcherFailed,
-                .credentialsDatabaseCleanupFailed,
-                .credentialsCleanupAttemptedWhileSyncWasEnabled,
-                .invalidPayload,
-                .burnerTabMisplaced,
-                .networkProtectionRemoteMessageFetchingFailed,
-                .networkProtectionRemoteMessageStorageFailed,
-                .dataBrokerProtectionRemoteMessageFetchingFailed,
-                .dataBrokerProtectionRemoteMessageStorageFailed:
-            return nil
-        }
-    }
-
-}
-
-extension Error {
-
-    var pixelParameters: [String: String] {
-        var params = [String: String]()
-
-        if let errorWithUserInfo = self as? ErrorWithPixelParameters {
-            params = errorWithUserInfo.errorParameters
-        }
-
-        let nsError = self as NSError
-
-        params[PixelKit.Parameters.errorCode] = "\(nsError.code)"
-        params[PixelKit.Parameters.errorDomain] = nsError.domain
-
-        if let underlyingError = nsError.userInfo[NSUnderlyingErrorKey] as? NSError {
-            params[PixelKit.Parameters.underlyingErrorCode] = "\(underlyingError.code)"
-            params[PixelKit.Parameters.underlyingErrorDomain] = underlyingError.domain
-        }
-
-        if let sqlErrorCode = nsError.userInfo["SQLiteResultCode"] as? NSNumber {
-            params[PixelKit.Parameters.underlyingErrorSQLiteCode] = "\(sqlErrorCode.intValue)"
-        }
-
-        if let sqlExtendedErrorCode = nsError.userInfo["SQLiteExtendedResultCode"] as? NSNumber {
-            params[PixelKit.Parameters.underlyingErrorSQLiteExtendedCode] = "\(sqlExtendedErrorCode.intValue)"
-        }
-
-        return params
-    }
-
-}
diff --git a/DuckDuckGo/Statistics/PrivacyProPixel.swift b/DuckDuckGo/Statistics/PrivacyProPixel.swift
new file mode 100644
index 0000000000..d50f06656a
--- /dev/null
+++ b/DuckDuckGo/Statistics/PrivacyProPixel.swift
@@ -0,0 +1,128 @@
+//
+//  PrivacyProPixel.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
+
+// swiftlint:disable private_over_fileprivate
+#if APPSTORE
+fileprivate let appDistribution = "store"
+#else
+fileprivate let appDistribution = "direct"
+#endif
+// swiftlint:enable private_over_fileprivate
+
+enum PrivacyProPixel: PixelKitEventV2 {
+    // Subscription
+    case privacyProFeatureEnabled
+    case privacyProBetaUserThankYouVPN
+    case privacyProBetaUserThankYouDBP
+    case privacyProSubscriptionActive
+    case privacyProOfferScreenImpression
+    case privacyProPurchaseAttempt
+    case privacyProPurchaseFailure
+    case privacyProPurchaseFailureStoreError
+    case privacyProPurchaseFailureBackendError
+    case privacyProPurchaseFailureAccountNotCreated
+    case privacyProPurchaseSuccess
+    case privacyProRestorePurchaseOfferPageEntry
+    case privacyProRestorePurchaseClick
+    case privacyProRestorePurchaseSettingsMenuEntry
+    case privacyProRestorePurchaseEmailStart
+    case privacyProRestorePurchaseStoreStart
+    case privacyProRestorePurchaseEmailSuccess
+    case privacyProRestorePurchaseStoreSuccess
+    case privacyProRestorePurchaseStoreFailureNotFound
+    case privacyProRestorePurchaseStoreFailureOther
+    case privacyProRestoreAfterPurchaseAttempt
+    case privacyProSubscriptionActivated
+    case privacyProWelcomeAddDevice
+    case privacyProSettingsAddDevice
+    case privacyProAddDeviceEnterEmail
+    case privacyProWelcomeVPN
+    case privacyProWelcomePersonalInformationRemoval
+    case privacyProWelcomeIdentityRestoration
+    case privacyProSubscriptionSettings
+    case privacyProVPNSettings
+    case privacyProPersonalInformationRemovalSettings
+    case privacyProIdentityRestorationSettings
+    case privacyProSubscriptionManagementEmail
+    case privacyProSubscriptionManagementPlanBilling
+    case privacyProSubscriptionManagementRemoval
+    case privacyProPurchaseStripeSuccess
+    // Web pixels
+    case privacyProOfferMonthlyPriceClick
+    case privacyProOfferYearlyPriceClick
+    case privacyProAddEmailSuccess
+    case privacyProWelcomeFAQClick
+
+    var name: String {
+        switch self {
+        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"
+        case .privacyProPurchaseFailure: return "m_mac_\(appDistribution)_privacy-pro_app_subscription-purchase_failure_other"
+        case .privacyProPurchaseFailureStoreError: return "m_mac_\(appDistribution)_privacy-pro_app_subscription-purchase_failure_store"
+        case .privacyProPurchaseFailureBackendError: return "m_mac_\(appDistribution)_privacy-pro_app_subscription-purchase_failure_backend"
+        case .privacyProPurchaseFailureAccountNotCreated: return "m_mac_\(appDistribution)_privacy-pro_app_subscription-purchase_failure_account-creation"
+        case .privacyProPurchaseSuccess: return "m_mac_\(appDistribution)_privacy-pro_app_subscription-purchase_success"
+        case .privacyProRestorePurchaseOfferPageEntry: return "m_mac_\(appDistribution)_privacy-pro_offer_restore-purchase_click"
+        case .privacyProRestorePurchaseClick: return "m_mac_\(appDistribution)_privacy-pro_settings_restore-purchase_click"
+        case .privacyProRestorePurchaseSettingsMenuEntry: return "m_mac_\(appDistribution)_privacy-pro_settings_restore-purchase_click"
+        case .privacyProRestorePurchaseEmailStart: return "m_mac_\(appDistribution)_privacy-pro_activate-subscription_enter-email_click"
+        case .privacyProRestorePurchaseStoreStart: return "m_mac_\(appDistribution)_privacy-pro_activate-subscription_restore-purchase_click"
+        case .privacyProRestorePurchaseEmailSuccess: return "m_mac_\(appDistribution)_privacy-pro_app_subscription-restore-using-email_success"
+        case .privacyProRestorePurchaseStoreSuccess: return "m_mac_\(appDistribution)_privacy-pro_app_subscription-restore-using-store_success"
+        case .privacyProRestorePurchaseStoreFailureNotFound: return "m_mac_\(appDistribution)_privacy-pro_subscription-restore-using-store_failure_not-found"
+        case .privacyProRestorePurchaseStoreFailureOther: return "m_mac_\(appDistribution)_privacy-pro_app_subscription-restore-using-store_failure_other"
+        case .privacyProRestoreAfterPurchaseAttempt: return "m_mac_\(appDistribution)_privacy-pro_app_subscription-restore-after-purchase-attempt_success"
+        case .privacyProSubscriptionActivated: return "m_mac_\(appDistribution)_privacy-pro_app_subscription_activated_u"
+        case .privacyProWelcomeAddDevice: return "m_mac_\(appDistribution)_privacy-pro_welcome_add-device_click_u"
+        case .privacyProSettingsAddDevice: return "m_mac_\(appDistribution)_privacy-pro_settings_add-device_click"
+        case .privacyProAddDeviceEnterEmail: return "m_mac_\(appDistribution)_privacy-pro_add-device_enter-email_click"
+        case .privacyProWelcomeVPN: return "m_mac_\(appDistribution)_privacy-pro_welcome_vpn_click_u"
+        case .privacyProWelcomePersonalInformationRemoval: return "m_mac_\(appDistribution)_privacy-pro_welcome_personal-information-removal_click_u"
+        case .privacyProWelcomeIdentityRestoration: return "m_mac_\(appDistribution)_privacy-pro_welcome_identity-theft-restoration_click_u"
+        case .privacyProSubscriptionSettings: return "m_mac_\(appDistribution)_privacy-pro_settings_screen_impression"
+        case .privacyProVPNSettings: return "m_mac_\(appDistribution)_privacy-pro_settings_vpn_click"
+        case .privacyProPersonalInformationRemovalSettings: return "m_mac_\(appDistribution)_privacy-pro_settings_personal-information-removal_click"
+        case .privacyProIdentityRestorationSettings: return "m_mac_\(appDistribution)_privacy-pro_settings_identity-theft-restoration_click"
+        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"
+        }
+    }
+
+    var error: (any Error)? {
+        return nil
+    }
+
+    var parameters: [String: String]? {
+        return nil
+    }
+}
diff --git a/DuckDuckGo/Statistics/RulesCompilationMonitor.swift b/DuckDuckGo/Statistics/RulesCompilationMonitor.swift
index 86e704f4d7..689a6c6174 100644
--- a/DuckDuckGo/Statistics/RulesCompilationMonitor.swift
+++ b/DuckDuckGo/Statistics/RulesCompilationMonitor.swift
@@ -54,14 +54,14 @@ final class AbstractContentBlockingAssetsCompilationTimeReporter<Caller: Hashabl
         }
     }
 
-    private func report(waitTime: TimeInterval, result: Pixel.Event.WaitResult, completionHandler: @escaping ((Error?) -> Void) = { _ in }) {
+    private func report(waitTime: TimeInterval, result: GeneralPixel.WaitResult, completionHandler: @escaping ((Error?) -> Void) = { _ in }) {
         // report only once
         isFinished = true
         completionHandler(nil)
 
         // This is temporarily disabled:
         //
-        // Pixel.fire(.compileRulesWait(onboardingShown: self.onboardingShown, waitTime: waitTime, result: result),
+        // PixelKit.fire(GeneralPixel.compileRulesWait(onboardingShown: self.onboardingShown, waitTime: waitTime, result: result),
         //            withAdditionalParameters: ["waitTime": String(waitTime)],
         //            onComplete: completionHandler)
 
diff --git a/DuckDuckGo/Subscription/DefaultSubscriptionFeatureAvailability+DefaultInitializer.swift b/DuckDuckGo/Subscription/DefaultSubscriptionFeatureAvailability+DefaultInitializer.swift
index 3e24a33be7..73e6407c28 100644
--- a/DuckDuckGo/Subscription/DefaultSubscriptionFeatureAvailability+DefaultInitializer.swift
+++ b/DuckDuckGo/Subscription/DefaultSubscriptionFeatureAvailability+DefaultInitializer.swift
@@ -17,10 +17,8 @@
 //
 
 import Foundation
-
-#if SUBSCRIPTION
 import Subscription
-#endif
+import BrowserServicesKit
 
 extension DefaultSubscriptionFeatureAvailability {
     convenience init() {
diff --git a/DuckDuckGo/Suggestions/Model/SuggestionContainer.swift b/DuckDuckGo/Suggestions/Model/SuggestionContainer.swift
index 9ca0f3aaa9..94f4a59e46 100644
--- a/DuckDuckGo/Suggestions/Model/SuggestionContainer.swift
+++ b/DuckDuckGo/Suggestions/Model/SuggestionContainer.swift
@@ -20,6 +20,7 @@ import Foundation
 import Suggestions
 import Common
 import History
+import PixelKit
 
 final class SuggestionContainer {
 
@@ -29,15 +30,17 @@ final class SuggestionContainer {
 
     private let historyCoordinating: HistoryCoordinating
     private let bookmarkManager: BookmarkManager
+    private let startupPreferences: StartupPreferences
     private let loading: SuggestionLoading
 
     private var latestQuery: Query?
 
     fileprivate let suggestionsURLSession = URLSession(configuration: .ephemeral)
 
-    init(suggestionLoading: SuggestionLoading, historyCoordinating: HistoryCoordinating, bookmarkManager: BookmarkManager) {
+    init(suggestionLoading: SuggestionLoading, historyCoordinating: HistoryCoordinating, bookmarkManager: BookmarkManager, startupPreferences: StartupPreferences = .shared) {
         self.bookmarkManager = bookmarkManager
         self.historyCoordinating = historyCoordinating
+        self.startupPreferences = startupPreferences
         self.loading = suggestionLoading
         self.loading.dataSource = self
     }
@@ -63,7 +66,7 @@ final class SuggestionContainer {
                 os_log("Suggestions: Failed to get suggestions - %s",
                        type: .error,
                        "\(String(describing: error))")
-                Pixel.fire(.debug(event: .suggestionsFetchFailed, error: error))
+                PixelKit.fire(DebugEvent(GeneralPixel.suggestionsFetchFailed, error: error))
                 return
             }
 
@@ -90,7 +93,23 @@ extension SuggestionContainer: SuggestionLoadingDataSource {
         return historyCoordinating.history ?? []
     }
 
-    func bookmarks(for suggestionLoading: SuggestionLoading) -> [Suggestions.Bookmark] {
+    @MainActor func internalPages(for suggestionLoading: Suggestions.SuggestionLoading) -> [Suggestions.InternalPage] {
+        [
+            // suggestions for Bookmarks&Settings
+            .init(title: UserText.bookmarks, url: .bookmarks),
+            .init(title: UserText.settings, url: .settings),
+        ] + PreferencePaneIdentifier.allCases.map {
+            // preference panes URLs
+            .init(title: UserText.settings + " → " + $0.displayName, url: .settingsPane($0))
+        } + {
+            guard startupPreferences.launchToCustomHomePage,
+                  let homePage = URL(string: startupPreferences.formattedCustomHomePageURL) else { return [] }
+            // home page suggestion
+            return [.init(title: UserText.homePage, url: homePage)]
+        }()
+    }
+
+    @MainActor func bookmarks(for suggestionLoading: SuggestionLoading) -> [Suggestions.Bookmark] {
         bookmarkManager.list?.bookmarks() ?? []
     }
 
diff --git a/DuckDuckGo/Suggestions/ViewModel/SuggestionViewModel.swift b/DuckDuckGo/Suggestions/ViewModel/SuggestionViewModel.swift
index d7b8c5910c..c3a6d1aad7 100644
--- a/DuckDuckGo/Suggestions/ViewModel/SuggestionViewModel.swift
+++ b/DuckDuckGo/Suggestions/ViewModel/SuggestionViewModel.swift
@@ -94,7 +94,8 @@ struct SuggestionViewModel: Equatable {
             } else {
                 return title ?? url.toString(forUserInput: userStringValue)
             }
-        case .bookmark(title: let title, url: _, isFavorite: _, allowedInTopHits: _):
+        case .bookmark(title: let title, url: _, isFavorite: _, allowedInTopHits: _),
+             .internalPage(title: let title, url: _):
             return title
         case .unknown(value: let value):
             return value
@@ -113,7 +114,8 @@ struct SuggestionViewModel: Equatable {
             } else {
                 return title
             }
-        case .bookmark(title: let title, url: _, isFavorite: _, allowedInTopHits: _):
+        case .bookmark(title: let title, url: _, isFavorite: _, allowedInTopHits: _),
+             .internalPage(title: let title, url: _):
             return title
         }
     }
@@ -155,6 +157,8 @@ struct SuggestionViewModel: Equatable {
                                               dropScheme: true,
                                               dropTrailingSlash: true)
             }
+        case .internalPage:
+            return " – " + UserText.duckDuckGo
         }
     }
 
@@ -174,6 +178,13 @@ struct SuggestionViewModel: Equatable {
             return .favoritedBookmarkSuggestion
         case .unknown:
             return .web
+        case .internalPage(title: _, url: let url) where url == .bookmarks:
+            return .bookmarksFolder
+        case .internalPage(title: _, url: let url) where url.isSettingsURL:
+            return .settingsMulticolor16
+        case .internalPage(title: _, url: let url):
+            guard url == URL(string: StartupPreferences.shared.formattedCustomHomePageURL) else { return nil }
+            return .home16
         }
     }
 
diff --git a/DuckDuckGo/Sync/CredentialsCleanupErrorHandling.swift b/DuckDuckGo/Sync/CredentialsCleanupErrorHandling.swift
index cac2ff4cee..386dd306a5 100644
--- a/DuckDuckGo/Sync/CredentialsCleanupErrorHandling.swift
+++ b/DuckDuckGo/Sync/CredentialsCleanupErrorHandling.swift
@@ -20,18 +20,19 @@ import Foundation
 import BrowserServicesKit
 import Common
 import Persistence
+import PixelKit
 
 public class CredentialsCleanupErrorHandling: EventMapping<CredentialsCleanupError> {
 
     public init() {
         super.init { event, _, _, _ in
             if event.cleanupError is CredentialsCleanupCancelledError {
-                Pixel.fire(.debug(event: .credentialsCleanupAttemptedWhileSyncWasEnabled))
+                PixelKit.fire(DebugEvent(GeneralPixel.credentialsCleanupAttemptedWhileSyncWasEnabled))
             } else {
                 let processedErrors = CoreDataErrorsParser.parse(error: event.cleanupError as NSError)
                 let params = processedErrors.errorPixelParameters
 
-                Pixel.fire(.debug(event: .credentialsDatabaseCleanupFailed, error: event.cleanupError), withAdditionalParameters: params)
+                PixelKit.fire(DebugEvent(GeneralPixel.credentialsDatabaseCleanupFailed, error: event.cleanupError), withAdditionalParameters: params)
             }
         }
     }
diff --git a/DuckDuckGo/Sync/SyncBookmarksAdapter.swift b/DuckDuckGo/Sync/SyncBookmarksAdapter.swift
index d7a9651d14..54dae6e41d 100644
--- a/DuckDuckGo/Sync/SyncBookmarksAdapter.swift
+++ b/DuckDuckGo/Sync/SyncBookmarksAdapter.swift
@@ -22,12 +22,13 @@ import Common
 import DDGSync
 import Persistence
 import SyncDataProviders
+import PixelKit
 
 public class BookmarksFaviconsFetcherErrorHandler: EventMapping<BookmarksFaviconsFetcherError> {
 
     public init() {
         super.init { event, _, _, _ in
-            Pixel.fire(.debug(event: .bookmarksFaviconsFetcherFailed, error: event.underlyingError))
+            PixelKit.fire(DebugEvent(GeneralPixel.bookmarksFaviconsFetcherFailed, error: event.underlyingError))
         }
     }
 
@@ -147,7 +148,7 @@ final class SyncBookmarksAdapter {
         do {
             stateStore = try BookmarksFaviconsFetcherStateStore(applicationSupportURL: URL.sandboxApplicationSupportURL)
         } catch {
-            Pixel.fire(.debug(event: .bookmarksFaviconsFetcherStateStoreInitializationFailed, error: error))
+            PixelKit.fire(DebugEvent(GeneralPixel.bookmarksFaviconsFetcherStateStoreInitializationFailed, error: error))
             os_log(.error, log: OSLog.sync, "Failed to initialize BookmarksFaviconsFetcherStateStore: %{public}s", String(reflecting: error))
             return nil
         }
@@ -167,17 +168,17 @@ final class SyncBookmarksAdapter {
             .sink { [weak self] error in
                 switch error {
                 case let syncError as SyncError:
-                    Pixel.fire(.debug(event: .syncBookmarksFailed, error: syncError))
+                    PixelKit.fire(DebugEvent(GeneralPixel.syncBookmarksFailed, error: syncError))
                     switch syncError {
                     case .unexpectedStatusCode(409):
                         // If bookmarks count limit has been exceeded
                         self?.isSyncBookmarksPaused = true
-                        Pixel.fire(.syncBookmarksCountLimitExceededDaily, limitTo: .dailyFirst)
+                        PixelKit.fire(GeneralPixel.syncBookmarksCountLimitExceededDaily, frequency: .daily)
                         self?.showSyncPausedAlert()
                     case .unexpectedStatusCode(413):
                         // If bookmarks request size limit has been exceeded
                         self?.isSyncBookmarksPaused = true
-                        Pixel.fire(.syncBookmarksRequestSizeLimitExceededDaily, limitTo: .dailyFirst)
+                        PixelKit.fire(GeneralPixel.syncBookmarksRequestSizeLimitExceededDaily, frequency: .daily)
                         self?.showSyncPausedAlert()
                     default:
                         break
@@ -187,7 +188,7 @@ final class SyncBookmarksAdapter {
                     if nsError.domain != NSURLErrorDomain {
                         let processedErrors = CoreDataErrorsParser.parse(error: error as NSError)
                         let params = processedErrors.errorPixelParameters
-                        Pixel.fire(.debug(event: .syncBookmarksFailed, error: error), withAdditionalParameters: params)
+                        PixelKit.fire(DebugEvent(GeneralPixel.syncBookmarksFailed, error: error), withAdditionalParameters: params)
                     }
                 }
                 os_log(.error, log: OSLog.sync, "Bookmarks Sync error: %{public}s", String(reflecting: error))
diff --git a/DuckDuckGo/Sync/SyncCredentialsAdapter.swift b/DuckDuckGo/Sync/SyncCredentialsAdapter.swift
index 444e7a1872..c9f495901e 100644
--- a/DuckDuckGo/Sync/SyncCredentialsAdapter.swift
+++ b/DuckDuckGo/Sync/SyncCredentialsAdapter.swift
@@ -22,6 +22,7 @@ import Common
 import DDGSync
 import Persistence
 import SyncDataProviders
+import PixelKit
 
 final class SyncCredentialsAdapter {
 
@@ -43,7 +44,7 @@ final class SyncCredentialsAdapter {
         syncDidCompletePublisher = syncDidCompleteSubject.eraseToAnyPublisher()
         databaseCleaner = CredentialsDatabaseCleaner(
             secureVaultFactory: secureVaultFactory,
-            secureVaultErrorReporter: SecureVaultErrorReporter.shared,
+            secureVaultErrorReporter: SecureVaultReporter.shared,
             errorEvents: CredentialsCleanupErrorHandling(),
             log: .passwordManager
         )
@@ -70,7 +71,7 @@ final class SyncCredentialsAdapter {
         do {
             let provider = try CredentialsProvider(
                 secureVaultFactory: secureVaultFactory,
-                secureVaultErrorReporter: SecureVaultErrorReporter.shared,
+                secureVaultErrorReporter: SecureVaultReporter.shared,
                 metadataStore: metadataStore,
                 metricsEvents: metricsEventsHandler,
                 log: OSLog.sync,
@@ -85,17 +86,17 @@ final class SyncCredentialsAdapter {
                 .sink { [weak self] error in
                     switch error {
                     case let syncError as SyncError:
-                        Pixel.fire(.debug(event: .syncCredentialsFailed, error: syncError))
+                        PixelKit.fire(DebugEvent(GeneralPixel.syncCredentialsFailed, error: syncError))
                         switch syncError {
                         case .unexpectedStatusCode(409):
                             // If credentials count limit has been exceeded
                             self?.isSyncCredentialsPaused = true
-                            Pixel.fire(.syncCredentialsCountLimitExceededDaily, limitTo: .dailyFirst)
+                            PixelKit.fire(GeneralPixel.syncCredentialsCountLimitExceededDaily, frequency: .daily)
                             self?.showSyncPausedAlert()
                         case .unexpectedStatusCode(413):
                             // If credentials request size limit has been exceeded
                             self?.isSyncCredentialsPaused = true
-                            Pixel.fire(.syncCredentialsRequestSizeLimitExceededDaily, limitTo: .dailyFirst)
+                            PixelKit.fire(GeneralPixel.syncCredentialsRequestSizeLimitExceededDaily, frequency: .daily)
                             self?.showSyncPausedAlert()
                         default:
                             break
@@ -105,7 +106,7 @@ final class SyncCredentialsAdapter {
                         if nsError.domain != NSURLErrorDomain {
                             let processedErrors = CoreDataErrorsParser.parse(error: error as NSError)
                             let params = processedErrors.errorPixelParameters
-                            Pixel.fire(.debug(event: .syncCredentialsFailed, error: error), withAdditionalParameters: params)
+                            PixelKit.fire(DebugEvent(GeneralPixel.syncCredentialsFailed, error: error), withAdditionalParameters: params)
                         }
                     }
                     os_log(.error, log: OSLog.sync, "Credentials Sync error: %{public}s", String(reflecting: error))
@@ -116,7 +117,7 @@ final class SyncCredentialsAdapter {
         } catch let error as NSError {
             let processedErrors = CoreDataErrorsParser.parse(error: error)
             let params = processedErrors.errorPixelParameters
-            Pixel.fire(.debug(event: .syncCredentialsProviderInitializationFailed, error: error), withAdditionalParameters: params)
+            PixelKit.fire(DebugEvent(GeneralPixel.syncCredentialsProviderInitializationFailed, error: error), withAdditionalParameters: params)
         }
     }
 
diff --git a/DuckDuckGo/Sync/SyncDataProviders.swift b/DuckDuckGo/Sync/SyncDataProviders.swift
index 2858e2664a..4da4a2d5c5 100644
--- a/DuckDuckGo/Sync/SyncDataProviders.swift
+++ b/DuckDuckGo/Sync/SyncDataProviders.swift
@@ -22,6 +22,7 @@ import Common
 import DDGSync
 import Persistence
 import SyncDataProviders
+import PixelKit
 
 final class SyncDataProviders: DataProvidersSource {
     public let bookmarksAdapter: SyncBookmarksAdapter
@@ -109,9 +110,9 @@ final class SyncDataProviders: DataProvidersSource {
         syncMetadataDatabase.db.loadStore { context, error in
             guard context != nil else {
                 if let error = error {
-                    Pixel.fire(.debug(event: .syncMetadataCouldNotLoadDatabase, error: error))
+                    PixelKit.fire(DebugEvent(GeneralPixel.syncMetadataCouldNotLoadDatabase, error: error))
                 } else {
-                    Pixel.fire(.debug(event: .syncMetadataCouldNotLoadDatabase))
+                    PixelKit.fire(DebugEvent(GeneralPixel.syncMetadataCouldNotLoadDatabase))
                 }
 
                 Thread.sleep(forTimeInterval: 1)
diff --git a/DuckDuckGo/Sync/SyncDebugMenu.swift b/DuckDuckGo/Sync/SyncDebugMenu.swift
index da1fe3e0be..c5ff802e84 100644
--- a/DuckDuckGo/Sync/SyncDebugMenu.swift
+++ b/DuckDuckGo/Sync/SyncDebugMenu.swift
@@ -89,14 +89,34 @@ final class SyncDebugMenu: NSMenu {
 
         context.performAndWait {
             let root = BookmarkUtils.fetchRootFolder(context)!
+            let favorites = BookmarkUtils.fetchFavoritesFolders(for: .displayNative(.desktop), in: context)
+
+            let nonStub1 = BookmarkEntity.makeBookmark(title: "Non stub", url: "url", parent: root, context: context)
+            nonStub1.addToFavorites(folders: favorites)
+
+            let stub1 = BookmarkEntity.makeBookmark(title: "Stub", url: "", parent: root, context: context)
+            stub1.isStub = true
+            stub1.addToFavorites(folders: favorites)
 
-            _ = 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
+            emptyStub.addToFavorites(folders: favorites)
+
+            let nonStub2 = BookmarkEntity.makeBookmark(title: "Non stub 2", url: "url", parent: root, context: context)
+            nonStub2.addToFavorites(folders: favorites)
+
+            let stub2 = BookmarkEntity.makeBookmark(title: "Stub", url: "", parent: root, context: context)
+            stub2.isStub = true
+            stub2.addToFavorites(folders: favorites)
+
+            let stub3 = BookmarkEntity.makeBookmark(title: "Stub", url: "", parent: root, context: context)
+            stub3.isStub = true
+            stub3.addToFavorites(folders: favorites)
+
+            let nonStub3 = BookmarkEntity.makeBookmark(title: "Non stub 3", url: "url", parent: root, context: context)
+            nonStub3.addToFavorites(folders: favorites)
 
             try? context.save()
         }
diff --git a/DuckDuckGo/Sync/SyncErrorHandler.swift b/DuckDuckGo/Sync/SyncErrorHandler.swift
index 15f94ac550..036c041fb7 100644
--- a/DuckDuckGo/Sync/SyncErrorHandler.swift
+++ b/DuckDuckGo/Sync/SyncErrorHandler.swift
@@ -19,12 +19,13 @@
 import Common
 import DDGSync
 import Foundation
+import PixelKit
 
 public class SyncErrorHandler: EventMapping<SyncError> {
 
     public init() {
         super.init { event, _, _, _ in
-            Pixel.fire(.debug(event: .syncSentUnauthenticatedRequest, error: event))
+            PixelKit.fire(DebugEvent(GeneralPixel.syncSentUnauthenticatedRequest, error: event))
         }
     }
 
diff --git a/DuckDuckGo/Sync/SyncMetricsEventsHandler.swift b/DuckDuckGo/Sync/SyncMetricsEventsHandler.swift
index 2c94d341f6..f5c29f6e7d 100644
--- a/DuckDuckGo/Sync/SyncMetricsEventsHandler.swift
+++ b/DuckDuckGo/Sync/SyncMetricsEventsHandler.swift
@@ -19,6 +19,7 @@
 import Common
 import SyncDataProviders
 import Foundation
+import PixelKit
 
 public class SyncMetricsEventsHandler: EventMapping<MetricsEvent> {
 
@@ -26,9 +27,9 @@ public class SyncMetricsEventsHandler: EventMapping<MetricsEvent> {
         super.init { event, _, _, _ in
             switch event {
             case .overrideEmailProtectionSettings:
-                Pixel.fire(.syncDuckAddressOverride)
+                PixelKit.fire(GeneralPixel.syncDuckAddressOverride)
             case .localTimestampResolutionTriggered(let feature):
-                Pixel.fire(.syncLocalTimestampResolutionTriggered(feature))
+                PixelKit.fire(GeneralPixel.syncLocalTimestampResolutionTriggered(feature))
             }
         }
     }
diff --git a/DuckDuckGo/Sync/SyncSettingsAdapter.swift b/DuckDuckGo/Sync/SyncSettingsAdapter.swift
index 96fc030a0d..f726673087 100644
--- a/DuckDuckGo/Sync/SyncSettingsAdapter.swift
+++ b/DuckDuckGo/Sync/SyncSettingsAdapter.swift
@@ -23,6 +23,7 @@ import Common
 import DDGSync
 import Persistence
 import SyncDataProviders
+import PixelKit
 
 extension SettingsProvider.Setting {
     static let favoritesDisplayMode = SettingsProvider.Setting(key: "favorites_display_mode")
@@ -63,18 +64,18 @@ final class SyncSettingsAdapter {
             .sink { error in
                 switch error {
                 case let syncError as SyncError:
-                    Pixel.fire(.debug(event: .syncSettingsFailed, error: syncError))
+                    PixelKit.fire(DebugEvent(GeneralPixel.syncSettingsFailed, error: syncError))
                 case let settingsMetadataError as SettingsSyncMetadataSaveError:
                     let underlyingError = settingsMetadataError.underlyingError
                     let processedErrors = CoreDataErrorsParser.parse(error: underlyingError as NSError)
                     let params = processedErrors.errorPixelParameters
-                    Pixel.fire(.debug(event: .syncSettingsMetadataUpdateFailed, error: underlyingError), withAdditionalParameters: params)
+                    PixelKit.fire(DebugEvent(GeneralPixel.syncSettingsMetadataUpdateFailed, error: underlyingError), withAdditionalParameters: params)
                 default:
                     let nsError = error as NSError
                     if nsError.domain != NSURLErrorDomain {
                         let processedErrors = CoreDataErrorsParser.parse(error: error as NSError)
                         let params = processedErrors.errorPixelParameters
-                        Pixel.fire(.debug(event: .syncSettingsFailed, error: error), withAdditionalParameters: params)
+                        PixelKit.fire(DebugEvent(GeneralPixel.syncSettingsFailed, error: error), withAdditionalParameters: params)
                     }
                 }
                 os_log(.error, log: OSLog.sync, "Settings Sync error: %{public}s", String(reflecting: error))
diff --git a/DuckDuckGo/Tab/Model/NewWindowPolicy.swift b/DuckDuckGo/Tab/Model/NewWindowPolicy.swift
index ca9e575d29..80e237929e 100644
--- a/DuckDuckGo/Tab/Model/NewWindowPolicy.swift
+++ b/DuckDuckGo/Tab/Model/NewWindowPolicy.swift
@@ -20,14 +20,15 @@ import Foundation
 import WebKit
 
 enum NewWindowPolicy {
-    case tab(selected: Bool, burner: Bool)
+    case tab(selected: Bool, burner: Bool, contextMenuInitiated: Bool = false)
     case popup(origin: NSPoint?, size: NSSize?)
     case window(active: Bool, burner: Bool)
 
-    init(_ windowFeatures: WKWindowFeatures, shouldSelectNewTab: Bool = false, isBurner: Bool) {
+    init(_ windowFeatures: WKWindowFeatures, shouldSelectNewTab: Bool = false, isBurner: Bool, contextMenuInitiated: Bool = false) {
         if windowFeatures.toolbarsVisibility?.boolValue == true {
             self = .tab(selected: shouldSelectNewTab,
-                        burner: isBurner)
+                        burner: isBurner,
+                        contextMenuInitiated: contextMenuInitiated)
         } else if windowFeatures.width != nil {
             self = .popup(origin: windowFeatures.origin, size: windowFeatures.size)
 
@@ -37,7 +38,7 @@ enum NewWindowPolicy {
         // See https://app.asana.com/0/1177771139624306/1205690527704551/f.
         if #available(macOS 14.1, *),
            windowFeatures.statusBarVisibility == nil && windowFeatures.menuBarVisibility == nil {
-            self = .tab(selected: shouldSelectNewTab, burner: isBurner)
+            self = .tab(selected: shouldSelectNewTab, burner: isBurner, contextMenuInitiated: contextMenuInitiated)
 
         } else {
             self = .window(active: true, burner: isBurner)
@@ -49,10 +50,30 @@ enum NewWindowPolicy {
         return false
     }
     var isSelectedTab: Bool {
-        if case .tab(selected: true, burner: _) = self { return true }
+        if case .tab(selected: true, burner: _, contextMenuInitiated: _) = self { return true }
         return false
     }
 
+    /**
+     * Replaces `.tab` with `.window` when user prefers windows over tabs.
+     */
+    func preferringTabsToWindows(_ prefersTabsToWindows: Bool) -> NewWindowPolicy {
+        guard case .tab(_, let isBurner, contextMenuInitiated: false) = self, !prefersTabsToWindows else {
+            return self
+        }
+        return .window(active: true, burner: isBurner)
+    }
+
+    /**
+     * Forces selecting a tab if `true` is passed as argument.
+     */
+    func preferringSelectedTabs(_ prefersSelectedTabs: Bool) -> NewWindowPolicy {
+        guard case .tab(selected: false, burner: let isBurner, contextMenuInitiated: let contextMenuInitiated) = self, prefersSelectedTabs else {
+            return self
+        }
+        return .tab(selected: true, burner: isBurner, contextMenuInitiated: contextMenuInitiated)
+    }
+
 }
 
 extension WKWindowFeatures {
diff --git a/DuckDuckGo/Tab/Model/Tab+Dialogs.swift b/DuckDuckGo/Tab/Model/Tab+Dialogs.swift
index 6a79217db6..851e103161 100644
--- a/DuckDuckGo/Tab/Model/Tab+Dialogs.swift
+++ b/DuckDuckGo/Tab/Model/Tab+Dialogs.swift
@@ -40,7 +40,7 @@ typealias AlertDialogRequest = UserDialogRequest<JSAlertParameters, Void>
 typealias BasicAuthDialogRequest = UserDialogRequest<URLProtectionSpace, AuthChallengeDisposition?>
 typealias PrintDialogRequest = UserDialogRequest<NSPrintOperation, Bool>
 
-enum JSAlertQuery {
+enum JSAlertQuery: Equatable {
     case confirm(ConfirmDialogRequest)
     case textInput(TextInputDialogRequest)
     case alert(AlertDialogRequest)
@@ -55,16 +55,35 @@ enum JSAlertQuery {
             return request.submit(nil)
         }
     }
+
+    static func == (lhs: JSAlertQuery, rhs: JSAlertQuery) -> Bool {
+        switch lhs {
+        case .confirm(let r1): if case .confirm(let r2) = rhs { r1 === r2 } else { false }
+        case .textInput(let r1): if case .textInput(let r2) = rhs { r1 === r2 } else { false }
+        case .alert(let r1): if case .alert(let r2) = rhs { r1 === r2 } else { false }
+        }
+    }
 }
 
 extension Tab {
 
-    enum UserDialogType {
+    enum UserDialogType: Equatable {
         case openPanel(OpenPanelDialogRequest)
         case savePanel(SavePanelDialogRequest)
         case jsDialog(JSAlertQuery)
         case basicAuthenticationChallenge(BasicAuthDialogRequest)
         case print(PrintDialogRequest)
+
+        static func == (lhs: Tab.UserDialogType, rhs: Tab.UserDialogType) -> Bool {
+            switch lhs {
+            case .openPanel(let r1): if case .openPanel(let r2) = rhs { r1 === r2 } else { false }
+            case .savePanel(let r1): if case .savePanel(let r2) = rhs { r1 === r2 } else { false }
+            case .jsDialog(let r1): if case .jsDialog(let r2) = rhs { r1 == r2 } else { false }
+            case .basicAuthenticationChallenge(let r1): if case .basicAuthenticationChallenge(let r2) = rhs { r1 === r2 } else { false }
+            case .print(let r1): if case .print(let r2) = rhs { r1 === r2 } else { false }
+            }
+        }
+
     }
 
     enum UserDialogSender: Equatable {
@@ -72,7 +91,7 @@ extension Tab {
         case page(domain: String)
     }
 
-    struct UserDialog {
+    struct UserDialog: Equatable {
         let sender: UserDialogSender
         let dialog: UserDialogType
 
@@ -87,6 +106,11 @@ extension Tab {
             case .print(let request): return request
             }
         }
+
+        static func == (lhs: Tab.UserDialog, rhs: Tab.UserDialog) -> Bool {
+            lhs.sender == rhs.sender && rhs.dialog == rhs.dialog
+        }
+
     }
 
 }
diff --git a/DuckDuckGo/Tab/Model/Tab+Navigation.swift b/DuckDuckGo/Tab/Model/Tab+Navigation.swift
index 7addf60028..2b86d68118 100644
--- a/DuckDuckGo/Tab/Model/Tab+Navigation.swift
+++ b/DuckDuckGo/Tab/Model/Tab+Navigation.swift
@@ -42,6 +42,7 @@ extension Tab: NavigationResponder {
     func setupNavigationDelegate() {
         navigationDelegate.setResponders(
             .weak(nullable: self.navigationHotkeyHandler),
+            .weak(nullable: self.brokenSiteInfo),
 
             // redirect to SERP for non-valid domains entered by user
             // should be before `self` to avoid Tab presenting an error screen
@@ -70,6 +71,8 @@ extension Tab: NavigationResponder {
             // add extra headers to SERP requests
             .struct(SerpHeadersNavigationResponder()),
 
+            .struct(RedirectNavigationResponder()),
+
             // ensure Content Blocking Rules are applied before navigation
             .weak(nullable: self.contentBlockingAndSurrogates),
             // update click-to-load state
@@ -83,8 +86,13 @@ extension Tab: NavigationResponder {
             // Tab Snapshots
             .weak(nullable: self.tabSnapshots),
 
+            // Error Page
+            .weak(nullable: self.errorPage),
+
             // should be the last, for Unit Tests navigation events tracking
-            .struct(nullable: testsClosureNavigationResponder)
+            .struct(nullable: testsClosureNavigationResponder),
+
+            .weak(nullable: self.networkProtection)
         )
 
         newWindowPolicyDecisionMakers = [NewWindowPolicyDecisionMaker?](arrayLiteral:
diff --git a/DuckDuckGo/Tab/Model/Tab+UIDelegate.swift b/DuckDuckGo/Tab/Model/Tab+UIDelegate.swift
index 26ae48bca4..81b12ca0b0 100644
--- a/DuckDuckGo/Tab/Model/Tab+UIDelegate.swift
+++ b/DuckDuckGo/Tab/Model/Tab+UIDelegate.swift
@@ -85,11 +85,12 @@ extension Tab: WKUIDelegate, PrintingUserScriptDelegate {
                                             windowFeatures: WKWindowFeatures,
                                             completionHandler: @escaping (WKWebView?) -> Void) {
 
-        switch newWindowPolicy(for: navigationAction) {
+        switch newWindowPolicy(for: navigationAction)?.preferringTabsToWindows(tabsPreferences.preferNewTabsToWindows) {
         // popup kind is known, action doesn‘t require Popup Permission
         case .allow(let targetKind):
             // proceed to web view creation
-            completionHandler(self.createWebView(from: webView, with: configuration, for: navigationAction, of: targetKind))
+            completionHandler(self.createWebView(from: webView, with: configuration,
+                                                 for: navigationAction, of: targetKind.preferringSelectedTabs(tabsPreferences.switchToNewTabWhenOpened)))
             return
         case .cancel:
             // navigation action was handled before and cancelled
@@ -99,9 +100,10 @@ extension Tab: WKUIDelegate, PrintingUserScriptDelegate {
             break
         }
 
-        let shouldSelectNewTab = !NSApp.isCommandPressed // this is actually not correct, to be fixed later
+        let shouldSelectNewTab = !NSApp.isCommandPressed || tabsPreferences.switchToNewTabWhenOpened // this is actually not correct, to be fixed later
         // try to guess popup kind from provided windowFeatures
         let targetKind = NewWindowPolicy(windowFeatures, shouldSelectNewTab: shouldSelectNewTab, isBurner: burnerMode.isBurner)
+            .preferringTabsToWindows(tabsPreferences.preferNewTabsToWindows)
 
         // action doesn‘t require Popup Permission as it‘s user-initiated
         // TO BE FIXED: this also opens a new window when a popup ad is shown on click simultaneously with the main frame navigation:
@@ -154,10 +156,13 @@ extension Tab: WKUIDelegate, PrintingUserScriptDelegate {
     @MainActor
     private func createWebView(from webView: WKWebView, with configuration: WKWebViewConfiguration, for navigationAction: WKNavigationAction, of kind: NewWindowPolicy) -> WKWebView? {
         guard let delegate else { return nil }
+        // disable opening 'javascript:' links in new tab
+        guard navigationAction.request.url?.navigationalScheme != .javascript else { return nil }
 
         let tab = Tab(content: .none,
                       webViewConfiguration: configuration,
                       parentTab: self,
+                      securityOrigin: navigationAction.safeSourceFrame.map { SecurityOrigin($0.securityOrigin) },
                       burnerMode: burnerMode,
                       canBeClosedWithBack: kind.isSelectedTab,
                       webViewSize: webView.superview?.bounds.size ?? .zero)
diff --git a/DuckDuckGo/Tab/Model/Tab.swift b/DuckDuckGo/Tab/Model/Tab.swift
index 6fd7bffd3a..1fd8c17493 100644
--- a/DuckDuckGo/Tab/Model/Tab.swift
+++ b/DuckDuckGo/Tab/Model/Tab.swift
@@ -19,22 +19,12 @@
 import BrowserServicesKit
 import Combine
 import Common
-import ContentBlocking
 import Foundation
 import Navigation
 import UserScript
 import WebKit
 import History
-import PrivacyDashboard
-
-#if SUBSCRIPTION
-import Subscription
-#endif
-
-#if NETWORK_PROTECTION
-import NetworkProtection
-import NetworkProtectionIPC
-#endif
+import PixelKit
 
 // swiftlint:disable file_length
 
@@ -55,275 +45,6 @@ protocol NewWindowPolicyDecisionMaker {
 // swiftlint:disable:next type_body_length
 @dynamicMemberLookup final class Tab: NSObject, Identifiable, ObservableObject {
 
-    enum TabContent: Equatable {
-        case newtab
-        case url(URL, credential: URLCredential? = nil, source: URLSource)
-        case settings(pane: PreferencePaneIdentifier?)
-        case bookmarks
-        case onboarding
-        case none
-        case dataBrokerProtection
-        case subscription(URL)
-        case identityTheftRestoration(URL)
-
-        enum URLSource: Equatable {
-            case pendingStateRestoration
-            case loadedByStateRestoration
-            case userEntered(String, downloadRequested: Bool = false)
-            case historyEntry
-            case bookmark
-            case ui
-            case link
-            case appOpenUrl
-            case reload
-
-            case webViewUpdated
-
-            var userEnteredValue: String? {
-                if case .userEntered(let userEnteredValue, _) = self {
-                    userEnteredValue
-                } else {
-                    nil
-                }
-            }
-
-            var isUserEnteredUrl: Bool {
-                userEnteredValue != nil
-            }
-
-            var navigationType: NavigationType {
-                switch self {
-                case .userEntered(_, downloadRequested: true):
-                    .custom(.userRequestedPageDownload)
-                case .userEntered:
-                    .custom(.userEnteredUrl)
-                case .pendingStateRestoration:
-                    .sessionRestoration
-                case .loadedByStateRestoration, .appOpenUrl, .historyEntry, .bookmark, .ui, .link, .webViewUpdated:
-                    .custom(.tabContentUpdate)
-                case .reload:
-                    .reload
-                }
-            }
-
-            var cachePolicy: URLRequest.CachePolicy {
-                switch self {
-                case .pendingStateRestoration, .historyEntry:
-                    .returnCacheDataElseLoad
-                case .reload, .loadedByStateRestoration:
-                    .reloadIgnoringCacheData
-                case .userEntered, .bookmark, .ui, .link, .appOpenUrl, .webViewUpdated:
-                    .useProtocolCachePolicy
-                }
-            }
-
-        }
-
-        // swiftlint:disable:next cyclomatic_complexity
-        static func contentFromURL(_ url: URL?, source: URLSource) -> TabContent {
-            switch url {
-            case URL.newtab, URL.Invalid.aboutNewtab, URL.Invalid.duckHome:
-                return .newtab
-            case URL.welcome, URL.Invalid.aboutWelcome:
-                return .onboarding
-            case URL.settings, URL.Invalid.aboutPreferences, URL.Invalid.aboutConfig, URL.Invalid.aboutSettings, URL.Invalid.duckConfig, URL.Invalid.duckPreferences:
-                return .anySettingsPane
-            case URL.bookmarks, URL.Invalid.aboutBookmarks:
-                return .bookmarks
-            case URL.dataBrokerProtection:
-                return .dataBrokerProtection
-            case URL.Invalid.aboutHome:
-                guard let customURL = URL(string: StartupPreferences.shared.formattedCustomHomePageURL) else {
-                    return .newtab
-                }
-                return .url(customURL, source: source)
-            default: break
-            }
-
-#if SUBSCRIPTION
-            if let url {
-                if url.isChild(of: URL.subscriptionBaseURL) {
-                    if SubscriptionPurchaseEnvironment.currentServiceEnvironment == .staging, url.getParameter(named: "environment") == nil {
-                        return .subscription(url.appendingParameter(name: "environment", value: "staging"))
-                    }
-                    return .subscription(url)
-                } else if url.isChild(of: URL.identityTheftRestoration) {
-                    return .identityTheftRestoration(url)
-                }
-            }
-#endif
-
-            if let settingsPane = url.flatMap(PreferencePaneIdentifier.init(url:)) {
-                return .settings(pane: settingsPane)
-            } else if let url, let credential = url.basicAuthCredential {
-                // when navigating to a URL with basic auth username/password, cache it and redirect to a trimmed URL
-                return .url(url.removingBasicAuthCredential(), credential: credential, source: source)
-            } else {
-                return .url(url ?? .blankPage, source: source)
-            }
-        }
-
-        static var displayableTabTypes: [TabContent] {
-            // Add new displayable types here
-            let displayableTypes = [TabContent.anySettingsPane, .bookmarks]
-
-            return displayableTypes.sorted { first, second in
-                guard let firstTitle = first.title, let secondTitle = second.title else {
-                    return true // Arbitrary sort order, only non-standard tabs are displayable.
-                }
-                return firstTitle.localizedStandardCompare(secondTitle) == .orderedAscending
-            }
-        }
-
-        /// Convenience accessor for `.preferences` Tab Content with no particular pane selected,
-        /// i.e. the currently selected pane is decided internally by `PreferencesViewController`.
-        static let anySettingsPane: Self = .settings(pane: nil)
-
-        var isDisplayable: Bool {
-            switch self {
-            case .settings, .bookmarks, .dataBrokerProtection, .subscription, .identityTheftRestoration:
-                return true
-            default:
-                return false
-            }
-        }
-
-        func matchesDisplayableTab(_ other: TabContent) -> Bool {
-            switch (self, other) {
-            case (.settings, .settings):
-                return true
-            case (.bookmarks, .bookmarks):
-                return true
-            case (.dataBrokerProtection, .dataBrokerProtection):
-                return true
-            case (.subscription, .subscription):
-                return true
-            case (.identityTheftRestoration, .identityTheftRestoration):
-                return true
-            default:
-                return false
-            }
-        }
-
-        var title: String? {
-            switch self {
-            case .url, .newtab, .none: return nil
-            case .settings: return UserText.tabPreferencesTitle
-            case .bookmarks: return UserText.tabBookmarksTitle
-            case .onboarding: return UserText.tabOnboardingTitle
-            case .dataBrokerProtection: return UserText.tabDataBrokerProtectionTitle
-            case .subscription, .identityTheftRestoration: return nil
-            }
-        }
-
-        var url: URL? {
-            userEditableUrl
-        }
-
-        var userEditableUrl: URL? {
-            switch self {
-            case .url(let url, credential: _, source: _) where !(url.isDuckPlayer || url.isDuckURLScheme):
-                return url
-            default:
-                return nil
-            }
-        }
-
-        var urlForWebView: URL? {
-            switch self {
-            case .url(let url, credential: _, source: _):
-                return url
-            case .newtab:
-                return .newtab
-            case .settings(pane: .some(let pane)):
-                return .settingsPane(pane)
-            case .settings(pane: .none):
-                return .settings
-            case .bookmarks:
-                return .bookmarks
-            case .onboarding:
-                return .welcome
-            case .dataBrokerProtection:
-                return .dataBrokerProtection
-            case .subscription(let url), .identityTheftRestoration(let url):
-                return url
-            case .none:
-                return nil
-            }
-        }
-
-        var source: URLSource {
-            switch self {
-            case .url(_, _, source: let source):
-                return source
-            case .newtab, .settings, .bookmarks, .onboarding, .dataBrokerProtection,
-                 .subscription, .identityTheftRestoration, .none:
-                return .ui
-            }
-        }
-
-        var isUrl: Bool {
-            switch self {
-            case .url, .subscription, .identityTheftRestoration:
-                return true
-            default:
-                return false
-            }
-        }
-
-        var userEnteredValue: String? {
-            switch self {
-            case .url(_, credential: _, source: let source):
-                return source.userEnteredValue
-            default:
-                return nil
-            }
-        }
-
-        var isUserEnteredUrl: Bool {
-            userEnteredValue != nil
-        }
-
-        var isUserRequestedPageDownload: Bool {
-            if case .url(_, credential: _, source: .userEntered(_, downloadRequested: true)) = self {
-                return true
-            } else {
-                return false
-            }
-        }
-
-        var displaysContentInWebView: Bool {
-            isUrl
-        }
-
-        var canBeDuplicated: Bool {
-            switch self {
-            case .settings, .subscription, .identityTheftRestoration, .dataBrokerProtection:
-                return false
-            default:
-                return true
-            }
-        }
-
-        var canBePinned: Bool {
-            switch self {
-            case .subscription, .identityTheftRestoration, .dataBrokerProtection:
-                return false
-            default:
-                return isUrl
-            }
-        }
-
-        var canBeBookmarked: Bool {
-            switch self {
-            case .subscription, .identityTheftRestoration, .dataBrokerProtection:
-                return false
-            default:
-                return isUrl
-            }
-        }
-
-    }
     private struct ExtensionDependencies: TabExtensionDependencies {
         let privacyFeatures: PrivacyFeaturesProtocol
         let historyCoordinating: HistoryCoordinating
@@ -331,6 +52,8 @@ protocol NewWindowPolicyDecisionMaker {
         var cbaTimeReporter: ContentBlockingAssetsCompilationTimeReporter?
         let duckPlayer: DuckPlayer
         var downloadManager: FileDownloadManagerProtocol
+        var certificateTrustEvaluator: CertificateTrustEvaluating
+        var tunnelController: NetworkProtectionIPCTunnelController?
     }
 
     fileprivate weak var delegate: TabDelegate?
@@ -344,13 +67,10 @@ protocol NewWindowPolicyDecisionMaker {
     private let internalUserDecider: InternalUserDecider?
     let pinnedTabsManager: PinnedTabsManager
 
-#if NETWORK_PROTECTION
-    private(set) var tunnelController: NetworkProtectionIPCTunnelController?
-#endif
-
     private let webViewConfiguration: WKWebViewConfiguration
 
     let startupPreferences: StartupPreferences
+    let tabsPreferences: TabsPreferences
 
     private var extensions: TabExtensions
     // accesing TabExtensions‘ Public Protocols projecting tab.extensions.extensionName to tab.extensionName
@@ -359,7 +79,6 @@ protocol NewWindowPolicyDecisionMaker {
         self.extensions[keyPath: keyPath]
     }
 
-    @Published
     private(set) var userContentController: UserContentController?
 
     @MainActor
@@ -382,12 +101,16 @@ protocol NewWindowPolicyDecisionMaker {
                      favicon: NSImage? = nil,
                      interactionStateData: Data? = nil,
                      parentTab: Tab? = nil,
+                     securityOrigin: SecurityOrigin? = nil,
                      shouldLoadInBackground: Bool = false,
                      burnerMode: BurnerMode = .regular,
                      canBeClosedWithBack: Bool = false,
                      lastSelectedAt: Date? = nil,
                      webViewSize: CGSize = CGSize(width: 1024, height: 768),
-                     startupPreferences: StartupPreferences = StartupPreferences.shared
+                     startupPreferences: StartupPreferences = StartupPreferences.shared,
+                     certificateTrustEvaluator: CertificateTrustEvaluating = CertificateTrustEvaluator(),
+                     tunnelController: NetworkProtectionIPCTunnelController? = TunnelControllerProvider.shared.tunnelController,
+                     tabsPreferences: TabsPreferences = TabsPreferences.shared
     ) {
 
         let duckPlayer = duckPlayer
@@ -421,12 +144,16 @@ protocol NewWindowPolicyDecisionMaker {
                   favicon: favicon,
                   interactionStateData: interactionStateData,
                   parentTab: parentTab,
+                  securityOrigin: securityOrigin,
                   shouldLoadInBackground: shouldLoadInBackground,
                   burnerMode: burnerMode,
                   canBeClosedWithBack: canBeClosedWithBack,
                   lastSelectedAt: lastSelectedAt,
                   webViewSize: webViewSize,
-                  startupPreferences: startupPreferences)
+                  startupPreferences: startupPreferences,
+                  certificateTrustEvaluator: certificateTrustEvaluator,
+                  tunnelController: tunnelController,
+                  tabsPreferences: tabsPreferences)
     }
 
     @MainActor
@@ -451,12 +178,16 @@ protocol NewWindowPolicyDecisionMaker {
          favicon: NSImage?,
          interactionStateData: Data?,
          parentTab: Tab?,
+         securityOrigin: SecurityOrigin? = nil,
          shouldLoadInBackground: Bool,
          burnerMode: BurnerMode,
          canBeClosedWithBack: Bool,
          lastSelectedAt: Date?,
          webViewSize: CGSize,
-         startupPreferences: StartupPreferences
+         startupPreferences: StartupPreferences,
+         certificateTrustEvaluator: CertificateTrustEvaluating,
+         tunnelController: NetworkProtectionIPCTunnelController?,
+         tabsPreferences: TabsPreferences
     ) {
 
         self.content = content
@@ -467,11 +198,13 @@ protocol NewWindowPolicyDecisionMaker {
         self.title = title
         self.favicon = favicon
         self.parentTab = parentTab
+        self.securityOrigin = securityOrigin ?? .empty
         self.burnerMode = burnerMode
         self._canBeClosedWithBack = canBeClosedWithBack
         self.interactionState = interactionStateData.map(InteractionState.loadCachedFromTabContent) ?? .none
         self.lastSelectedAt = lastSelectedAt
         self.startupPreferences = startupPreferences
+        self.tabsPreferences = tabsPreferences
 
         let configuration = webViewConfiguration ?? WKWebViewConfiguration()
         configuration.applyStandardConfiguration(contentBlocking: privacyFeatures.contentBlocking,
@@ -513,7 +246,9 @@ protocol NewWindowPolicyDecisionMaker {
                                                        workspace: workspace,
                                                        cbaTimeReporter: cbaTimeReporter,
                                                        duckPlayer: duckPlayer,
-                                                       downloadManager: downloadManager))
+                                                       downloadManager: downloadManager,
+                                                       certificateTrustEvaluator: certificateTrustEvaluator,
+                                                       tunnelController: tunnelController))
 
         super.init()
         tabGetter = { [weak self] in self }
@@ -534,20 +269,7 @@ protocol NewWindowPolicyDecisionMaker {
                 self?.onDuckDuckGoEmailSignOut(notification)
             }
 
-#if NETWORK_PROTECTION
-        netPOnboardStatusCancellabel = DefaultNetworkProtectionVisibility().onboardStatusPublisher
-            .receive(on: DispatchQueue.main)
-            .sink { [weak self] onboardingStatus in
-                guard onboardingStatus == .completed else { return }
-
-                let ipcClient = TunnelControllerIPCClient()
-                ipcClient.register()
-
-                self?.tunnelController = NetworkProtectionIPCTunnelController(ipcClient: ipcClient)
-            }
-#endif
-
-        self.audioState = webView.audioState()
+        self.audioState = webView.audioState
         addDeallocationChecks(for: webView)
     }
 
@@ -611,15 +333,15 @@ protocol NewWindowPolicyDecisionMaker {
     }
 
     deinit {
-        cleanUpBeforeClosing(onDeinit: true)
+        cleanUpBeforeClosing(onDeinit: true, webView: webView, userContentController: userContentController)
     }
 
     func cleanUpBeforeClosing() {
-        cleanUpBeforeClosing(onDeinit: false)
+        cleanUpBeforeClosing(onDeinit: false, webView: webView, userContentController: userContentController)
     }
 
     @MainActor(unsafe)
-    private func cleanUpBeforeClosing(onDeinit: Bool) {
+    private func cleanUpBeforeClosing(onDeinit: Bool, webView: WebView, userContentController: UserContentController?) {
         let job = { [webView, userContentController] in
             webView.stopAllMedia(shouldStopLoading: true)
 
@@ -660,13 +382,18 @@ protocol NewWindowPolicyDecisionMaker {
 
     // MARK: - Event Publishers
 
-    let webViewDidStartNavigationPublisher = PassthroughSubject<Void, Never>()
-    let webViewDidReceiveUserInteractiveChallengePublisher = PassthroughSubject<Void, Never>()
-    let webViewDidReceiveRedirectPublisher = PassthroughSubject<Void, Never>()
-    var webViewDidCommitNavigationPublisher: some Publisher<Void, Never> {
-        $committedURL.dropFirst().asVoid()
+    /// Publishes currently active main frame Navigation state
+    var navigationStatePublisher: some Publisher<NavigationState?, Never> {
+        navigationDelegate.$currentNavigation.map { currentNavigation -> AnyPublisher<NavigationState?, Never> in
+            MainActor.assumeIsolated {
+                currentNavigation?.$state.map { $0 }.eraseToAnyPublisher() ?? Just(nil).eraseToAnyPublisher()
+            }
+        }.switchToLatest()
+    }
+
+    var webViewDidFinishNavigationPublisher: some Publisher<Void, Never> {
+        navigationStatePublisher.compactMap { $0 }.filter { $0.isFinished }.asVoid()
     }
-    let webViewDidFinishNavigationPublisher = PassthroughSubject<Void, Never>()
 
     // MARK: - Properties
 
@@ -687,16 +414,19 @@ protocol NewWindowPolicyDecisionMaker {
             if navigationDelegate.currentNavigation == nil {
                 updateCanGoBackForward(withCurrentNavigation: nil)
             }
-            error = nil
         }
     }
 
-    /// Use this property to obtain the accurate URL of the displayed content
+    /// Currently committed page security origin (protocol, host, port).
     ///
-    /// When a navigation request is made, the web view goes through a series of steps to load and display the requested content.
-    /// The committedURL property reflects the URL of the web page that has undergone this process and is currently being displayed in the web view.
-    /// Navigations that are still in progress or not yet committed won't have their URLs reflected in the committedURL property.
-    @PublishedAfter private(set) var committedURL: URL?
+    /// Set to the opener location security origin for popup Tabs.
+    /// Used to safely update the Address Bar displayed URL to protect from spoofing attacks
+    ///
+    /// see https://github.com/mozilla-mobile/firefox-ios/wiki/WKWebView-navigation-and-security-considerations
+    @Published private(set) var securityOrigin: SecurityOrigin = .empty
+
+    /// Set to true when the Tab‘s first navigation is committed
+    @Published var hasCommittedContent = false
 
     @discardableResult
     func setContent(_ newContent: TabContent) -> ExpectedNavigation? {
@@ -722,6 +452,8 @@ protocol NewWindowPolicyDecisionMaker {
             self.title = title
         }
 
+        if error != nil { error = nil }
+
         return reloadIfNeeded(source: .contentUpdated)
     }
 
@@ -734,12 +466,15 @@ protocol NewWindowPolicyDecisionMaker {
         if let url = webView.url {
             let content = TabContent.contentFromURL(url, source: .webViewUpdated)
 
-            if self.content.isUrl, self.content.url == url {
+            if self.content.isUrl, self.content.urlForWebView == url {
                 // ignore content updates when tab.content has userEntered or credential set but equal url as it comes from the WebView url updated event
             } else if content != self.content {
                 self.content = content
             }
-        } else if self.content.isUrl {
+        } else if self.content.isUrl,
+                  // DuckURLSchemeHandler redirects duck:// address to a simulated request
+                  // ignore webView.url temporarily switching to `nil`
+                  self.content.urlForWebView?.isDuckPlayer != true {
             // when e.g. opening a download in new tab - web view restores `nil` after the navigation is interrupted
             // maybe it worths adding another content type like .interruptedLoad(URL) to display a URL in the address bar
             self.content = .none
@@ -776,13 +511,6 @@ protocol NewWindowPolicyDecisionMaker {
     }
     let permissions: PermissionModel
 
-    @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
 
@@ -859,7 +587,7 @@ protocol NewWindowPolicyDecisionMaker {
     @MainActor
     var currentHistoryItem: BackForwardListItem? {
         webView.backForwardList.currentItem.map(BackForwardListItem.init)
-        ?? (content.url ?? navigationDelegate.currentNavigation?.url).map { url in
+        ?? (content.urlForWebView ?? navigationDelegate.currentNavigation?.url).map { url in
             BackForwardListItem(kind: .url(url), title: webView.title ?? title, identity: nil)
         }
     }
@@ -888,7 +616,11 @@ protocol NewWindowPolicyDecisionMaker {
 
         let canGoBack = webView.canGoBack
         let canGoForward = webView.canGoForward
-        let canReload = self.content.userEditableUrl != nil
+        let canReload = if case .url(let url, credential: _, source: _) = content, !(url.isDuckPlayer || url.isDuckURLScheme) {
+            true
+        } else {
+            false
+        }
 
         if canGoBack != self.canGoBack {
             self.canGoBack = canGoBack
@@ -1001,7 +733,7 @@ protocol NewWindowPolicyDecisionMaker {
 
         if startupPreferences.launchToCustomHomePage,
            let customURL = URL(string: startupPreferences.formattedCustomHomePageURL) {
-            setContent(.url(customURL, credential: nil, source: .ui))
+            setContent(.contentFromURL(customURL, source: .ui))
         } else {
             setContent(.newtab)
         }
@@ -1018,6 +750,8 @@ protocol NewWindowPolicyDecisionMaker {
     func reload() -> ExpectedNavigation? {
         userInteractionDialog = nil
 
+        self.brokenSiteInfo?.tabReloadRequested()
+
         // In the case of an error only reload web URLs to prevent uxss attacks via redirecting to javascript://
         if let error = error,
            let failingUrl = error.failingUrl ?? content.urlForWebView,
@@ -1032,8 +766,6 @@ 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
@@ -1043,12 +775,11 @@ protocol NewWindowPolicyDecisionMaker {
         }
     }
 
-    @Published private(set) var audioState: WKWebView.AudioState = .notSupported
+    @Published private(set) var audioState: WKWebView.AudioState?
 
     func muteUnmuteTab() {
-        webView.muteOrUnmute()
-
-        audioState = webView.audioState()
+        webView.audioState.toggle()
+        audioState = webView.audioState
     }
 
     private enum ReloadIfNeededSource {
@@ -1077,8 +808,11 @@ protocol NewWindowPolicyDecisionMaker {
 
         let source = content.source
         if url.isFileURL {
+            // WebKit won‘t load local page‘s external resouces even with `allowingReadAccessTo` provided
+            // this could be fixed using a custom scheme handler loading local resources in future.
+            let readAccessScopeURL = url
             return webView.navigator(distributedNavigationDelegate: navigationDelegate)
-                .loadFileURL(url, allowingReadAccessTo: URL(fileURLWithPath: "/"), withExpectedNavigationType: source.navigationType)
+                .loadFileURL(url, allowingReadAccessTo: readAccessScopeURL, withExpectedNavigationType: source.navigationType)
         }
 
         var request = URLRequest(url: url, cachePolicy: source.cachePolicy)
@@ -1136,7 +870,12 @@ protocol NewWindowPolicyDecisionMaker {
         // only restore session from interactionStateData passed to Tab.init
         guard case .loadCachedFromTabContent(let interactionStateData) = self.interactionState else { return false }
 
-        if let url = content.urlForWebView, url.isFileURL {
+        switch content.urlForWebView {
+        case .some(let url) where url.isFileURL:
+#if APPSTORE
+            guard url.isWritableLocation() else { fallthrough }
+#endif
+
             // request file system access before restoration
             webView.navigator(distributedNavigationDelegate: navigationDelegate)
                 .loadFileURL(url, allowingReadAccessTo: url)?
@@ -1145,7 +884,8 @@ protocol NewWindowPolicyDecisionMaker {
                 }, navigationDidFail: { [weak self] _, _ in
                     self?.restoreInteractionState(with: interactionStateData)
                 })
-        } else {
+
+        default:
             restoreInteractionState(with: interactionStateData)
         }
 
@@ -1167,9 +907,10 @@ protocol NewWindowPolicyDecisionMaker {
     }
 
     func requestFireproofToggle() {
-        guard let url = content.userEditableUrl,
-              let host = url.host
-        else { return }
+        guard case .url(let url, _, _) = content,
+              url.navigationalScheme?.isHypertextScheme == true,
+              !url.isDuckPlayer,
+              let host = url.host else { return }
 
         _ = FireproofDomains.shared.toggle(domain: host)
     }
@@ -1177,10 +918,6 @@ protocol NewWindowPolicyDecisionMaker {
     private var webViewCancellables = Set<AnyCancellable>()
     private var emailDidSignOutCancellable: AnyCancellable?
 
-#if NETWORK_PROTECTION
-    private var netPOnboardStatusCancellabel: AnyCancellable?
-#endif
-
     private func setupWebView(shouldLoadInBackground: Bool) {
         webView.navigationDelegate = navigationDelegate
         webView.uiDelegate = self
@@ -1194,9 +931,9 @@ protocol NewWindowPolicyDecisionMaker {
 
         webView.observe(\.superview, options: .old) { [weak self] _, change in
             // if the webView is being added to superview - reload if needed
-            if case .some(.none) = change.oldValue {
-                self?.reloadIfNeeded(source: .webViewDisplayed)
-            }
+            guard case .some(.none) = change.oldValue else { return }
+
+            self?.reloadIfNeeded(source: .webViewDisplayed)
         }.store(in: &webViewCancellables)
 
         webView.publisher(for: \.url)
@@ -1226,12 +963,6 @@ protocol NewWindowPolicyDecisionMaker {
             .assign(to: \.loadingProgress, onWeaklyHeld: self)
             .store(in: &webViewCancellables)
 
-        webView.publisher(for: \.serverTrust)
-            .sink { [weak self] serverTrust in
-                self?.privacyInfo?.serverTrust = serverTrust
-            }
-            .store(in: &webViewCancellables)
-
         navigationDelegate.$currentNavigation.sink { [weak self] navigation in
             self?.updateCanGoBackForward(withCurrentNavigation: navigation)
         }.store(in: &webViewCancellables)
@@ -1274,7 +1005,7 @@ protocol NewWindowPolicyDecisionMaker {
             if cachedFavicon != favicon {
                 favicon = cachedFavicon
             }
-        } else if oldValue?.url?.host != url.host {
+        } else if oldValue?.urlForWebView?.host != url.host {
             // If the domain matches the previous value, just keep the same favicon
             favicon = nil
         }
@@ -1293,9 +1024,6 @@ extension Tab: UserContentControllerDelegate {
         userScripts.faviconScript.delegate = self
         userScripts.pageObserverScript.delegate = self
         userScripts.printingUserScript.delegate = self
-
-        performanceMetrics = PerformanceMetricsSubfeature(targetWebview: webView)
-        userScripts.contentScopeUserScriptIsolated.registerSubfeature(delegate: performanceMetrics!)
     }
 
 }
@@ -1316,7 +1044,7 @@ extension Tab: FaviconUserScriptDelegate {
                            for documentUrl: URL) {
         guard documentUrl != .error else { return }
         faviconManagement.handleFaviconLinks(faviconLinks, documentUrl: documentUrl) { favicon in
-            guard documentUrl == self.content.url, let favicon = favicon else {
+            guard documentUrl == self.content.urlForWebView, let favicon = favicon else {
                 return
             }
             self.favicon = favicon.image
@@ -1331,9 +1059,6 @@ extension Tab/*: NavigationResponder*/ { // to be moved to Tab+Navigation.swift
     func didReceive(_ challenge: URLAuthenticationChallenge, for navigation: Navigation?) async -> AuthChallengeDisposition? {
         guard challenge.protectionSpace.authenticationMethod == NSURLAuthenticationMethodHTTPBasic else { return nil }
 
-        // send this event only when we're interrupting loading and showing extra UI to the user
-        webViewDidReceiveUserInteractiveChallengePublisher.send()
-
         // when navigating to a URL with basic auth username/password, cache it and redirect to a trimmed URL
         if case .url(let url, credential: .some(let credential), source: let source) = content,
            url.matches(challenge.protectionSpace),
@@ -1357,31 +1082,19 @@ extension Tab/*: NavigationResponder*/ { // to be moved to Tab+Navigation.swift
         }
     }
 
-    func didReceiveRedirect(_ navigationAction: NavigationAction, for navigation: Navigation) {
-        webViewDidReceiveRedirectPublisher.send()
-    }
-
     @MainActor
     func didCommit(_ navigation: Navigation) {
-        committedURL = navigation.url
-    }
-
-    func resetRefreshCountIfNeeded(action: NavigationAction) {
-        switch action.navigationType {
-        case .reload, .other:
-            break
-        default:
-            refreshCountSinceLoad = 0
+        let securityOrigin = if !navigation.url.securityOrigin.isEmpty {
+            navigation.url.securityOrigin
+        } else {
+            navigation.navigationAction.sourceFrame.securityOrigin
         }
-    }
-
-    func setOpenerContextIfNeeded(action: NavigationAction) {
-        switch action.navigationType {
-        case .linkActivated, .formSubmitted:
-            inferredOpenerContext = .navigation
-        default:
-            break
+        if !securityOrigin.isEmpty || self.hasCommittedContent {
+            // don‘t reset the initially passed parent tab SecurityOrigin to an empty one for "about:blank" page
+            self.securityOrigin = securityOrigin
         }
+
+        hasCommittedContent = true
     }
 
     @MainActor
@@ -1389,9 +1102,6 @@ extension Tab/*: NavigationResponder*/ { // to be moved to Tab+Navigation.swift
         // 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 {
@@ -1401,7 +1111,7 @@ extension Tab/*: NavigationResponder*/ { // to be moved to Tab+Navigation.swift
                 // credential is removed from the URL and set to TabContent to be used on next Challenge
                 self.content = .url(navigationAction.url.removingBasicAuthCredential(), credential: credential, source: .webViewUpdated)
                 // reload URL without credentialss
-                request.url = self.content.url!
+                request.url = self.content.urlForWebView!
                 navigator.load(request)
             }
         }
@@ -1417,7 +1127,6 @@ extension Tab/*: NavigationResponder*/ { // to be moved to Tab+Navigation.swift
     @MainActor
     func willStart(_ navigation: Navigation) {
         if error != nil { error = nil }
-        if lastWebError != nil { lastWebError = nil }
 
         delegate?.tabWillStartNavigation(self, isUserInitiated: navigation.navigationAction.isUserInitiated)
     }
@@ -1427,49 +1136,28 @@ extension Tab/*: NavigationResponder*/ { // to be moved to Tab+Navigation.swift
         internalUserDecider?.markUserAsInternalIfNeeded(forUrl: webView.url,
                                                         response: navigationResponse.response as? HTTPURLResponse)
 
-        lastHttpStatusCode = navigationResponse.httpStatusCode
-
         return .next
     }
 
     @MainActor
     func didStart(_ navigation: Navigation) {
-        webViewDidStartNavigationPublisher.send()
         delegate?.tabDidStartNavigation(self)
         permissions.tabDidStartNavigation()
         userInteractionDialog = nil
 
         // Unnecessary assignment triggers publishing
-        if lastWebError != nil { lastWebError = nil }
         if error != nil,
            navigation.navigationAction.navigationType != .alternateHtmlLoad { // error page navigation
             error = nil
         }
 
-        if inferredOpenerContext != .external {
-            inferredOpenerContext = nil
-        }
-
         invalidateInteractionStateData()
     }
 
     @MainActor
     func navigationDidFinish(_ navigation: Navigation) {
         invalidateInteractionStateData()
-        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)
-        }
-#endif
     }
 
     @MainActor
@@ -1477,9 +1165,6 @@ extension Tab/*: NavigationResponder*/ { // to be moved to Tab+Navigation.swift
         guard navigation.isCurrent else { return }
 
         invalidateInteractionStateData()
-        if navigation.url.host == committedURL?.host {
-            committedURL = navigation.url
-        }
     }
 
     @MainActor
@@ -1490,27 +1175,24 @@ extension Tab/*: NavigationResponder*/ { // to be moved to Tab+Navigation.swift
         invalidateInteractionStateData()
 
         if !error.isFrameLoadInterrupted, !error.isNavigationCancelled,
-           // don‘t show an error page if the error was already handled
-           // (by SearchNonexistentDomainNavigationResponder) or another navigation was triggered by `setContent`
-           self.content.urlForWebView == url {
+                   // don‘t show an error page if the error was already handled
+                   // (by SearchNonexistentDomainNavigationResponder) or another navigation was triggered by `setContent`
+            self.content.urlForWebView == url || self.content == .none /* when navigation fails instantly we may have no content set yet */ {
 
             self.error = error
             // when already displaying the error page and reload navigation fails again: don‘t navigate, just update page HTML
-            let shouldPerformAlternateNavigation = navigation.url != webView.url || navigation.navigationAction.targetFrame?.url != .error
-            loadErrorHTML(error, header: UserText.errorPageHeader, forUnreachableURL: url, alternate: shouldPerformAlternateNavigation)
+            if error.errorCode != NSURLErrorServerCertificateUntrusted {
+                let shouldPerformAlternateNavigation = navigation.url != webView.url || navigation.navigationAction.targetFrame?.url != .error
+                loadErrorHTML(error, header: UserText.errorPageHeader, forUnreachableURL: url, alternate: shouldPerformAlternateNavigation)
+            }
         }
     }
 
-    @MainActor
-    func didFailProvisionalLoad(with request: URLRequest, in frame: WKFrameInfo, with error: Error) {
-        lastWebError = error
-    }
-
     @MainActor
     func webContentProcessDidTerminate(with reason: WKProcessTerminationReason?) {
         let error = WKError(.webContentProcessTerminated, userInfo: [
             WKProcessTerminationReason.userInfoKey: reason?.rawValue ?? -1,
-            NSLocalizedDescriptionKey: UserText.webProcessCrashPageMessage,
+            NSLocalizedDescriptionKey: UserText.webProcessCrashPageMessage
         ])
 
         if case.url(let url, _, _) = content {
@@ -1519,7 +1201,7 @@ extension Tab/*: NavigationResponder*/ { // to be moved to Tab+Navigation.swift
             loadErrorHTML(error, header: UserText.webProcessCrashPageHeader, forUnreachableURL: url, alternate: true)
         }
 
-        Pixel.fire(.debug(event: .webKitDidTerminate, error: error))
+        PixelKit.fire(DebugEvent(GeneralPixel.webKitDidTerminate, error: error))
     }
 
     @MainActor
diff --git a/DuckDuckGo/Tab/Model/TabContent.swift b/DuckDuckGo/Tab/Model/TabContent.swift
new file mode 100644
index 0000000000..369a036ba2
--- /dev/null
+++ b/DuckDuckGo/Tab/Model/TabContent.swift
@@ -0,0 +1,303 @@
+//
+//  TabContent.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 Navigation
+import Subscription
+
+extension Tab {
+
+    enum Content: Equatable {
+        case newtab
+        case url(URL, credential: URLCredential? = nil, source: URLSource)
+        case settings(pane: PreferencePaneIdentifier?)
+        case bookmarks
+        case onboarding
+        case none
+        case dataBrokerProtection
+        case subscription(URL)
+        case identityTheftRestoration(URL)
+    }
+    typealias TabContent = Tab.Content
+
+}
+typealias TabContent = Tab.Content
+
+extension TabContent {
+
+    enum URLSource: Equatable {
+        case pendingStateRestoration
+        case loadedByStateRestoration
+        case userEntered(String, downloadRequested: Bool = false)
+        case historyEntry
+        case bookmark
+        case ui
+        case link
+        case appOpenUrl
+        case reload
+
+        case webViewUpdated
+
+        var userEnteredValue: String? {
+            if case .userEntered(let userEnteredValue, _) = self {
+                userEnteredValue
+            } else {
+                nil
+            }
+        }
+
+        var isUserEnteredUrl: Bool {
+            userEnteredValue != nil
+        }
+
+        var navigationType: NavigationType {
+            switch self {
+            case .userEntered(_, downloadRequested: true):
+                    .custom(.userRequestedPageDownload)
+            case .userEntered:
+                    .custom(.userEnteredUrl)
+            case .pendingStateRestoration:
+                    .sessionRestoration
+            case .loadedByStateRestoration, .appOpenUrl, .historyEntry, .bookmark, .ui, .link, .webViewUpdated:
+                    .custom(.tabContentUpdate)
+            case .reload:
+                    .reload
+            }
+        }
+
+        var cachePolicy: URLRequest.CachePolicy {
+            switch self {
+            case .pendingStateRestoration, .historyEntry:
+                    .returnCacheDataElseLoad
+            case .reload, .loadedByStateRestoration:
+                    .reloadIgnoringCacheData
+            case .userEntered, .bookmark, .ui, .link, .appOpenUrl, .webViewUpdated:
+                    .useProtocolCachePolicy
+            }
+        }
+
+    }
+}
+extension TabContent {
+
+    // swiftlint:disable:next cyclomatic_complexity
+    static func contentFromURL(_ url: URL?, source: URLSource) -> TabContent {
+        switch url {
+        case URL.newtab, URL.Invalid.aboutNewtab, URL.Invalid.duckHome:
+            return .newtab
+        case URL.welcome, URL.Invalid.aboutWelcome:
+            return .onboarding
+        case URL.settings, URL.Invalid.aboutPreferences, URL.Invalid.aboutConfig, URL.Invalid.aboutSettings, URL.Invalid.duckConfig, URL.Invalid.duckPreferences:
+            return .anySettingsPane
+        case URL.bookmarks, URL.Invalid.aboutBookmarks:
+            return .bookmarks
+        case URL.dataBrokerProtection:
+            return .dataBrokerProtection
+        case URL.Invalid.aboutHome:
+            guard let customURL = URL(string: StartupPreferences.shared.formattedCustomHomePageURL) else {
+                return .newtab
+            }
+            return .url(customURL, source: source)
+        default: break
+        }
+
+        if let url {
+            if url.isChild(of: URL.subscriptionBaseURL) {
+                if SubscriptionPurchaseEnvironment.currentServiceEnvironment == .staging, url.getParameter(named: "environment") == nil {
+                    return .subscription(url.appendingParameter(name: "environment", value: "staging"))
+                }
+                return .subscription(url)
+            } else if url.isChild(of: URL.identityTheftRestoration) {
+                return .identityTheftRestoration(url)
+            }
+        }
+
+        if let settingsPane = url.flatMap(PreferencePaneIdentifier.init(url:)) {
+            return .settings(pane: settingsPane)
+        } else if url?.isDuckPlayer == true, let (videoId, timestamp) = url?.youtubeVideoParams {
+            return .url(.duckPlayer(videoId, timestamp: timestamp), credential: nil, source: source)
+        } else if let url, let credential = url.basicAuthCredential {
+            // when navigating to a URL with basic auth username/password, cache it and redirect to a trimmed URL
+            return .url(url.removingBasicAuthCredential(), credential: credential, source: source)
+        } else {
+            return .url(url ?? .blankPage, source: source)
+        }
+    }
+
+    static var displayableTabTypes: [TabContent] {
+        // Add new displayable types here
+        let displayableTypes = [TabContent.anySettingsPane, .bookmarks]
+
+        return displayableTypes.sorted { first, second in
+            guard let firstTitle = first.title, let secondTitle = second.title else {
+                return true // Arbitrary sort order, only non-standard tabs are displayable.
+            }
+            return firstTitle.localizedStandardCompare(secondTitle) == .orderedAscending
+        }
+    }
+
+    /// Convenience accessor for `.preferences` Tab Content with no particular pane selected,
+    /// i.e. the currently selected pane is decided internally by `PreferencesViewController`.
+    static let anySettingsPane: Self = .settings(pane: nil)
+
+    var isDisplayable: Bool {
+        switch self {
+        case .settings, .bookmarks, .dataBrokerProtection, .subscription, .identityTheftRestoration:
+            return true
+        default:
+            return false
+        }
+    }
+
+    func matchesDisplayableTab(_ other: TabContent) -> Bool {
+        switch (self, other) {
+        case (.settings, .settings):
+            return true
+        case (.bookmarks, .bookmarks):
+            return true
+        case (.dataBrokerProtection, .dataBrokerProtection):
+            return true
+        case (.subscription, .subscription):
+            return true
+        case (.identityTheftRestoration, .identityTheftRestoration):
+            return true
+        default:
+            return false
+        }
+    }
+
+    var title: String? {
+        switch self {
+        case .url, .newtab, .none: return nil
+        case .settings: return UserText.tabPreferencesTitle
+        case .bookmarks: return UserText.tabBookmarksTitle
+        case .onboarding: return UserText.tabOnboardingTitle
+        case .dataBrokerProtection: return UserText.tabDataBrokerProtectionTitle
+        case .subscription, .identityTheftRestoration: return nil
+        }
+    }
+
+    // !!! don‘t add `url` property to avoid ambiguity with the `.url` enum case
+    // use `userEditableUrl` or `urlForWebView` instead.
+
+    /// user-editable URL displayed in the address bar
+    var userEditableUrl: URL? {
+        let url = urlForWebView
+        if let url, url.isDuckPlayer,
+           let (videoID, timestamp) = url.youtubeVideoParams {
+            return .duckPlayer(videoID, timestamp: timestamp)
+        }
+        return url
+    }
+
+    /// `real` URL loaded in the web view
+    var urlForWebView: URL? {
+        switch self {
+        case .url(let url, credential: _, source: _):
+            return url
+        case .newtab:
+            return .newtab
+        case .settings(pane: .some(let pane)):
+            return .settingsPane(pane)
+        case .settings(pane: .none):
+            return .settings
+        case .bookmarks:
+            return .bookmarks
+        case .onboarding:
+            return .welcome
+        case .dataBrokerProtection:
+            return .dataBrokerProtection
+        case .subscription(let url), .identityTheftRestoration(let url):
+            return url
+        case .none:
+            return nil
+        }
+    }
+
+    var source: URLSource {
+        switch self {
+        case .url(_, _, source: let source):
+            return source
+        case .newtab, .settings, .bookmarks, .onboarding, .dataBrokerProtection,
+                .subscription, .identityTheftRestoration, .none:
+            return .ui
+        }
+    }
+
+    var isUrl: Bool {
+        switch self {
+        case .url, .subscription, .identityTheftRestoration:
+            return true
+        default:
+            return false
+        }
+    }
+
+    var userEnteredValue: String? {
+        switch self {
+        case .url(_, credential: _, source: let source):
+            return source.userEnteredValue
+        default:
+            return nil
+        }
+    }
+
+    var isUserEnteredUrl: Bool {
+        userEnteredValue != nil
+    }
+
+    var isUserRequestedPageDownload: Bool {
+        if case .url(_, credential: _, source: .userEntered(_, downloadRequested: true)) = self {
+            return true
+        } else {
+            return false
+        }
+    }
+
+    var displaysContentInWebView: Bool {
+        isUrl
+    }
+
+    var canBeDuplicated: Bool {
+        switch self {
+        case .settings, .subscription, .identityTheftRestoration, .dataBrokerProtection:
+            return false
+        default:
+            return true
+        }
+    }
+
+    var canBePinned: Bool {
+        switch self {
+        case .subscription, .identityTheftRestoration, .dataBrokerProtection:
+            return false
+        default:
+            return isUrl
+        }
+    }
+
+    var canBeBookmarked: Bool {
+        switch self {
+        case .newtab, .onboarding, .none:
+            return false
+        case .url, .settings, .bookmarks, .subscription, .identityTheftRestoration, .dataBrokerProtection:
+            return true
+        }
+    }
+
+}
diff --git a/DuckDuckGo/Tab/Model/TabExtensionsBuilder.swift b/DuckDuckGo/Tab/Model/TabExtensionsBuilder.swift
index ef950d286a..9e34d1aac8 100644
--- a/DuckDuckGo/Tab/Model/TabExtensionsBuilder.swift
+++ b/DuckDuckGo/Tab/Model/TabExtensionsBuilder.swift
@@ -117,7 +117,7 @@ final class TestTabExtensionsBuilder: TabExtensionsBuilderProtocol {
         else {
             fatalError("\(type(of: components[idx].buildingBlock)) has been already initialized at the moment of the `override` call")
         }
-        loader.state = TabExtensionLazyLoader<Extension.PublicProtocol>.State.none { makeTabExtension().getPublicProtocol () }
+        loader.state = TabExtensionLazyLoader<Extension.PublicProtocol>.State.none { makeTabExtension().getPublicProtocol() }
 
         return builderBlock
     }
diff --git a/DuckDuckGo/Tab/Navigation/RedirectNavigationResponder.swift b/DuckDuckGo/Tab/Navigation/RedirectNavigationResponder.swift
new file mode 100644
index 0000000000..d06cb5f3d3
--- /dev/null
+++ b/DuckDuckGo/Tab/Navigation/RedirectNavigationResponder.swift
@@ -0,0 +1,49 @@
+//
+//  RedirectNavigationResponder.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 Navigation
+import Foundation
+import Subscription
+import BrowserServicesKit
+
+struct RedirectNavigationResponder: NavigationResponder {
+
+    func decidePolicy(for navigationAction: NavigationAction, preferences: inout NavigationPreferences) async -> NavigationActionPolicy? {
+        guard let mainFrame = navigationAction.mainFrameTarget, let redirectURL = redirectURL(for: navigationAction.url) else { return .next }
+
+        return .redirect(mainFrame) { navigator in
+            var request = navigationAction.request
+            request.url = redirectURL
+            navigator.load(request)
+        }
+    }
+
+    private func redirectURL(for url: URL) -> URL? {
+        guard url.isPart(ofDomain: "duckduckgo.com") else { return nil }
+
+        if url.pathComponents == URL.privacyPro.pathComponents {
+            let isFeatureAvailable = DefaultSubscriptionFeatureAvailability().isFeatureAvailable
+            let shouldHidePrivacyProDueToNoProducts = SubscriptionPurchaseEnvironment.current == .appStore && SubscriptionPurchaseEnvironment.canPurchase == false
+            let isPurchasePageRedirectActive = isFeatureAvailable && !shouldHidePrivacyProDueToNoProducts
+
+            return isPurchasePageRedirectActive ? URL.subscriptionBaseURL : nil
+        }
+
+        return nil
+    }
+}
diff --git a/DuckDuckGo/Tab/TabExtensions/AutofillTabExtension.swift b/DuckDuckGo/Tab/TabExtensions/AutofillTabExtension.swift
index 5a973d76cc..c881ebc2c1 100644
--- a/DuckDuckGo/Tab/TabExtensions/AutofillTabExtension.swift
+++ b/DuckDuckGo/Tab/TabExtensions/AutofillTabExtension.swift
@@ -20,6 +20,7 @@ import BrowserServicesKit
 import Combine
 import Foundation
 import SecureStorage
+import PixelKit
 
 final class AutofillTabExtension: TabExtension {
 
@@ -148,7 +149,7 @@ extension AutofillTabExtension: SecureVaultManagerDelegate {
     }
 
     func secureVaultManager(_: SecureVaultManager, didAutofill type: AutofillType, withObjectId objectId: String) {
-        Pixel.fire(.formAutofilled(kind: type.formAutofillKind))
+        PixelKit.fire(GeneralPixel.formAutofilled(kind: type.formAutofillKind))
 
         if type.formAutofillKind == .password &&
             passwordManagerCoordinator.isEnabled {
@@ -162,12 +163,16 @@ extension AutofillTabExtension: SecureVaultManagerDelegate {
         }
     }
 
-    func secureVaultInitFailed(_ error: SecureStorageError) {
-        SecureVaultErrorReporter.shared.secureVaultInitFailed(error)
+    func secureVaultError(_ error: SecureStorageError) {
+        SecureVaultReporter.shared.secureVaultError(error)
+    }
+
+    func secureVaultKeyStoreEvent(_ event: SecureStorageKeyStoreEvent) {
+        SecureVaultReporter.shared.secureVaultKeyStoreEvent(event)
     }
 
     public func secureVaultManager(_: BrowserServicesKit.SecureVaultManager, didReceivePixel pixel: AutofillUserScript.JSPixel) {
-        Pixel.fire(.jsPixel(pixel))
+        PixelKit.fire(GeneralPixel.jsPixel(pixel))
     }
 
     public func secureVaultManager(_: SecureVaultManager, didRequestCreditCardsManagerForDomain domain: String) {
@@ -206,7 +211,7 @@ extension AutofillTabExtension: SecureVaultManagerDelegate {
 }
 
 extension AutofillType {
-    var formAutofillKind: Pixel.Event.FormAutofillKind {
+    var formAutofillKind: GeneralPixel.FormAutofillKind {
         switch self {
         case .password: return .password
         case .card: return .card
diff --git a/DuckDuckGo/Tab/TabExtensions/BrokenSiteInfoTabExtension.swift b/DuckDuckGo/Tab/TabExtensions/BrokenSiteInfoTabExtension.swift
new file mode 100644
index 0000000000..0e2749ed8d
--- /dev/null
+++ b/DuckDuckGo/Tab/TabExtensions/BrokenSiteInfoTabExtension.swift
@@ -0,0 +1,146 @@
+//
+//  BrokenSiteInfoTabExtension.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 Combine
+import Foundation
+import Navigation
+import PrivacyDashboard
+import UserScript
+
+final class BrokenSiteInfoTabExtension {
+
+    private(set) var lastWebError: Error?
+    private(set) var lastHttpStatusCode: Int?
+
+    private(set) var inferredOpenerContext: BrokenSiteReport.OpenerContext?
+    private(set) var refreshCountSinceLoad: Int = 0
+
+    private(set) var performanceMetrics: PerformanceMetricsSubfeature?
+
+    private var cancellables = Set<AnyCancellable>()
+
+    init(contentPublisher: some Publisher<Tab.TabContent, Never>,
+         webViewPublisher: some Publisher<WKWebView, Never>,
+         contentScopeUserScriptPublisher: some Publisher<ContentScopeUserScript, Never>) {
+
+        webViewPublisher.sink { [weak self] webView in
+            self?.performanceMetrics = PerformanceMetricsSubfeature(targetWebview: webView)
+        }.store(in: &cancellables)
+
+        contentScopeUserScriptPublisher.sink { [weak self] contentScopeUserScript in
+            guard let self, let performanceMetrics else { return }
+            contentScopeUserScript.registerSubfeature(delegate: performanceMetrics)
+        }.store(in: &cancellables)
+    }
+
+    private func resetRefreshCountIfNeeded(action: NavigationAction) {
+        switch action.navigationType {
+        case .reload, .other:
+            break
+        default:
+            refreshCountSinceLoad = 0
+        }
+    }
+
+    private func setOpenerContextIfNeeded(action: NavigationAction) {
+        switch action.navigationType {
+        case .linkActivated, .formSubmitted:
+            inferredOpenerContext = .navigation
+        default:
+            break
+        }
+    }
+
+    func tabReloadRequested() {
+        refreshCountSinceLoad += 1
+    }
+
+}
+
+extension BrokenSiteInfoTabExtension: NavigationResponder {
+
+    @MainActor
+    func decidePolicy(for navigationAction: NavigationAction, preferences: inout NavigationPreferences) async -> NavigationActionPolicy? {
+        resetRefreshCountIfNeeded(action: navigationAction)
+        setOpenerContextIfNeeded(action: navigationAction)
+
+        return .next
+    }
+
+    @MainActor
+    func willStart(_ navigation: Navigation) {
+        if lastWebError != nil { lastWebError = nil }
+    }
+
+    @MainActor
+    func decidePolicy(for navigationResponse: NavigationResponse) async -> NavigationResponsePolicy? {
+        lastHttpStatusCode = navigationResponse.httpStatusCode
+
+        return .next
+    }
+
+    @MainActor
+    func didStart(_ navigation: Navigation) {
+        if inferredOpenerContext != .external {
+            inferredOpenerContext = nil
+        }
+
+        if lastWebError != nil {
+            lastWebError = nil
+        }
+    }
+
+    @MainActor
+    func navigationDidFinish(_ navigation: Navigation) {
+        Task { @MainActor in
+            if await navigation.navigationAction.targetFrame?.webView?.isCurrentSiteReferredFromDuckDuckGo == true {
+                inferredOpenerContext = .serp
+            }
+        }
+    }
+
+    @MainActor
+    func didFailProvisionalLoad(with request: URLRequest, in frame: WKFrameInfo, with error: Error) {
+        lastWebError = error
+    }
+
+}
+
+protocol BrokenSiteInfoTabExtensionProtocol: AnyObject, NavigationResponder {
+    var lastWebError: Error? { get }
+    var lastHttpStatusCode: Int? { get }
+
+    var inferredOpenerContext: BrokenSiteReport.OpenerContext? { get }
+    var refreshCountSinceLoad: Int { get }
+
+    var performanceMetrics: PerformanceMetricsSubfeature? { get }
+
+    func tabReloadRequested()
+}
+
+extension BrokenSiteInfoTabExtension: TabExtension, BrokenSiteInfoTabExtensionProtocol {
+    typealias PublicProtocol = BrokenSiteInfoTabExtensionProtocol
+    func getPublicProtocol() -> PublicProtocol { self }
+}
+
+extension TabExtensions {
+    var brokenSiteInfo: BrokenSiteInfoTabExtensionProtocol? {
+        resolve(BrokenSiteInfoTabExtension.self)
+    }
+}
diff --git a/DuckDuckGo/Tab/TabExtensions/ContextMenuManager.swift b/DuckDuckGo/Tab/TabExtensions/ContextMenuManager.swift
index 787ac89300..57174a6ec7 100644
--- a/DuckDuckGo/Tab/TabExtensions/ContextMenuManager.swift
+++ b/DuckDuckGo/Tab/TabExtensions/ContextMenuManager.swift
@@ -24,6 +24,16 @@ import WebKit
 enum NavigationDecision {
     case allow(NewWindowPolicy)
     case cancel
+
+    /**
+     * Replaces `.tab` with `.window` when user prefers windows over tabs.
+     */
+    func preferringTabsToWindows(_ prefersTabsToWindows: Bool) -> NavigationDecision {
+        guard case .allow(let targetKind) = self, !prefersTabsToWindows else {
+            return self
+        }
+        return .allow(targetKind.preferringTabsToWindows(prefersTabsToWindows))
+    }
 }
 
 @MainActor
@@ -35,6 +45,8 @@ final class ContextMenuManager: NSObject {
     private var selectedText: String?
     private var linkURL: String?
 
+    private var tabsPreferences: TabsPreferences
+
     private var isEmailAddress: Bool {
         guard let linkURL, let url = URL(string: linkURL) else {
             return false
@@ -52,7 +64,9 @@ final class ContextMenuManager: NSObject {
     fileprivate weak var webView: WKWebView?
 
     @MainActor
-    init(contextMenuScriptPublisher: some Publisher<ContextMenuUserScript?, Never>) {
+    init(contextMenuScriptPublisher: some Publisher<ContextMenuUserScript?, Never>,
+         tabsPreferences: TabsPreferences = TabsPreferences.shared) {
+        self.tabsPreferences = tabsPreferences
         super.init()
 
         userScriptCancellable = contextMenuScriptPublisher.sink { [weak self] contextMenuScript in
@@ -234,7 +248,7 @@ private extension ContextMenuManager {
     }
 
     func bookmarkPageMenuItem() -> NSMenuItem {
-        NSMenuItem(title: UserText.bookmarkPage, action: #selector(MainViewController.bookmarkThisPage), target: nil, keyEquivalent: "")
+        NSMenuItem(title: UserText.bookmarkPage, action: #selector(MainViewController.bookmarkThisPage), target: nil, keyEquivalent: "").withAccessibilityIdentifier("ContextMenuManager.bookmarkPageMenuItem")
     }
 
     func openLinkInNewWindowMenuItem(from item: NSMenuItem) -> NSMenuItem {
@@ -360,8 +374,8 @@ private extension ContextMenuManager {
             return
         }
 
-        onNewWindow = { _ in
-            .allow(.tab(selected: false, burner: burner))
+        onNewWindow = { [weak self] _ in
+            .allow(.tab(selected: self?.tabsPreferences.switchToNewTabWhenOpened ?? false, burner: burner, contextMenuInitiated: true))
         }
         NSApp.sendAction(action, to: originalItem.target, from: originalItem)
     }
diff --git a/DuckDuckGo/Tab/TabExtensions/DownloadsTabExtension.swift b/DuckDuckGo/Tab/TabExtensions/DownloadsTabExtension.swift
index 65eb64e98a..339aca0a9a 100644
--- a/DuckDuckGo/Tab/TabExtensions/DownloadsTabExtension.swift
+++ b/DuckDuckGo/Tab/TabExtensions/DownloadsTabExtension.swift
@@ -182,7 +182,8 @@ extension DownloadsTabExtension: NavigationResponder {
             ?? navigationResponse.mainFrameNavigation?.navigationAction
 
         guard navigationResponse.httpResponse?.isSuccessful != false, // download non-http responses
-              !navigationResponse.canShowMIMEType || navigationResponse.shouldDownload
+              !navigationResponse.url.isDirectory, // don‘t download a local directory
+              !responseCanShowMIMEType(navigationResponse) || navigationResponse.shouldDownload
                 // if user pressed Opt+Enter in the Address bar to download from a URL
                 || (navigationResponse.mainFrameNavigation?.redirectHistory.last ?? navigationResponse.mainFrameNavigation?.navigationAction)?.navigationType == .custom(.userRequestedPageDownload)
         else {
@@ -199,6 +200,15 @@ extension DownloadsTabExtension: NavigationResponder {
         return .download
     }
 
+    private func responseCanShowMIMEType(_ response: NavigationResponse) -> Bool {
+        if response.canShowMIMEType {
+            return true
+        } else if response.url.isFileURL {
+            return Bundle.main.fileTypeExtensions.contains(response.url.pathExtension)
+        }
+        return false
+    }
+
     @MainActor
     func navigationAction(_ navigationAction: NavigationAction, didBecome download: WebKitDownload) {
         enqueueDownload(download, withNavigationAction: navigationAction)
@@ -213,16 +223,24 @@ extension DownloadsTabExtension: NavigationResponder {
     func enqueueDownload(_ download: WebKitDownload, withNavigationAction navigationAction: NavigationAction?) {
         let task = downloadManager.add(download, fromBurnerWindow: self.isBurner, delegate: self, destination: .auto)
 
+        var isMainFrameNavigationActionWithNoHistory: Bool {
+            // get the first navigation action in the redirect series
+            guard let navigationAction = navigationAction?.redirectHistory?.first ?? navigationAction,
+                  navigationAction.isForMainFrame,
+                  navigationAction.isTargetingNewWindow,
+                  // webView has no navigation history (downloaded navigationAction has started from an empty state)
+                  navigationAction.fromHistoryItemIdentity == nil
+            else { return false }
+            return true
+        }
+
         // If the download has started from a popup Tab - close it after starting the download
         // e.g. download button on this page:
         // https://en.wikipedia.org/wiki/Guitar#/media/File:GuitareClassique5.png
-        guard let navigationAction,
-              navigationAction.isForMainFrame,
-              navigationAction.isTargetingNewWindow,
-              let webView = download.webView,
-              // webView has no navigation history (downloaded navigationAction has started from an empty state)
-              (navigationAction.redirectHistory?.first ?? navigationAction).fromHistoryItemIdentity == nil
-        else { return }
+        guard let webView = download.webView,
+              isMainFrameNavigationActionWithNoHistory
+                // if converted from navigation response but no page was loaded
+                || navigationAction == nil && webView.backForwardList.currentItem == nil else { return }
 
         self.closeWebView(webView, afterDownloadTaskHasStarted: task)
     }
diff --git a/DuckDuckGo/Tab/TabExtensions/DuckPlayerTabExtension.swift b/DuckDuckGo/Tab/TabExtensions/DuckPlayerTabExtension.swift
index 6b41cd838f..ca6cec4c5a 100644
--- a/DuckDuckGo/Tab/TabExtensions/DuckPlayerTabExtension.swift
+++ b/DuckDuckGo/Tab/TabExtensions/DuckPlayerTabExtension.swift
@@ -21,6 +21,7 @@ import Common
 import ContentBlocking
 import Foundation
 import Navigation
+import PixelKit
 
 protocol YoutubeScriptsProvider {
     var youtubeOverlayScript: YoutubeOverlayUserScript? { get }
@@ -111,9 +112,9 @@ extension DuckPlayerTabExtension: YoutubeOverlayUserScriptDelegate {
 
     func youtubeOverlayUserScriptDidRequestDuckPlayer(with url: URL, in webView: WKWebView) {
         if duckPlayer.mode == .enabled {
-            Pixel.fire(.duckPlayerViewFromYoutubeAutomatic)
+            PixelKit.fire(GeneralPixel.duckPlayerViewFromYoutubeAutomatic)
         } else {
-            Pixel.fire(.duckPlayerViewFromYoutubeViaHoverButton)
+            PixelKit.fire(GeneralPixel.duckPlayerViewFromYoutubeViaHoverButton)
         }
         // to be standardised across the app
         let isRequestingNewTab = NSApp.isCommandPressed
@@ -131,6 +132,17 @@ extension DuckPlayerTabExtension: YoutubeOverlayUserScriptDelegate {
 extension DuckPlayerTabExtension: NewWindowPolicyDecisionMaker {
 
     func decideNewWindowPolicy(for navigationAction: WKNavigationAction) -> NavigationDecision? {
+        // if a link was clicked inside duckplayer (like a recommendation)
+        // and has target=_blank - then we want to prevent a new tab
+        // opening, and just load it inside the current one instead
+        if navigationAction.targetFrame == nil,
+           navigationAction.safeSourceFrame?.webView?.url?.isDuckPlayer == true,
+           navigationAction.request.url?.isYoutubeVideoRecommendation == true,
+           let webView, let url = navigationAction.request.url {
+            webView.load(URLRequest(url: url))
+            return .cancel
+        }
+
         if let shouldSelectNextNewTab {
             defer {
                 self.shouldSelectNextNewTab = nil
@@ -191,7 +203,7 @@ extension DuckPlayerTabExtension: NavigationResponder {
         // Always allow loading Private Player URLs (local HTML)
         if navigationAction.url.isDuckURLScheme || navigationAction.url.isDuckPlayer {
             if navigationAction.request.allHTTPHeaderFields?["Referer"] == URL.duckDuckGo.absoluteString {
-                Pixel.fire(.duckPlayerViewFromSERP)
+                PixelKit.fire(GeneralPixel.duckPlayerViewFromSERP)
             }
             return .allow
         }
@@ -278,10 +290,10 @@ extension DuckPlayerTabExtension: NavigationResponder {
 
             switch navigationAction.navigationType {
             case .custom, .redirect(.server):
-                Pixel.fire(.duckPlayerViewFromOther)
+                PixelKit.fire(GeneralPixel.duckPlayerViewFromOther)
             case .other:
                 if navigationAction.request.allHTTPHeaderFields?["Referer"] == URL.duckDuckGo.absoluteString {
-                    Pixel.fire(.duckPlayerViewFromSERP)
+                    PixelKit.fire(GeneralPixel.duckPlayerViewFromSERP)
                 }
             default:
                 break
@@ -300,7 +312,7 @@ extension DuckPlayerTabExtension: NavigationResponder {
             return
         }
         if navigation.url.isDuckPlayer {
-            Pixel.fire(.duckPlayerDailyUniqueView, limitTo: .dailyFirst)
+            PixelKit.fire(GeneralPixel.duckPlayerDailyUniqueView, frequency: .daily)
         }
     }
 
diff --git a/DuckDuckGo/Tab/TabExtensions/HistoryTabExtension.swift b/DuckDuckGo/Tab/TabExtensions/HistoryTabExtension.swift
index 84eb4d9b54..dc3e5d094e 100644
--- a/DuckDuckGo/Tab/TabExtensions/HistoryTabExtension.swift
+++ b/DuckDuckGo/Tab/TabExtensions/HistoryTabExtension.swift
@@ -205,7 +205,7 @@ extension HistoryTabExtension: NavigationResponder {
     }
 
     func navigation(_ navigation: Navigation, didSameDocumentNavigationOf navigationType: WKSameDocumentNavigationType) {
-        if navigation.isCurrent, navigationType != .sessionStatePop {
+        if navigation.isCurrent, [.sessionStatePush, .anchorNavigation].contains(navigationType) {
             self.url = navigation.navigationAction.url
             addVisit()
         }
diff --git a/DuckDuckGo/Tab/TabExtensions/NavigationProtectionTabExtension.swift b/DuckDuckGo/Tab/TabExtensions/NavigationProtectionTabExtension.swift
index aa8fa230fc..e5a9a8d0e7 100644
--- a/DuckDuckGo/Tab/TabExtensions/NavigationProtectionTabExtension.swift
+++ b/DuckDuckGo/Tab/TabExtensions/NavigationProtectionTabExtension.swift
@@ -22,6 +22,7 @@ import Common
 import Foundation
 import Navigation
 import WebKit
+import PixelKit
 
 final class NavigationProtectionTabExtension {
 
@@ -30,7 +31,7 @@ final class NavigationProtectionTabExtension {
     private static let debugEvents = EventMapping<AMPProtectionDebugEvents> { event, _, _, _ in
         switch event {
         case .ampBlockingRulesCompilationFailed:
-            Pixel.fire(.ampBlockingRulesCompilationFailed)
+            PixelKit.fire(GeneralPixel.ampBlockingRulesCompilationFailed)
         }
     }
 
diff --git a/DuckDuckGo/Tab/TabExtensions/NetworkProtectionControllerTabExtension.swift b/DuckDuckGo/Tab/TabExtensions/NetworkProtectionControllerTabExtension.swift
new file mode 100644
index 0000000000..7f86b0f766
--- /dev/null
+++ b/DuckDuckGo/Tab/TabExtensions/NetworkProtectionControllerTabExtension.swift
@@ -0,0 +1,53 @@
+//
+//  NetworkProtectionControllerTabExtension.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 Navigation
+import NetworkProtection
+import PixelKit
+
+final class NetworkProtectionControllerTabExtension {
+    let tunnelController: NetworkProtectionIPCTunnelController
+
+    init(tunnelController: NetworkProtectionIPCTunnelController) {
+        self.tunnelController = tunnelController
+    }
+}
+
+extension NetworkProtectionControllerTabExtension: NavigationResponder {
+    func navigationDidFinish(_ navigation: Navigation) {
+        if navigation.url.isDuckDuckGoSearch, tunnelController.isConnected == true {
+            PixelKit.fire(GeneralPixel.networkProtectionEnabledOnSearch, frequency: .dailyAndCount)
+        }
+    }
+}
+
+protocol NetworkProtectionTabExtensionProtocol: AnyObject, NavigationResponder {
+    var tunnelController: NetworkProtectionIPCTunnelController { get }
+}
+
+extension NetworkProtectionControllerTabExtension: TabExtension, NetworkProtectionTabExtensionProtocol {
+    typealias PublicProtocol = NetworkProtectionTabExtensionProtocol
+    func getPublicProtocol() -> PublicProtocol { self }
+}
+
+extension TabExtensions {
+    var networkProtection: NetworkProtectionTabExtensionProtocol? {
+        resolve(NetworkProtectionControllerTabExtension.self)
+    }
+}
diff --git a/DuckDuckGo/Tab/TabExtensions/PrivacyDashboardTabExtension.swift b/DuckDuckGo/Tab/TabExtensions/PrivacyDashboardTabExtension.swift
index ab33546a06..7d2900d390 100644
--- a/DuckDuckGo/Tab/TabExtensions/PrivacyDashboardTabExtension.swift
+++ b/DuckDuckGo/Tab/TabExtensions/PrivacyDashboardTabExtension.swift
@@ -27,18 +27,25 @@ import PrivacyDashboard
 final class PrivacyDashboardTabExtension {
 
     private let contentBlocking: any ContentBlockingProtocol
+    private let certificateTrustEvaluator: CertificateTrustEvaluating
 
     @Published private(set) var privacyInfo: PrivacyInfo?
 
+    private(set) var isCertificateValid: Bool?
+
     private var previousPrivacyInfosByURL: [String: PrivacyInfo] = [:]
 
     private var cancellables = Set<AnyCancellable>()
 
     init(contentBlocking: some ContentBlockingProtocol,
+         certificateTrustEvaluator: CertificateTrustEvaluating,
          autoconsentUserScriptPublisher: some Publisher<UserScriptWithAutoconsent?, Never>,
          didUpgradeToHttpsPublisher: some Publisher<URL, Never>,
-         trackersPublisher: some Publisher<DetectedTracker, Never>) {
+         trackersPublisher: some Publisher<DetectedTracker, Never>,
+         webViewPublisher: some Publisher<WKWebView, Never>) {
+
         self.contentBlocking = contentBlocking
+        self.certificateTrustEvaluator = certificateTrustEvaluator
 
         autoconsentUserScriptPublisher.sink { [weak self] autoconsentUserScript in
             autoconsentUserScript?.delegate = self
@@ -61,6 +68,30 @@ final class PrivacyDashboardTabExtension {
                 self.privacyInfo?.trackerInfo.addDetectedTracker(tracker.request, onPageWithURL: url)
             }
         }.store(in: &cancellables)
+
+        webViewPublisher.map {
+            $0.publisher(for: \.serverTrust)
+        }
+        .switchToLatest()
+        .sink { [weak self] serverTrust in
+            Task { [weak self] in
+                await self?.updatePrivacyInfo(with: serverTrust)
+            }
+        }
+        .store(in: &cancellables)
+
+    }
+
+    private func updatePrivacyInfo(with trust: SecTrust?) async {
+        let isValid = await self.certificateTrustEvaluator.evaluateCertificateTrust(trust: trust)
+        await MainActor.run {
+            self.isCertificateValid = isValid
+            if isValid ?? false {
+                self.privacyInfo?.serverTrust = trust
+            } else {
+                self.privacyInfo?.serverTrust = nil
+            }
+        }
     }
 
 }
@@ -136,13 +167,14 @@ extension PrivacyDashboardTabExtension: NavigationResponder {
     }
 
     @MainActor
-    func didReceiveRedirect(_ navigationAction: NavigationAction, for navigation: Navigation) {
-        resetDashboardInfo(for: navigationAction.url, didGoBackForward: false)
+    func didCommit(_ navigation: Navigation) {
+        resetDashboardInfo(for: navigation.url, didGoBackForward: navigation.navigationAction.navigationType.isBackForward)
     }
 
-    @MainActor
-    func didStart(_ navigation: Navigation) {
-        resetDashboardInfo(for: navigation.url, didGoBackForward: navigation.navigationAction.navigationType.isBackForward)
+    func navigationDidFinish(_ navigation: Navigation) {
+        if privacyInfo?.url != navigation.url {
+            resetDashboardInfo(for: navigation.url, didGoBackForward: navigation.navigationAction.navigationType.isBackForward)
+        }
     }
 
 }
@@ -158,6 +190,7 @@ extension PrivacyDashboardTabExtension: AutoconsentUserScriptDelegate {
 protocol PrivacyDashboardProtocol: AnyObject, NavigationResponder {
     var privacyInfo: PrivacyInfo? { get }
     var privacyInfoPublisher: AnyPublisher<PrivacyInfo?, Never> { get }
+    var isCertificateValid: Bool? { get }
 
     func setMainFrameConnectionUpgradedTo(_ upgradedUrl: URL?)
 }
@@ -185,6 +218,10 @@ extension Tab {
         self.privacyDashboard?.setMainFrameConnectionUpgradedTo(upgradedUrl)
     }
 
+    var isCertificateValid: Bool? {
+        self.privacyDashboard?.isCertificateValid
+    }
+
 }
 
 extension TabExtensions {
diff --git a/DuckDuckGo/Tab/TabExtensions/SSLErrorPageTabExtension.swift b/DuckDuckGo/Tab/TabExtensions/SSLErrorPageTabExtension.swift
new file mode 100644
index 0000000000..aac116210a
--- /dev/null
+++ b/DuckDuckGo/Tab/TabExtensions/SSLErrorPageTabExtension.swift
@@ -0,0 +1,180 @@
+//
+//  SSLErrorPageTabExtension.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 Navigation
+import WebKit
+import Combine
+import ContentScopeScripts
+import BrowserServicesKit
+
+protocol SSLErrorPageScriptProvider {
+    var sslErrorPageUserScript: SSLErrorPageUserScript? { get }
+}
+
+extension UserScripts: SSLErrorPageScriptProvider {}
+
+final class SSLErrorPageTabExtension {
+    weak var webView: ErrorPageTabExtensionNavigationDelegate?
+    private weak var sslErrorPageUserScript: SSLErrorPageUserScript?
+    private var shouldBypassSSLError = false
+    private var urlCredentialCreator: URLCredentialCreating
+    private var featureFlagger: FeatureFlagger
+
+    private var cancellables = Set<AnyCancellable>()
+
+    init(
+        webViewPublisher: some Publisher<WKWebView, Never>,
+        scriptsPublisher: some Publisher<some SSLErrorPageScriptProvider, Never>,
+        urlCredentialCreator: URLCredentialCreating = URLCredentialCreator(),
+        featureFlagger: FeatureFlagger = NSApp.delegateTyped.featureFlagger) {
+            self.featureFlagger = featureFlagger
+            self.urlCredentialCreator = urlCredentialCreator
+            webViewPublisher.sink { [weak self] webView in
+                self?.webView = webView
+            }.store(in: &cancellables)
+            scriptsPublisher.sink { [weak self] scripts in
+                self?.sslErrorPageUserScript = scripts.sslErrorPageUserScript
+                self?.sslErrorPageUserScript?.delegate = self
+            }.store(in: &cancellables)
+        }
+
+    @MainActor
+    private func loadSSLErrorHTML(url: URL, alternate: Bool, errorCode: Int) {
+        let domain: String = url.host ?? url.toString(decodePunycode: true, dropScheme: true, dropTrailingSlash: true)
+        let html = SSLErrorPageHTMLTemplate(domain: domain, errorCode: errorCode).makeHTMLFromTemplate()
+        webView?.loadAlternateHTML(html, baseURL: .error, forUnreachableURL: url)
+        loadHTML(html: html, url: url, alternate: alternate)
+    }
+
+    @MainActor
+    private func loadErrorHTML(_ error: WKError, header: String, forUnreachableURL url: URL, alternate: Bool) {
+        let html = ErrorPageHTMLTemplate(error: error, header: header).makeHTMLFromTemplate()
+        loadHTML(html: html, url: url, alternate: alternate)
+    }
+
+    @MainActor
+    private func loadHTML(html: String, url: URL, alternate: Bool) {
+        if alternate {
+            webView?.loadAlternateHTML(html, baseURL: .error, forUnreachableURL: url)
+        } else {
+            webView?.setDocumentHtml(html)
+        }
+    }
+
+}
+
+extension SSLErrorPageTabExtension: NavigationResponder {
+    @MainActor
+    func navigation(_ navigation: Navigation, didFailWith error: WKError) {
+        let url = error.failingUrl ?? navigation.url
+        guard navigation.isCurrent else { return }
+        guard error.errorCode != NSURLErrorCannotFindHost else { return }
+
+        if !error.isFrameLoadInterrupted, !error.isNavigationCancelled {
+            // when already displaying the error page and reload navigation fails again: don‘t navigate, just update page HTML
+            guard let webView else { return }
+            let shouldPerformAlternateNavigation = navigation.url != webView.url || navigation.navigationAction.targetFrame?.url != .error
+            if featureFlagger.isFeatureOn(.sslCertificatesBypass),
+               error.errorCode == NSURLErrorServerCertificateUntrusted,
+               let errorCode = error.userInfo["_kCFStreamErrorCodeKey"] as? Int {
+                sslErrorPageUserScript?.failingURL = url
+                loadSSLErrorHTML(url: url, alternate: shouldPerformAlternateNavigation, errorCode: errorCode)
+            }
+        }
+    }
+
+    @MainActor
+    func navigationDidFinish(_ navigation: Navigation) {
+        sslErrorPageUserScript?.isEnabled = navigation.url == sslErrorPageUserScript?.failingURL
+    }
+
+    @MainActor
+    func didReceive(_ challenge: URLAuthenticationChallenge, for navigation: Navigation?) async -> AuthChallengeDisposition? {
+        guard challenge.protectionSpace.authenticationMethod == NSURLAuthenticationMethodServerTrust else { return nil }
+        guard shouldBypassSSLError else { return nil}
+        guard navigation?.url == webView?.url else { return nil }
+        guard let credential = urlCredentialCreator.urlCredentialFrom(trust: challenge.protectionSpace.serverTrust) else { return nil }
+
+        shouldBypassSSLError = false
+        return .credential(credential)
+    }
+}
+
+extension SSLErrorPageTabExtension: SSLErrorPageUserScriptDelegate {
+    func leaveSite() {
+        guard webView?.canGoBack == true else {
+            webView?.close()
+            return
+        }
+        _ = webView?.goBack()
+    }
+
+    func visitSite() {
+        shouldBypassSSLError = true
+        _ = webView?.reloadPage()
+    }
+}
+
+protocol ErrorPageTabExtensionProtocol: AnyObject, NavigationResponder {}
+
+extension SSLErrorPageTabExtension: TabExtension, ErrorPageTabExtensionProtocol {
+    typealias PublicProtocol = ErrorPageTabExtensionProtocol
+    func getPublicProtocol() -> PublicProtocol { self }
+}
+
+extension TabExtensions {
+    var errorPage: ErrorPageTabExtensionProtocol? {
+        resolve(SSLErrorPageTabExtension.self)
+    }
+}
+
+protocol ErrorPageTabExtensionNavigationDelegate: AnyObject {
+    var url: URL? { get }
+    var canGoBack: Bool { get }
+    func loadAlternateHTML(_ html: String, baseURL: URL, forUnreachableURL failingURL: URL)
+    func setDocumentHtml(_ html: String)
+    func goBack() -> WKNavigation?
+    func close()
+    func reloadPage() -> WKNavigation?
+}
+
+extension ErrorPageTabExtensionNavigationDelegate {
+    func reloadPage() -> WKNavigation? {
+        guard let wevView = self as? WKWebView else { return nil }
+        if let item = wevView.backForwardList.currentItem {
+            return wevView.go(to: item)
+        }
+        return nil
+    }
+}
+
+extension WKWebView: ErrorPageTabExtensionNavigationDelegate { }
+
+protocol URLCredentialCreating {
+    func urlCredentialFrom(trust: SecTrust?) -> URLCredential?
+}
+
+struct URLCredentialCreator: URLCredentialCreating {
+    func urlCredentialFrom(trust: SecTrust?) -> URLCredential? {
+        if let trust {
+            return URLCredential(trust: trust)
+        }
+        return nil
+    }
+}
diff --git a/DuckDuckGo/Tab/TabExtensions/TabExtensions.swift b/DuckDuckGo/Tab/TabExtensions/TabExtensions.swift
index 56351d7c11..139c9c2b97 100644
--- a/DuckDuckGo/Tab/TabExtensions/TabExtensions.swift
+++ b/DuckDuckGo/Tab/TabExtensions/TabExtensions.swift
@@ -70,6 +70,8 @@ protocol TabExtensionDependencies {
     var downloadManager: FileDownloadManagerProtocol { get }
     var cbaTimeReporter: ContentBlockingAssetsCompilationTimeReporter? { get }
     var duckPlayer: DuckPlayer { get }
+    var certificateTrustEvaluator: CertificateTrustEvaluating { get }
+    var tunnelController: NetworkProtectionIPCTunnelController? { get }
 }
 
 // swiftlint:disable:next large_tuple
@@ -122,9 +124,17 @@ extension TabExtensionsBuilder {
 
         add {
             PrivacyDashboardTabExtension(contentBlocking: dependencies.privacyFeatures.contentBlocking,
+                                         certificateTrustEvaluator: dependencies.certificateTrustEvaluator,
                                          autoconsentUserScriptPublisher: userScripts.map(\.?.autoconsentUserScript),
                                          didUpgradeToHttpsPublisher: httpsUpgrade.didUpgradeToHttpsPublisher,
-                                         trackersPublisher: contentBlocking.trackersPublisher)
+                                         trackersPublisher: contentBlocking.trackersPublisher,
+                                         webViewPublisher: args.webViewFuture)
+        }
+
+        add {
+            BrokenSiteInfoTabExtension(contentPublisher: args.contentPublisher,
+                                       webViewPublisher: args.webViewFuture,
+                                       contentScopeUserScriptPublisher: userScripts.compactMap(\.?.contentScopeUserScriptIsolated))
         }
 
         add {
@@ -169,7 +179,7 @@ extension TabExtensionsBuilder {
             HistoryTabExtension(isBurner: args.isTabBurner,
                                 historyCoordinating: dependencies.historyCoordinating,
                                 trackersPublisher: contentBlocking.trackersPublisher,
-                                urlPublisher: args.contentPublisher.map { content in content.isUrl ? content.url : nil },
+                                urlPublisher: args.contentPublisher.map { content in content.isUrl ? content.urlForWebView : nil },
                                 titlePublisher: args.titlePublisher)
         }
         add {
@@ -185,6 +195,17 @@ extension TabExtensionsBuilder {
                                    scriptsPublisher: userScripts.compactMap { $0 },
                                    webViewPublisher: args.webViewFuture)
         }
+
+        add {
+            SSLErrorPageTabExtension(webViewPublisher: args.webViewFuture,
+                                  scriptsPublisher: userScripts.compactMap { $0 })
+        }
+
+        if let tunnelController = dependencies.tunnelController {
+            add {
+                NetworkProtectionControllerTabExtension(tunnelController: tunnelController)
+            }
+        }
     }
 
 }
diff --git a/DuckDuckGo/Tab/TabExtensions/TabSnapshotExtension.swift b/DuckDuckGo/Tab/TabExtensions/TabSnapshotExtension.swift
index 66f84f5ebd..4aaee77a92 100644
--- a/DuckDuckGo/Tab/TabExtensions/TabSnapshotExtension.swift
+++ b/DuckDuckGo/Tab/TabExtensions/TabSnapshotExtension.swift
@@ -151,7 +151,8 @@ final class TabSnapshotExtension {
 
     @MainActor
     func renderWebViewSnapshot() async {
-        guard let webView, let tabContent, let url = tabContent.url else {
+        guard let webView, let tabContent,
+              let url = tabContent.userEditableUrl, !url.isDuckURLScheme else {
             // Previews of native views are rendered in renderNativePreview()
             return
         }
diff --git a/DuckDuckGo/Tab/TabLazyLoader/LazyLoadable.swift b/DuckDuckGo/Tab/TabLazyLoader/LazyLoadable.swift
index 20415c11e6..7fb5446cb5 100644
--- a/DuckDuckGo/Tab/TabLazyLoader/LazyLoadable.swift
+++ b/DuckDuckGo/Tab/TabLazyLoader/LazyLoadable.swift
@@ -37,12 +37,13 @@ protocol LazyLoadable: AnyObject, Identifiable {
 extension Tab: LazyLoadable {
     var isUrl: Bool { content.isUrl }
 
-    var url: URL? { content.url }
+    var url: URL? { content.urlForWebView }
 
     var loadingFinishedPublisher: AnyPublisher<Tab, Never> {
-        webViewDidFinishNavigationPublisher
+        navigationStatePublisher.compactMap { $0 }
+            .filter { $0.isCompleted }
             .prefix(1)
-            .map { self }
+            .map { _ in self }
             .eraseToAnyPublisher()
     }
 
diff --git a/DuckDuckGo/Tab/UserScripts/IdentityTheftRestorationPagesUserScript.swift b/DuckDuckGo/Tab/UserScripts/IdentityTheftRestorationPagesUserScript.swift
index ca8efc779e..a613d64566 100644
--- a/DuckDuckGo/Tab/UserScripts/IdentityTheftRestorationPagesUserScript.swift
+++ b/DuckDuckGo/Tab/UserScripts/IdentityTheftRestorationPagesUserScript.swift
@@ -16,8 +16,6 @@
 //  limitations under the License.
 //
 
-#if SUBSCRIPTION
-
 import BrowserServicesKit
 import Common
 import Combine
@@ -72,7 +70,7 @@ extension IdentityTheftRestorationPagesUserScript: WKScriptMessageHandler {
 /// Use Subscription sub-feature
 ///
 final class IdentityTheftRestorationPagesFeature: Subfeature {
-    var broker: UserScriptMessageBroker?
+    weak var broker: UserScriptMessageBroker?
 
     var featureName = "useIdentityTheftRestoration"
 
@@ -101,5 +99,3 @@ final class IdentityTheftRestorationPagesFeature: Subfeature {
         }
     }
 }
-
-#endif
diff --git a/DuckDuckGo/Tab/UserScripts/Subscription/SubscriptionAppStoreRestorer.swift b/DuckDuckGo/Tab/UserScripts/Subscription/SubscriptionAppStoreRestorer.swift
index 1a3605a102..35661ff131 100644
--- a/DuckDuckGo/Tab/UserScripts/Subscription/SubscriptionAppStoreRestorer.swift
+++ b/DuckDuckGo/Tab/UserScripts/Subscription/SubscriptionAppStoreRestorer.swift
@@ -20,6 +20,7 @@ import Foundation
 import Subscription
 import SubscriptionUI
 import enum StoreKit.StoreKitError
+import PixelKit
 
 @available(macOS 12.0, *)
 struct SubscriptionAppStoreRestorer {
@@ -66,13 +67,12 @@ struct SubscriptionAppStoreRestorer {
 
         switch result {
         case .success:
-            DailyPixel.fire(pixel: .privacyProRestorePurchaseStoreSuccess, frequency: .dailyAndCount)
-
+            PixelKit.fire(PrivacyProPixel.privacyProRestorePurchaseStoreSuccess, frequency: .dailyAndCount)
         case .failure(let error):
             switch error {
             case .missingAccountOrTransactions: break
             default:
-                DailyPixel.fire(pixel: .privacyProRestorePurchaseStoreFailureOther, frequency: .dailyAndCount)
+                PixelKit.fire(PrivacyProPixel.privacyProRestorePurchaseStoreFailureOther, frequency: .dailyAndCount)
             }
 
             switch error {
diff --git a/DuckDuckGo/Tab/UserScripts/Subscription/SubscriptionErrorReporter.swift b/DuckDuckGo/Tab/UserScripts/Subscription/SubscriptionErrorReporter.swift
index bdce936804..438997c0f7 100644
--- a/DuckDuckGo/Tab/UserScripts/Subscription/SubscriptionErrorReporter.swift
+++ b/DuckDuckGo/Tab/UserScripts/Subscription/SubscriptionErrorReporter.swift
@@ -18,6 +18,7 @@
 
 import Foundation
 import Common
+import PixelKit
 
 enum SubscriptionError: Error {
     case purchaseFailed,
@@ -60,7 +61,7 @@ struct SubscriptionErrorReporter {
         case .failedToRestorePastPurchase:
             isStoreError = true
         case .subscriptionNotFound:
-            DailyPixel.fire(pixel: .privacyProRestorePurchaseStoreFailureNotFound, frequency: .dailyAndCount)
+            PixelKit.fire(PrivacyProPixel.privacyProRestorePurchaseStoreFailureNotFound, frequency: .dailyAndCount)
             isStoreError = true
         case .subscriptionExpired:
             isStoreError = true
@@ -69,17 +70,17 @@ struct SubscriptionErrorReporter {
             isBackendError = true
         case .cancelledByUser: break
         case .accountCreationFailed:
-            DailyPixel.fire(pixel: .privacyProPurchaseFailureAccountNotCreated, frequency: .dailyAndCount)
+            PixelKit.fire(PrivacyProPixel.privacyProPurchaseFailureAccountNotCreated, frequency: .dailyAndCount)
         case .activeSubscriptionAlreadyPresent: break
         case .generalError: break
         }
 
         if isStoreError {
-            DailyPixel.fire(pixel: .privacyProPurchaseFailureStoreError, frequency: .dailyAndCount)
+            PixelKit.fire(PrivacyProPixel.privacyProPurchaseFailureStoreError, frequency: .dailyAndCount)
         }
 
         if isBackendError {
-            DailyPixel.fire(pixel: .privacyProPurchaseFailureBackendError, frequency: .dailyAndCount)
+            PixelKit.fire(PrivacyProPixel.privacyProPurchaseFailureBackendError, frequency: .dailyAndCount)
         }
     }
 }
diff --git a/DuckDuckGo/Tab/UserScripts/Subscription/SubscriptionPagesUserScript.swift b/DuckDuckGo/Tab/UserScripts/Subscription/SubscriptionPagesUserScript.swift
index 76cdb94e7c..4d9b38724b 100644
--- a/DuckDuckGo/Tab/UserScripts/Subscription/SubscriptionPagesUserScript.swift
+++ b/DuckDuckGo/Tab/UserScripts/Subscription/SubscriptionPagesUserScript.swift
@@ -16,8 +16,6 @@
 //  limitations under the License.
 //
 
-#if SUBSCRIPTION
-
 import BrowserServicesKit
 import Common
 import Combine
@@ -27,6 +25,7 @@ import WebKit
 import UserScript
 import Subscription
 import SubscriptionUI
+import PixelKit
 
 public extension Notification.Name {
     static let subscriptionPageCloseAndOpenPreferences = Notification.Name("com.duckduckgo.subscriptionPage.CloseAndOpenPreferences")
@@ -78,7 +77,7 @@ extension SubscriptionPagesUserScript: WKScriptMessageHandler {
 /// Use Subscription sub-feature
 ///
 final class SubscriptionPagesUseSubscriptionFeature: Subfeature {
-    var broker: UserScriptMessageBroker?
+    weak var broker: UserScriptMessageBroker?
     var featureName = "useSubscription"
     var messageOriginPolicy: MessageOriginPolicy = .only(rules: [
         .exact(hostname: "duckduckgo.com"),
@@ -106,6 +105,7 @@ final class SubscriptionPagesUseSubscriptionFeature: Subfeature {
         static let subscriptionsUnknownPriceClicked = "subscriptionsUnknownPriceClicked"
         static let subscriptionsAddEmailSuccess = "subscriptionsAddEmailSuccess"
         static let subscriptionsWelcomeFaqClicked = "subscriptionsWelcomeFaqClicked"
+        static let getAccessToken = "getAccessToken"
     }
 
     // swiftlint:disable:next cyclomatic_complexity
@@ -125,6 +125,7 @@ final class SubscriptionPagesUseSubscriptionFeature: Subfeature {
         case Handlers.subscriptionsUnknownPriceClicked: return subscriptionsUnknownPriceClicked
         case Handlers.subscriptionsAddEmailSuccess: return subscriptionsAddEmailSuccess
         case Handlers.subscriptionsWelcomeFaqClicked: return subscriptionsWelcomeFaqClicked
+        case Handlers.getAccessToken: return getAccessToken
         default:
             return nil
         }
@@ -143,16 +144,13 @@ final class SubscriptionPagesUseSubscriptionFeature: Subfeature {
     }
 
     func getSubscription(params: Any, original: WKScriptMessage) async throws -> Encodable? {
-        if let authToken = accountManager.authToken, accountManager.accessToken != nil {
-            return Subscription(token: authToken)
-        } else {
-            return Subscription(token: "")
-        }
+        let authToken = accountManager.authToken ?? ""
+        return Subscription(token: authToken)
     }
 
     func setSubscription(params: Any, original: WKScriptMessage) async throws -> Encodable? {
 
-        DailyPixel.fire(pixel: .privacyProRestorePurchaseEmailSuccess, frequency: .dailyAndCount)
+        PixelKit.fire(PrivacyProPixel.privacyProRestorePurchaseEmailSuccess, frequency: .dailyAndCount)
 
         guard let subscriptionValues: SubscriptionValues = DecodableHelper.decode(from: params) else {
             assertionFailure("SubscriptionPagesUserScript: expected JSON representation of SubscriptionValues")
@@ -211,8 +209,7 @@ final class SubscriptionPagesUseSubscriptionFeature: Subfeature {
     // swiftlint:disable:next function_body_length cyclomatic_complexity
     func subscriptionSelected(params: Any, original: WKScriptMessage) async throws -> Encodable? {
 
-        DailyPixel.fire(pixel: .privacyProPurchaseAttempt, frequency: .dailyAndCount)
-
+        PixelKit.fire(PrivacyProPixel.privacyProPurchaseAttempt, frequency: .dailyAndCount)
         struct SubscriptionSelection: Decodable {
             let id: String
         }
@@ -242,9 +239,7 @@ final class SubscriptionPagesUseSubscriptionFeature: Subfeature {
 
                 // Check for active subscriptions
                 if await PurchaseManager.hasActiveSubscription() {
-
-                    Pixel.fire(.privacyProRestoreAfterPurchaseAttempt)
-
+                    PixelKit.fire(PrivacyProPixel.privacyProRestoreAfterPurchaseAttempt)
                     os_log(.info, log: .subscription, "[Purchase] Found active subscription during purchase")
                     SubscriptionErrorReporter.report(subscriptionActivationError: .hasActiveSubscription)
                     await WindowControllersManager.shared.lastKeyMainWindowController?.showSubscriptionFoundAlert(originalMessage: message)
@@ -290,8 +285,8 @@ final class SubscriptionPagesUseSubscriptionFeature: Subfeature {
                 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)
-                    Pixel.fire(.privacyProSubscriptionActivated, limitTo: .initial)
+                    PixelKit.fire(PrivacyProPixel.privacyProPurchaseSuccess, frequency: .dailyAndCount)
+                    PixelKit.fire(PrivacyProPixel.privacyProSubscriptionActivated, frequency: .unique)
                     await pushPurchaseUpdate(originalMessage: message, purchaseUpdate: purchaseUpdate)
                 case .failure(let error):
                     switch error {
@@ -344,7 +339,7 @@ final class SubscriptionPagesUseSubscriptionFeature: Subfeature {
 
     func activateSubscription(params: Any, original: WKScriptMessage) async throws -> Encodable? {
 
-        Pixel.fire(.privacyProRestorePurchaseOfferPageEntry)
+        PixelKit.fire(PrivacyProPixel.privacyProRestorePurchaseOfferPageEntry)
         guard let mainViewController = await WindowControllersManager.shared.lastKeyMainWindowController?.mainViewController,
               let windowControllerManager = await WindowControllersManager.shared.lastKeyMainWindowController else {
             return nil
@@ -365,7 +360,7 @@ final class SubscriptionPagesUseSubscriptionFeature: Subfeature {
         }, uiActionHandler: { event in
             switch event {
             case .activateAddEmailClick:
-                DailyPixel.fire(pixel: .privacyProRestorePurchaseEmailStart, frequency: .dailyAndCount)
+                PixelKit.fire(PrivacyProPixel.privacyProRestorePurchaseEmailStart, frequency: .dailyAndCount)
             default:
                 break
             }
@@ -402,14 +397,14 @@ final class SubscriptionPagesUseSubscriptionFeature: Subfeature {
         case .appTrackingProtection:
             NotificationCenter.default.post(name: .openAppTrackingProtection, object: self, userInfo: nil)
         case .vpn:
-            Pixel.fire(.privacyProWelcomeVPN, limitTo: .initial)
+            PixelKit.fire(PrivacyProPixel.privacyProWelcomeVPN, frequency: .unique)
             NotificationCenter.default.post(name: .ToggleNetworkProtectionInMainWindow, object: self, userInfo: nil)
         case .personalInformationRemoval:
-            Pixel.fire(.privacyProWelcomePersonalInformationRemoval, limitTo: .initial)
+            PixelKit.fire(PrivacyProPixel.privacyProWelcomePersonalInformationRemoval, frequency: .unique)
             NotificationCenter.default.post(name: .openPersonalInformationRemoval, object: self, userInfo: nil)
             await WindowControllersManager.shared.showTab(with: .dataBrokerProtection)
         case .identityTheftRestoration:
-            Pixel.fire(.privacyProWelcomeIdentityRestoration, limitTo: .initial)
+            PixelKit.fire(PrivacyProPixel.privacyProWelcomeIdentityRestoration, frequency: .unique)
             await WindowControllersManager.shared.showTab(with: .identityTheftRestoration(.identityTheftRestoration))
         }
 
@@ -424,20 +419,19 @@ final class SubscriptionPagesUseSubscriptionFeature: Subfeature {
         await StripePurchaseFlow.completeSubscriptionPurchase(subscriptionAppGroup: subscriptionAppGroup)
         await mainViewController?.dismiss(progressViewController)
 
-        DailyPixel.fire(pixel: .privacyProPurchaseStripeSuccess, frequency: .dailyAndCount)
-
+        PixelKit.fire(PrivacyProPixel.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)
+        PixelKit.fire(PrivacyProPixel.privacyProOfferMonthlyPriceClick)
         return nil
     }
 
     func subscriptionsYearlyPriceClicked(params: Any, original: WKScriptMessage) async -> Encodable? {
-        Pixel.fire(.privacyProOfferYearlyPriceClick)
+        PixelKit.fire(PrivacyProPixel.privacyProOfferYearlyPriceClick)
         return nil
     }
 
@@ -447,15 +441,23 @@ final class SubscriptionPagesUseSubscriptionFeature: Subfeature {
     }
 
     func subscriptionsAddEmailSuccess(params: Any, original: WKScriptMessage) async -> Encodable? {
-        Pixel.fire(.privacyProAddEmailSuccess, limitTo: .initial)
+        PixelKit.fire(PrivacyProPixel.privacyProAddEmailSuccess, frequency: .unique)
         return nil
     }
 
     func subscriptionsWelcomeFaqClicked(params: Any, original: WKScriptMessage) async -> Encodable? {
-        Pixel.fire(.privacyProWelcomeFAQClick, limitTo: .initial)
+        PixelKit.fire(PrivacyProPixel.privacyProWelcomeFAQClick, frequency: .unique)
         return nil
     }
 
+    func getAccessToken(params: Any, original: WKScriptMessage) async throws -> Encodable? {
+        if let accessToken = AccountManager(subscriptionAppGroup: Bundle.main.appGroup(bundle: .subs)).accessToken {
+            return ["token": accessToken]
+        } else {
+            return [String: String]()
+        }
+    }
+
     // MARK: Push actions
 
     enum SubscribeActionName: String {
@@ -468,7 +470,11 @@ final class SubscriptionPagesUseSubscriptionFeature: Subfeature {
     }
 
     func pushAction(method: SubscribeActionName, webView: WKWebView, params: Encodable) {
-        let broker = UserScriptMessageBroker(context: SubscriptionPagesUserScript.context, requiresRunInPageContentWorld: true )
+        guard let broker else {
+            assertionFailure("Cannot continue without broker instance")
+            return
+        }
+
         broker.push(method: method.rawValue, params: params, for: self, into: webView)
     }
 }
@@ -477,7 +483,7 @@ extension MainWindowController {
 
     @MainActor
     func showSomethingWentWrongAlert() {
-        DailyPixel.fire(pixel: .privacyProPurchaseFailure, frequency: .dailyAndCount)
+        PixelKit.fire(PrivacyProPixel.privacyProPurchaseFailure, frequency: .dailyAndCount)
         guard let window else { return }
 
         window.show(.somethingWentWrongAlert())
@@ -489,7 +495,7 @@ extension MainWindowController {
 
         window.show(.subscriptionNotFoundAlert(), firstButtonAction: {
             WindowControllersManager.shared.showTab(with: .subscription(.subscriptionPurchase))
-            Pixel.fire(.privacyProOfferScreenImpression)
+            PixelKit.fire(PrivacyProPixel.privacyProOfferScreenImpression)
         })
     }
 
@@ -499,7 +505,7 @@ extension MainWindowController {
 
         window.show(.subscriptionInactiveAlert(), firstButtonAction: {
             WindowControllersManager.shared.showTab(with: .subscription(.subscriptionPurchase))
-            Pixel.fire(.privacyProOfferScreenImpression)
+            PixelKit.fire(PrivacyProPixel.privacyProOfferScreenImpression)
         })
     }
 
@@ -513,7 +519,7 @@ extension MainWindowController {
                     let result = await AppStoreRestoreFlow.restoreAccountFromPastPurchase(subscriptionAppGroup: Bundle.main.appGroup(bundle: .subs))
                     switch result {
                     case .success:
-                        DailyPixel.fire(pixel: .privacyProRestorePurchaseStoreSuccess, frequency: .dailyAndCount)
+                        PixelKit.fire(PrivacyProPixel.privacyProRestorePurchaseStoreSuccess, frequency: .dailyAndCount)
                     case .failure: break
                     }
                     originalMessage.webView?.reload()
@@ -522,5 +528,3 @@ extension MainWindowController {
         })
     }
 }
-
-#endif
diff --git a/DuckDuckGo/Tab/UserScripts/UserScripts.swift b/DuckDuckGo/Tab/UserScripts/UserScripts.swift
index 017c0c6716..1bc9443977 100644
--- a/DuckDuckGo/Tab/UserScripts/UserScripts.swift
+++ b/DuckDuckGo/Tab/UserScripts/UserScripts.swift
@@ -31,10 +31,8 @@ final class UserScripts: UserScriptsProvider {
     let printingUserScript = PrintingUserScript()
     let hoverUserScript = HoverUserScript()
     let debugScript = DebugUserScript()
-#if SUBSCRIPTION
     let subscriptionPagesUserScript = SubscriptionPagesUserScript()
     let identityTheftRestorationPagesUserScript = IdentityTheftRestorationPagesUserScript()
-#endif
     let clickToLoadScript: ClickToLoadUserScript
 
     let contentBlockerRulesScript: ContentBlockerRulesUserScript
@@ -46,6 +44,7 @@ final class UserScripts: UserScriptsProvider {
     let autoconsentUserScript: UserScriptWithAutoconsent
     let youtubeOverlayScript: YoutubeOverlayUserScript?
     let youtubePlayerUserScript: YoutubePlayerUserScript?
+    let sslErrorPageUserScript: SSLErrorPageUserScript?
 
     init(with sourceProvider: ScriptSourceProviding) {
         clickToLoadScript = ClickToLoadUserScript(scriptSourceProvider: sourceProvider)
@@ -64,14 +63,16 @@ final class UserScripts: UserScriptsProvider {
 
         autoconsentUserScript = AutoconsentUserScript(scriptSource: sourceProvider, config: sourceProvider.privacyConfigurationManager.privacyConfig)
 
+        sslErrorPageUserScript = SSLErrorPageUserScript()
+
+        specialPages = SpecialPagesUserScript()
+
         if DuckPlayer.shared.isAvailable {
             youtubeOverlayScript = YoutubeOverlayUserScript()
             youtubePlayerUserScript = YoutubePlayerUserScript()
-            specialPages = SpecialPagesUserScript()
         } else {
             youtubeOverlayScript = nil
             youtubePlayerUserScript = nil
-            specialPages = nil
         }
 
         userScripts.append(autoconsentUserScript)
@@ -80,14 +81,16 @@ final class UserScripts: UserScriptsProvider {
             contentScopeUserScriptIsolated.registerSubfeature(delegate: youtubeOverlayScript)
         }
 
-        if let youtubePlayerUserScript {
-            if let specialPages = specialPages {
+        if let specialPages = specialPages {
+            if let sslErrorPageUserScript {
+                specialPages.registerSubfeature(delegate: sslErrorPageUserScript)
+            }
+            if let youtubePlayerUserScript {
                 specialPages.registerSubfeature(delegate: youtubePlayerUserScript)
-                userScripts.append(specialPages)
             }
+            userScripts.append(specialPages)
         }
 
-#if SUBSCRIPTION
         if DefaultSubscriptionFeatureAvailability().isFeatureAvailable {
             subscriptionPagesUserScript.registerSubfeature(delegate: SubscriptionPagesUseSubscriptionFeature())
             userScripts.append(subscriptionPagesUserScript)
@@ -95,7 +98,6 @@ final class UserScripts: UserScriptsProvider {
             identityTheftRestorationPagesUserScript.registerSubfeature(delegate: IdentityTheftRestorationPagesFeature())
             userScripts.append(identityTheftRestorationPagesUserScript)
         }
-#endif
     }
 
     lazy var userScripts: [UserScript] = [
diff --git a/DuckDuckGo/Tab/View/BrowserTabViewController.swift b/DuckDuckGo/Tab/View/BrowserTabViewController.swift
index d3e4ebbc31..dde4a10a29 100644
--- a/DuckDuckGo/Tab/View/BrowserTabViewController.swift
+++ b/DuckDuckGo/Tab/View/BrowserTabViewController.swift
@@ -23,6 +23,7 @@ import Common
 import SwiftUI
 import WebKit
 import Subscription
+import PixelKit
 
 // swiftlint:disable file_length
 // swiftlint:disable:next type_body_length
@@ -154,7 +155,6 @@ final class BrowserTabViewController: NSViewController {
 
 #endif
 
-#if SUBSCRIPTION
         NotificationCenter.default.addObserver(self,
                                                selector: #selector(onCloseSubscriptionPage),
                                                name: .subscriptionPageCloseAndOpenPreferences,
@@ -163,7 +163,6 @@ final class BrowserTabViewController: NSViewController {
                                                selector: #selector(onSubscriptionAccountDidSignOut),
                                                name: .accountDidSignOut,
                                                object: nil)
-#endif
     }
 
     @objc
@@ -225,7 +224,6 @@ final class BrowserTabViewController: NSViewController {
 
 #endif
 
-#if SUBSCRIPTION
     @objc
     private func onCloseSubscriptionPage(_ notification: Notification) {
         guard let activeTab = tabViewModel?.tab else { return }
@@ -254,8 +252,6 @@ final class BrowserTabViewController: NSViewController {
         }
     }
 
-#endif
-
     private func subscribeToSelectedTabViewModel() {
         tabCollectionViewModel.$selectedTabViewModel
             .sink { [weak self] selectedTabViewModel in
@@ -391,20 +387,23 @@ final class BrowserTabViewController: NSViewController {
                 return old == new
             })
             .map { [weak tabViewModel] tabContent -> AnyPublisher<Void, Never> in
-                // For non-URL tabs, just emit an event
+                // For non-URL tabs, just emit an event displaying the tab content
                 guard let tabViewModel, tabContent.isUrl else {
                     return Just(()).eraseToAnyPublisher()
                 }
 
-                // For URL tabs, we only want to show tab content (webView) when webView starts
-                // navigation or when another navigation-related event happens.
-                // We take the first such event and move forward.
-                return Publishers.Merge4(
-                    tabViewModel.tab.webViewDidStartNavigationPublisher,
-                    tabViewModel.tab.webViewDidReceiveRedirectPublisher,
-                    tabViewModel.tab.webViewDidCommitNavigationPublisher,
-                    tabViewModel.tab.webViewDidReceiveUserInteractiveChallengePublisher
+                // For URL tabs, we only want to show tab content (webView) when
+                // it has content to display (first navigation had been committed)
+                // or starts navigation.
+                return Publishers.Merge(
+                    tabViewModel.tab.$hasCommittedContent
+                        .filter { $0 == true }
+                        .asVoid(),
+                    tabViewModel.tab.navigationStatePublisher.compactMap { $0 }
+                        .filter{ $0 >= .started }
+                        .asVoid()
                 )
+                // take the first such event and move forward.
                 .prefix(1)
                 .eraseToAnyPublisher()
             }
@@ -425,6 +424,7 @@ final class BrowserTabViewController: NSViewController {
             tabViewModel.tab.downloads?.savePanelDialogPublisher ?? Just(nil).eraseToAnyPublisher()
         )
         .map { $1 ?? $0 }
+        .removeDuplicates()
         .sink { [weak self] dialog in
             self?.show(dialog)
         }
@@ -547,7 +547,8 @@ final class BrowserTabViewController: NSViewController {
                       shouldLoadInBackground: true,
                       burnerMode: tabCollectionViewModel.burnerMode,
                       webViewSize: view.frame.size)
-        tabCollectionViewModel.append(tab: tab, selected: true)
+
+        tabCollectionViewModel.insertOrAppend(tab: tab, selected: true)
     }
 
     // MARK: - Browser Tabs
@@ -776,7 +777,7 @@ extension BrowserTabViewController: NSDraggingDestination {
             return true
         }
 
-        selectedTab.setContent(.url(url, source: .appOpenUrl))
+        selectedTab.setContent(.contentFromURL(url, source: .appOpenUrl))
         return true
     }
 
@@ -834,7 +835,7 @@ extension BrowserTabViewController: TabDelegate {
         case .window(active: let active, let isBurner):
             assert(isBurner == childTab.burnerMode.isBurner)
             WindowsManager.openNewWindow(with: childTab, showWindow: active)
-        case .tab(selected: let selected, _):
+        case .tab(selected: let selected, _, _):
             self.tabCollectionViewModel.insert(childTab, after: parentTab, selected: selected)
         }
     }
@@ -916,6 +917,15 @@ extension BrowserTabViewController: TabDelegate {
     // MARK: - Dialogs
 
     fileprivate func show(_ dialog: Tab.UserDialog?) {
+        guard activeUserDialogCancellable == nil || dialog == nil else {
+            // first hide a displayed dialog before showing another one
+            activeUserDialogCancellable = nil
+            DispatchQueue.main.async { [weak self] in
+                self?.show(dialog)
+            }
+            return
+        }
+
         switch dialog?.dialog {
         case .basicAuthenticationChallenge(let query):
             activeUserDialogCancellable = showBasicAuthenticationChallenge(with: query)
@@ -964,13 +974,28 @@ extension BrowserTabViewController: TabDelegate {
                                                                  suggestedFilename: request.parameters.suggestedFilename,
                                                                  directoryURL: directoryURL)
 
-        savePanel.beginSheetModal(for: window) { [weak request] response in
+        savePanel.beginSheetModal(for: window) { [weak request, weak self] response in
             switch response {
             case .abort:
                 // panel not closed by user but by a tab switching
                 return
             case .OK:
-                guard let url = savePanel.url else { fallthrough }
+                guard let self,
+                      let window = view.window,
+                      let url = savePanel.url else { fallthrough }
+
+                do {
+                    // validate selected URL is writable
+                    try FileManager.default.checkWritability(url)
+                } catch {
+                    // hide the save panel
+                    self.activeUserDialogCancellable = nil
+                    NSAlert(error: error).beginSheetModal(for: window) { [weak self] _ in
+                        guard let self, let request else { return }
+                        self.activeUserDialogCancellable = showSavePanel(with: request)
+                    }
+                    return
+                }
                 request?.submit( (url, savePanel.selectedFileType) )
             default:
                 request?.submit(nil)
@@ -1105,7 +1130,7 @@ extension BrowserTabViewController: OnboardingDelegate {
             return
         }
 
-        Pixel.fire(.defaultRequestedFromOnboarding)
+        PixelKit.fire(GeneralPixel.defaultRequestedFromOnboarding)
         defaultBrowserPreferences.becomeDefault { _ in
             _ = defaultBrowserPreferences
             withAnimation {
diff --git a/DuckDuckGo/Tab/View/WebView.swift b/DuckDuckGo/Tab/View/WebView.swift
index 96b3322fe7..03f56f8b0d 100644
--- a/DuckDuckGo/Tab/View/WebView.swift
+++ b/DuckDuckGo/Tab/View/WebView.swift
@@ -34,12 +34,37 @@ protocol WebViewZoomLevelDelegate: AnyObject {
      func zoomWasSet(to level: DefaultZoomValue)
  }
 
+@objc(DuckDuckGo_WebView)
 final class WebView: WKWebView {
 
     weak var contextMenuDelegate: WebViewContextMenuDelegate?
     weak var interactionEventsDelegate: WebViewInteractionEventsDelegate?
     weak var zoomLevelDelegate: WebViewZoomLevelDelegate?
 
+    private var isLoadingObserver: Any?
+
+    override func addTrackingArea(_ trackingArea: NSTrackingArea) {
+        /// disable mouseEntered/mouseMoved/mouseExited events passing to Web View while it‘s loading
+        /// see https://app.asana.com/0/1177771139624306/1206990108527681/f
+        if trackingArea.owner?.className == "WKMouseTrackingObserver" {
+            // suppress Tracking Area events while loading
+            isLoadingObserver = self.observe(\.isLoading, options: [.new]) { [weak self, trackingArea] _, c in
+                if c.newValue /* isLoading */ ?? false {
+                    guard let self, self.trackingAreas.contains(trackingArea) else { return }
+                    removeTrackingArea(trackingArea)
+                } else {
+                    guard let self, !self.trackingAreas.contains(trackingArea) else { return }
+                    superAddTrackingArea(trackingArea)
+                }
+            }
+        }
+        super.addTrackingArea(trackingArea)
+    }
+
+    private func superAddTrackingArea(_ trackingArea: NSTrackingArea) {
+        super.addTrackingArea(trackingArea)
+    }
+
     override var isInFullScreenMode: Bool {
         if #available(macOS 13.0, *) {
             return self.fullscreenState != .notInFullscreen
diff --git a/DuckDuckGo/Tab/ViewModel/TabViewModel.swift b/DuckDuckGo/Tab/ViewModel/TabViewModel.swift
index 9549b17a77..9c8c158b5f 100644
--- a/DuckDuckGo/Tab/ViewModel/TabViewModel.swift
+++ b/DuckDuckGo/Tab/ViewModel/TabViewModel.swift
@@ -20,17 +20,20 @@ import BrowserServicesKit
 import Cocoa
 import Combine
 import Common
+import WebKit
 
 final class TabViewModel {
 
     enum Favicon {
         static let home = NSImage.homeFavicon
+        static let duckPlayer = NSImage.duckPlayerSettings
         static let burnerHome = NSImage.burnerTabFavicon
-        static let preferences = NSImage.preferences
-        static let bookmarks = NSImage.bookmarks
-        static let dataBrokerProtection = NSImage.dbpIcon
-        static let subscription = NSImage.subscriptionIcon
-        static let identityTheftRestoration = NSImage.itrIcon
+        static let settings = NSImage.settingsMulticolor16
+        static let bookmarks = NSImage.bookmarksFolder
+        static let emailProtection = NSImage.emailProtectionIcon
+        static let dataBrokerProtection = NSImage.personalInformationRemovalMulticolor16
+        static let subscription = NSImage.privacyPro
+        static let identityTheftRestoration = NSImage.identityTheftRestorationMulticolor16
     }
 
     private(set) var tab: Tab
@@ -61,7 +64,8 @@ final class TabViewModel {
     var loadingStartTime: CFTimeInterval?
 
     @Published private(set) var addressBarString: String = ""
-    @Published private(set) var passiveAddressBarString: String = ""
+    @Published private(set) var passiveAddressBarAttributedString = NSAttributedString()
+
     var lastAddressBarTextFieldValue: AddressBarTextField.Value?
 
     @Published private(set) var title: String = UserText.tabHomeTitle
@@ -79,6 +83,19 @@ final class TabViewModel {
         !isShowingErrorPage && canReload && !tab.webView.isInFullScreenMode
     }
 
+    var canFindInPage: Bool {
+        guard !isShowingErrorPage else { return false }
+        switch tab.content {
+        case .url(let url, _, _):
+            return !(url.isDuckPlayer || url.isDuckURLScheme)
+        case .subscription, .identityTheftRestoration:
+            return true
+
+        case .newtab, .settings, .bookmarks, .onboarding, .dataBrokerProtection, .none:
+            return false
+        }
+    }
+
     init(tab: Tab,
          appearancePreferences: AppearancePreferences = .shared,
          accessibilityPreferences: AccessibilityPreferences = .shared) {
@@ -106,45 +123,44 @@ final class TabViewModel {
     }
 
     private func subscribeToUrl() {
-        enum Event {
-            case instant
-            case didCommit
-        }
         tab.$content
-            .map { [tab] content -> AnyPublisher<Event, Never> in
+            .map { [tab] content -> AnyPublisher<Void, Never> in
                 switch content {
-                case .url(let url, _, source: .webViewUpdated),
-                     .url(let url, _, source: .link):
-
-                    // Update the address bar only after the tab did commit navigation to prevent Address Bar Spoofing
-                    return tab.$committedURL.filter { committedURL in
-                        committedURL == url
-                    }.map { _ in
-                        .didCommit
-                    }.eraseToAnyPublisher()
-
                 case .url(_, _, source: .userEntered(_, downloadRequested: true)):
                     // don‘t update the address bar for download navigations
                     return Empty().eraseToAnyPublisher()
 
+                case .url(let url, _, source: .webViewUpdated),
+                        .url(let url, _, source: .link):
+
+                    guard !url.isEmpty, url != .blankPage, !url.isDuckPlayer else { fallthrough }
+
+                    // Only display the Tab content URL update matching its Security Origin
+                    // see https://github.com/mozilla-mobile/firefox-ios/wiki/WKWebView-navigation-and-security-considerations
+                    return tab.$securityOrigin
+                        .filter { tabSecurityOrigin in
+                            url.securityOrigin == tabSecurityOrigin
+                        }
+                        .asVoid().eraseToAnyPublisher()
+
                 case .url(_, _, source: .pendingStateRestoration),
-                     .url(_, _, source: .loadedByStateRestoration),
-                     .url(_, _, source: .userEntered),
-                     .url(_, _, source: .historyEntry),
-                     .url(_, _, source: .bookmark),
-                     .url(_, _, source: .ui),
-                     .url(_, _, source: .appOpenUrl),
-                     .url(_, _, source: .reload),
-                     .newtab,
-                     .settings,
-                     .bookmarks,
-                     .onboarding,
-                     .none,
-                     .dataBrokerProtection,
-                     .subscription,
-                     .identityTheftRestoration:
+                        .url(_, _, source: .loadedByStateRestoration),
+                        .url(_, _, source: .userEntered),
+                        .url(_, _, source: .historyEntry),
+                        .url(_, _, source: .bookmark),
+                        .url(_, _, source: .ui),
+                        .url(_, _, source: .appOpenUrl),
+                        .url(_, _, source: .reload),
+                        .newtab,
+                        .settings,
+                        .bookmarks,
+                        .onboarding,
+                        .none,
+                        .dataBrokerProtection,
+                        .subscription,
+                        .identityTheftRestoration:
                     // Update the address bar instantly for built-in content types or user-initiated navigations
-                    return Just( .instant ).eraseToAnyPublisher()
+                    return Just( () ).eraseToAnyPublisher()
                 }
             }
             .switchToLatest()
@@ -204,6 +220,7 @@ final class TabViewModel {
             .sink { [weak self] _ in
                 self?.updateTitle()
                 self?.updateFavicon()
+                self?.updateCanBeBookmarked()
             }.store(in: &cancellables)
     }
 
@@ -216,9 +233,8 @@ final class TabViewModel {
 
     private func subscribeToPreferences() {
         self.tab.webView.zoomLevelDelegate = self
-        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)
+        appearancePreferences.$showFullURL.dropFirst().sink { [weak self] showFullURL in
+            self?.updatePassiveAddressBarString(showFullURL: showFullURL)
         }.store(in: &cancellables)
         accessibilityPreferences.$defaultPageZoom.sink { [weak self] newValue in
             guard let self = self else { return }
@@ -256,68 +272,78 @@ final class TabViewModel {
     }
 
     private func updateCanBeBookmarked() {
-        canBeBookmarked = !isShowingErrorPage && (tab.content.url ?? .blankPage) != .blankPage
+        canBeBookmarked = !isShowingErrorPage && tab.content.canBeBookmarked
     }
 
-    var tabURL: URL? {
-        return tab.content.url
+    private func updateAddressBarStrings() {
+        updateAddressBarString()
+        updatePassiveAddressBarString()
     }
 
-    private var tabHostURL: URL? {
-        return tabURL?.root
-    }
+    private func updateAddressBarString() {
+        addressBarString = {
+            guard ![.none, .onboarding, .newtab].contains(tab.content),
+                  let url = tab.content.userEditableUrl else { return "" }
 
-    private func updateAddressBarStrings() {
-        guard tab.content.isUrl, let url = tabURL else {
-            addressBarString = ""
-            passiveAddressBarString = ""
-            return
-        }
-
-        if url.isFileURL {
-            addressBarString = url.absoluteString
-            passiveAddressBarString = url.absoluteString
-            return
-        }
+            if url.isBlobURL {
+                return url.strippingUnsupportedCredentials()
+            }
+            return url.absoluteString
+        }()
+    }
 
-        if url.isDataURL {
-            addressBarString = url.absoluteString
-            passiveAddressBarString = "data:"
-            return
+    private func updatePassiveAddressBarString(showFullURL: Bool? = nil) {
+        let showFullURL = showFullURL ?? appearancePreferences.showFullURL
+        passiveAddressBarAttributedString = switch tab.content {
+        case .newtab, .onboarding, .none:
+                .init() // empty
+        case .settings:
+                .settingsTrustedIndicator
+        case .bookmarks:
+                .bookmarksTrustedIndicator
+        case .dataBrokerProtection:
+                .dbpTrustedIndicator
+        case .subscription:
+                .subscriptionTrustedIndicator
+        case .identityTheftRestoration:
+                .identityTheftRestorationTrustedIndicator
+        case .url(let url, _, _) where url.isDuckPlayer:
+                .duckPlayerTrustedIndicator
+        case .url(let url, _, _) where url.isEmailProtection:
+                .emailProtectionTrustedIndicator
+        case .url(let url, _, _):
+            NSAttributedString(string: passiveAddressBarString(with: url, showFullURL: showFullURL))
         }
+    }
 
+    private func passiveAddressBarString(with url: URL, showFullURL: Bool) -> String {
         if url.isBlobURL {
-            let strippedUrl = url.stripUnsupportedCredentials()
-            addressBarString = strippedUrl
-            passiveAddressBarString = strippedUrl
-            return
-        }
+            url.strippingUnsupportedCredentials()
 
-        guard let hostURL = tabHostURL else {
-            // also lands here for about:blank and about:home
-            addressBarString = ""
-            passiveAddressBarString = ""
-            return
-        }
+        } else if url.isDataURL {
+            "data:"
 
-        addressBarString = url.absoluteString
-        updatePassiveAddressBarString(showURL: appearancePreferences.showFullURL, url: url, hostURL: hostURL)
-    }
+        } else if !showFullURL && url.isFileURL {
+            url.lastPathComponent
+
+        } else if !showFullURL && url.host?.isEmpty == false {
+            url.root?.toString(decodePunycode: true, dropScheme: true, dropTrailingSlash: true).droppingWwwPrefix() ?? ""
 
-    private func updatePassiveAddressBarString(showURL: Bool, url: URL, hostURL: URL) {
-        if showURL {
-            passiveAddressBarString = url.toString(decodePunycode: true, dropScheme: false, dropTrailingSlash: true)
-        } else {
-            passiveAddressBarString = hostURL.toString(decodePunycode: true, dropScheme: true, dropTrailingSlash: true).droppingWwwPrefix()
+        } else /* display full url */ {
+            url.toString(decodePunycode: true, dropScheme: false, dropTrailingSlash: true)
         }
     }
 
     private func updateTitle() { // swiftlint:disable:this cyclomatic_complexity
-        let title: String
+        var title: String
         switch tab.content {
-        // keep an old tab title for web page terminated page, display "Failed to open page" for loading errors
+            // keep an old tab title for web page terminated page, display "Failed to open page" for loading errors
         case _ where isShowingErrorPage && (tab.error?.code != .webContentProcessTerminated || tab.title == nil):
-            title = UserText.tabErrorTitle
+            if tab.error?.errorCode == NSURLErrorServerCertificateUntrusted {
+                title = UserText.sslErrorPageTabTitle
+            } else {
+                title = UserText.tabErrorTitle
+            }
         case .dataBrokerProtection:
             title = UserText.tabDataBrokerProtectionTitle
         case .settings:
@@ -343,47 +369,41 @@ final class TabViewModel {
                 title = addressBarString
             }
         }
+        if title.isEmpty {
+            title = UserText.tabUntitledTitle
+        }
         if self.title != title {
             self.title = title
         }
     }
 
+    // swiftlint:disable:next cyclomatic_complexity
     private func updateFavicon(_ tabFavicon: NSImage?? = .none /* provided from .sink or taken from tab.favicon (optional) if .none */) {
         guard !isShowingErrorPage else {
-            favicon = .alertCircleColor16
+            favicon = errorFaviconToShow(error: tab.error)
             return
         }
-
-        switch tab.content {
+        favicon = switch tab.content {
         case .dataBrokerProtection:
-            favicon = Favicon.dataBrokerProtection
-            return
+            Favicon.dataBrokerProtection
+        case .newtab where tab.burnerMode.isBurner:
+            Favicon.burnerHome
         case .newtab:
-            if tab.burnerMode.isBurner {
-                favicon = Favicon.burnerHome
-            } else {
-                favicon = Favicon.home
-            }
-            return
+            Favicon.home
         case .settings:
-            favicon = Favicon.preferences
-            return
+            Favicon.settings
         case .bookmarks:
-            favicon = Favicon.bookmarks
-            return
+            Favicon.bookmarks
         case .subscription:
-            favicon = Favicon.subscription
-            return
+            Favicon.subscription
         case .identityTheftRestoration:
-            favicon = Favicon.identityTheftRestoration
-            return
-        case .url, .onboarding, .none: break
-        }
-
-        if let favicon: NSImage? = tabFavicon {
-            self.favicon = favicon
-        } else {
-            self.favicon = tab.favicon
+            Favicon.identityTheftRestoration
+        case .url(let url, _, _) where url.isDuckPlayer:
+            Favicon.duckPlayer
+        case .url(let url, _, _) where url.isEmailProtection:
+            Favicon.emailProtection
+        case .url, .onboarding, .none:
+            tabFavicon ?? tab.favicon
         }
     }
 
@@ -392,6 +412,13 @@ final class TabViewModel {
         updateAddressBarStrings()
     }
 
+    private func errorFaviconToShow(error: WKError?) -> NSImage {
+        if error?.errorCode == NSURLErrorServerCertificateUntrusted {
+            return .redAlertCircle16
+        }
+        return.alertCircleColor16
+    }
+
     // MARK: - Privacy icon animation
 
     let trackersAnimationTriggerPublisher = PassthroughSubject<Void, Never>()
@@ -445,3 +472,61 @@ extension TabViewModel: WebViewZoomLevelDelegate {
         }
     }
 }
+
+private extension NSAttributedString {
+
+    private typealias Component = NSAttributedString
+
+    private static let spacer = NSImage() // empty spacer image attachment for Attributed Strings below
+
+    private static let iconBaselineOffset: CGFloat = -3
+    private static let iconSize: CGFloat = 16
+    private static let iconSpacing: CGFloat = 6
+    private static let chevronSize: CGFloat = 12
+    private static let chevronSpacing: CGFloat = 12
+
+    private static let duckDuckGoWithChevronAttributedString = NSAttributedString {
+        // logo
+        Component(image: .homeFavicon, rect: CGRect(x: 0, y: iconBaselineOffset, width: iconSize, height: iconSize))
+        // spacing
+        Component(image: spacer, rect: CGRect(x: 0, y: 0, width: iconSpacing, height: 1))
+        // DuckDuckGo
+        Component(string: UserText.duckDuckGo)
+
+        // spacing (wide)
+        Component(image: spacer, rect: CGRect(x: 0, y: 0, width: chevronSpacing, height: 1))
+        // chevron
+        Component(image: .chevronRight12, rect: CGRect(x: 0, y: -1, width: chevronSize, height: chevronSize))
+        // spacing (wide)
+        Component(image: spacer, rect: CGRect(x: 0, y: 0, width: chevronSpacing, height: 1))
+    }
+
+    private static func trustedIndicatorAttributedString(with icon: NSImage, title: String) -> NSAttributedString {
+        NSAttributedString {
+            duckDuckGoWithChevronAttributedString
+
+            // favicon
+            Component(image: icon, rect: CGRect(x: 0, y: iconBaselineOffset, width: icon.size.width, height: icon.size.height))
+            // spacing
+            Component(image: spacer, rect: CGRect(x: 0, y: 0, width: iconSpacing, height: 1))
+            // title
+            Component(string: title)
+        }
+    }
+
+    static let settingsTrustedIndicator = trustedIndicatorAttributedString(with: .settingsMulticolor16,
+                                                                           title: UserText.settings)
+    static let bookmarksTrustedIndicator = trustedIndicatorAttributedString(with: .bookmarksFolder,
+                                                                            title: UserText.bookmarks)
+    static let dbpTrustedIndicator = trustedIndicatorAttributedString(with: .personalInformationRemovalMulticolor16,
+                                                                      title: UserText.tabDataBrokerProtectionTitle)
+    static let subscriptionTrustedIndicator = trustedIndicatorAttributedString(with: .privacyPro,
+                                                                               title: UserText.subscription)
+    static let identityTheftRestorationTrustedIndicator = trustedIndicatorAttributedString(with: .identityTheftRestorationMulticolor16,
+                                                                                           title: UserText.identityTheftRestorationOptionsMenuItem)
+    static let duckPlayerTrustedIndicator = trustedIndicatorAttributedString(with: .duckPlayerSettings,
+                                                                             title: UserText.duckPlayer)
+    static let emailProtectionTrustedIndicator = trustedIndicatorAttributedString(with: .emailProtectionIcon,
+                                                                                  title: UserText.emailProtectionPreferences)
+
+}
diff --git a/DuckDuckGo/TabBar/Model/TabCollection.swift b/DuckDuckGo/TabBar/Model/TabCollection.swift
index 94b632fa86..87c15fe1a6 100644
--- a/DuckDuckGo/TabBar/Model/TabCollection.swift
+++ b/DuckDuckGo/TabBar/Model/TabCollection.swift
@@ -78,6 +78,11 @@ final class TabCollection: NSObject {
         tabs = tab.map { [$0] } ?? []
     }
 
+    func removeTabs(before index: Int) {
+        tabsWillClose(range: 0..<index)
+        tabs.removeSubrange(0..<index)
+    }
+
     func removeTabs(after index: Int) {
         tabsWillClose(range: (index + 1)..<tabs.count)
         tabs.removeSubrange((index + 1)...)
diff --git a/DuckDuckGo/TabBar/View/TabBarViewController.swift b/DuckDuckGo/TabBar/View/TabBarViewController.swift
index 6ebc31e640..b2d4be517a 100644
--- a/DuckDuckGo/TabBar/View/TabBarViewController.swift
+++ b/DuckDuckGo/TabBar/View/TabBarViewController.swift
@@ -141,7 +141,7 @@ final class TabBarViewController: NSViewController {
     }
 
     @objc func addButtonAction(_ sender: NSButton) {
-        tabCollectionViewModel.appendNewTab(with: .newtab)
+        tabCollectionViewModel.insertOrAppendNewTab()
     }
 
     @IBAction func rightScrollButtonAction(_ sender: NSButton) {
@@ -1041,7 +1041,7 @@ extension TabBarViewController: TabBarViewItemDelegate {
     func tabBarViewItemBookmarkThisPageAction(_ tabBarViewItem: TabBarViewItem) {
         guard let indexPath = collectionView.indexPath(for: tabBarViewItem),
               let tabViewModel = tabCollectionViewModel.tabViewModel(at: indexPath.item),
-              let url = tabViewModel.tab.content.url else {
+              let url = tabViewModel.tab.content.userEditableUrl else {
             os_log("TabBarViewController: Failed to get index path of tab bar view item", type: .error)
             return
         }
@@ -1049,6 +1049,15 @@ extension TabBarViewController: TabBarViewItemDelegate {
         bookmarkTab(with: url, title: tabViewModel.title)
     }
 
+    func tabBarViewAllItemsCanBeBookmarked(_ tabBarViewItem: TabBarViewItem) -> Bool {
+        tabCollectionViewModel.canBookmarkAllOpenTabs()
+    }
+
+    func tabBarViewItemBookmarkAllOpenTabsAction(_ tabBarViewItem: TabBarViewItem) {
+        let websitesInfo = tabCollectionViewModel.tabs.compactMap(WebsiteInfo.init)
+        BookmarksDialogViewFactory.makeBookmarkAllOpenTabsView(websitesInfo: websitesInfo).show()
+    }
+
     func tabBarViewItemCloseAction(_ tabBarViewItem: TabBarViewItem) {
         guard let indexPath = collectionView.indexPath(for: tabBarViewItem) else {
             assertionFailure("TabBarViewController: Failed to get index path of tab bar view item")
@@ -1084,6 +1093,15 @@ extension TabBarViewController: TabBarViewItemDelegate {
         tabCollectionViewModel.removeAllTabs(except: indexPath.item)
     }
 
+    func tabBarViewItemCloseToTheLeftAction(_ tabBarViewItem: TabBarViewItem) {
+        guard let indexPath = collectionView.indexPath(for: tabBarViewItem) else {
+            assertionFailure("TabBarViewController: Failed to get index path of tab bar view item")
+            return
+        }
+
+        tabCollectionViewModel.removeTabs(before: indexPath.item)
+    }
+
     func tabBarViewItemCloseToTheRightAction(_ tabBarViewItem: TabBarViewItem) {
         guard let indexPath = collectionView.indexPath(for: tabBarViewItem) else {
             assertionFailure("TabBarViewController: Failed to get index path of tab bar view item")
@@ -1144,12 +1162,9 @@ extension TabBarViewController: TabBarViewItemDelegate {
         removeFireproofing(from: tab)
     }
 
-    func tabBarViewItemAudioState(_ tabBarViewItem: TabBarViewItem) -> WKWebView.AudioState {
+    func tabBarViewItemAudioState(_ tabBarViewItem: TabBarViewItem) -> WKWebView.AudioState? {
         guard let indexPath = collectionView.indexPath(for: tabBarViewItem),
-              let tab = tabCollectionViewModel.tabCollection.tabs[safe: indexPath.item]
-        else {
-            return .notSupported
-        }
+              let tab = tabCollectionViewModel.tabCollection.tabs[safe: indexPath.item] else { return nil }
 
         return tab.audioState
     }
diff --git a/DuckDuckGo/TabBar/View/TabBarViewItem.swift b/DuckDuckGo/TabBar/View/TabBarViewItem.swift
index b4a1bbca64..18042eb73f 100644
--- a/DuckDuckGo/TabBar/View/TabBarViewItem.swift
+++ b/DuckDuckGo/TabBar/View/TabBarViewItem.swift
@@ -33,20 +33,23 @@ protocol TabBarViewItemDelegate: AnyObject {
     func tabBarViewItemCanBeDuplicated(_ tabBarViewItem: TabBarViewItem) -> Bool
     func tabBarViewItemCanBePinned(_ tabBarViewItem: TabBarViewItem) -> Bool
     func tabBarViewItemCanBeBookmarked(_ tabBarViewItem: TabBarViewItem) -> Bool
+    func tabBarViewAllItemsCanBeBookmarked(_ tabBarViewItem: TabBarViewItem) -> Bool
 
     func tabBarViewItemCloseAction(_ tabBarViewItem: TabBarViewItem)
     func tabBarViewItemTogglePermissionAction(_ tabBarViewItem: TabBarViewItem)
     func tabBarViewItemCloseOtherAction(_ tabBarViewItem: TabBarViewItem)
+    func tabBarViewItemCloseToTheLeftAction(_ tabBarViewItem: TabBarViewItem)
     func tabBarViewItemCloseToTheRightAction(_ tabBarViewItem: TabBarViewItem)
     func tabBarViewItemDuplicateAction(_ tabBarViewItem: TabBarViewItem)
     func tabBarViewItemPinAction(_ tabBarViewItem: TabBarViewItem)
     func tabBarViewItemBookmarkThisPageAction(_ tabBarViewItem: TabBarViewItem)
+    func tabBarViewItemBookmarkAllOpenTabsAction(_ tabBarViewItem: TabBarViewItem)
     func tabBarViewItemMoveToNewWindowAction(_ tabBarViewItem: TabBarViewItem)
     func tabBarViewItemMoveToNewBurnerWindowAction(_ tabBarViewItem: TabBarViewItem)
     func tabBarViewItemFireproofSite(_ tabBarViewItem: TabBarViewItem)
     func tabBarViewItemMuteUnmuteSite(_ tabBarViewItem: TabBarViewItem)
     func tabBarViewItemRemoveFireproofing(_ tabBarViewItem: TabBarViewItem)
-    func tabBarViewItemAudioState(_ tabBarViewItem: TabBarViewItem) -> WKWebView.AudioState
+    func tabBarViewItemAudioState(_ tabBarViewItem: TabBarViewItem) -> WKWebView.AudioState?
 
     func otherTabBarViewItemsState(for tabBarViewItem: TabBarViewItem) -> OtherTabBarViewItemsState
 
@@ -196,6 +199,10 @@ final class TabBarViewItem: NSCollectionViewItem {
         delegate?.tabBarViewItemBookmarkThisPageAction(self)
     }
 
+    @objc func bookmarkAllOpenTabsAction(_ sender: Any) {
+        delegate?.tabBarViewItemBookmarkAllOpenTabsAction(self)
+    }
+
     private var lastKnownIndexPath: IndexPath?
 
     @IBAction func closeButtonAction(_ sender: Any) {
@@ -229,6 +236,10 @@ final class TabBarViewItem: NSCollectionViewItem {
         delegate?.tabBarViewItemCloseOtherAction(self)
     }
 
+    @objc func closeToTheLeftAction(_ sender: NSMenuItem) {
+        delegate?.tabBarViewItemCloseToTheLeftAction(self)
+    }
+
     @objc func closeToTheRightAction(_ sender: NSMenuItem) {
         delegate?.tabBarViewItemCloseToTheRightAction(self)
     }
@@ -253,7 +264,7 @@ final class TabBarViewItem: NSCollectionViewItem {
         }.store(in: &cancellables)
 
         tabViewModel.tab.$content.sink { [weak self] content in
-            self?.currentURL = content.url
+            self?.currentURL = content.userEditableUrl
         }.store(in: &cancellables)
 
         tabViewModel.$usedPermissions.assign(to: \.usedPermissions, onWeaklyHeld: self).store(in: &cancellables)
@@ -446,7 +457,7 @@ final class TabBarViewItem: NSCollectionViewItem {
         switch delegate?.tabBarViewItemAudioState(self) {
         case .muted:
             mutedTabIcon.isHidden = false
-        default:
+        case .unmuted, .none:
             mutedTabIcon.isHidden = true
         }
     }
@@ -486,19 +497,21 @@ extension TabBarViewItem: NSMenuDelegate {
         // Section 1
         addDuplicateMenuItem(to: menu)
         addPinMenuItem(to: menu)
-        menu.addItem(NSMenuItem.separator())
+        addMuteUnmuteMenuItem(to: menu)
+        menu.addItem(.separator())
 
         // Section 2
-        addBookmarkMenuItem(to: menu)
         addFireproofMenuItem(to: menu)
-
-        addMuteUnmuteMenuItem(to: menu)
-        menu.addItem(NSMenuItem.separator())
+        addBookmarkMenuItem(to: menu)
+        menu.addItem(.separator())
 
         // Section 3
+        addBookmarkAllTabsMenuItem(to: menu)
+        menu.addItem(.separator())
+
+        // Section 4
         addCloseMenuItem(to: menu)
-        addCloseOtherMenuItem(to: menu, areThereOtherTabs: areThereOtherTabs)
-        addCloseTabsToTheRightMenuItem(to: menu, areThereTabsToTheRight: otherItemsState.hasItemsToTheRight)
+        addCloseOtherSubmenu(to: menu, tabBarItemState: otherItemsState)
         if !isBurner {
             addMoveToNewWindowMenuItem(to: menu, areThereOtherTabs: areThereOtherTabs)
         }
@@ -525,6 +538,13 @@ extension TabBarViewItem: NSMenuDelegate {
         menu.addItem(bookmarkMenuItem)
     }
 
+    private func addBookmarkAllTabsMenuItem(to menu: NSMenu) {
+        let bookmarkMenuItem = NSMenuItem(title: UserText.bookmarkAllTabs, action: #selector(bookmarkAllOpenTabsAction(_:)), keyEquivalent: "")
+        bookmarkMenuItem.target = self
+        bookmarkMenuItem.isEnabled = delegate?.tabBarViewAllItemsCanBeBookmarked(self) ?? false
+        menu.addItem(bookmarkMenuItem)
+    }
+
     private func addFireproofMenuItem(to menu: NSMenu) {
         var menuItem = NSMenuItem(title: UserText.fireproofSite, action: #selector(fireproofSiteAction(_:)), keyEquivalent: "")
         menuItem.isEnabled = false
@@ -540,15 +560,12 @@ extension TabBarViewItem: NSMenuDelegate {
     }
 
     private func addMuteUnmuteMenuItem(to menu: NSMenu) {
-        let audioState = delegate?.tabBarViewItemAudioState(self) ?? .notSupported
-
-        if audioState != .notSupported {
-            menu.addItem(NSMenuItem.separator())
-            let menuItemTitle = audioState == .muted ? UserText.unmuteTab : UserText.muteTab
-            let muteUnmuteMenuItem = NSMenuItem(title: menuItemTitle, action: #selector(muteUnmuteSiteAction(_:)), keyEquivalent: "")
-            muteUnmuteMenuItem.target = self
-            menu.addItem(muteUnmuteMenuItem)
-        }
+        guard let audioState = delegate?.tabBarViewItemAudioState(self) else { return }
+
+        let menuItemTitle = audioState == .muted ? UserText.unmuteTab : UserText.muteTab
+        let muteUnmuteMenuItem = NSMenuItem(title: menuItemTitle, action: #selector(muteUnmuteSiteAction(_:)), keyEquivalent: "")
+        muteUnmuteMenuItem.target = self
+        menu.addItem(muteUnmuteMenuItem)
     }
 
     private func addCloseMenuItem(to menu: NSMenu) {
@@ -557,13 +574,35 @@ extension TabBarViewItem: NSMenuDelegate {
         menu.addItem(closeMenuItem)
     }
 
+    private func addCloseOtherSubmenu(to menu: NSMenu, tabBarItemState: OtherTabBarViewItemsState) {
+        let closeOtherMenuItem = NSMenuItem(title: UserText.closeOtherTabs)
+        let submenu = NSMenu()
+        submenu.autoenablesItems = false
+
+        addCloseTabsToTheLeftMenuItem(to: submenu, areThereTabsToTheLeft: tabBarItemState.hasItemsToTheLeft)
+        addCloseTabsToTheRightMenuItem(to: submenu, areThereTabsToTheRight: tabBarItemState.hasItemsToTheRight)
+        addCloseOtherMenuItem(to: submenu, areThereOtherTabs: tabBarItemState.hasItemsToTheLeft || tabBarItemState.hasItemsToTheRight)
+
+        closeOtherMenuItem.submenu = submenu
+        menu.addItem(closeOtherMenuItem)
+    }
+
     private func addCloseOtherMenuItem(to menu: NSMenu, areThereOtherTabs: Bool) {
-        let closeOtherMenuItem = NSMenuItem(title: UserText.closeOtherTabs, action: #selector(closeOtherAction(_:)), keyEquivalent: "")
+        let closeOtherMenuItem = NSMenuItem(title: UserText.closeAllOtherTabs, action: #selector(closeOtherAction(_:)), keyEquivalent: "")
         closeOtherMenuItem.target = self
         closeOtherMenuItem.isEnabled = areThereOtherTabs
         menu.addItem(closeOtherMenuItem)
     }
 
+    private func addCloseTabsToTheLeftMenuItem(to menu: NSMenu, areThereTabsToTheLeft: Bool) {
+        let closeTabsToTheLeftMenuItem = NSMenuItem(title: UserText.closeTabsToTheLeft,
+                                                     action: #selector(closeToTheLeftAction(_:)),
+                                                     keyEquivalent: "")
+        closeTabsToTheLeftMenuItem.target = self
+        closeTabsToTheLeftMenuItem.isEnabled = areThereTabsToTheLeft
+        menu.addItem(closeTabsToTheLeftMenuItem)
+    }
+
     private func addCloseTabsToTheRightMenuItem(to menu: NSMenu, areThereTabsToTheRight: Bool) {
         let closeTabsToTheRightMenuItem = NSMenuItem(title: UserText.closeTabsToTheRight,
                                                      action: #selector(closeToTheRightAction(_:)),
diff --git a/DuckDuckGo/TabBar/ViewModel/TabCollectionViewModel.swift b/DuckDuckGo/TabBar/ViewModel/TabCollectionViewModel.swift
index e1fd1751c0..c4bb6b716b 100644
--- a/DuckDuckGo/TabBar/ViewModel/TabCollectionViewModel.swift
+++ b/DuckDuckGo/TabBar/ViewModel/TabCollectionViewModel.swift
@@ -20,6 +20,7 @@ import Common
 import Foundation
 import Combine
 import History
+import PixelKit
 
 /**
  * The delegate callbacks are triggered for events related to unpinned tabs only.
@@ -101,6 +102,7 @@ final class TabCollectionViewModel: NSObject {
 
     private var cancellables = Set<AnyCancellable>()
 
+    private var tabsPreferences: TabsPreferences
     private var startupPreferences: StartupPreferences
     private var homePage: Tab.TabContent {
         var homePage: Tab.TabContent = .newtab
@@ -116,12 +118,14 @@ final class TabCollectionViewModel: NSObject {
         selectionIndex: Int = 0,
         pinnedTabsManager: PinnedTabsManager?,
         burnerMode: BurnerMode = .regular,
-        startupPreferences: StartupPreferences = StartupPreferences.shared
+        startupPreferences: StartupPreferences = StartupPreferences.shared,
+        tabsPreferences: TabsPreferences = TabsPreferences.shared
     ) {
         self.tabCollection = tabCollection
         self.pinnedTabsManager = pinnedTabsManager
         self.burnerMode = burnerMode
         self.startupPreferences = startupPreferences
+        self.tabsPreferences = tabsPreferences
         super.init()
 
         subscribeToTabs()
@@ -320,6 +324,10 @@ final class TabCollectionViewModel: NSObject {
         delegate?.tabCollectionViewModelDidMultipleChanges(self)
     }
 
+    func insertNewTab(after parentTab: Tab, with content: Tab.TabContent = .newtab, selected: Bool = true) {
+        insert(Tab(content: content, shouldLoadInBackground: true, burnerMode: burnerMode), after: parentTab, selected: selected)
+    }
+
     func insert(_ tab: Tab, at index: TabIndex, selected: Bool = true) {
         guard changesEnabled else { return }
         guard let tabCollection = tabCollection(for: index) else {
@@ -362,6 +370,18 @@ final class TabCollectionViewModel: NSObject {
         }
     }
 
+    func insertOrAppendNewTab(_ content: Tab.TabContent = .newtab, selected: Bool = true) {
+        insertOrAppend(tab: Tab(content: content, shouldLoadInBackground: true, burnerMode: burnerMode), selected: selected)
+    }
+
+    func insertOrAppend(tab: Tab, selected: Bool) {
+        if tabsPreferences.newTabPosition == .nextToCurrent, let selectionIndex {
+            self.insert(tab, at: selectionIndex.makeNextUnpinned(), selected: selected)
+        } else {
+            append(tab: tab, selected: selected)
+        }
+    }
+
     // MARK: - Removal
 
     func removeAll(with content: Tab.TabContent) {
@@ -488,6 +508,22 @@ final class TabCollectionViewModel: NSObject {
         delegate?.tabCollectionViewModelDidMultipleChanges(self)
     }
 
+    func removeTabs(before index: Int) {
+        guard changesEnabled else { return }
+
+        tabCollection.removeTabs(before: index)
+
+        if let currentSelection = selectionIndex, currentSelection.isUnpinnedTab {
+            if currentSelection.item < index {
+                selectionIndex = .unpinned(0)
+            } else {
+                selectionIndex = .unpinned(currentSelection.item - index)
+            }
+        }
+
+        delegate?.tabCollectionViewModelDidMultipleChanges(self)
+    }
+
     func removeTabs(after index: Int) {
         guard changesEnabled else { return }
 
@@ -657,7 +693,7 @@ final class TabCollectionViewModel: NSObject {
 
             // Make sure the tab is burner if it is supposed to be
             if newTabs.first(where: { $0.burnerMode != self.burnerMode }) != nil {
-                Pixel.fire(.debug(event: .burnerTabMisplaced))
+                PixelKit.fire(DebugEvent(GeneralPixel.burnerTabMisplaced))
                 fatalError("Error in burner tab management")
             }
         } .store(in: &cancellables)
@@ -762,3 +798,14 @@ extension TabCollectionViewModel {
     }
 
 }
+
+// MARK: - Bookmark All Open Tabs
+
+extension TabCollectionViewModel {
+
+    func canBookmarkAllOpenTabs() -> Bool {
+        // At least two non pinned, non empty (URL only), and not showing an error tabs.
+        tabViewModels.values.filter(\.canBeBookmarked).count >= 2
+    }
+
+}
diff --git a/DuckDuckGo/TabBar/ViewModel/TabIndex.swift b/DuckDuckGo/TabBar/ViewModel/TabIndex.swift
index c55bd59a7f..7a2675d1bb 100644
--- a/DuckDuckGo/TabBar/ViewModel/TabIndex.swift
+++ b/DuckDuckGo/TabBar/ViewModel/TabIndex.swift
@@ -64,6 +64,15 @@ enum TabIndex: Equatable, Comparable {
         }
     }
 
+    func makeNextUnpinned() -> TabIndex {
+        switch self {
+        case .pinned:
+            return .unpinned(0)
+        case let .unpinned(index):
+            return .unpinned(index + 1)
+        }
+    }
+
     func isInSameSection(as other: TabIndex) -> Bool {
         switch (self, other) {
         case (.pinned, .unpinned), (.unpinned, .pinned):
diff --git a/DuckDuckGo/TabPreview/TabPreviewViewController.swift b/DuckDuckGo/TabPreview/TabPreviewViewController.swift
index e805efac9c..cdf6d3e721 100644
--- a/DuckDuckGo/TabPreview/TabPreviewViewController.swift
+++ b/DuckDuckGo/TabPreview/TabPreviewViewController.swift
@@ -23,6 +23,7 @@ protocol Previewable {
 
     var title: String { get }
     var tabContent: Tab.TabContent { get }
+    var addressBarString: String { get }
     var snapshot: NSImage? { get }
 }
 
@@ -131,11 +132,8 @@ final class TabPreviewViewController: NSViewController {
         titleTextField.lineBreakMode = isSelected ? .byWordWrapping : .byTruncatingTail
 
         switch tabViewModel.tabContent {
-        case .url(let url, credential: _, source: _):
-            urlTextField.stringValue = url.toString(decodePunycode: true,
-                                                    dropScheme: true,
-                                                    needsWWW: false,
-                                                    dropTrailingSlash: true)
+        case .url:
+            urlTextField.stringValue = tabViewModel.addressBarString
         case .bookmarks, .dataBrokerProtection, .newtab, .onboarding, .settings:
             urlTextField.stringValue = "DuckDuckGo Browser"
         default:
@@ -187,6 +185,7 @@ extension TabPreviewViewController {
             let title: String
             var tabContent: Tab.TabContent
             let shouldShowPreview: Bool
+            var addressBarString: String { tabContent.userEditableUrl?.absoluteString ?? "Default" }
 
             var snapshot: NSImage? {
                 let image = NSImage(size: size)
diff --git a/DuckDuckGo/UserAgent/Model/UserAgent.swift b/DuckDuckGo/UserAgent/Model/UserAgent.swift
index a65930a81f..c7c66b146c 100644
--- a/DuckDuckGo/UserAgent/Model/UserAgent.swift
+++ b/DuckDuckGo/UserAgent/Model/UserAgent.swift
@@ -51,7 +51,7 @@ extension UserAgent {
         return version
     }()
 
-    static let ddgVersion: String = safariVersion.appending(" Ddg/\(safariVersion)")
+    static let ddgVersion: String = "Ddg/\(safariVersion)"
 
     // MARK: - User Agents
 
@@ -66,7 +66,7 @@ extension UserAgent {
         "Safari/537.36"
     static let `default` = UserAgent.safari
     static let webViewDefault = ""
-    static let brandedDefault = Self.default.appending(ddgVersion)
+    static let brandedDefault = "\(Self.default) \(ddgVersion)"
 
     static let localUserAgentConfiguration: KeyValuePairs<RegEx, String> = [
         // use safari when serving up PDFs from duckduckgo directly
diff --git a/DuckDuckGo/VPNFeedbackForm/VPNFeedbackCategory.swift b/DuckDuckGo/VPNFeedbackForm/VPNFeedbackCategory.swift
index 34adf335df..972f6ef4e7 100644
--- a/DuckDuckGo/VPNFeedbackForm/VPNFeedbackCategory.swift
+++ b/DuckDuckGo/VPNFeedbackForm/VPNFeedbackCategory.swift
@@ -18,8 +18,6 @@
 
 import Foundation
 
-#if NETWORK_PROTECTION
-
 enum VPNFeedbackCategory: String, CaseIterable {
     case landingPage
     case unableToInstall
@@ -61,5 +59,3 @@ enum VPNFeedbackCategory: String, CaseIterable {
         }
     }
 }
-
-#endif
diff --git a/DuckDuckGo/VPNFeedbackForm/VPNFeedbackFormView.swift b/DuckDuckGo/VPNFeedbackForm/VPNFeedbackFormView.swift
index 17323bbedc..fb3f6ccf4b 100644
--- a/DuckDuckGo/VPNFeedbackForm/VPNFeedbackFormView.swift
+++ b/DuckDuckGo/VPNFeedbackForm/VPNFeedbackFormView.swift
@@ -19,8 +19,6 @@
 import Foundation
 import SwiftUI
 
-#if NETWORK_PROTECTION
-
 struct VPNFeedbackFormView: View {
 
     @EnvironmentObject var viewModel: VPNFeedbackFormViewModel
@@ -214,5 +212,3 @@ private struct VPNFeedbackFormButtons: View {
     }
 
 }
-
-#endif
diff --git a/DuckDuckGo/VPNFeedbackForm/VPNFeedbackFormViewController.swift b/DuckDuckGo/VPNFeedbackForm/VPNFeedbackFormViewController.swift
index 4311945264..fe8b8258e2 100644
--- a/DuckDuckGo/VPNFeedbackForm/VPNFeedbackFormViewController.swift
+++ b/DuckDuckGo/VPNFeedbackForm/VPNFeedbackFormViewController.swift
@@ -16,8 +16,6 @@
 //  limitations under the License.
 //
 
-#if NETWORK_PROTECTION
-
 import Foundation
 import AppKit
 import SwiftUI
@@ -120,5 +118,3 @@ extension VPNFeedbackFormViewController: VPNFeedbackFormViewModelDelegate {
     }
 
 }
-
-#endif
diff --git a/DuckDuckGo/VPNFeedbackForm/VPNFeedbackFormViewModel.swift b/DuckDuckGo/VPNFeedbackForm/VPNFeedbackFormViewModel.swift
index 76282a51af..7363d0d817 100644
--- a/DuckDuckGo/VPNFeedbackForm/VPNFeedbackFormViewModel.swift
+++ b/DuckDuckGo/VPNFeedbackForm/VPNFeedbackFormViewModel.swift
@@ -16,8 +16,6 @@
 //  limitations under the License.
 //
 
-#if NETWORK_PROTECTION
-
 import Foundation
 import Combine
 import SwiftUI
@@ -100,5 +98,3 @@ final class VPNFeedbackFormViewModel: ObservableObject {
     }
 
 }
-
-#endif
diff --git a/DuckDuckGo/VPNFeedbackForm/VPNFeedbackSender.swift b/DuckDuckGo/VPNFeedbackForm/VPNFeedbackSender.swift
index 52a951acbd..9fe17e7a62 100644
--- a/DuckDuckGo/VPNFeedbackForm/VPNFeedbackSender.swift
+++ b/DuckDuckGo/VPNFeedbackForm/VPNFeedbackSender.swift
@@ -16,9 +16,8 @@
 //  limitations under the License.
 //
 
-#if NETWORK_PROTECTION
-
 import Foundation
+import PixelKit
 
 protocol VPNFeedbackSender {
     func send(metadata: VPNMetadata, category: VPNFeedbackCategory, userText: String) async throws
@@ -29,10 +28,10 @@ struct DefaultVPNFeedbackSender: VPNFeedbackSender {
     func send(metadata: VPNMetadata, category: VPNFeedbackCategory, userText: String) async throws {
         let urlAllowed: CharacterSet = .alphanumerics.union(.init(charactersIn: "-._~"))
         let encodedUserText = userText.addingPercentEncoding(withAllowedCharacters: urlAllowed) ?? userText
-        let pixelEvent = Pixel.Event.vpnBreakageReport(category: category.rawValue, description: encodedUserText, metadata: metadata.toBase64())
+        let pixelEvent = GeneralPixel.vpnBreakageReport(category: category.rawValue, description: encodedUserText, metadata: metadata.toBase64())
 
         try await withCheckedThrowingContinuation { (continuation: CheckedContinuation<Void, Error>) in
-            Pixel.fire(pixelEvent) { error in
+            PixelKit.fire(pixelEvent) { _, error in
                 if let error {
                     continuation.resume(throwing: error)
                 } else {
@@ -43,5 +42,3 @@ struct DefaultVPNFeedbackSender: VPNFeedbackSender {
     }
 
 }
-
-#endif
diff --git a/DuckDuckGo/VPNFeedbackForm/VPNMetadataCollector.swift b/DuckDuckGo/VPNFeedbackForm/VPNMetadataCollector.swift
index f724c14aae..700149aad7 100644
--- a/DuckDuckGo/VPNFeedbackForm/VPNMetadataCollector.swift
+++ b/DuckDuckGo/VPNFeedbackForm/VPNMetadataCollector.swift
@@ -16,8 +16,6 @@
 //  limitations under the License.
 //
 
-#if NETWORK_PROTECTION
-
 import Foundation
 import AppKit
 import Common
@@ -26,6 +24,7 @@ import NetworkProtection
 import NetworkExtension
 import NetworkProtectionIPC
 import NetworkProtectionUI
+import Subscription
 
 struct VPNMetadata: Encodable {
 
@@ -51,7 +50,8 @@ struct VPNMetadata: Encodable {
     struct VPNState: Encodable {
         let onboardingState: String
         let connectionState: String
-        let lastErrorMessage: String
+        let lastStartErrorDescription: String
+        let lastTunnelErrorDescription: String
         let connectedServer: String
         let connectedServerIP: String
     }
@@ -74,12 +74,18 @@ struct VPNMetadata: Encodable {
         let notificationsAgentIsRunning: Bool
     }
 
+    struct PrivacyProInfo: Encodable {
+        let hasPrivacyProAccount: Bool
+        let hasVPNEntitlement: Bool
+    }
+
     let appInfo: AppInfo
     let deviceInfo: DeviceInfo
     let networkInfo: NetworkInfo
     let vpnState: VPNState
     let vpnSettingsState: VPNSettingsState
     let loginItemState: LoginItemState
+    let privacyProInfo: PrivacyProInfo
 
     func toPrettyPrintedJSON() -> String? {
         let encoder = JSONEncoder()
@@ -113,17 +119,23 @@ protocol VPNMetadataCollector {
 final class DefaultVPNMetadataCollector: VPNMetadataCollector {
 
     private let statusReporter: NetworkProtectionStatusReporter
+    private let ipcClient: TunnelControllerIPCClient
+    private let defaults: UserDefaults
 
-    init() {
+    init(defaults: UserDefaults = .netP) {
         let ipcClient = TunnelControllerIPCClient()
         ipcClient.register()
 
+        self.ipcClient = ipcClient
+        self.defaults = defaults
+
         self.statusReporter = DefaultNetworkProtectionStatusReporter(
             statusObserver: ipcClient.connectionStatusObserver,
             serverInfoObserver: ipcClient.serverInfoObserver,
             connectionErrorObserver: ipcClient.connectionErrorObserver,
             connectivityIssuesObserver: ConnectivityIssueObserverThroughDistributedNotifications(),
-            controllerErrorMessageObserver: ControllerErrorMesssageObserverThroughDistributedNotifications()
+            controllerErrorMessageObserver: ControllerErrorMesssageObserverThroughDistributedNotifications(),
+            dataVolumeObserver: ipcClient.dataVolumeObserver
         )
 
         // Force refresh just in case. A refresh is requested when the IPC client is created, but distributed notifications don't guarantee delivery
@@ -139,6 +151,7 @@ final class DefaultVPNMetadataCollector: VPNMetadataCollector {
         let vpnState = await collectVPNState()
         let vpnSettingsState = collectVPNSettingsState()
         let loginItemState = collectLoginItemState()
+        let privacyProInfo = await collectPrivacyProInfo()
 
         return VPNMetadata(
             appInfo: appInfoMetadata,
@@ -146,7 +159,8 @@ final class DefaultVPNMetadataCollector: VPNMetadataCollector {
             networkInfo: networkInfoMetadata,
             vpnState: vpnState,
             vpnSettingsState: vpnSettingsState,
-            loginItemState: loginItemState
+            loginItemState: loginItemState,
+            privacyProInfo: privacyProInfo
         )
     }
 
@@ -154,7 +168,7 @@ final class DefaultVPNMetadataCollector: VPNMetadataCollector {
 
     private func collectAppInfoMetadata() -> VPNMetadata.AppInfo {
         let appVersion = AppVersion.shared.versionAndBuildNumber
-        let versionStore = NetworkProtectionLastVersionRunStore(userDefaults: .netP)
+        let versionStore = NetworkProtectionLastVersionRunStore(userDefaults: defaults)
         let isInternalUser = NSApp.delegateTyped.internalUserDecider.isInternalUser
         let isInApplicationsDirectory = Bundle.main.isInApplicationsDirectory
 
@@ -223,7 +237,7 @@ final class DefaultVPNMetadataCollector: VPNMetadataCollector {
     func collectVPNState() async -> VPNMetadata.VPNState {
         let onboardingState: String
 
-        switch UserDefaults.netP.networkProtectionOnboardingStatus {
+        switch defaults.networkProtectionOnboardingStatus {
         case .completed:
             onboardingState = "complete"
         case .isOnboarding(let step):
@@ -235,13 +249,16 @@ final class DefaultVPNMetadataCollector: VPNMetadataCollector {
             }
         }
 
+        let errorHistory = VPNOperationErrorHistory(ipcClient: ipcClient, defaults: defaults)
+
         let connectionState = String(describing: statusReporter.statusObserver.recentValue)
-        let lastErrorMessage = statusReporter.connectionErrorObserver.recentValue ?? "none"
+        let lastTunnelErrorDescription = await errorHistory.lastTunnelErrorDescription
         let connectedServer = statusReporter.serverInfoObserver.recentValue.serverLocation?.serverLocation ?? "none"
         let connectedServerIP = statusReporter.serverInfoObserver.recentValue.serverAddress ?? "none"
         return .init(onboardingState: onboardingState,
                      connectionState: connectionState,
-                     lastErrorMessage: lastErrorMessage,
+                     lastStartErrorDescription: errorHistory.lastStartErrorDescription,
+                     lastTunnelErrorDescription: lastTunnelErrorDescription,
                      connectedServer: connectedServer,
                      connectedServerIP: connectedServerIP)
     }
@@ -270,7 +287,7 @@ final class DefaultVPNMetadataCollector: VPNMetadataCollector {
     }
 
     func collectVPNSettingsState() -> VPNMetadata.VPNSettingsState {
-        let settings = VPNSettings(defaults: .netP)
+        let settings = VPNSettings(defaults: defaults)
 
         return .init(
             connectOnLoginEnabled: settings.connectOnLogin,
@@ -284,6 +301,15 @@ final class DefaultVPNMetadataCollector: VPNMetadataCollector {
         )
     }
 
-}
+    func collectPrivacyProInfo() async -> VPNMetadata.PrivacyProInfo {
+        let accountManager = AccountManager(subscriptionAppGroup: Bundle.main.appGroup(bundle: .subs))
 
-#endif
+        let hasVPNEntitlement = (try? await accountManager.hasEntitlement(for: .networkProtection).get()) ?? false
+
+        return .init(
+            hasPrivacyProAccount: accountManager.isUserAuthenticated,
+            hasVPNEntitlement: hasVPNEntitlement
+        )
+    }
+
+}
diff --git a/DuckDuckGo/Waitlist/Models/WaitlistViewModel.swift b/DuckDuckGo/Waitlist/Models/WaitlistViewModel.swift
index 5be2d26fe1..6419bb86c5 100644
--- a/DuckDuckGo/Waitlist/Models/WaitlistViewModel.swift
+++ b/DuckDuckGo/Waitlist/Models/WaitlistViewModel.swift
@@ -16,8 +16,6 @@
 //  limitations under the License.
 //
 
-#if NETWORK_PROTECTION
-
 import Foundation
 import NetworkProtection
 import UserNotifications
@@ -232,5 +230,3 @@ final class WaitlistViewModel: ObservableObject {
         termsAndConditionActionHandler.didAccept()
     }
 }
-
-#endif
diff --git a/DuckDuckGo/Waitlist/NetworkProtectionFeatureDisabler.swift b/DuckDuckGo/Waitlist/NetworkProtectionFeatureDisabler.swift
index ba12c9cdd2..cddc3b1a9c 100644
--- a/DuckDuckGo/Waitlist/NetworkProtectionFeatureDisabler.swift
+++ b/DuckDuckGo/Waitlist/NetworkProtectionFeatureDisabler.swift
@@ -16,8 +16,6 @@
 //  limitations under the License.
 //
 
-#if NETWORK_PROTECTION
-
 import BrowserServicesKit
 import Common
 import NetworkExtension
@@ -31,7 +29,7 @@ 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 disable(uninstallSystemExtension: Bool) async -> Bool
 
     func stop()
 }
@@ -70,12 +68,14 @@ final class NetworkProtectionFeatureDisabler: NetworkProtectionFeatureDisabling
     /// 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 {
+    func disable(uninstallSystemExtension: Bool) async -> Bool {
+        // We can do this optimistically as it has little if any impact.
+        unpinNetworkProtection()
+
         // 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 {
@@ -85,7 +85,6 @@ final class NetworkProtectionFeatureDisabler: NetworkProtectionFeatureDisabling
         isDisabling = true
 
         defer {
-            unpinNetworkProtection()
             resetUserDefaults(uninstallSystemExtension: uninstallSystemExtension)
         }
 
@@ -102,22 +101,31 @@ final class NetworkProtectionFeatureDisabler: NetworkProtectionFeatureDisabling
             }
         }
 
-        try? await removeVPNConfiguration()
+        var attemptNumber = 1
+        while attemptNumber <= 3 {
+            do {
+                try await removeVPNConfiguration()
+                break // Removal succeeded, break out of the while loop and continue with the rest of uninstallation
+            } catch {
+                print("Failed to remove VPN configuration, with error: \(error.localizedDescription)")
+            }
+
+            attemptNumber += 1
+        }
+
         // We want to give some time for the login item to reset state before disabling it
         try? await Task.sleep(interval: 0.5)
         disableLoginItems()
 
-        if !keepAuthToken {
-            try? removeAppAuthToken()
-        }
-
         notifyVPNUninstalled()
         isDisabling = false
         return true
     }
 
     func stop() {
-        ipcClient.stop()
+        ipcClient.stop { _ in
+            // Intentional no-op
+        }
     }
 
     private func enableLoginItems() {
@@ -138,10 +146,6 @@ final class NetworkProtectionFeatureDisabler: NetworkProtectionFeatureDisabling
         pinningManager.unpin(.networkProtection)
     }
 
-    private func removeAppAuthToken() throws {
-        try NetworkProtectionKeychainTokenStore().deleteToken()
-    }
-
     private func removeVPNConfiguration() async throws {
         // Remove the agent VPN configuration
         try await ipcClient.debugCommand(.removeVPNConfiguration)
@@ -165,5 +169,3 @@ final class NetworkProtectionFeatureDisabler: NetworkProtectionFeatureDisabling
         }
     }
 }
-
-#endif
diff --git a/DuckDuckGo/Waitlist/NetworkProtectionFeatureVisibility.swift b/DuckDuckGo/Waitlist/NetworkProtectionFeatureVisibility.swift
index 96341cc2db..6956ba22ae 100644
--- a/DuckDuckGo/Waitlist/NetworkProtectionFeatureVisibility.swift
+++ b/DuckDuckGo/Waitlist/NetworkProtectionFeatureVisibility.swift
@@ -16,8 +16,6 @@
 //  limitations under the License.
 //
 
-#if NETWORK_PROTECTION
-
 import BrowserServicesKit
 import Combine
 import Common
@@ -26,23 +24,19 @@ import NetworkProtection
 import NetworkProtectionUI
 import LoginItems
 import PixelKit
-
-#if SUBSCRIPTION
 import Subscription
-#endif
 
 protocol NetworkProtectionFeatureVisibility {
-    var isEligibleForThankYouMessage: Bool { get }
     var isInstalled: Bool { get }
 
     func canStartVPN() async throws -> Bool
     func isVPNVisible() -> Bool
-    func isNetworkProtectionBetaVisible() -> Bool
     func shouldUninstallAutomatically() -> Bool
     func disableForAllUsers() async
-    func disableForWaitlistUsers()
     @discardableResult
     func disableIfUserHasNoAccess() async -> Bool
+
+    var onboardStatusPublisher: AnyPublisher<OnboardingStatus, Never> { get }
 }
 
 struct DefaultNetworkProtectionVisibility: NetworkProtectionFeatureVisibility {
@@ -50,16 +44,11 @@ struct DefaultNetworkProtectionVisibility: NetworkProtectionFeatureVisibility {
     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
-    }
-
     init(privacyConfigurationManager: PrivacyConfigurationManaging = ContentBlocking.shared.privacyConfigurationManager,
          networkProtectionFeatureActivation: NetworkProtectionFeatureActivation = NetworkProtectionKeychainTokenStore(),
          featureOverrides: WaitlistBetaOverriding = DefaultWaitlistBetaOverrides(),
@@ -75,17 +64,6 @@ struct DefaultNetworkProtectionVisibility: NetworkProtectionFeatureVisibility {
         self.accountManager = AccountManager(subscriptionAppGroup: subscriptionAppGroup)
     }
 
-    /// 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 the VPN from the user.
-    func isNetworkProtectionBetaVisible() -> Bool {
-        return isEasterEggUser || waitlistIsOngoing
-    }
-
     var isInstalled: Bool {
         LoginItem.vpnMenu.status.isInstalled
     }
@@ -97,7 +75,7 @@ struct DefaultNetworkProtectionVisibility: NetworkProtectionFeatureVisibility {
     ///
     func canStartVPN() async throws -> Bool {
         guard subscriptionFeatureAvailability.isFeatureAvailable else {
-            return isNetworkProtectionBetaVisible()
+            return false
         }
 
         switch await accountManager.hasEntitlement(for: .networkProtection) {
@@ -115,7 +93,7 @@ struct DefaultNetworkProtectionVisibility: NetworkProtectionFeatureVisibility {
     ///
     func isVPNVisible() -> Bool {
         guard subscriptionFeatureAvailability.isFeatureAvailable else {
-            return isNetworkProtectionBetaVisible()
+            return false
         }
 
         return accountManager.isUserAuthenticated
@@ -130,15 +108,7 @@ struct DefaultNetworkProtectionVisibility: NetworkProtectionFeatureVisibility {
     /// 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 = defaults.networkProtectionOnboardingStatus != .default
-
-        return isNotEasterEggUser && waitlistAccessEnded && isOnboarded
-#endif
     }
 
     /// Whether the user is fully onboarded
@@ -153,113 +123,19 @@ struct DefaultNetworkProtectionVisibility: NetworkProtectionFeatureVisibility {
         defaults.networkProtectionOnboardingStatusPublisher
     }
 
-    /// Easter egg users can be identified by them being internal users and having an auth token (NetP being activated).
-    ///
-    private var isEasterEggUser: Bool {
-        !isWaitlistUser && networkProtectionFeatureActivation.isFeatureActivated
-    }
-
-    /// Whether it's a user with feature access
-    private var isEnabledWaitlistUser: Bool {
-        isWaitlistUser && waitlistIsOngoing
-    }
-
-    /// Waitlist users are users that have the waitlist enabled and active
-    ///
-    private var isWaitlistUser: Bool {
-        networkProtectionWaitlist.waitlistStorage.isWaitlistUser
-    }
-
-    /// Waitlist users are users that have the waitlist enabled and active and are invited
-    ///
-    private var isInvitedWaitlistUser: Bool {
-        networkProtectionWaitlist.waitlistStorage.isWaitlistUser && networkProtectionWaitlist.waitlistStorage.isInvited
-    }
-
-    private var isWaitlistBetaActive: Bool {
-        switch featureOverrides.waitlistActive {
-        case .useRemoteValue:
-            guard privacyConfigurationManager.privacyConfig.isSubfeatureEnabled(NetworkProtectionSubfeature.waitlistBetaActive) else {
-                return false
-            }
-
-            return true
-        case .on:
-            return true
-        case .off:
-            return false
-        }
-    }
-
-    private var isWaitlistEnabled: Bool {
-        switch featureOverrides.waitlistEnabled {
-        case .useRemoteValue:
-            return privacyConfigurationManager.privacyConfig.isSubfeatureEnabled(NetworkProtectionSubfeature.waitlist)
-        case .on:
-            return true
-        case .off:
-            return 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() {
-        guard isWaitlistUser else {
-            return
-        }
-
-        Task {
-            await featureDisabler.disable(keepAuthToken: false, uninstallSystemExtension: false)
-        }
+        await featureDisabler.disable(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 {
+        guard shouldUninstallAutomatically() else {
             return false
         }
 
-        return !token.hasPrefix(Self.subscriptionAuthTokenPrefix)
-    }
-
-    /// Checks whether the VPN needs to be disabled.
-    ///
-    var isEligibleForThankYouMessage: Bool {
-        isPreSubscriptionUser() && subscriptionFeatureAvailability.isFeatureAvailable
+        await disableForAllUsers()
+        return true
     }
 }
-
-#endif
diff --git a/DuckDuckGo/Waitlist/Views/WaitlistDialogView.swift b/DuckDuckGo/Waitlist/Views/WaitlistDialogView.swift
index 70f22ec3ea..11e5fe8622 100644
--- a/DuckDuckGo/Waitlist/Views/WaitlistDialogView.swift
+++ b/DuckDuckGo/Waitlist/Views/WaitlistDialogView.swift
@@ -16,8 +16,6 @@
 //  limitations under the License.
 //
 
-#if NETWORK_PROTECTION
-
 import SwiftUI
 
 struct WaitlistDialogView<Content, Buttons>: View where Content: View, Buttons: View {
@@ -64,5 +62,3 @@ struct WaitlistDialogView<Content, Buttons>: View where Content: View, Buttons:
         // .padding(.bottom, 16.0)
     }
 }
-
-#endif
diff --git a/DuckDuckGo/Waitlist/Views/WaitlistModalViewController.swift b/DuckDuckGo/Waitlist/Views/WaitlistModalViewController.swift
index ac7f7a1f58..80a977d6ae 100644
--- a/DuckDuckGo/Waitlist/Views/WaitlistModalViewController.swift
+++ b/DuckDuckGo/Waitlist/Views/WaitlistModalViewController.swift
@@ -16,8 +16,6 @@
 //  limitations under the License.
 //
 
-#if NETWORK_PROTECTION
-
 import AppKit
 import SwiftUI
 import UserNotifications
@@ -107,5 +105,3 @@ struct WaitlistModalDismisser {
         }
     }
 }
-
-#endif
diff --git a/DuckDuckGo/Waitlist/Views/WaitlistRootView.swift b/DuckDuckGo/Waitlist/Views/WaitlistRootView.swift
index d4cd80abd5..b9a029d4c6 100644
--- a/DuckDuckGo/Waitlist/Views/WaitlistRootView.swift
+++ b/DuckDuckGo/Waitlist/Views/WaitlistRootView.swift
@@ -16,37 +16,8 @@
 //  limitations under the License.
 //
 
-#if NETWORK_PROTECTION
-
 import SwiftUI
 
-struct NetworkProtectionWaitlistRootView: View {
-    @EnvironmentObject var model: WaitlistViewModel
-
-    var body: some View {
-        Group {
-            switch model.viewState {
-            case .notOnWaitlist, .joiningWaitlist:
-                JoinWaitlistView(viewData: NetworkProtectionJoinWaitlistViewData())
-            case .joinedWaitlist(let state):
-                JoinedWaitlistView(viewData: NetworkProtectionJoinedWaitlistViewData(),
-                                   notificationsAllowed: state == .notificationAllowed)
-            case .invited:
-                InvitedToWaitlistView(viewData: NetworkProtectionInvitedToWaitlistViewData())
-            case .termsAndConditions:
-                WaitlistTermsAndConditionsView(viewData: NetworkProtectionWaitlistTermsAndConditionsViewData()) {
-                    NetworkProtectionTermsAndConditionsContentView()
-                }
-            case .readyToEnable:
-                EnableWaitlistFeatureView(viewData: EnableNetworkProtectionViewData())
-            }
-        }
-        .environmentObject(model)
-    }
-}
-
-#endif
-
 #if DBP
 
 import SwiftUI
diff --git a/DuckDuckGo/Waitlist/Views/WaitlistSteps/EnableWaitlistFeatureView.swift b/DuckDuckGo/Waitlist/Views/WaitlistSteps/EnableWaitlistFeatureView.swift
deleted file mode 100644
index 074c74d1ca..0000000000
--- a/DuckDuckGo/Waitlist/Views/WaitlistSteps/EnableWaitlistFeatureView.swift
+++ /dev/null
@@ -1,77 +0,0 @@
-//
-//  EnableWaitlistFeatureView.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.
-//
-
-#if NETWORK_PROTECTION || DBP
-
-import SwiftUI
-import SwiftUIExtensions
-
-protocol EnableWaitlistFeatureViewData {
-    var headerImageName: String { get }
-    var title: String { get }
-    var subtitle: String { get }
-    var availabilityDisclaimer: String { get }
-    var buttonConfirmLabel: String { get }
-}
-
-struct EnableWaitlistFeatureView: View {
-    var viewData: EnableWaitlistFeatureViewData
-    @EnvironmentObject var model: WaitlistViewModel
-
-    var body: some View {
-        WaitlistDialogView {
-            VStack(spacing: 16.0) {
-                Image(viewData.headerImageName)
-
-                Text(viewData.title)
-                    .font(.system(size: 17, weight: .bold))
-
-                Text(viewData.subtitle)
-                    .multilineTextAlignment(.center)
-                    .foregroundColor(Color(.blackWhite80))
-
-                Text(viewData.availabilityDisclaimer)
-                    .multilineTextAlignment(.center)
-                    .font(.system(size: 12))
-                    .foregroundColor(Color(.blackWhite60))
-            }
-        } buttons: {
-            Button(viewData.buttonConfirmLabel) {
-                Task {
-                    await model.perform(action: .closeAndConfirmFeature)
-                }
-            }
-            .buttonStyle(DefaultActionButtonStyle(enabled: true))
-        }
-        .environmentObject(model)
-    }
-}
-
-#endif
-
-#if NETWORK_PROTECTION
-
-struct EnableNetworkProtectionViewData: EnableWaitlistFeatureViewData {
-    var headerImageName: String = "Network-Protection-256"
-    var title: String = UserText.networkProtectionWaitlistEnableTitle
-    var subtitle: String = UserText.networkProtectionWaitlistEnableSubtitle
-    var availabilityDisclaimer: String = UserText.networkProtectionWaitlistAvailabilityDisclaimer
-    var buttonConfirmLabel: String = UserText.networkProtectionWaitlistButtonGotIt
-}
-
-#endif
diff --git a/DuckDuckGo/Waitlist/Views/WaitlistSteps/InvitedToWaitlistView.swift b/DuckDuckGo/Waitlist/Views/WaitlistSteps/InvitedToWaitlistView.swift
index dc4b75749c..ca30a44deb 100644
--- a/DuckDuckGo/Waitlist/Views/WaitlistSteps/InvitedToWaitlistView.swift
+++ b/DuckDuckGo/Waitlist/Views/WaitlistSteps/InvitedToWaitlistView.swift
@@ -16,8 +16,6 @@
 //  limitations under the License.
 //
 
-#if NETWORK_PROTECTION
-
 import Foundation
 import SwiftUI
 import SwiftUIExtensions
@@ -119,35 +117,6 @@ struct WaitlistEntryViewItemViewData: Identifiable {
     let subtitle: String
 }
 
-#endif
-
-#if NETWORK_PROTECTION
-
-struct NetworkProtectionInvitedToWaitlistViewData: InvitedToWaitlistViewData {
-    let headerImageName = "Gift-96"
-    let title = UserText.networkProtectionWaitlistInvitedTitle
-    let subtitle = UserText.networkProtectionWaitlistInvitedSubtitle
-    let buttonDismissLabel = UserText.networkProtectionWaitlistButtonDismiss
-    let buttonGetStartedLabel = UserText.networkProtectionWaitlistButtonGetStarted
-    let availabilityDisclaimer = UserText.networkProtectionWaitlistAvailabilityDisclaimer
-    let entryViewViewDataList: [WaitlistEntryViewItemViewData] =
-    [
-        .init(imageName: "Shield-16",
-              title: UserText.networkProtectionWaitlistInvitedSection1Title,
-              subtitle: UserText.networkProtectionWaitlistInvitedSection1Subtitle),
-
-        .init(imageName: "Rocket-16",
-                  title: UserText.networkProtectionWaitlistInvitedSection2Title,
-                  subtitle: UserText.networkProtectionWaitlistInvitedSection2Subtitle),
-
-        .init(imageName: "Card-16",
-                  title: UserText.networkProtectionWaitlistInvitedSection3Title,
-                  subtitle: UserText.networkProtectionWaitlistInvitedSection3Subtitle),
-    ]
-}
-
-#endif
-
 #if DBP
 
 struct DataBrokerProtectionInvitedToWaitlistViewData: InvitedToWaitlistViewData {
diff --git a/DuckDuckGo/Waitlist/Views/WaitlistSteps/JoinWaitlistView.swift b/DuckDuckGo/Waitlist/Views/WaitlistSteps/JoinWaitlistView.swift
index 47aaf86705..6c0e4deb2a 100644
--- a/DuckDuckGo/Waitlist/Views/WaitlistSteps/JoinWaitlistView.swift
+++ b/DuckDuckGo/Waitlist/Views/WaitlistSteps/JoinWaitlistView.swift
@@ -16,8 +16,6 @@
 //  limitations under the License.
 //
 
-#if NETWORK_PROTECTION || DBP
-
 import SwiftUI
 import SwiftUIExtensions
 
@@ -75,22 +73,6 @@ struct JoinWaitlistView: View {
     }
 }
 
-#endif
-
-#if NETWORK_PROTECTION
-
-struct NetworkProtectionJoinWaitlistViewData: JoinWaitlistViewViewData {
-    let headerImageName = "JoinWaitlistHeader"
-    let title = UserText.networkProtectionWaitlistJoinTitle
-    let subtitle1 = UserText.networkProtectionWaitlistJoinSubtitle1
-    let subtitle2 = UserText.networkProtectionWaitlistJoinSubtitle2
-    let availabilityDisclaimer = UserText.networkProtectionWaitlistAvailabilityDisclaimer
-    let buttonCloseLabel = UserText.networkProtectionWaitlistButtonClose
-    let buttonJoinWaitlistLabel = UserText.networkProtectionWaitlistButtonJoinWaitlist
-}
-
-#endif
-
 #if DBP
 
 struct DataBrokerProtectionJoinWaitlistViewData: JoinWaitlistViewViewData {
diff --git a/DuckDuckGo/Waitlist/Views/WaitlistSteps/JoinedWaitlistView.swift b/DuckDuckGo/Waitlist/Views/WaitlistSteps/JoinedWaitlistView.swift
index bcf30d95ad..553d3e6562 100644
--- a/DuckDuckGo/Waitlist/Views/WaitlistSteps/JoinedWaitlistView.swift
+++ b/DuckDuckGo/Waitlist/Views/WaitlistSteps/JoinedWaitlistView.swift
@@ -16,8 +16,6 @@
 //  limitations under the License.
 //
 
-#if NETWORK_PROTECTION || DBP
-
 import SwiftUI
 import SwiftUIExtensions
 
@@ -87,23 +85,6 @@ struct JoinedWaitlistView: View {
     }
 }
 
-#endif
-
-#if NETWORK_PROTECTION
-
-struct NetworkProtectionJoinedWaitlistViewData: JoinedWaitlistViewData {
-    let headerImageName = "JoinedWaitlistHeader"
-    var title = UserText.networkProtectionWaitlistJoinedTitle
-    var joinedWithNoNotificationSubtitle1 = UserText.networkProtectionWaitlistJoinedWithNotificationsSubtitle1
-    var joinedWithNoNotificationSubtitle2 = UserText.networkProtectionWaitlistJoinedWithNotificationsSubtitle2
-    var enableNotificationSubtitle = UserText.networkProtectionWaitlistEnableNotifications
-    var buttonConfirmLabel = UserText.networkProtectionWaitlistButtonDone
-    var buttonCancelLabel = UserText.networkProtectionWaitlistButtonNoThanks
-    var buttonEnableNotificationLabel = UserText.networkProtectionWaitlistButtonEnableNotifications
-}
-
-#endif
-
 #if DBP
 
 struct DataBrokerProtectionJoinedWaitlistViewData: JoinedWaitlistViewData {
diff --git a/DuckDuckGo/Waitlist/Views/WaitlistSteps/WaitlistTermsAndConditionsView.swift b/DuckDuckGo/Waitlist/Views/WaitlistSteps/WaitlistTermsAndConditionsView.swift
index a10b10e34c..7495ae9e0b 100644
--- a/DuckDuckGo/Waitlist/Views/WaitlistSteps/WaitlistTermsAndConditionsView.swift
+++ b/DuckDuckGo/Waitlist/Views/WaitlistSteps/WaitlistTermsAndConditionsView.swift
@@ -16,8 +16,6 @@
 //  limitations under the License.
 //
 
-#if NETWORK_PROTECTION || DBP
-
 import SwiftUI
 import SwiftUIExtensions
 
@@ -84,82 +82,6 @@ private extension Text {
 
 }
 
-#endif
-
-#if NETWORK_PROTECTION
-
-struct NetworkProtectionTermsAndConditionsContentView: View {
-    var body: some View {
-        VStack(alignment: .leading, spacing: 0) {
-            Text(verbatim: UserText.networkProtectionPrivacyPolicyTitle)
-                .font(.system(size: 15, weight: .bold))
-                .multilineTextAlignment(.leading)
-
-            Group {
-                Text(verbatim: UserText.networkProtectionPrivacyPolicySection1Title).titleStyle()
-
-                if #available(macOS 12.0, *) {
-                    Text(verbatim: UserText.networkProtectionPrivacyPolicySection1ListMarkdown).bodyStyle()
-                } else {
-                    Text(verbatim: UserText.networkProtectionPrivacyPolicySection1ListNonMarkdown).bodyStyle()
-                }
-
-                Text(verbatim: UserText.networkProtectionPrivacyPolicySection2Title).titleStyle()
-                Text(verbatim: UserText.networkProtectionPrivacyPolicySection2List).bodyStyle()
-                Text(verbatim: UserText.networkProtectionPrivacyPolicySection3Title).titleStyle()
-                Text(verbatim: UserText.networkProtectionPrivacyPolicySection3List).bodyStyle()
-                Text(verbatim: UserText.networkProtectionPrivacyPolicySection4Title).titleStyle()
-                Text(verbatim: UserText.networkProtectionPrivacyPolicySection4List).bodyStyle()
-                Text(verbatim: UserText.networkProtectionPrivacyPolicySection5Title).titleStyle()
-                Text(verbatim: UserText.networkProtectionPrivacyPolicySection5List).bodyStyle()
-            }
-
-            Text(verbatim: UserText.networkProtectionTermsOfServiceTitle)
-                .font(.system(size: 15, weight: .bold))
-                .multilineTextAlignment(.leading)
-                .padding(.top, 28)
-                .padding(.bottom, 14)
-
-            Group {
-                Text(verbatim: UserText.networkProtectionTermsOfServiceSection1Title).titleStyle(topPadding: 0)
-                Text(verbatim: UserText.networkProtectionTermsOfServiceSection1List).bodyStyle()
-                Text(verbatim: UserText.networkProtectionTermsOfServiceSection2Title).titleStyle()
-
-                if #available(macOS 12.0, *) {
-                    Text(verbatim: UserText.networkProtectionTermsOfServiceSection2ListMarkdown).bodyStyle()
-                } else {
-                    Text(UserText.networkProtectionTermsOfServiceSection2ListNonMarkdown).bodyStyle()
-                }
-
-                Text(verbatim: UserText.networkProtectionTermsOfServiceSection3Title).titleStyle()
-                Text(verbatim: UserText.networkProtectionTermsOfServiceSection3List).bodyStyle()
-                Text(verbatim: UserText.networkProtectionTermsOfServiceSection4Title).titleStyle()
-                Text(verbatim: UserText.networkProtectionTermsOfServiceSection4List).bodyStyle()
-                Text(verbatim: UserText.networkProtectionTermsOfServiceSection5Title).titleStyle()
-                Text(verbatim: UserText.networkProtectionTermsOfServiceSection5List).bodyStyle()
-            }
-
-            Group {
-                Text(verbatim: UserText.networkProtectionTermsOfServiceSection6Title).titleStyle()
-                Text(verbatim: UserText.networkProtectionTermsOfServiceSection6List).bodyStyle()
-                Text(verbatim: UserText.networkProtectionTermsOfServiceSection7Title).titleStyle()
-                Text(verbatim: UserText.networkProtectionTermsOfServiceSection7List).bodyStyle()
-                Text(verbatim: UserText.networkProtectionTermsOfServiceSection8Title).titleStyle()
-                Text(verbatim: UserText.networkProtectionTermsOfServiceSection8List).bodyStyle()
-            }
-        }
-        .padding(.all, 20)
-    }
-}
-
-struct NetworkProtectionWaitlistTermsAndConditionsViewData: WaitlistTermsAndConditionsViewData {
-    let title = "VPN Beta\nService Terms and Privacy Policy"
-    let buttonCancelLabel = UserText.networkProtectionWaitlistButtonCancel
-    let buttonAgreeAndContinueLabel = UserText.networkProtectionWaitlistButtonAgreeAndContinue
-}
-
-#endif
-
 #if DBP
 
 struct DataBrokerProtectionTermsAndConditionsContentView: View {
diff --git a/DuckDuckGo/Waitlist/Views/WaitlistThankYouPromptPresenter.swift b/DuckDuckGo/Waitlist/Views/WaitlistThankYouPromptPresenter.swift
index 2237c32222..11281dcaba 100644
--- a/DuckDuckGo/Waitlist/Views/WaitlistThankYouPromptPresenter.swift
+++ b/DuckDuckGo/Waitlist/Views/WaitlistThankYouPromptPresenter.swift
@@ -18,44 +18,40 @@
 
 import AppKit
 import Foundation
-import Subscription
+import BrowserServicesKit
+import PixelKit
 
 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: {
+        self.init(isPIRBetaTester: {
             return DefaultDataBrokerProtectionFeatureVisibility().isEligibleForThankYouMessage()
         })
     }
 
-    init(isVPNBetaTester: @escaping () -> Bool, isPIRBetaTester: @escaping () -> Bool, userDefaults: UserDefaults = .standard) {
-        self.isVPNBetaTester = isVPNBetaTester
+    init(isPIRBetaTester: @escaping () -> Bool, userDefaults: UserDefaults = .standard) {
         self.isPIRBetaTester = isPIRBetaTester
         self.userDefaults = userDefaults
     }
 
     // MARK: - Presentation
 
-    // Presents a Thank You prompt to testers of the VPN or PIR.
+    // Presents a Thank You prompt to testers of 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)
+            PixelKit.fire(PrivacyProPixel.privacyProFeatureEnabled, frequency: .daily)
         }
 
         guard canShowPromptCheck() else {
@@ -64,21 +60,8 @@ final class WaitlistThankYouPromptPresenter {
 
         if isPIRBetaTester() {
             saveDidShowPromptCheck()
-            DailyPixel.fire(pixel: Pixel.Event.privacyProBetaUserThankYouDBP, frequency: .dailyAndCount)
+            PixelKit.fire(PrivacyProPixel.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)
         }
     }
 
@@ -93,14 +76,6 @@ final class WaitlistThankYouPromptPresenter {
 
     // 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
@@ -115,10 +90,6 @@ final class WaitlistThankYouPromptPresenter {
 
     // MARK: - Dismissal
 
-    func didDismissVPNThankYouCard() {
-        self.userDefaults.setValue(true, forKey: Constants.didDismissVPNCardKey)
-    }
-
     func didDismissPIRThankYouCard() {
         self.userDefaults.setValue(true, forKey: Constants.didDismissPIRCardKey)
     }
@@ -131,7 +102,6 @@ final class WaitlistThankYouPromptPresenter {
 
     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/WaitlistViewControllerPresenter.swift b/DuckDuckGo/Waitlist/Views/WaitlistViewControllerPresenter.swift
index 22fcf9bbdb..55ee0e6584 100644
--- a/DuckDuckGo/Waitlist/Views/WaitlistViewControllerPresenter.swift
+++ b/DuckDuckGo/Waitlist/Views/WaitlistViewControllerPresenter.swift
@@ -18,9 +18,7 @@
 
 import Foundation
 import UserNotifications
-import Subscription
-
-#if NETWORK_PROTECTION || DBP
+import BrowserServicesKit
 
 protocol WaitlistViewControllerPresenter {
     static func show(completion: (() -> Void)?)
@@ -32,61 +30,15 @@ extension WaitlistViewControllerPresenter {
     }
 }
 
-#endif
-
-#if NETWORK_PROTECTION
-
-struct NetworkProtectionWaitlistViewControllerPresenter: WaitlistViewControllerPresenter {
-
-    @MainActor
-    static func show(completion: (() -> Void)? = nil) {
-        guard let windowController = WindowControllersManager.shared.lastKeyMainWindowController,
-              windowController.window?.isKeyWindow == true else {
-            return
-        }
-
-        // This is a hack to get around an issue with the waitlist notification screen showing the wrong state while it animates in, and then
-        // jumping to the correct state as soon as the animation is complete. This works around that problem by providing the correct state up front,
-        // preventing any state changing from occurring.
-        UNUserNotificationCenter.current().getNotificationSettings { settings in
-            let status = settings.authorizationStatus
-            let state = WaitlistViewModel.NotificationPermissionState.from(status)
-
-            DispatchQueue.main.async {
-                let viewModel = WaitlistViewModel(waitlist: NetworkProtectionWaitlist(),
-                                                  notificationPermissionState: state,
-                                                  showNotificationSuccessState: true,
-                                                  termsAndConditionActionHandler: NetworkProtectionWaitlistTermsAndConditionsActionHandler(),
-                                                  featureSetupHandler: NetworkProtectionWaitlistFeatureSetupHandler())
-
-                let viewController = WaitlistModalViewController(viewModel: viewModel, contentView: NetworkProtectionWaitlistRootView())
-                windowController.mainViewController.beginSheet(viewController) { _ in
-                    // If the user dismissed the waitlist flow without signing up, hide the button.
-                    let waitlist = NetworkProtectionWaitlist()
-                    if !waitlist.waitlistStorage.isOnWaitlist {
-                        waitlist.waitlistSignUpPromptDismissed = true
-                        NotificationCenter.default.post(name: .networkProtectionWaitlistAccessChanged, object: nil)
-                    }
-
-                    completion?()
-                }
-            }
-        }
-    }
-}
-
-#endif
-
 #if DBP
 
 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)
@@ -99,7 +51,7 @@ struct DataBrokerProtectionWaitlistViewControllerPresenter: WaitlistViewControll
         guard let windowController = WindowControllersManager.shared.lastKeyMainWindowController else {
             return
         }
-        DataBrokerProtectionExternalWaitlistPixels.fire(pixel: .dataBrokerProtectionWaitlistIntroDisplayed, frequency: .dailyAndCount)
+        DataBrokerProtectionExternalWaitlistPixels.fire(pixel: GeneralPixel.dataBrokerProtectionWaitlistIntroDisplayed, frequency: .dailyAndCount)
 
         // This is a hack to get around an issue with the waitlist notification screen showing the wrong state while it animates in, and then
         // jumping to the correct state as soon as the animation is complete. This works around that problem by providing the correct state up front,
diff --git a/DuckDuckGo/Waitlist/Waitlist.swift b/DuckDuckGo/Waitlist/Waitlist.swift
index 8b91f0b8de..b8bc8e1ba7 100644
--- a/DuckDuckGo/Waitlist/Waitlist.swift
+++ b/DuckDuckGo/Waitlist/Waitlist.swift
@@ -16,8 +16,6 @@
 //  limitations under the License.
 //
 
-#if NETWORK_PROTECTION
-
 import Foundation
 import Networking
 import UserNotifications
@@ -156,92 +154,6 @@ extension ProductWaitlistRequest {
     }
 }
 
-// MARK: - VPN Waitlist
-
-struct NetworkProtectionWaitlist: Waitlist {
-
-    static let identifier: String = "networkprotection"
-    static let apiProductName: String = "networkprotection_macos"
-    static let keychainAppGroup: String = Bundle.main.appGroup(bundle: .netP)
-
-    static let notificationIdentifier = "com.duckduckgo.macos.browser.network-protection.invite-code-available"
-    static let inviteAvailableNotificationTitle = UserText.networkProtectionWaitlistNotificationTitle
-    static let inviteAvailableNotificationBody = UserText.networkProtectionWaitlistNotificationText
-
-    let waitlistStorage: WaitlistStorage
-    let waitlistRequest: WaitlistRequest
-    private let networkProtectionCodeRedemption: NetworkProtectionCodeRedeeming
-
-    @UserDefaultsWrapper(key: .networkProtectionWaitlistSignUpPromptDismissed, defaultValue: false)
-    var waitlistSignUpPromptDismissed: Bool
-
-    var shouldShowWaitlistViewController: Bool {
-        return isOnWaitlist || readyToAcceptTermsAndConditions
-    }
-
-    var isOnWaitlist: Bool {
-        return waitlistStorage.isOnWaitlist
-    }
-
-    var isInvited: Bool {
-        return waitlistStorage.isInvited
-    }
-
-    var readyToAcceptTermsAndConditions: Bool {
-        let accepted = UserDefaults().bool(forKey: UserDefaultsWrapper<Bool>.Key.networkProtectionTermsAndConditionsAccepted.rawValue)
-        return waitlistStorage.isInvited && !accepted
-    }
-
-    init() {
-        self.init(
-            store: WaitlistKeychainStore(waitlistIdentifier: Self.identifier, keychainAppGroup: Self.keychainAppGroup),
-            request: ProductWaitlistRequest(productName: Self.apiProductName),
-            networkProtectionCodeRedemption: NetworkProtectionCodeRedemptionCoordinator()
-        )
-    }
-
-    init(store: WaitlistStorage, request: WaitlistRequest, networkProtectionCodeRedemption: NetworkProtectionCodeRedeeming) {
-        self.waitlistStorage = store
-        self.waitlistRequest = request
-        self.networkProtectionCodeRedemption = networkProtectionCodeRedemption
-    }
-
-    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 {
-                // 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 {
-                        try await networkProtectionCodeRedemption.redeem(inviteCode)
-                        NotificationCenter.default.post(name: .networkProtectionWaitlistAccessChanged, object: nil)
-                        sendInviteCodeAvailableNotification {
-                            DailyPixel.fire(pixel: .networkProtectionWaitlistNotificationShown, frequency: .dailyAndCount)
-                        }
-                        completion(nil)
-                    } catch {
-                        assertionFailure("Failed to redeem invite code")
-                        completion(.failure(error))
-                    }
-                }
-            } else {
-                completion(nil)
-                assertionFailure("Didn't get error or invite code")
-            }
-        }
-    }
-
-}
-
-#endif
-
 #if DBP
 
 // MARK: - DataBroker Protection Waitlist
@@ -352,7 +264,7 @@ struct DataBrokerProtectionWaitlist: Waitlist {
 
         sendInviteCodeAvailableNotification {
             DispatchQueue.main.async {
-                DataBrokerProtectionExternalWaitlistPixels.fire(pixel: .dataBrokerProtectionWaitlistNotificationShown, frequency: .dailyAndCount)
+                DataBrokerProtectionExternalWaitlistPixels.fire(pixel: GeneralPixel.dataBrokerProtectionWaitlistNotificationShown, frequency: .dailyAndCount)
             }
         }
     }
diff --git a/DuckDuckGo/Waitlist/WaitlistFeatureSetupHandler.swift b/DuckDuckGo/Waitlist/WaitlistFeatureSetupHandler.swift
index 587acfda5e..6c2c63b563 100644
--- a/DuckDuckGo/Waitlist/WaitlistFeatureSetupHandler.swift
+++ b/DuckDuckGo/Waitlist/WaitlistFeatureSetupHandler.swift
@@ -16,18 +16,12 @@
 //  limitations under the License.
 //
 
-#if NETWORK_PROTECTION || DBP
-
 import Foundation
 
 protocol WaitlistFeatureSetupHandler {
     func confirmFeature()
 }
 
-#endif
-
-#if NETWORK_PROTECTION
-
 struct NetworkProtectionWaitlistFeatureSetupHandler: WaitlistFeatureSetupHandler {
     func confirmFeature() {
         LocalPinningManager.shared.pin(.networkProtection)
@@ -35,8 +29,6 @@ struct NetworkProtectionWaitlistFeatureSetupHandler: WaitlistFeatureSetupHandler
     }
 }
 
-#endif
-
 #if DBP
 
 struct DataBrokerProtectionWaitlistFeatureSetupHandler: WaitlistFeatureSetupHandler {
diff --git a/DuckDuckGo/Waitlist/WaitlistTermsAndConditionsActionHandler.swift b/DuckDuckGo/Waitlist/WaitlistTermsAndConditionsActionHandler.swift
index 0c0f8bb0cb..3f6f456ea0 100644
--- a/DuckDuckGo/Waitlist/WaitlistTermsAndConditionsActionHandler.swift
+++ b/DuckDuckGo/Waitlist/WaitlistTermsAndConditionsActionHandler.swift
@@ -16,10 +16,9 @@
 //  limitations under the License.
 //
 
-#if NETWORK_PROTECTION || DBP
-
 import Foundation
 import UserNotifications
+import PixelKit
 
 protocol WaitlistTermsAndConditionsActionHandler {
     var acceptedTermsAndConditions: Bool { get }
@@ -27,29 +26,6 @@ protocol WaitlistTermsAndConditionsActionHandler {
     mutating func didAccept()
 }
 
-#endif
-
-#if NETWORK_PROTECTION
-
-struct NetworkProtectionWaitlistTermsAndConditionsActionHandler: WaitlistTermsAndConditionsActionHandler {
-    @UserDefaultsWrapper(key: .networkProtectionTermsAndConditionsAccepted, defaultValue: false)
-    var acceptedTermsAndConditions: Bool
-
-    func didShow() {
-        DailyPixel.fire(pixel: .networkProtectionWaitlistTermsAndConditionsDisplayed, frequency: .dailyAndCount)
-    }
-
-    mutating func didAccept() {
-        acceptedTermsAndConditions = true
-        // Remove delivered NetP notifications in case the user didn't click them.
-        UNUserNotificationCenter.current().removeDeliveredNotifications(withIdentifiers: [NetworkProtectionWaitlist.notificationIdentifier])
-
-        DailyPixel.fire(pixel: .networkProtectionWaitlistTermsAndConditionsAccepted, frequency: .dailyAndCount)
-    }
-}
-
-#endif
-
 #if DBP
 
 struct DataBrokerProtectionWaitlistTermsAndConditionsActionHandler: WaitlistTermsAndConditionsActionHandler {
@@ -57,7 +33,7 @@ struct DataBrokerProtectionWaitlistTermsAndConditionsActionHandler: WaitlistTerm
     var acceptedTermsAndConditions: Bool
 
     func didShow() {
-        DataBrokerProtectionExternalWaitlistPixels.fire(pixel: .dataBrokerProtectionWaitlistTermsAndConditionsDisplayed, frequency: .dailyAndCount)
+        PixelKit.fire(GeneralPixel.dataBrokerProtectionWaitlistTermsAndConditionsDisplayed, frequency: .dailyAndCount)
     }
 
     mutating func didAccept() {
@@ -65,7 +41,7 @@ struct DataBrokerProtectionWaitlistTermsAndConditionsActionHandler: WaitlistTerm
         // Remove delivered NetP notifications in case the user didn't click them.
         UNUserNotificationCenter.current().removeDeliveredNotifications(withIdentifiers: [DataBrokerProtectionWaitlist.notificationIdentifier])
 
-        DataBrokerProtectionExternalWaitlistPixels.fire(pixel: .dataBrokerProtectionWaitlistTermsAndConditionsAccepted, frequency: .dailyAndCount)
+        PixelKit.fire(GeneralPixel.dataBrokerProtectionWaitlistTermsAndConditionsAccepted, frequency: .dailyAndCount)
     }
 }
 
diff --git a/DuckDuckGo/Windows/View/WindowControllersManager.swift b/DuckDuckGo/Windows/View/WindowControllersManager.swift
index 92a871a208..1bea6538a8 100644
--- a/DuckDuckGo/Windows/View/WindowControllersManager.swift
+++ b/DuckDuckGo/Windows/View/WindowControllersManager.swift
@@ -174,12 +174,12 @@ extension WindowControllersManager {
            let firstTab = tabCollection.tabs.first,
            case .newtab = firstTab.content,
            !newTab {
-            firstTab.setContent(url.map { .url($0, source: source) } ?? .newtab)
+            firstTab.setContent(url.map { .contentFromURL($0, source: source) } ?? .newtab)
         } else if let tab = tabCollectionViewModel.selectedTabViewModel?.tab, !newTab {
-            tab.setContent(url.map { .url($0, source: source) } ?? .newtab)
+            tab.setContent(url.map { .contentFromURL($0, source: source) } ?? .newtab)
         } else {
             let newTab = Tab(content: url.map { .url($0, source: source) } ?? .newtab, shouldLoadInBackground: true, burnerMode: tabCollectionViewModel.burnerMode)
-            newTab.setContent(url.map { .url($0, source: source) } ?? .newtab)
+            newTab.setContent(url.map { .contentFromURL($0, source: source) } ?? .newtab)
             tabCollectionViewModel.append(tab: newTab)
         }
     }
@@ -200,7 +200,6 @@ extension WindowControllersManager {
 
     // MARK: - VPN
 
-#if NETWORK_PROTECTION
     @MainActor
     func showNetworkProtectionStatus(retry: Bool = false) async {
         guard let windowController = mainWindowControllers.first else {
@@ -223,13 +222,26 @@ extension WindowControllersManager {
         let feedbackFormViewController = VPNFeedbackFormViewController()
         let feedbackFormWindowController = feedbackFormViewController.wrappedInWindowController()
 
-        guard let feedbackFormWindow = feedbackFormWindowController.window,
-              let parentWindowController = WindowControllersManager.shared.lastKeyMainWindowController else {
-            assertionFailure("Failed to present native VPN feedback form")
+        guard let feedbackFormWindow = feedbackFormWindowController.window else {
+            assertionFailure("Couldn't get window for feedback form")
             return
         }
 
-        parentWindowController.window?.beginSheet(feedbackFormWindow)
+        if let parentWindowController = WindowControllersManager.shared.lastKeyMainWindowController {
+            parentWindowController.window?.beginSheet(feedbackFormWindow)
+        } else {
+            let tabCollection = TabCollection(tabs: [])
+            let tabCollectionViewModel = TabCollectionViewModel(tabCollection: tabCollection)
+            let window = WindowsManager.openNewWindow(with: tabCollectionViewModel)
+            window?.beginSheet(feedbackFormWindow)
+        }
+    }
+
+    func showMainWindow() {
+        guard WindowControllersManager.shared.lastKeyMainWindowController == nil else { return }
+        let tabCollection = TabCollection(tabs: [])
+        let tabCollectionViewModel = TabCollectionViewModel(tabCollection: tabCollection)
+        _ = WindowsManager.openNewWindow(with: tabCollectionViewModel)
     }
 
     func showLocationPickerSheet() {
@@ -244,7 +256,6 @@ extension WindowControllersManager {
 
         parentWindowController.window?.beginSheet(locationsFormWindow)
     }
-#endif
 
 }
 
diff --git a/DuckDuckGo/Windows/View/WindowsManager.swift b/DuckDuckGo/Windows/View/WindowsManager.swift
index 245b36ed0c..007f850990 100644
--- a/DuckDuckGo/Windows/View/WindowsManager.swift
+++ b/DuckDuckGo/Windows/View/WindowsManager.swift
@@ -61,7 +61,8 @@ final class WindowsManager {
                              contentSize: NSSize? = nil,
                              showWindow: Bool = true,
                              popUp: Bool = false,
-                             lazyLoadTabs: Bool = false) -> MainWindow? {
+                             lazyLoadTabs: Bool = false,
+                             isMiniaturized: Bool = false) -> MainWindow? {
         let mainWindowController = makeNewWindow(tabCollectionViewModel: tabCollectionViewModel,
                                                  popUp: popUp,
                                                  burnerMode: burnerMode,
@@ -71,6 +72,8 @@ final class WindowsManager {
             mainWindowController.window?.setContentSize(contentSize)
         }
 
+        mainWindowController.window?.setIsMiniaturized(isMiniaturized)
+
         if let droppingPoint {
             mainWindowController.window?.setFrameOrigin(droppingPoint: droppingPoint)
 
diff --git a/DuckDuckGo/YoutubePlayer/DuckPlayer.swift b/DuckDuckGo/YoutubePlayer/DuckPlayer.swift
index 53620c7236..abbd1fb71e 100644
--- a/DuckDuckGo/YoutubePlayer/DuckPlayer.swift
+++ b/DuckDuckGo/YoutubePlayer/DuckPlayer.swift
@@ -23,6 +23,7 @@ import Foundation
 import Navigation
 import WebKit
 import UserScript
+import PixelKit
 
 enum DuckPlayerMode: Equatable, Codable {
     case enabled, alwaysAsk, disabled
@@ -152,11 +153,11 @@ final class DuckPlayer {
                 .handleEvents(receiveOutput: { mode in
                     switch mode {
                     case .enabled:
-                        Pixel.fire(.duckPlayerSettingAlways)
+                        PixelKit.fire(GeneralPixel.duckPlayerSettingAlways)
                     case .alwaysAsk:
-                        Pixel.fire(.duckPlayerSettingBackToDefault)
+                        PixelKit.fire(GeneralPixel.duckPlayerSettingBackToDefault)
                     case .disabled:
-                        Pixel.fire(.duckPlayerSettingNever)
+                        PixelKit.fire(GeneralPixel.duckPlayerSettingNever)
                     }
                 })
                 .prepend(preferences.duckPlayerMode)
diff --git a/DuckDuckGo/YoutubePlayer/YoutubeOverlayUserScript.swift b/DuckDuckGo/YoutubePlayer/YoutubeOverlayUserScript.swift
index 60906938bc..e5b711db73 100644
--- a/DuckDuckGo/YoutubePlayer/YoutubeOverlayUserScript.swift
+++ b/DuckDuckGo/YoutubePlayer/YoutubeOverlayUserScript.swift
@@ -20,6 +20,7 @@ import Foundation
 import WebKit
 import Common
 import UserScript
+import PixelKit
 
 protocol YoutubeOverlayUserScriptDelegate: AnyObject {
     func youtubeOverlayUserScriptDidRequestDuckPlayer(with url: URL, in webView: WKWebView)
@@ -113,16 +114,16 @@ extension YoutubeOverlayUserScript {
         if pixelName == "play.use" || pixelName == "play.do_not_use" {
             duckPlayerPreferences.youtubeOverlayAnyButtonPressed = true
             if pixelName == "play.use" {
-                Pixel.fire(.duckPlayerViewFromYoutubeViaMainOverlay)
+                PixelKit.fire(GeneralPixel.duckPlayerViewFromYoutubeViaMainOverlay)
             }
         }
 
         // Temporary pixel for first time user uses Duck Player
-        if !Pixel.isNewUser {
+        if !AppDelegate.isNewUser {
             return nil
         }
         if pixelName == "play.use" {
-            Pixel.fire(.watchInDuckPlayerInitial, limitTo: .initial)
+            PixelKit.fire(GeneralPixel.watchInDuckPlayerInitial, frequency: .legacyInitial)
         }
         return nil
     }
diff --git a/DuckDuckGoDBPBackgroundAgent/DataBrokerProtectionBackgroundManager.swift b/DuckDuckGoDBPBackgroundAgent/DataBrokerProtectionBackgroundManager.swift
index 787a859f90..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 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/DuckDuckGoDBPBackgroundAgentAppDelegate.swift b/DuckDuckGoDBPBackgroundAgent/DuckDuckGoDBPBackgroundAgentAppDelegate.swift
index 522bef3306..0a3e777138 100644
--- a/DuckDuckGoDBPBackgroundAgent/DuckDuckGoDBPBackgroundAgentAppDelegate.swift
+++ b/DuckDuckGoDBPBackgroundAgent/DuckDuckGoDBPBackgroundAgentAppDelegate.swift
@@ -43,7 +43,6 @@ final class DuckDuckGoDBPBackgroundAgentApplication: NSApplication {
                        appVersion: AppVersion.shared.versionNumber,
                        source: "dbpBackgroundAgent",
                        defaultHeaders: [:],
-                       log: .dbpBackgroundAgentPixel,
                        defaults: .standard) { (pixelName: String, headers: [String: String], parameters: [String: String], _, _, onComplete: @escaping (Bool, Error?) -> Void) in
 
             let url = URL.pixelUrl(forPixelNamed: pixelName)
@@ -73,15 +72,43 @@ final class DuckDuckGoDBPBackgroundAgentApplication: NSApplication {
     required init?(coder: NSCoder) {
         fatalError("init(coder:) has not been implemented")
     }
+
 }
 
 @main
 final class DuckDuckGoDBPBackgroundAgentAppDelegate: NSObject, NSApplicationDelegate {
+    private let settings = DataBrokerProtectionSettings()
+    private var cancellables = Set<AnyCancellable>()
+    private var statusBarMenu: StatusBarMenu?
 
+    @MainActor
     func applicationDidFinishLaunching(_ aNotification: Notification) {
         os_log("DuckDuckGoAgent started", log: .dbpBackgroundAgent, type: .info)
 
         let manager = DataBrokerProtectionBackgroundManager.shared
         manager.runOperationsAndStartSchedulerIfPossible()
+
+        setupStatusBarMenu()
+    }
+
+    @MainActor
+    private func setupStatusBarMenu() {
+        statusBarMenu = StatusBarMenu()
+
+        if settings.showInMenuBar {
+            statusBarMenu?.show()
+        } else {
+            statusBarMenu?.hide()
+        }
+
+        settings.showInMenuBarPublisher.sink { [weak self] showInMenuBar in
+            Task { @MainActor in
+                if showInMenuBar {
+                    self?.statusBarMenu?.show()
+                } else {
+                    self?.statusBarMenu?.hide()
+                }
+            }
+        }.store(in: &cancellables)
     }
 }
diff --git a/DuckDuckGoDBPBackgroundAgent/IPCServiceManager.swift b/DuckDuckGoDBPBackgroundAgent/IPCServiceManager.swift
index c452200f7b..8c39f28e07 100644
--- a/DuckDuckGoDBPBackgroundAgent/IPCServiceManager.swift
+++ b/DuckDuckGoDBPBackgroundAgent/IPCServiceManager.swift
@@ -61,43 +61,54 @@ final class IPCServiceManager {
 extension IPCServiceManager: IPCServerInterface {
 
     func register() {
-        pixelHandler.fire(.ipcServerRegister)
-
         // When a new client registers, send the last known status
         ipcServer.schedulerStatusChanges(scheduler.status)
     }
 
     func startScheduler(showWebView: Bool) {
-        pixelHandler.fire(.ipcServerStartScheduler)
+        pixelHandler.fire(.ipcServerStartSchedulerReceivedByAgent)
         scheduler.startScheduler(showWebView: showWebView)
     }
 
     func stopScheduler() {
-        pixelHandler.fire(.ipcServerStopScheduler)
+        pixelHandler.fire(.ipcServerStopSchedulerReceivedByAgent)
         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)) {
-        pixelHandler.fire(.ipcServerScanAllBrokers)
-        scheduler.scanAllBrokers(showWebView: showWebView) { error in
-            self.pixelHandler.fire(.ipcServerScanAllBrokersCompletion(error: error))
-            completion(error)
+    func startManualScan(showWebView: Bool,
+                         startTime: Date,
+                         completion: @escaping ((DataBrokerProtectionSchedulerErrorCollection?) -> Void)) {
+        pixelHandler.fire(.ipcServerScanAllBrokersReceivedByAgent)
+        scheduler.startManualScan(showWebView: showWebView, startTime: startTime) { errors in
+            if let error = errors?.oneTimeError {
+                switch error {
+                case DataBrokerProtectionSchedulerError.operationsInterrupted:
+                    self.pixelHandler.fire(.ipcServerScanAllBrokersInterruptedOnAgent)
+                default:
+                    self.pixelHandler.fire(.ipcServerScanAllBrokersCompletedOnAgentWithError(error: error))
+                }
+            } else {
+                self.pixelHandler.fire(.ipcServerScanAllBrokersCompletedOnAgentWithoutError)
+            }
+            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)
         }
     }
 
@@ -111,4 +122,8 @@ extension IPCServiceManager: IPCServerInterface {
             browserWindowManager.show(domain: domain)
         }
     }
+
+    func getDebugMetadata(completion: @escaping (DBPBackgroundAgentMetadata?) -> Void) {
+        scheduler.getDebugMetadata(completion: completion)
+    }
 }
diff --git a/DuckDuckGoDBPBackgroundAgent/UserText.swift b/DuckDuckGoDBPBackgroundAgent/UserText.swift
index 5b460321e5..608cab9e14 100644
--- a/DuckDuckGoDBPBackgroundAgent/UserText.swift
+++ b/DuckDuckGoDBPBackgroundAgent/UserText.swift
@@ -21,6 +21,6 @@ import Foundation
 final class UserText {
     // MARK: - Status Menu
 
-    static let networkProtectionStatusMenuShareFeedback = NSLocalizedString("network.protection.status.menu.share.feedback", value: "Send VPN Feedback...", comment: "The status menu 'Send VPN Feedback' menu item")
-    static let networkProtectionStatusMenuOpenDuckDuckGo = NSLocalizedString("network.protection.status.menu.open.duckduckgo", value: "Open DuckDuckGo...", comment: "The status menu 'Open DuckDuckGo' menu item")
+    static let networkProtectionStatusMenuShareFeedback = NSLocalizedString("network.protection.status.menu.share.feedback", value: "Share VPN Feedback…", comment: "The status menu 'Share VPN Feedback' menu item")
+    static let networkProtectionStatusMenuOpenDuckDuckGo = NSLocalizedString("network.protection.status.menu.open.duckduckgo", value: "Open DuckDuckGo…", comment: "The status menu 'Open DuckDuckGo' menu item")
 }
diff --git a/DuckDuckGoNotifications/DuckDuckGoNotificationsAppDelegate.swift b/DuckDuckGoNotifications/DuckDuckGoNotificationsAppDelegate.swift
index 41677dc8f1..75b3471644 100644
--- a/DuckDuckGoNotifications/DuckDuckGoNotificationsAppDelegate.swift
+++ b/DuckDuckGoNotifications/DuckDuckGoNotificationsAppDelegate.swift
@@ -19,6 +19,8 @@
 import Cocoa
 import Combine
 import Common
+import Networking
+import PixelKit
 import NetworkExtension
 import NetworkProtection
 
@@ -69,6 +71,38 @@ final class DuckDuckGoNotificationsAppDelegate: NSObject, NSApplicationDelegate
     func applicationDidFinishLaunching(_ aNotification: Notification) {
         os_log("Login item finished launching", log: .networkProtectionLoginItemLog, type: .info)
 
+        let dryRun: Bool
+
+#if DEBUG
+        dryRun = true
+#else
+        dryRun = false
+#endif
+
+        let pixelSource: String
+
+#if NETP_SYSTEM_EXTENSION
+        pixelSource = "vpnNotificationAgent"
+#else
+        pixelSource = "vpnNotificationAgentAppStore" // Should never get used, but just in case
+#endif
+
+        PixelKit.setUp(dryRun: dryRun,
+                       appVersion: AppVersion.shared.versionNumber,
+                       source: pixelSource,
+                       defaultHeaders: [:],
+                       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)
+
+            request.fetch { _, error in
+                onComplete(error == nil, error)
+            }
+        }
+
         startObservingVPNStatusChanges()
         os_log("Login item listening")
     }
@@ -157,3 +191,17 @@ final class DuckDuckGoNotificationsAppDelegate: NSObject, NSApplicationDelegate
     }
 
 }
+
+extension NSApplication {
+
+    enum RunType: Int, CustomStringConvertible {
+        case normal
+        var description: String {
+            switch self {
+            case .normal: return "normal"
+            }
+        }
+    }
+    static var runType: RunType { .normal }
+
+}
diff --git a/DuckDuckGoVPN/DuckDuckGoVPNAppDelegate.swift b/DuckDuckGoVPN/DuckDuckGoVPNAppDelegate.swift
index 67d2baeb1d..b19518730d 100644
--- a/DuckDuckGoVPN/DuckDuckGoVPNAppDelegate.swift
+++ b/DuckDuckGoVPN/DuckDuckGoVPNAppDelegate.swift
@@ -27,10 +27,7 @@ import NetworkProtectionProxy
 import NetworkProtectionUI
 import ServiceManagement
 import PixelKit
-
-#if SUBSCRIPTION
 import Subscription
-#endif
 
 @objc(Application)
 final class DuckDuckGoVPNApplication: NSApplication {
@@ -48,7 +45,7 @@ final class DuckDuckGoVPNApplication: NSApplication {
         super.init()
         self.delegate = _delegate
 
-#if DEBUG && SUBSCRIPTION
+#if DEBUG
         let accountManager = AccountManager(subscriptionAppGroup: Bundle.main.appGroup(bundle: .subs))
 
         if let token = accountManager.accessToken {
@@ -187,12 +184,18 @@ final class DuckDuckGoVPNAppDelegate: NSObject, NSApplicationDelegate {
             platformNotificationCenter: NSWorkspace.shared.notificationCenter,
             platformDidWakeNotification: NSWorkspace.didWakeNotification)
 
+        let dataVolumeObserver = DataVolumeObserverThroughSession(
+            tunnelSessionProvider: tunnelController,
+            platformNotificationCenter: NSWorkspace.shared.notificationCenter,
+            platformDidWakeNotification: NSWorkspace.didWakeNotification)
+
         return DefaultNetworkProtectionStatusReporter(
             statusObserver: statusObserver,
             serverInfoObserver: serverInfoObserver,
             connectionErrorObserver: errorObserver,
             connectivityIssuesObserver: DisabledConnectivityIssueObserver(),
-            controllerErrorMessageObserver: ControllerErrorMesssageObserverThroughDistributedNotifications()
+            controllerErrorMessageObserver: ControllerErrorMesssageObserverThroughDistributedNotifications(),
+            dataVolumeObserver: dataVolumeObserver
         )
     }()
 
@@ -245,17 +248,18 @@ final class DuckDuckGoVPNAppDelegate: NSObject, NSApplicationDelegate {
                     StatusBarMenu.MenuItem(name: UserText.networkProtectionStatusMenuFAQ, action: { [weak self] in
                         await self?.appLauncher.launchApp(withCommand: .showFAQ)
                     }),
+                    StatusBarMenu.MenuItem(name: UserText.networkProtectionStatusMenuShareFeedback, action: { [weak self] in
+                        await self?.appLauncher.launchApp(withCommand: .shareFeedback)
+                    }),
                     StatusBarMenu.MenuItem(name: UserText.networkProtectionStatusMenuOpenDuckDuckGo, action: { [weak self] in
                         await self?.appLauncher.launchApp(withCommand: .justOpen)
                     }),
-                    StatusBarMenu.MenuItem(name: UserText.networkProtectionStatusMenuShareFeedback, action: { [weak self] in
-                        await self?.appLauncher.launchApp(withCommand: .shareFeedback)
-                    })
                 ]
             },
             agentLoginItem: nil,
             isMenuBarStatusView: true,
             userDefaults: .netP,
+            locationFormatter: DefaultVPNLocationFormatter(),
             uninstallHandler: { [weak self] in
                 guard let self else { return }
                 await self.vpnUninstaller.uninstall(includingSystemExtension: true)
@@ -266,9 +270,7 @@ final class DuckDuckGoVPNAppDelegate: NSObject, NSApplicationDelegate {
     @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)
 
@@ -303,7 +305,6 @@ final class DuckDuckGoVPNAppDelegate: NSObject, NSApplicationDelegate {
                            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)
@@ -358,7 +359,6 @@ final class DuckDuckGoVPNAppDelegate: NSObject, NSApplicationDelegate {
     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 = {
@@ -372,7 +372,7 @@ final class DuckDuckGoVPNAppDelegate: NSObject, NSApplicationDelegate {
                     UserDefaults.netP.networkProtectionEntitlementsExpired = false
                 case .invalidEntitlement:
                     UserDefaults.netP.networkProtectionEntitlementsExpired = true
-                    PixelKit.fire(VPNPrivacyProPixel.vpnAccessRevokedDialogShown, frequency: .dailyAndContinuous)
+                    PixelKit.fire(VPNPrivacyProPixel.vpnAccessRevokedDialogShown, frequency: .dailyAndCount)
 
                     guard let self else { return }
                     Task {
@@ -387,7 +387,6 @@ final class DuckDuckGoVPNAppDelegate: NSObject, NSApplicationDelegate {
                 }
             }
         }
-#endif
     }
 }
 
diff --git a/DuckDuckGoVPN/NetworkExtensionController.swift b/DuckDuckGoVPN/NetworkExtensionController.swift
index d850bfbb80..23a5eca958 100644
--- a/DuckDuckGoVPN/NetworkExtensionController.swift
+++ b/DuckDuckGoVPN/NetworkExtensionController.swift
@@ -54,7 +54,7 @@ extension NetworkExtensionController {
 
         NetworkProtectionLastVersionRunStore(userDefaults: defaults).lastExtensionVersionRun = extensionVersion
 
-        try? await Task.sleep(nanoseconds: 300 * NSEC_PER_MSEC)
+        try await Task.sleep(nanoseconds: 300 * NSEC_PER_MSEC)
 #endif
     }
 
diff --git a/DuckDuckGoVPN/NetworkProtection+VPNAgentConvenienceInitializers.swift b/DuckDuckGoVPN/NetworkProtection+VPNAgentConvenienceInitializers.swift
index b61f1779c1..b2839cfb5d 100644
--- a/DuckDuckGoVPN/NetworkProtection+VPNAgentConvenienceInitializers.swift
+++ b/DuckDuckGoVPN/NetworkProtection+VPNAgentConvenienceInitializers.swift
@@ -18,10 +18,7 @@
 
 import Foundation
 import NetworkProtection
-
-#if SUBSCRIPTION
 import Subscription
-#endif
 
 extension NetworkProtectionKeychainTokenStore {
     convenience init() {
diff --git a/DuckDuckGoVPN/NetworkProtectionBouncer.swift b/DuckDuckGoVPN/NetworkProtectionBouncer.swift
index f50152e122..302245b270 100644
--- a/DuckDuckGoVPN/NetworkProtectionBouncer.swift
+++ b/DuckDuckGoVPN/NetworkProtectionBouncer.swift
@@ -21,10 +21,7 @@ import Foundation
 import NetworkProtection
 import ServiceManagement
 import AppKit
-
-#if SUBSCRIPTION
 import Subscription
-#endif
 
 /// Class that implements the necessary logic to ensure the VPN is enabled, or prevent the app from running otherwise.
 ///
@@ -34,13 +31,12 @@ final class NetworkProtectionBouncer {
     /// current app.
     ///
     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,
diff --git a/DuckDuckGoVPN/TunnelControllerIPCService.swift b/DuckDuckGoVPN/TunnelControllerIPCService.swift
index c8a9ce456d..b88c3f20b8 100644
--- a/DuckDuckGoVPN/TunnelControllerIPCService.swift
+++ b/DuckDuckGoVPN/TunnelControllerIPCService.swift
@@ -50,6 +50,7 @@ final class TunnelControllerIPCService {
         subscribeToErrorChanges()
         subscribeToStatusUpdates()
         subscribeToServerChanges()
+        subscribeToDataVolumeUpdates()
 
         server.serverDelegate = self
     }
@@ -84,6 +85,15 @@ final class TunnelControllerIPCService {
             }
             .store(in: &cancellables)
     }
+
+    private func subscribeToDataVolumeUpdates() {
+        statusReporter.dataVolumeObserver.publisher
+            .subscribe(on: DispatchQueue.main)
+            .sink { [weak self] dataVolume in
+                self?.server.dataVolumeUpdated(dataVolume)
+            }
+            .store(in: &cancellables)
+    }
 }
 
 // MARK: - Requests from the client
@@ -95,16 +105,39 @@ extension TunnelControllerIPCService: IPCServerInterface {
         server.statusChanged(statusReporter.statusObserver.recentValue)
     }
 
-    func start() {
+    func start(completion: @escaping (Error?) -> Void) {
         Task {
             await tunnelController.start()
         }
+
+        // For IPC requests, completion means the IPC request was processed, and NOT
+        // that the requested operation was executed fully.  Failure to complete the
+        // operation will be handled entirely within the tunnel controller.
+        completion(nil)
     }
 
-    func stop() {
+    func stop(completion: @escaping (Error?) -> Void) {
         Task {
             await tunnelController.stop()
         }
+
+        // For IPC requests, completion means the IPC request was processed, and NOT
+        // that the requested operation was executed fully.  Failure to complete the
+        // operation will be handled entirely within the tunnel controller.
+        completion(nil)
+    }
+
+    func fetchLastError(completion: @escaping (Error?) -> Void) {
+        Task {
+            guard #available(macOS 13.0, *),
+                  let connection = await tunnelController.connection else {
+
+                completion(nil)
+                return
+            }
+
+            connection.fetchLastDisconnectError(completionHandler: completion)
+        }
     }
 
     func resetAll(uninstallSystemExtension: Bool) async {
diff --git a/DuckDuckGoVPN/UserText.swift b/DuckDuckGoVPN/UserText.swift
index 57ea5e3c3b..4c64c664eb 100644
--- a/DuckDuckGoVPN/UserText.swift
+++ b/DuckDuckGoVPN/UserText.swift
@@ -24,5 +24,5 @@ final class UserText {
     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")
+    static let networkProtectionStatusMenuShareFeedback = NSLocalizedString("network.protection.status.menu.share.feedback", value: "Share VPN Feedback…", comment: "The status menu 'Share VPN Feedback' menu item")
 }
diff --git a/IntegrationTests/Common/TestsURLExtension.swift b/IntegrationTests/Common/TestsURLExtension.swift
index 95da2cd8ca..b1bd1f7a8f 100644
--- a/IntegrationTests/Common/TestsURLExtension.swift
+++ b/IntegrationTests/Common/TestsURLExtension.swift
@@ -37,7 +37,7 @@ extension URL {
         let url = URL.testsServer
            .appendingPathComponent("filename")  // "http://localhost:8085/filename"
            .appendingTestParameters(status: 301,
-                               reason: "Moved"
+                               reason: "Moved",
                                data: Data(),
                                headers: ["Location": "/redirect-location.html"])
         Tab.setUrl(url)
diff --git a/IntegrationTests/Downloads/DownloadsIntegrationTests.swift b/IntegrationTests/Downloads/DownloadsIntegrationTests.swift
index 35e2024c05..f74e6e42e5 100644
--- a/IntegrationTests/Downloads/DownloadsIntegrationTests.swift
+++ b/IntegrationTests/Downloads/DownloadsIntegrationTests.swift
@@ -70,9 +70,9 @@ class DownloadsIntegrationTests: XCTestCase {
 
     @MainActor
     func testWhenShouldDownloadResponse_downloadStarts() async throws {
-        let persistor = DownloadsPreferencesUserDefaultsPersistor()
-        persistor.alwaysRequestDownloadLocation = false
-        persistor.selectedDownloadLocation = FileManager.default.temporaryDirectory.absoluteString
+        let preferences = DownloadsPreferences.shared
+        preferences.alwaysRequestDownloadLocation = false
+        preferences.selectedDownloadLocation = FileManager.default.temporaryDirectory
 
         let downloadTaskFuture = FileDownloadManager.shared.downloadsPublisher.timeout(5).first().promise()
         let suffix = Int.random(in: 0..<Int.max)
@@ -91,6 +91,227 @@ class DownloadsIntegrationTests: XCTestCase {
         XCTAssertEqual(try? Data(contentsOf: fileUrl), data.html)
     }
 
+    @MainActor
+    func testWhenUnsupportedMimeType_downloadStarts() async throws {
+        let preferences = DownloadsPreferences.shared
+        preferences.alwaysRequestDownloadLocation = false
+        preferences.selectedDownloadLocation = FileManager.default.temporaryDirectory
+
+        let downloadTaskFuture = FileDownloadManager.shared.downloadsPublisher.timeout(5).first().promise()
+        let suffix = Int.random(in: 0..<Int.max)
+        let url = URL.testsServer
+            .appendingPathComponent("fname_\(suffix).dat")
+            .appendingTestParameters(data: data.html,
+                                     headers: ["Content-Type": "application/unsupported-mime-type"])
+        let tab = tabViewModel.tab
+        _=await tab.setUrl(url, source: .link)?.result
+
+        let fileUrl = try await downloadTaskFuture.get().output
+            .timeout(1, scheduler: DispatchQueue.main) { .init(TimeoutError() as NSError) }.first().promise().get()
+
+        XCTAssertEqual(fileUrl, FileManager.default.temporaryDirectory.appendingPathComponent("fname_\(suffix).dat"))
+        XCTAssertEqual(try? Data(contentsOf: fileUrl), data.html)
+    }
+
+    @MainActor
+    func testWhenLocalFile_downloadStartsAlwaysDisplayingSavePanel() async throws {
+        let tempFileURL = FileManager.default.temporaryDirectory.appendingPathComponent(UUID().uuidString)
+        let destDirURL = FileManager.default.temporaryDirectory.appendingPathComponent(UUID().uuidString)
+        try FileManager.default.createDirectory(at: destDirURL, withIntermediateDirectories: true)
+        try data.html.write(to: tempFileURL)
+
+        let preferences = DownloadsPreferences.shared
+        preferences.alwaysRequestDownloadLocation = false
+        preferences.selectedDownloadLocation = destDirURL
+        let persistor = DownloadsPreferencesUserDefaultsPersistor()
+        persistor.lastUsedCustomDownloadLocation = destDirURL.path
+
+        let downloadTaskFuture = FileDownloadManager.shared.downloadsPublisher.timeout(5).first().promise()
+        let tab = tabViewModel.tab
+        _=await tab.setUrl(tempFileURL, source: .link)?.result
+
+        let eSaveDialogShown = expectation(description: "Save dialog shown")
+        let getSaveDialog = Task { @MainActor in
+            while true {
+                if let sheet = self.window.sheets.first as? NSSavePanel {
+                    eSaveDialogShown.fulfill()
+                    return sheet
+                }
+                try await Task.sleep(interval: 0.01)
+            }
+        }
+
+        if case .timedOut = await XCTWaiter(delegate: self).fulfillment(of: [eSaveDialogShown], timeout: 5) {
+            getSaveDialog.cancel()
+        }
+        let saveDialog = try await getSaveDialog.value
+        window.endSheet(saveDialog, returnCode: .OK)
+
+        let fileUrl = try await downloadTaskFuture.get().output
+            .timeout(1, scheduler: DispatchQueue.main) { .init(TimeoutError() as NSError) }.first().promise().get()
+
+        XCTAssertEqual(fileUrl.resolvingSymlinksInPath(), destDirURL.appendingPathComponent(tempFileURL.lastPathComponent).resolvingSymlinksInPath())
+        XCTAssertEqual(try? Data(contentsOf: fileUrl), data.html)
+    }
+
+    @MainActor
+    func testWhenLocalNonExistentFile_loadingFails() async throws {
+        let preferences = DownloadsPreferences.shared
+        preferences.alwaysRequestDownloadLocation = false
+        preferences.selectedDownloadLocation = FileManager.default.temporaryDirectory
+        let tempFileURL = FileManager.default.temporaryDirectory.appendingPathComponent(UUID().uuidString)
+
+        let tab = tabViewModel.tab
+        let loadingResult = await tab.setUrl(tempFileURL, source: .link)?.result
+
+        XCTAssertThrowsError(try loadingResult?.get()) { error in
+            XCTAssertEqual((error as? URLError)?.code, .fileDoesNotExist)
+        }
+    }
+
+    @MainActor
+    func testWhenLocalFolder_loadingFails() async throws {
+        let preferences = DownloadsPreferences.shared
+        preferences.alwaysRequestDownloadLocation = false
+        preferences.selectedDownloadLocation = FileManager.default.temporaryDirectory
+        let dirURL = FileManager.default.temporaryDirectory.appendingPathComponent(UUID().uuidString)
+        try FileManager.default.createDirectory(at: dirURL, withIntermediateDirectories: true)
+
+        let tab = tabViewModel.tab
+        let loadingResult = await tab.setUrl(dirURL, source: .link)?.result
+
+        XCTAssertThrowsError(try loadingResult?.get()) { error in
+            XCTAssertEqual((error as? URLError)?.code, .fileIsDirectory)
+        }
+    }
+
+    @MainActor
+    func testWhenDownloadIsStartedInNewTab_tabIsClosed() async throws {
+        let preferences = DownloadsPreferences.shared
+        preferences.alwaysRequestDownloadLocation = false
+        preferences.selectedDownloadLocation = FileManager.default.temporaryDirectory
+        let dirURL = FileManager.default.temporaryDirectory.appendingPathComponent(UUID().uuidString)
+        try FileManager.default.createDirectory(at: dirURL, withIntermediateDirectories: true)
+
+        let downloadUrl = URL.testsServer
+            .appendingPathComponent("fname.dat")
+            .appendingTestParameters(data: data.html,
+                                     headers: ["Content-Disposition": "attachment; filename=\"fname.dat\"",
+                                               "Content-Type": "text/html"])
+
+        let pageUrl = URL.testsServer
+            .appendingTestParameters(data: """
+            <html>
+            <head>
+            <meta charset="UTF-8">
+            <meta name="viewport" content="width=device-width, initial-scale=1.0">
+            <title>Clickable Body</title>
+            </head>
+            <body onclick="window.open('\(downloadUrl.absoluteString.escapedJavaScriptString())')" style="cursor: pointer;">
+            <h1>Click anywhere on the page to open the link</h1>
+            </body>
+            </html>
+            """.utf8data)
+        let tab = tabViewModel.tab
+        _=await tab.setUrl(pageUrl, source: .link)?.result
+
+        NSApp.activate(ignoringOtherApps: true)
+        let downloadTaskFuture = FileDownloadManager.shared.downloadsPublisher.timeout(5).first().promise()
+
+        let e1 = expectation(description: "new tab opened")
+        var e2: XCTestExpectation!
+        let c = tabCollectionViewModel.$selectedTabViewModel.dropFirst()
+            .receive(on: DispatchQueue.main)
+            .sink { [unowned self] tabViewModel in
+                guard let tabViewModel else { return }
+                print("tabViewModel", tabViewModel.tab, tab)
+                if tabViewModel.tab !== tab {
+                    e1.fulfill()
+                    e2 = expectation(description: "new tab closed")
+                } else {
+                    e2.fulfill()
+                }
+            }
+
+        // click to open a new (download) tab and instantly deactivate it
+        click(tab.webView)
+
+        // download should start in the background tab
+        _=try await downloadTaskFuture.get()
+
+        // expect for the download tab to close
+        await fulfillment(of: [e1, e2], timeout: 10)
+        withExtendedLifetime(c, {})
+    }
+
+    @MainActor
+    func testWhenDownloadIsStartedInNewTabAfterRedirect_tabIsClosed() async throws {
+        let preferences = DownloadsPreferences.shared
+        preferences.alwaysRequestDownloadLocation = false
+        preferences.selectedDownloadLocation = FileManager.default.temporaryDirectory
+        let dirURL = FileManager.default.temporaryDirectory.appendingPathComponent(UUID().uuidString)
+        try FileManager.default.createDirectory(at: dirURL, withIntermediateDirectories: true)
+
+        let downloadUrl = URL.testsServer
+            .appendingPathComponent("fname.dat")
+            .appendingTestParameters(data: data.html,
+                                     headers: ["Content-Disposition": "attachment; filename=\"fname.dat\"",
+                                               "Content-Type": "text/html"])
+
+        let redirectUrl = URL.testsServer
+            .appendingTestParameters(data: """
+            <html><head>
+            <script>
+              window.location.replace('\(downloadUrl.absoluteString.escapedJavaScriptString())');
+            </script>
+            </head></html>
+            """.utf8data)
+
+        let pageUrl = URL.testsServer
+            .appendingTestParameters(data: """
+            <html>
+            <head>
+            <meta charset="UTF-8">
+            <meta name="viewport" content="width=device-width, initial-scale=1.0">
+            <title>Clickable Body</title>
+            </head>
+            <body onclick="window.open('\(redirectUrl.absoluteString.escapedJavaScriptString())')" style="cursor: pointer;">
+            <h1>Click anywhere on the page to open the link</h1>
+            </body>
+            </html>
+            """.utf8data)
+        let tab = tabViewModel.tab
+        _=await tab.setUrl(pageUrl, source: .link)?.result
+
+        NSApp.activate(ignoringOtherApps: true)
+        let downloadTaskFuture = FileDownloadManager.shared.downloadsPublisher.timeout(5).first().promise()
+
+        let e1 = expectation(description: "new tab opened")
+        var e2: XCTestExpectation!
+        let c = tabCollectionViewModel.$selectedTabViewModel.dropFirst()
+            .receive(on: DispatchQueue.main)
+            .sink { [unowned self] tabViewModel in
+                guard let tabViewModel else { return }
+                print("tabViewModel", tabViewModel.tab, tab)
+                if tabViewModel.tab !== tab {
+                    e1.fulfill()
+                    e2 = expectation(description: "new tab closed")
+                } else {
+                    e2.fulfill()
+                }
+            }
+
+        // click to open a new (download) tab and instantly deactivate it
+        click(tab.webView)
+
+        // download should start in the background tab
+        _=try await downloadTaskFuture.get()
+
+        // expect for the download tab to close
+        await fulfillment(of: [e1, e2], timeout: 10)
+        withExtendedLifetime(c, {})
+    }
+
     @MainActor
     func testWhenSaveDialogOpenInBackgroundTabAndTabIsClosed_downloadIsCancelled() async throws {
         let persistor = DownloadsPreferencesUserDefaultsPersistor()
@@ -235,9 +456,9 @@ class DownloadsIntegrationTests: XCTestCase {
 
     @MainActor
     func testWhenNavigationActionIsData_downloadStarts() async throws {
-        let persistor = DownloadsPreferencesUserDefaultsPersistor()
-        persistor.alwaysRequestDownloadLocation = false
-        persistor.selectedDownloadLocation = FileManager.default.temporaryDirectory.absoluteString
+        let preferences = DownloadsPreferences.shared
+        preferences.alwaysRequestDownloadLocation = false
+        preferences.selectedDownloadLocation = FileManager.default.temporaryDirectory
 
         let tab = tabViewModel.tab
         // load empty page
@@ -268,9 +489,9 @@ class DownloadsIntegrationTests: XCTestCase {
 
     @MainActor
     func testWhenNavigationActionIsBlob_downloadStarts() async throws {
-        let persistor = DownloadsPreferencesUserDefaultsPersistor()
-        persistor.alwaysRequestDownloadLocation = false
-        persistor.selectedDownloadLocation = FileManager.default.temporaryDirectory.absoluteString
+        let preferences = DownloadsPreferences.shared
+        preferences.alwaysRequestDownloadLocation = false
+        preferences.selectedDownloadLocation = FileManager.default.temporaryDirectory
 
         let tab = tabViewModel.tab
         // load empty page
diff --git a/IntegrationTests/NavigationProtection/NavigationProtectionIntegrationTests.swift b/IntegrationTests/NavigationProtection/NavigationProtectionIntegrationTests.swift
index f06aa2ade3..9cbc7831bf 100644
--- a/IntegrationTests/NavigationProtection/NavigationProtectionIntegrationTests.swift
+++ b/IntegrationTests/NavigationProtection/NavigationProtectionIntegrationTests.swift
@@ -77,7 +77,7 @@ class NavigationProtectionIntegrationTests: XCTestCase {
         for i in 0..<itemsCount {
             print("processing", i)
             // open test page if needed
-            if tab.content.url != url {
+            if tab.content.urlForWebView != url {
                 _=try await tab.setUrl(url, source: .link)?.result.get()
             }
 
diff --git a/IntegrationTests/Tab/AddressBarTests.swift b/IntegrationTests/Tab/AddressBarTests.swift
index 22b6ce65aa..9323afb45c 100644
--- a/IntegrationTests/Tab/AddressBarTests.swift
+++ b/IntegrationTests/Tab/AddressBarTests.swift
@@ -23,7 +23,6 @@ import XCTest
 @testable import DuckDuckGo_Privacy_Browser
 
 @available(macOS 12.0, *)
-@MainActor
 class AddressBarTests: XCTestCase {
 
     var window: MainWindow!
@@ -141,6 +140,7 @@ class AddressBarTests: XCTestCase {
 
     // MARK: - Tests
 
+    @MainActor
     func testWhenUserStartsTypingOnNewTabPageLoad_userInputIsNotReset() async throws {
         // open Tab with newtab page
         let tab = Tab(content: .newtab, privacyFeatures: privacyFeaturesMock)
@@ -190,6 +190,7 @@ class AddressBarTests: XCTestCase {
 
     }
 
+    @MainActor
     func testWhenSwitchingBetweenTabs_addressBarFocusStateIsCorrect() async throws {
         let viewModel = TabCollectionViewModel(tabCollection: TabCollection(tabs: [
             Tab(content: .newtab, privacyFeatures: privacyFeaturesMock),
@@ -215,29 +216,33 @@ class AddressBarTests: XCTestCase {
                 XCTAssertEqual(addressBarValue, "", "\(idx)")
             } else {
                 XCTAssertFalse(isAddressBarFirstResponder, "\(idx)")
-                XCTAssertEqual(addressBarValue, tab.content.isUrl ? tab.content.url!.absoluteString : "", "\(idx)")
+                XCTAssertEqual(addressBarValue, tab.content == .newtab ? "" : tab.content.userEditableUrl!.absoluteString, "\(idx)")
             }
         }
     }
 
+    @MainActor
     func testWhenRestoringToOnboarding_addressBarIsNotActive() async throws {
         let viewModel = TabCollectionViewModel(tabCollection: TabCollection(tabs: [Tab(content: .onboarding, privacyFeatures: privacyFeaturesMock)]))
         window = WindowsManager.openNewWindow(with: viewModel)!
         XCTAssertEqual(window.firstResponder, mainViewController.browserTabViewController.transientTabContentViewController!.view)
     }
 
+    @MainActor
     func testWhenRestoringToSettings_addressBarIsNotActive() async throws {
         let viewModel = TabCollectionViewModel(tabCollection: TabCollection(tabs: [Tab(content: .settings(pane: .appearance), privacyFeatures: privacyFeaturesMock)]))
         window = WindowsManager.openNewWindow(with: viewModel)!
         XCTAssertEqual(window.firstResponder, mainViewController.browserTabViewController.preferencesViewController!.view)
     }
 
+    @MainActor
     func testWhenRestoringToBookmarks_addressBarIsNotActive() async throws {
         let viewModel = TabCollectionViewModel(tabCollection: TabCollection(tabs: [Tab(content: .bookmarks, privacyFeatures: privacyFeaturesMock)]))
         window = WindowsManager.openNewWindow(with: viewModel)!
         XCTAssertEqual(window.firstResponder, mainViewController.browserTabViewController.bookmarksViewController!.view)
     }
 
+    @MainActor
     func testWhenRestoringToURL_addressBarIsNotActive() async throws {
         let tab = Tab(content: .url(.duckDuckGo, credential: nil, source: .loadedByStateRestoration), webViewConfiguration: webViewConfiguration, privacyFeatures: privacyFeaturesMock)
         let viewModel = TabCollectionViewModel(tabCollection: TabCollection(tabs: [tab]))
@@ -245,12 +250,14 @@ class AddressBarTests: XCTestCase {
         XCTAssertEqual(window.firstResponder, tab.webView)
     }
 
+    @MainActor
     func testWhenRestoringToNewTab_addressBarIsActive() async throws {
         let viewModel = TabCollectionViewModel(tabCollection: TabCollection(tabs: [Tab(content: .newtab, privacyFeatures: privacyFeaturesMock)]))
         window = WindowsManager.openNewWindow(with: viewModel)!
         XCTAssertTrue(isAddressBarFirstResponder)
     }
 
+    @MainActor
     func testWhenOpeningNewTab_addressBarIsActivated() async throws {
         let tab = Tab(content: .url(.duckDuckGo, credential: nil, source: .loadedByStateRestoration), webViewConfiguration: webViewConfiguration, privacyFeatures: privacyFeaturesMock)
         let viewModel = TabCollectionViewModel(tabCollection: TabCollection(tabs: [tab]))
@@ -274,6 +281,7 @@ class AddressBarTests: XCTestCase {
         XCTAssertEqual(window.firstResponder, tab.webView)
     }
 
+    @MainActor
     func testWhenSwitchingBetweenTabsWithTypedValue_typedValueIsPreserved() async throws {
         let viewModel = TabCollectionViewModel(tabCollection: TabCollection(tabs: [
             Tab(content: .newtab, privacyFeatures: privacyFeaturesMock),
@@ -312,6 +320,7 @@ class AddressBarTests: XCTestCase {
         }
     }
 
+    @MainActor
     func testWhenSwitchingBetweenURLTabs_addressBarIsDeactivated() async throws {
         let viewModel = TabCollectionViewModel(tabCollection: TabCollection(tabs: [
             Tab(content: .url(.duckDuckGo, credential: nil, source: .pendingStateRestoration), webViewConfiguration: webViewConfiguration, privacyFeatures: privacyFeaturesMock),
@@ -332,6 +341,7 @@ class AddressBarTests: XCTestCase {
         XCTAssertEqual(window.firstResponder, viewModel.tabs[0].webView)
     }
 
+    @MainActor
     func testWhenDeactivatingAddressBar_webViewShouldBecomeFirstResponder() async throws {
         let tab = Tab(content: .url(.duckDuckGo, credential: nil, source: .pendingStateRestoration), webViewConfiguration: webViewConfiguration, privacyFeatures: privacyFeaturesMock)
         let viewModel = TabCollectionViewModel(tabCollection: TabCollection(tabs: [tab]))
@@ -346,6 +356,7 @@ class AddressBarTests: XCTestCase {
         XCTAssertEqual(window.firstResponder, tab.webView)
     }
 
+    @MainActor
     func testWhenGoingBack_addressBarIsDeactivated() async throws {
         let tab = Tab(content: .url(.duckDuckGo, credential: nil, source: .loadedByStateRestoration), webViewConfiguration: webViewConfiguration, privacyFeatures: privacyFeaturesMock)
         let viewModel = TabCollectionViewModel(tabCollection: TabCollection(tabs: [tab]))
@@ -372,6 +383,7 @@ class AddressBarTests: XCTestCase {
         XCTAssertEqual(window.firstResponder, tab.webView)
     }
 
+    @MainActor
     func testWhenGoingBackToNewtabPage_addressBarIsActivated() async throws {
         let tab = Tab(content: .newtab, webViewConfiguration: webViewConfiguration, privacyFeatures: privacyFeaturesMock)
         let viewModel = TabCollectionViewModel(tabCollection: TabCollection(tabs: [tab]))
@@ -409,6 +421,7 @@ class AddressBarTests: XCTestCase {
         XCTAssertEqual(window.firstResponder, tab.webView)
     }
 
+    @MainActor
     func testWhenGoingBackToNewtabPageFromSettings_addressBarIsActivated() async throws {
         let tab = Tab(content: .newtab, webViewConfiguration: webViewConfiguration, privacyFeatures: privacyFeaturesMock)
         let viewModel = TabCollectionViewModel(tabCollection: TabCollection(tabs: [tab]))
@@ -434,6 +447,7 @@ class AddressBarTests: XCTestCase {
         XCTAssertEqual(window.firstResponder, mainViewController.browserTabViewController.preferencesViewController!.view)
     }
 
+    @MainActor
     func testWhenGoingBackToNewtabPageFromBookmarks_addressBarIsActivated() async throws {
         let tab = Tab(content: .newtab, webViewConfiguration: webViewConfiguration, privacyFeatures: privacyFeaturesMock)
         let viewModel = TabCollectionViewModel(tabCollection: TabCollection(tabs: [tab]))
@@ -459,6 +473,7 @@ class AddressBarTests: XCTestCase {
         XCTAssertEqual(window.firstResponder, mainViewController.browserTabViewController.bookmarksViewController!.view)
     }
 
+    @MainActor
     func testWhenTabReloaded_addressBarIsDeactivated() async throws {
         let tab = Tab(content: .url(.duckDuckGo, credential: nil, source: .webViewUpdated), webViewConfiguration: webViewConfiguration, privacyFeatures: privacyFeaturesMock)
         let viewModel = TabCollectionViewModel(tabCollection: TabCollection(tabs: [tab]))
@@ -476,6 +491,7 @@ class AddressBarTests: XCTestCase {
         XCTAssertEqual(window.firstResponder, tab.webView)
     }
 
+    @MainActor
     func testWhenReloadingFailingPage_addressBarIsDeactivated() async throws {
         // first navigation should fail
         schemeHandler.middleware = [{ _ in
@@ -499,6 +515,7 @@ class AddressBarTests: XCTestCase {
         XCTAssertEqual(window.firstResponder, tab.webView)
     }
 
+    @MainActor
     func testWhenTabReloadedBySubmittingSameAddressAndAddressIsActivated_addressBarIsKeptActiveOnPageLoad() async throws {
         let tab = Tab(content: .url(.duckDuckGo, credential: nil, source: .userEntered("")), webViewConfiguration: webViewConfiguration, privacyFeatures: privacyFeaturesMock)
         let viewModel = TabCollectionViewModel(tabCollection: TabCollection(tabs: [tab]))
@@ -520,6 +537,7 @@ class AddressBarTests: XCTestCase {
         XCTAssertEqual(addressBarValue, "some-text")
     }
 
+    @MainActor
     func testWhenEditingSerpURL_serpIconIsDisplayed() async throws {
         let tab = Tab(content: .url(.makeSearchUrl(from: "catz")!, credential: nil, source: .userEntered("catz")), webViewConfiguration: webViewConfiguration, privacyFeatures: privacyFeaturesMock)
         let viewModel = TabCollectionViewModel(tabCollection: TabCollection(tabs: [tab]))
@@ -527,10 +545,9 @@ class AddressBarTests: XCTestCase {
         _=try await tab.webViewDidFinishNavigationPublisher.timeout(5).first().promise().value
 
         _=window.makeFirstResponder(addressBarTextField)
-
-//        try await Task.sleep(interval: 60.01)
     }
 
+    @MainActor
     func testWhenOpeningBookmark_addressBarIsDeactivated() async throws {
         let tab = Tab(content: .url(.duckDuckGo, credential: nil, source: .webViewUpdated), webViewConfiguration: webViewConfiguration, privacyFeatures: privacyFeaturesMock)
         let viewModel = TabCollectionViewModel(tabCollection: TabCollection(tabs: [tab]))
@@ -545,6 +562,7 @@ class AddressBarTests: XCTestCase {
         XCTAssertEqual(window.firstResponder, tab.webView)
     }
 
+    @MainActor
     func testWhenOpeningHistoryEntry_addressBarIsDeactivated() async throws {
         let tab = Tab(content: .url(.duckDuckGo, credential: nil, source: .webViewUpdated), webViewConfiguration: webViewConfiguration, privacyFeatures: privacyFeaturesMock)
         let viewModel = TabCollectionViewModel(tabCollection: TabCollection(tabs: [tab]))
@@ -559,6 +577,7 @@ class AddressBarTests: XCTestCase {
         XCTAssertEqual(window.firstResponder, tab.webView)
     }
 
+    @MainActor
     func testWhenOpeningURLfromUI_addressBarIsDeactivated() async throws {
         let tab = Tab(content: .url(.duckDuckGo, credential: nil, source: .webViewUpdated), webViewConfiguration: webViewConfiguration, privacyFeatures: privacyFeaturesMock)
         let viewModel = TabCollectionViewModel(tabCollection: TabCollection(tabs: [tab]))
@@ -573,6 +592,7 @@ class AddressBarTests: XCTestCase {
         XCTAssertEqual(window.firstResponder, tab.webView)
     }
 
+    @MainActor
     func testWhenHomePageIsOpened_addressBarIsDeactivated() async throws {
         StartupPreferences.shared.launchToCustomHomePage = true
 
@@ -592,6 +612,7 @@ class AddressBarTests: XCTestCase {
         XCTAssertEqual(window.firstResponder, tab.webView)
     }
 
+    @MainActor
     func testWhenAddressSubmitted_addressBarIsDeactivated() async throws {
         let tab = Tab(content: .newtab, webViewConfiguration: webViewConfiguration, privacyFeatures: privacyFeaturesMock)
         let viewModel = TabCollectionViewModel(tabCollection: TabCollection(tabs: [tab]))
@@ -605,6 +626,7 @@ class AddressBarTests: XCTestCase {
         XCTAssertEqual(window.firstResponder, tab.webView)
     }
 
+    @MainActor
     func testWhenAddressSubmittedAndAddressBarIsReactivated_addressBarIsKeptActiveOnPageLoad() async throws {
         let tab = Tab(content: .newtab, webViewConfiguration: webViewConfiguration, privacyFeatures: privacyFeaturesMock)
         let viewModel = TabCollectionViewModel(tabCollection: TabCollection(tabs: [tab]))
@@ -624,6 +646,7 @@ class AddressBarTests: XCTestCase {
         XCTAssertEqual(addressBarValue, "some-text")
     }
 
+    @MainActor
     func testWhenPageRedirected_addressBarStaysActivePreservingUserInput() async throws {
         let expectation = expectation(description: "request sent")
         schemeHandler.middleware = [{ request in
@@ -669,6 +692,7 @@ class AddressBarTests: XCTestCase {
         XCTAssertEqual(addressBarValue, "replacement-url")
     }
 
+    @MainActor
     func testWhenPageRedirectedWhenAddressBarIsInactive_addressBarShouldReset() async throws {
         AppearancePreferences.shared.showFullURL = true
 
@@ -717,6 +741,7 @@ class AddressBarTests: XCTestCase {
         XCTAssertEqual(addressBarValue, "https://redirected.com/")
     }
 
+    @MainActor
     func testWhenActivatingWindowWithPinnedTabOpen_webViewBecomesFirstResponder() async throws {
         let tab = Tab(content: .url(.duckDuckGo, credential: nil, source: .userEntered("")), webViewConfiguration: webViewConfiguration, privacyFeatures: privacyFeaturesMock)
         WindowControllersManager.shared.pinnedTabsManager.setUp(with: TabCollection(tabs: [tab]))
@@ -737,17 +762,18 @@ class AddressBarTests: XCTestCase {
 
         // when activaing a Pinned Tab in another window its Web View should become the first responder
         viewModel2.select(at: .pinned(0))
-        try await Task.sleep(interval: 0.01)
+        try await Task.sleep(interval: 0.1)
         XCTAssertEqual(window.firstResponder, window)
         XCTAssertEqual(window2.firstResponder, tab.webView)
 
         window.makeKeyAndOrderFront(nil)
-        try await Task.sleep(interval: 0.01)
+        try await Task.sleep(interval: 0.1)
 
         XCTAssertEqual(window.firstResponder, tab.webView)
         XCTAssertEqual(window2.firstResponder, window2)
     }
 
+    @MainActor
     func testWhenActivatingWindowWithPinnedTabWhenAddressBarIsActive_addressBarIsKeptActive() async throws {
         let tab = Tab(content: .url(.duckDuckGo, credential: nil, source: .userEntered("")), webViewConfiguration: webViewConfiguration, privacyFeatures: privacyFeaturesMock)
         WindowControllersManager.shared.pinnedTabsManager.setUp(with: TabCollection(tabs: [tab]))
@@ -780,4 +806,99 @@ class AddressBarTests: XCTestCase {
         XCTAssertEqual(window2.firstResponder, window2)
     }
 
+    @MainActor
+    func test_WhenSiteCertificateNil_ThenAddressBarShowsStandardShieldIcon() async throws {
+        // GIVEN
+        let expectedImage = NSImage(named: "Shield")!
+        let evaluator = MockCertificateEvaluator()
+        let tab = Tab(content: .url(.duckDuckGo, credential: nil, source: .userEntered("")), certificateTrustEvaluator: evaluator)
+        let viewModel = TabCollectionViewModel(tabCollection: TabCollection(tabs: [tab]))
+        let tabLoadedPromise = tab.webViewDidFinishNavigationPublisher.timeout(5).first().promise()
+
+        // WHEN
+        window = WindowsManager.openNewWindow(with: viewModel)!
+        _=try await tabLoadedPromise.value
+
+        // THEN
+        let shieldImage = mainViewController.navigationBarViewController.addressBarViewController!.addressBarButtonsViewController!.privacyEntryPointButton.image!
+        XCTAssertTrue(shieldImage.isEqualToImage(expectedImage))
+    }
+
+    @MainActor
+    func test_WhenSiteCertificateValid_ThenAddressBarShowsStandardShieldIcon() async throws {
+        // GIVEN
+        let expectedImage = NSImage(named: "Shield")!
+        let evaluator = MockCertificateEvaluator()
+        evaluator.isValidCertificate = true
+        let tab = Tab(content: .url(.duckDuckGo, credential: nil, source: .userEntered("")), certificateTrustEvaluator: evaluator)
+        let viewModel = TabCollectionViewModel(tabCollection: TabCollection(tabs: [tab]))
+        let tabLoadedPromise = tab.webViewDidFinishNavigationPublisher.timeout(5).first().promise()
+
+        // WHEN
+        window = WindowsManager.openNewWindow(with: viewModel)!
+        _=try await tabLoadedPromise.value
+
+        // THEN
+        let shieldImage = mainViewController.navigationBarViewController.addressBarViewController!.addressBarButtonsViewController!.privacyEntryPointButton.image!
+        XCTAssertTrue(shieldImage.isEqualToImage(expectedImage))
+    }
+
+    @MainActor
+    func test_WhenSiteCertificateInvalid_ThenAddressBarShowsDottedShieldIcon() async throws {
+        // GIVEN
+        let expectedImage = NSImage(named: "ShieldDot")!
+        let evaluator = MockCertificateEvaluator()
+        evaluator.isValidCertificate = false
+        let tab = Tab(content: .url(.duckDuckGo, credential: nil, source: .userEntered("")), certificateTrustEvaluator: evaluator)
+        let viewModel = TabCollectionViewModel(tabCollection: TabCollection(tabs: [tab]))
+        let tabLoadedPromise = tab.webViewDidFinishNavigationPublisher.timeout(5).first().promise()
+
+        // WHEN
+        window = WindowsManager.openNewWindow(with: viewModel)!
+        _=try await tabLoadedPromise.value
+
+        // THEN
+        let shieldImage = mainViewController.navigationBarViewController.addressBarViewController!.addressBarButtonsViewController!.privacyEntryPointButton.image!
+        XCTAssertTrue(shieldImage.isEqualToImage(expectedImage))
+    }
+}
+
+protocol MainActorPerformer {
+    func perform(_ closure: @MainActor () -> Void)
+}
+struct OnMainActor: MainActorPerformer {
+    private init() {}
+
+    static func instance() -> MainActorPerformer { OnMainActor() }
+
+    @MainActor(unsafe)
+    func perform(_ closure: @MainActor () -> Void) {
+        closure()
+    }
+}
+
+extension NSImage {
+    func pngData() -> Data? {
+        guard let tiffRepresentation = self.tiffRepresentation,
+              let bitmapImage = NSBitmapImageRep(data: tiffRepresentation) else {
+            return nil
+        }
+        return bitmapImage.representation(using: .png, properties: [:])
+    }
+
+    func isEqualToImage(_ image: NSImage) -> Bool {
+        guard let data1 = self.pngData(),
+              let data2 = image.pngData() else {
+            return false
+        }
+        return data1 == data2
+    }
+}
+
+class MockCertificateEvaluator: CertificateTrustEvaluating {
+    var isValidCertificate: Bool?
+
+    func evaluateCertificateTrust(trust: SecTrust?) -> Bool? {
+        return isValidCertificate
+    }
 }
diff --git a/IntegrationTests/Tab/ErrorPageTests.swift b/IntegrationTests/Tab/ErrorPageTests.swift
index bcdd64ba76..a6dab00d9d 100644
--- a/IntegrationTests/Tab/ErrorPageTests.swift
+++ b/IntegrationTests/Tab/ErrorPageTests.swift
@@ -23,7 +23,6 @@ import XCTest
 @testable import DuckDuckGo_Privacy_Browser
 
 @available(macOS 12.0, *)
-@MainActor
 class ErrorPageTests: XCTestCase {
 
     var window: NSWindow!
@@ -146,6 +145,7 @@ class ErrorPageTests: XCTestCase {
 
     // MARK: - Tests
 
+    @MainActor
     func testWhenPageFailsToLoad_errorPageShown() async throws {
         // open Tab with newtab page
         let tab = Tab(content: .newtab, webViewConfiguration: webViewConfiguration, privacyFeatures: privacyFeaturesMock)
@@ -186,6 +186,7 @@ class ErrorPageTests: XCTestCase {
         XCTAssertEqual(tab.content.userEditableUrl, .test)
     }
 
+    @MainActor
     func testWhenTabWithNoConnectionErrorActivated_reloadTriggered() async throws {
         // open 2 Tabs with newtab page
         let tab1 = Tab(content: .newtab, webViewConfiguration: webViewConfiguration, privacyFeatures: privacyFeaturesMock)
@@ -227,10 +228,11 @@ class ErrorPageTests: XCTestCase {
 
         await fulfillment(of: [eServerQueried], timeout: 5)
         _=try await eNavigationSucceeded.value
-        XCTAssertEqual(tab1.content.url, .test)
+        XCTAssertEqual(tab1.content.urlForWebView, .test)
         XCTAssertNil(tab1.error)
     }
 
+    @MainActor
     func testWhenTabWithConnectionLostErrorActivatedAndReloadFailsAgain_errorPageIsShownOnce() async throws {
         // open 2 Tabs with newtab page
         // navigate to a failing url right away
@@ -284,6 +286,7 @@ class ErrorPageTests: XCTestCase {
         withExtendedLifetime(c) {}
     }
 
+    @MainActor
     func testWhenTabWithOtherErrorActivated_reloadNotTriggered() async throws {
         // open 2 Tabs with newtab page
         // navigate to a failing url right away
@@ -314,6 +317,7 @@ class ErrorPageTests: XCTestCase {
         withExtendedLifetime(c) {}
     }
 
+    @MainActor
     func testWhenGoingBackToFailingPage_reloadIsTriggered() async throws {
         // open Tab with newtab page
         // navigate to a failing url right away
@@ -366,6 +370,7 @@ class ErrorPageTests: XCTestCase {
         XCTAssertTrue(tab.canReload)
     }
 
+    @MainActor
     func testWhenGoingBackToFailingPageAndItFailsAgain_errorPageIsUpdated() async throws {
         // open Tab with newtab page
         // navigate to a failing url right away
@@ -424,6 +429,7 @@ class ErrorPageTests: XCTestCase {
         XCTAssertTrue(tab.canReload)
     }
 
+    @MainActor
     func testWhenPageLoadedAndFailsOnRefreshAndOnConsequentRefresh_errorPageIsUpdatedKeepingForwardHistory() async throws {
         // open Tab with newtab page
         let tab = Tab(content: .newtab, webViewConfiguration: webViewConfiguration, privacyFeatures: privacyFeaturesMock)
@@ -500,6 +506,7 @@ class ErrorPageTests: XCTestCase {
         XCTAssertTrue(tab.canReload)
     }
 
+    @MainActor
     func testWhenPageLoadedAndFailsOnRefreshAndSucceedsOnConsequentRefresh_forwardHistoryIsPreserved() async throws {
         // open Tab with newtab page
         let tab = Tab(content: .newtab, webViewConfiguration: webViewConfiguration, privacyFeatures: privacyFeaturesMock)
@@ -568,6 +575,7 @@ class ErrorPageTests: XCTestCase {
         XCTAssertTrue(tab.canReload)
     }
 
+    @MainActor
     func testWhenReloadingBySubmittingSameURL_errorPageRemainsSame() async throws {
         // open Tab with newtab page
         let tab = Tab(content: .newtab, webViewConfiguration: webViewConfiguration, privacyFeatures: privacyFeaturesMock)
@@ -643,6 +651,7 @@ class ErrorPageTests: XCTestCase {
         XCTAssertTrue(tab.canReload)
     }
 
+    @MainActor
     func testWhenGoingToAnotherUrlFails_newBackForwardHistoryItemIsAdded() async throws {
         // open Tab with newtab page
         let tab = Tab(content: .newtab, webViewConfiguration: webViewConfiguration, privacyFeatures: privacyFeaturesMock)
@@ -718,6 +727,7 @@ class ErrorPageTests: XCTestCase {
         XCTAssertTrue(tab.canReload)
     }
 
+    @MainActor
     func testWhenGoingToAnotherUrlSucceeds_newBackForwardHistoryItemIsAdded() async throws {
         // open Tab with newtab page
         let tab = Tab(content: .newtab, webViewConfiguration: webViewConfiguration, privacyFeatures: privacyFeaturesMock)
@@ -787,6 +797,7 @@ class ErrorPageTests: XCTestCase {
         XCTAssertTrue(tab.canReload)
     }
 
+    @MainActor
     func testWhenLoadingFailsAfterSessionRestoration_navigationHistoryIsPreserved() async throws {
         schemeHandler.middleware = [{ _ in
             .failure(NSError.noConnection)
@@ -827,6 +838,7 @@ class ErrorPageTests: XCTestCase {
         XCTAssertTrue(tab.canReload)
     }
 
+    @MainActor
     func testPinnedTabDoesNotNavigateAway() async throws {
         schemeHandler.middleware = [{ _ in
             return .ok(.html(Self.testHtml))
@@ -874,6 +886,7 @@ class ErrorPageTests: XCTestCase {
         XCTAssertEqual(viewModel.tabs.count, 1)
     }
 
+    @MainActor
     func testWhenPageFailsToLoadAfterRedirect_errorPageShown() async throws {
         // open Tab with newtab page
         let tab = Tab(content: .newtab, webViewConfiguration: webViewConfiguration, privacyFeatures: privacyFeaturesMock)
diff --git a/IntegrationTests/Tab/SearchNonexistentDomainTests.swift b/IntegrationTests/Tab/SearchNonexistentDomainTests.swift
index b715d829e5..6ace162307 100644
--- a/IntegrationTests/Tab/SearchNonexistentDomainTests.swift
+++ b/IntegrationTests/Tab/SearchNonexistentDomainTests.swift
@@ -241,7 +241,7 @@ final class SearchNonexistentDomainTests: XCTestCase {
         addressBar.suggestionContainerViewModel = SuggestionContainerViewModel(isHomePage: true, isBurner: false, suggestionContainer: suggestionContainer)
 
         suggestionContainer.getSuggestions(for: enteredString)
-        suggestionLoadingMock.completion!(.init(topHits: [.website(url: url)], duckduckgoSuggestions: [], historyAndBookmarks: []), nil)
+        suggestionLoadingMock.completion!(.init(topHits: [.website(url: url)], duckduckgoSuggestions: [], localSuggestions: []), nil)
 
         addressBar.suggestionViewControllerDidConfirmSelection(addressBar.suggestionViewController)
 
diff --git a/IntegrationTests/Tab/TabContentTests.swift b/IntegrationTests/Tab/TabContentTests.swift
index f2abe4b312..bf851f09c8 100644
--- a/IntegrationTests/Tab/TabContentTests.swift
+++ b/IntegrationTests/Tab/TabContentTests.swift
@@ -24,7 +24,6 @@ import XCTest
 @testable import DuckDuckGo_Privacy_Browser
 
 @available(macOS 12.0, *)
-@MainActor
 class TabContentTests: XCTestCase {
 
     var window: NSWindow!
@@ -220,7 +219,7 @@ class TabContentTests: XCTestCase {
             return
         }
 
-        // wait for print dialog to appear
+        // wait for save dialog to appear
         let eSaveDialogShown = expectation(description: "Save dialog shown")
         let getSaveDialog = Task { @MainActor in
             while true {
@@ -277,7 +276,7 @@ class TabContentTests: XCTestCase {
         let eNewtabPageLoaded = tab.webViewDidFinishNavigationPublisher.timeout(5).first().promise()
         try await eNewtabPageLoaded.value
 
-        // wait for print dialog to appear
+        // wait for save dialog to appear
         let eSaveDialogShown = expectation(description: "Save dialog shown")
         let getSaveDialog = Task { @MainActor in
             while true {
diff --git a/LocalPackages/DataBrokerProtection/Package.swift b/LocalPackages/DataBrokerProtection/Package.swift
index 0e74e2bf30..19b8daa1e2 100644
--- a/LocalPackages/DataBrokerProtection/Package.swift
+++ b/LocalPackages/DataBrokerProtection/Package.swift
@@ -29,34 +29,30 @@ let package = Package(
             targets: ["DataBrokerProtection"])
     ],
     dependencies: [
-        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "132.0.1"),
-        .package(path: "../PixelKit"),
+        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "144.0.0"),
         .package(path: "../SwiftUIExtensions"),
         .package(path: "../XPCHelper"),
-        .package(url: "https://github.com/duckduckgo/apple-toolbox.git", exact: "2.0.0"),
     ],
     targets: [
         .target(
             name: "DataBrokerProtection",
             dependencies: [
                 .product(name: "BrowserServicesKit", package: "BrowserServicesKit"),
-                .product(name: "PixelKit", package: "PixelKit"),
                 .product(name: "SwiftUIExtensions", package: "SwiftUIExtensions"),
                 .byName(name: "XPCHelper"),
+                .product(name: "PixelKit", package: "BrowserServicesKit"),
             ],
             resources: [.process("Resources")],
             swiftSettings: [
                 .define("DEBUG", .when(configuration: .debug))
-            ],
-            plugins: [.plugin(name: "SwiftLintPlugin", package: "apple-toolbox")]
+            ]
         ),
         .testTarget(
             name: "DataBrokerProtectionTests",
             dependencies: [
                 "DataBrokerProtection",
                 "BrowserServicesKit",
-            ],
-            plugins: [.plugin(name: "SwiftLintPlugin", package: "apple-toolbox")]
+            ]
         )
     ]
 )
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/DataBrokerProtectionDataManager.swift b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Database/DataBrokerProtectionDataManager.swift
index 50f5bb47fe..b006af7433 100644
--- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Database/DataBrokerProtectionDataManager.swift
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Database/DataBrokerProtectionDataManager.swift
@@ -23,21 +23,14 @@ public protocol DataBrokerProtectionDataManaging {
     var cache: InMemoryDataCache { get }
     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
-}
-
-extension DataBrokerProtectionDataManaging {
-    func fetchProfile() -> DataBrokerProtectionProfile? {
-        fetchProfile(ignoresCache: false)
-    }
-
-    func fetchBrokerProfileQueryData() async -> [BrokerProfileQueryData] {
-        await fetchBrokerProfileQueryData(ignoresCache: false)
-    }
+    init(pixelHandler: EventMapping<DataBrokerProtectionPixels>, fakeBrokerFlag: DataBrokerDebugFlag)
+    func saveProfile(_ profile: DataBrokerProtectionProfile) async throws
+    func fetchProfile() throws -> DataBrokerProtectionProfile?
+    func prepareProfileCache() throws
+    func fetchBrokerProfileQueryData(ignoresCache: Bool) throws -> [BrokerProfileQueryData]
+    func prepareBrokerProfileQueryDataCache() throws
+    func hasMatches() throws -> Bool
+    func profileQueriesCount() throws -> Int
 }
 
 public protocol DataBrokerProtectionDataManagerDelegate: AnyObject {
@@ -52,27 +45,43 @@ 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
     }
 
-    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
+            cache.invalidate()
+            throw error
+        }
         cache.invalidate()
         cache.profile = profile
-
-        return result
     }
 
-    public func fetchProfile(ignoresCache: Bool = false) -> 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
         }
 
-        if let profile = database.fetchProfile() {
+        return try fetchProfileFromDB()
+    }
+
+    public func profileQueriesCount() throws -> Int {
+        guard let profile = try fetchProfileFromDB() else {
+            throw DataBrokerProtectionError.dataNotInDatabase
+        }
+
+        return profile.profileQueries.count
+    }
+
+    private func fetchProfileFromDB() throws -> DataBrokerProtectionProfile? {
+        if let profile = try database.fetchProfile() {
             cache.profile = profile
             return profile
         } else {
@@ -81,34 +90,43 @@ public class DataBrokerProtectionDataManager: DataBrokerProtectionDataManaging {
         }
     }
 
-    public func fetchBrokerProfileQueryData(ignoresCache: Bool = false) async -> [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
         }
 
-        let queryData = database.fetchAllBrokerProfileQueryData()
+        let queryData = try database.fetchAllBrokerProfileQueryData()
         cache.brokerProfileQueryData = queryData
         return queryData
     }
 
-    public func hasMatches() -> Bool {
-        return database.hasMatches()
+    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 -> Bool {
-        guard let profile = profile else { return false }
-        let result = await saveProfile(profile)
+    public func saveCachedProfileToDatabase(_ profile: DataBrokerProtectionProfile) async throws {
+        try await saveProfile(profile)
 
         delegate?.dataBrokerProtectionDataManagerDidUpdateData()
-
-        return result
     }
 
-    public func removeAllData() {
-        database.deleteProfileData()
+    public func removeAllData() throws {
+        try database.deleteProfileData()
         cache.invalidate()
 
         delegate?.dataBrokerProtectionDataManagerDidDeleteData()
@@ -116,8 +134,8 @@ extension DataBrokerProtectionDataManager: InMemoryDataCacheDelegate {
 }
 
 public protocol InMemoryDataCacheDelegate: AnyObject {
-    func flushCache(profile: DataBrokerProtectionProfile?) async -> Bool
-    func removeAllData()
+    func saveCachedProfileToDatabase(_ profile: DataBrokerProtectionProfile) async throws
+    func removeAllData() throws
 }
 
 public final class InMemoryDataCache {
@@ -139,10 +157,9 @@ public final class InMemoryDataCache {
 }
 
 extension InMemoryDataCache: DBPUICommunicationDelegate {
-    func saveProfile() async -> Bool {
-        _ = await delegate?.flushCache(profile: profile)
-
-        return true
+    func saveProfile() async throws {
+        guard let profile = profile else { return }
+        try await delegate?.saveCachedProfileToDatabase(profile)
     }
 
     private func indexForName(matching name: DBPUIUserProfileName, in profile: DataBrokerProtectionProfile) -> Int? {
@@ -178,9 +195,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 {
@@ -277,7 +294,7 @@ extension InMemoryDataCache: DBPUICommunicationDelegate {
     }
 
     func startScanAndOptOut() -> Bool {
-        return scanDelegate?.startScan() ?? false
+        return scanDelegate?.startScan(startDate: Date()) ?? false
     }
 
     func getInitialScanState() async -> DBPUIInitialScanState {
@@ -313,4 +330,10 @@ extension InMemoryDataCache: DBPUICommunicationDelegate {
                 }
             }
     }
+
+    func getBackgroundAgentMetadata() async -> DBPUIDebugMetadata {
+        let metadata = await scanDelegate?.getBackgroundAgentMetadata()
+
+        return mapper.mapToUIDebugMetadata(metadata: metadata, brokerProfileQueryData: brokerProfileQueryData)
+    }
 }
diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Database/DataBrokerProtectionDatabase.swift b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Database/DataBrokerProtectionDatabase.swift
index 794b2422fc..c1cbafd4a8 100644
--- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Database/DataBrokerProtectionDatabase.swift
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Database/DataBrokerProtectionDatabase.swift
@@ -18,176 +18,195 @@
 
 import Foundation
 import Common
+import SecureStorage
 
 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 fetchScanHistoryEvents(brokerId: Int64, profileQueryId: Int64) -> [HistoryEvent]
-    func fetchOptOutHistoryEvents(brokerId: Int64, profileQueryId: Int64, extractedProfileId: Int64) -> [HistoryEvent]
-    func hasMatches() -> Bool
+    func add(_ historyEvent: HistoryEvent) throws
+    func fetchLastEvent(brokerId: Int64, profileQueryId: Int64) throws -> HistoryEvent?
+    func fetchScanHistoryEvents(brokerId: Int64, profileQueryId: Int64) throws -> [HistoryEvent]
+    func fetchOptOutHistoryEvents(brokerId: Int64, profileQueryId: Int64, extractedProfileId: 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 {
     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: SecureVaultReporting?
 
-    init(fakeBrokerFlag: DataBrokerDebugFlag = DataBrokerDebugFlagFakeBroker(), vault: (any DataBrokerProtectionSecureVault)? = nil) {
+    init(fakeBrokerFlag: DataBrokerDebugFlag = DataBrokerDebugFlagFakeBroker(),
+         pixelHandler: EventMapping<DataBrokerProtectionPixels>,
+         vault: (any DataBrokerProtectionSecureVault)? = nil,
+         secureVaultErrorReporter: SecureVaultReporting? = DataBrokerProtectionSecureVaultErrorReporter.shared) {
         self.fakeBrokerFlag = fakeBrokerFlag
+        self.pixelHandler = pixelHandler
         self.vault = vault
+        self.secureVaultErrorReporter = secureVaultErrorReporter
     }
 
-    func save(_ profile: DataBrokerProtectionProfile) async -> Bool {
+    func save(_ profile: DataBrokerProtectionProfile) async throws {
         do {
-            let vault = try self.vault ?? DataBrokerProtectionSecureVaultFactory.makeVault(errorReporter: nil)
+            let vault = try self.vault ?? DataBrokerProtectionSecureVaultFactory.makeVault(reporter: secureVaultErrorReporter)
 
             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)
-
-            return false
+            os_log("Database error: save profile, error: %{public}@", log: .error, error.localizedDescription)
+            pixelHandler.fire(.generalError(error: error, functionOccurredIn: "DataBrokerProtectionDatabase.save profile"))
+            throw error
         }
     }
 
-    public func fetchProfile() -> DataBrokerProtectionProfile? {
+    public func fetchProfile() throws -> DataBrokerProtectionProfile? {
         do {
-            let vault = try DataBrokerProtectionSecureVaultFactory.makeVault(errorReporter: nil)
+            let vault = try DataBrokerProtectionSecureVaultFactory.makeVault(reporter: secureVaultErrorReporter)
             return try vault.fetchProfile(with: Self.profileId)
         } catch {
             os_log("Database error: fetchProfile, error: %{public}@", log: .error, error.localizedDescription)
-            return nil
+            pixelHandler.fire(.generalError(error: error, functionOccurredIn: "DataBrokerProtectionDatabase.fetchProfile"))
+            throw error
         }
     }
 
-    public func deleteProfileData() {
+    public func deleteProfileData() throws {
         do {
-            let vault = try DataBrokerProtectionSecureVaultFactory.makeVault(errorReporter: nil)
+            let vault = try DataBrokerProtectionSecureVaultFactory.makeVault(reporter: secureVaultErrorReporter)
             try vault.deleteProfileData()
         } catch {
-            os_log("Database error: removeProfileData, error: %{public}@", log: .error, error.localizedDescription)
-            return
+            os_log("Database error: deleteProfileData, error: %{public}@", log: .error, error.localizedDescription)
+            pixelHandler.fire(.generalError(error: error, functionOccurredIn: "DataBrokerProtectionDatabase.deleteProfileData"))
+            throw error
         }
     }
 
-    func fetchChildBrokers(for parentBroker: String) -> [DataBroker] {
+    func fetchChildBrokers(for parentBroker: String) throws -> [DataBroker] {
         do {
-            let vault = try DataBrokerProtectionSecureVaultFactory.makeVault(errorReporter: nil)
+            let vault = try DataBrokerProtectionSecureVaultFactory.makeVault(reporter: secureVaultErrorReporter)
             return try vault.fetchChildBrokers(for: parentBroker)
         } catch {
             os_log("Database error: fetchChildBrokers, error: %{public}@", log: .error, error.localizedDescription)
-            return [DataBroker]()
+            pixelHandler.fire(.generalError(error: error, functionOccurredIn: "DataBrokerProtectionDatabase.fetchChildBrokers for parentBroker"))
+            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(reporter: secureVaultErrorReporter)
 
-        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)
+            pixelHandler.fire(.generalError(error: error, functionOccurredIn: "DataBrokerProtectionDatabase.save extractedProfile brokerId profileQueryId"))
+            throw error
+        }
     }
 
-    func brokerProfileQueryData(for brokerId: Int64, and profileQueryId: Int64) -> BrokerProfileQueryData? {
+    func brokerProfileQueryData(for brokerId: Int64, and profileQueryId: Int64) throws -> 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
+            let vault = try self.vault ?? DataBrokerProtectionSecureVaultFactory.makeVault(reporter: 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 {
+                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
             }
+
+            let optOutOperations = try vault.fetchOptOuts(brokerId: brokerId, profileQueryId: profileQueryId)
+
+            return BrokerProfileQueryData(
+                dataBroker: broker,
+                profileQuery: profileQuery,
+                scanOperationData: scanOperation,
+                optOutOperationsData: optOutOperations
+            )
         } catch {
             os_log("Database error: brokerProfileQueryData, error: %{public}@", log: .error, error.localizedDescription)
-            return nil
+            pixelHandler.fire(.generalError(error: error, functionOccurredIn: "DataBrokerProtectionDatabase.brokerProfileQueryData for brokerId and profileQueryId"))
+            throw error
         }
     }
 
-    func fetchExtractedProfiles(for brokerId: Int64) -> [ExtractedProfile] {
+    func fetchExtractedProfiles(for brokerId: Int64) throws -> [ExtractedProfile] {
         do {
-            let vault = try self.vault ?? DataBrokerProtectionSecureVaultFactory.makeVault(errorReporter: nil)
-
+            let vault = try self.vault ?? DataBrokerProtectionSecureVaultFactory.makeVault(reporter: secureVaultErrorReporter)
             return try vault.fetchExtractedProfiles(for: brokerId)
         } catch {
-            os_log("Database error: fetchExtractedProfiles for scan, error: %{public}@", log: .error, error.localizedDescription)
-            return [ExtractedProfile]()
+            os_log("Database error: fetchExtractedProfiles, error: %{public}@", log: .error, error.localizedDescription)
+            pixelHandler.fire(.generalError(error: error, functionOccurredIn: "DataBrokerProtectionDatabase.fetchExtractedProfiles for brokerId"))
+            throw error
         }
     }
 
-    func updatePreferredRunDate(_ date: Date?, brokerId: Int64, profileQueryId: Int64) {
+    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(reporter: secureVaultErrorReporter)
             try vault.updatePreferredRunDate(date, brokerId: brokerId, profileQueryId: profileQueryId)
         } catch {
-            os_log("Database error: updatePreferredRunDate for scan, error: %{public}@", log: .error, error.localizedDescription)
+            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
         }
     }
 
-    func updatePreferredRunDate(_ date: Date?, brokerId: Int64, profileQueryId: Int64, extractedProfileId: Int64) {
+    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(reporter: secureVaultErrorReporter)
 
             try vault.updatePreferredRunDate(
                 date,
                 brokerId: brokerId,
                 profileQueryId: profileQueryId,
-                extractedProfileId: extractedProfileId
-            )
+                extractedProfileId: extractedProfileId)
         } catch {
-            os_log("Database error: updatePreferredRunDate for optOut, error: %{public}@", log: .error, error.localizedDescription)
+            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
         }
     }
 
-    func updateLastRunDate(_ date: Date?, brokerId: Int64, profileQueryId: Int64) {
+    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(reporter: secureVaultErrorReporter)
             try vault.updateLastRunDate(date, brokerId: brokerId, profileQueryId: profileQueryId)
         } catch {
-            os_log("Database error: updateLastRunDate for scan, error: %{public}@", log: .error, error.localizedDescription)
+            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
         }
     }
 
-    func updateLastRunDate(_ date: Date?, brokerId: Int64, profileQueryId: Int64, extractedProfileId: Int64) {
+    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(reporter: secureVaultErrorReporter)
 
             try vault.updateLastRunDate(
                 date,
@@ -196,23 +215,26 @@ final class DataBrokerProtectionDatabase: DataBrokerProtectionRepository {
                 extractedProfileId: extractedProfileId
             )
         } catch {
-            os_log("Database error: updateLastRunDate for optOut, error: %{public}@", log: .error, error.localizedDescription)
+            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
         }
     }
 
-    func updateRemovedDate(_ date: Date?, on extractedProfileId: Int64) {
+    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(reporter: secureVaultErrorReporter)
             try vault.updateRemovedDate(for: extractedProfileId, with: date)
         } catch {
-            os_log("Database error: updateRemoveDate, error: %{public}@", log: .error, error.localizedDescription)
+            os_log("Database error: updateRemovedDate, error: %{public}@", log: .error, error.localizedDescription)
+            pixelHandler.fire(.generalError(error: error, functionOccurredIn: "DataBrokerProtectionDatabase.updateRemovedDate date on extractedProfileId"))
+            throw error
         }
     }
 
-    func add(_ historyEvent: HistoryEvent) {
+    func add(_ historyEvent: HistoryEvent) throws {
         do {
-            let vault = try self.vault ?? DataBrokerProtectionSecureVaultFactory.makeVault(errorReporter: nil)
+            let vault = try self.vault ?? DataBrokerProtectionSecureVaultFactory.makeVault(reporter: secureVaultErrorReporter)
 
             if  let extractedProfileId = historyEvent.extractedProfileId {
                 try vault.save(historyEvent: historyEvent, brokerId: historyEvent.brokerId, profileQueryId: historyEvent.profileQueryId, extractedProfileId: extractedProfileId)
@@ -220,13 +242,15 @@ final class DataBrokerProtectionDatabase: DataBrokerProtectionRepository {
                 try vault.save(historyEvent: historyEvent, brokerId: historyEvent.brokerId, profileQueryId: historyEvent.profileQueryId)
             }
         } catch {
-            os_log("Database error: addHistoryEvent, error: %{public}@", log: .error, error.localizedDescription)
+            os_log("Database error: add historyEvent, error: %{public}@", log: .error, error.localizedDescription)
+            pixelHandler.fire(.generalError(error: error, functionOccurredIn: "DataBrokerProtectionDatabase.add historyEvent"))
+            throw error
         }
     }
 
-    func fetchAllBrokerProfileQueryData() -> [BrokerProfileQueryData] {
+    func fetchAllBrokerProfileQueryData() throws -> [BrokerProfileQueryData] {
         do {
-            let vault = try self.vault ?? DataBrokerProtectionSecureVaultFactory.makeVault(errorReporter: nil)
+            let vault = try self.vault ?? DataBrokerProtectionSecureVaultFactory.makeVault(reporter: secureVaultErrorReporter)
             let brokers = try vault.fetchAllBrokers()
             let profileQueries = try vault.fetchAllProfileQueries(for: Self.profileId)
             var brokerProfileQueryDataList = [BrokerProfileQueryData]()
@@ -252,35 +276,54 @@ final class DataBrokerProtectionDatabase: DataBrokerProtectionRepository {
             return brokerProfileQueryDataList
         } catch {
             os_log("Database error: fetchAllBrokerProfileQueryData, error: %{public}@", log: .error, error.localizedDescription)
-            return [BrokerProfileQueryData]()
+            pixelHandler.fire(.generalError(error: error, functionOccurredIn: "DataBrokerProtectionDatabase.fetchAllBrokerProfileQueryData"))
+            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(reporter: secureVaultErrorReporter)
 
-        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)
+            pixelHandler.fire(.generalError(error: error, functionOccurredIn: "DataBrokerProtectionDatabase.saveOptOutOperation optOut extractedProfile"))
+            throw error
+        }
     }
 
-    func fetchLastEvent(brokerId: Int64, profileQueryId: Int64) -> HistoryEvent? {
+    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(reporter: secureVaultErrorReporter)
             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
+            pixelHandler.fire(.generalError(error: error, functionOccurredIn: "fetchLastEvent brokerId profileQueryId"))
+            throw error
+        }
+    }
+
+    func hasMatches() throws -> Bool {
+        do {
+            let vault = try self.vault ?? DataBrokerProtectionSecureVaultFactory.makeVault(reporter: secureVaultErrorReporter)
+            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
         }
     }
 
-    func fetchScanHistoryEvents(brokerId: Int64, profileQueryId: Int64) -> [HistoryEvent] {
+    func fetchScanHistoryEvents(brokerId: Int64, profileQueryId: Int64) throws -> [HistoryEvent] {
         do {
-            let vault = try self.vault ?? DataBrokerProtectionSecureVaultFactory.makeVault(errorReporter: nil)
+            let vault = try self.vault ?? DataBrokerProtectionSecureVaultFactory.makeVault(reporter: secureVaultErrorReporter)
             guard let scan = try vault.fetchScan(brokerId: brokerId, profileQueryId: profileQueryId) else {
                 return [HistoryEvent]()
             }
@@ -288,13 +331,14 @@ final class DataBrokerProtectionDatabase: DataBrokerProtectionRepository {
             return scan.historyEvents
         } catch {
             os_log("Database error: fetchHistoryEvents, error: %{public}@", log: .error, error.localizedDescription)
-            return [HistoryEvent]()
+            pixelHandler.fire(.generalError(error: error, functionOccurredIn: "fetchScanHistoryEvents brokerId profileQueryId"))
+            throw error
         }
     }
 
-    func fetchOptOutHistoryEvents(brokerId: Int64, profileQueryId: Int64, extractedProfileId: Int64) -> [HistoryEvent] {
+    func fetchOptOutHistoryEvents(brokerId: Int64, profileQueryId: Int64, extractedProfileId: Int64) throws -> [HistoryEvent] {
         do {
-            let vault = try self.vault ?? DataBrokerProtectionSecureVaultFactory.makeVault(errorReporter: nil)
+            let vault = try self.vault ?? DataBrokerProtectionSecureVaultFactory.makeVault(reporter: secureVaultErrorReporter)
             guard let optOut = try vault.fetchOptOut(brokerId: brokerId, profileQueryId: profileQueryId, extractedProfileId: extractedProfileId) else {
                 return [HistoryEvent]()
             }
@@ -302,33 +346,25 @@ final class DataBrokerProtectionDatabase: DataBrokerProtectionRepository {
             return optOut.historyEvents
         } catch {
             os_log("Database error: fetchHistoryEvents, error: %{public}@", log: .error, error.localizedDescription)
-            return [HistoryEvent]()
+            pixelHandler.fire(.generalError(error: error, functionOccurredIn: "DataBrokerProtectionDatabase.fetchOptOutHistoryEvents brokerId profileQueryId extractedProfileId"))
+            throw error
         }
     }
 
-    func hasMatches() -> Bool {
+    func fetchAttemptInformation(for extractedProfileId: Int64) throws -> AttemptInformation? {
         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 fetchAttemptInformation(for extractedProfileId: Int64) -> AttemptInformation? {
-        do {
-            let vault = try self.vault ?? DataBrokerProtectionSecureVaultFactory.makeVault(errorReporter: nil)
+            let vault = try self.vault ?? DataBrokerProtectionSecureVaultFactory.makeVault(reporter: secureVaultErrorReporter)
             return try vault.fetchAttemptInformation(for: extractedProfileId)
         } catch {
             os_log("Database error: fetchAttemptInformation, error: %{public}@", log: .error, error.localizedDescription)
-            return nil
+            pixelHandler.fire(.generalError(error: error, functionOccurredIn: "DataBrokerProtectionDatabase.fetchAttemptInformation for extractedProfileId"))
+            throw error
         }
     }
 
-    func addAttempt(extractedProfileId: Int64, attemptUUID: UUID, dataBroker: String, lastStageDate: Date, startTime: Date) {
+    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(reporter: secureVaultErrorReporter)
             try vault.save(extractedProfileId: extractedProfileId,
                            attemptUUID: attemptUUID,
                            dataBroker: dataBroker,
@@ -336,6 +372,8 @@ 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
         }
     }
 }
@@ -365,7 +403,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 {
@@ -387,17 +425,25 @@ 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))
 
-        // The queries that need update exist in both the new and the database
-        // We assume updated queries will be not deprecated
-        var profileQueriesToUpdate = Array(Set(databaseProfileQueries).intersection(Set(newProfileQueries))).map {
-            $0.with(deprecated: false)
-        }
+        // Updated profile queries. This is only for use for deprecated matches.
+        // We do not use it for updating a particular profile query. The reason is that
+        // updates do not exist because the UI returns a complete profile, and does not
+        // discriminate if a change was something new
+        //
+        // Examples:
+        // - If a user John Doe, Miami, FL. Changes its name to Jonathan, for us it will be a new profile query.
+        // and we should remove the John Doe one.
+        // - The same happens with addresses, if a user changes the address from Miami to Aventura. We want
+        // to delete all profile queries that have Miami, FL as an address, and add the new ones.
+        //
+        var profileQueriesToUpdate = [ProfileQuery]()
+
         // The ones that we need to remove are the ones that exist in the database but not in the new ones
         var profileQueriesToRemove = Set(databaseProfileQueries).subtracting(Set(newProfileQueries))
 
@@ -462,7 +508,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)
                 }
             }
         }
diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Database/DataBrokerProtectionSecureVaultErrorReporter.swift b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Database/DataBrokerProtectionSecureVaultErrorReporter.swift
new file mode 100644
index 0000000000..86421908fd
--- /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: SecureVaultReporting {
+    static let shared = DataBrokerProtectionSecureVaultErrorReporter(pixelHandler: DataBrokerProtectionPixelsHandler())
+
+    let pixelHandler: EventMapping<DataBrokerProtectionPixels>
+    private init(pixelHandler: EventMapping<DataBrokerProtectionPixels>) {
+        self.pixelHandler = pixelHandler
+    }
+
+    func secureVaultError(_ error: SecureStorageError) {
+        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 514957192a..a3bf0d1547 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()
@@ -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? 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 3e0d151dc9..6b5894d5e1 100644
--- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/DebugUI/DataBrokerRunCustomJSONViewModel.swift
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/DebugUI/DataBrokerRunCustomJSONViewModel.swift
@@ -145,6 +145,9 @@ final class DataBrokerRunCustomJSONViewModel: ObservableObject {
 
     private let runnerProvider: OperationRunnerProvider
     private let privacyConfigManager: PrivacyConfigurationManaging
+    private let fakePixelHandler: EventMapping<DataBrokerProtectionPixels> = EventMapping { event, _, _, _ in
+        print(event)
+    }
     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"]
 
@@ -174,7 +177,7 @@ final class DataBrokerRunCustomJSONViewModel: ObservableObject {
         self.contentScopeProperties = contentScopeProperties
 
         let fileResources = FileResources()
-        self.brokers = fileResources.fetchBrokerFromResourceFiles() ?? [DataBroker]()
+        self.brokers = (try? fileResources.fetchBrokerFromResourceFiles()) ?? [DataBroker]()
     }
 
     func runAllBrokers() {
@@ -184,18 +187,14 @@ final class DataBrokerRunCustomJSONViewModel: ObservableObject {
 
         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 {
@@ -351,7 +350,7 @@ final class DataBrokerRunCustomJSONViewModel: ObservableObject {
 
                     Task {
                         do {
-                            let extractedProfiles = try await runner.scan(query, stageCalculator: FakeStageDurationCalculator(), showWebView: true) { true }
+                            let extractedProfiles = try await runner.scan(query, stageCalculator: FakeStageDurationCalculator(), pixelHandler: fakePixelHandler, showWebView: true) { true }
 
                             DispatchQueue.main.async {
                                 for extractedProfile in extractedProfiles {
@@ -387,7 +386,7 @@ final class DataBrokerRunCustomJSONViewModel: ObservableObject {
         )
         Task {
             do {
-                try await runner.optOut(profileQuery: brokerProfileQueryData, extractedProfile: scanResult.extractedProfile, stageCalculator: FakeStageDurationCalculator(), showWebView: true) {
+                try await runner.optOut(profileQuery: brokerProfileQueryData, extractedProfile: scanResult.extractedProfile, stageCalculator: FakeStageDurationCalculator(), pixelHandler: fakePixelHandler, showWebView: true) {
                     true
                 }
 
@@ -477,6 +476,7 @@ final class DataBrokerRunCustomJSONViewModel: ObservableObject {
 
 final class FakeStageDurationCalculator: StageDurationCalculator {
     var attemptId: UUID = UUID()
+    var isManualScan: Bool = false
 
     func durationSinceLastStage() -> Double {
         0.0
diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/DebugUI/DebugScanOperation.swift b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/DebugUI/DebugScanOperation.swift
index fb632105a3..3d4e4b779c 100644
--- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/DebugUI/DebugScanOperation.swift
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/DebugUI/DebugScanOperation.swift
@@ -68,6 +68,8 @@ final class DebugScanOperation: DataBrokerOperation {
     var scanURL: String?
     let clickAwaitTime: TimeInterval
     let cookieHandler: CookieHandler
+    let pixelHandler: EventMapping<DataBrokerProtectionPixels>
+    var postLoadingSiteStartTime: Date?
 
     private let fileManager = FileManager.default
     private let debugScanContentPath: String?
@@ -96,6 +98,9 @@ final class DebugScanOperation: DataBrokerOperation {
         }
         self.cookieHandler = EmptyCookieHandler()
         stageCalculator = FakeStageDurationCalculator()
+        pixelHandler =  EventMapping(mapping: { _, _, _, _ in
+            // We do not need the pixel handler for the debug
+        })
     }
 
     func run(inputValue: Void,
diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/DebugUI/ForceOptOut/DataBrokerForceOptOutViewModel.swift b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/DebugUI/ForceOptOut/DataBrokerForceOptOutViewModel.swift
index 3668052d2f..322af7070d 100644
--- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/DebugUI/ForceOptOut/DataBrokerForceOptOutViewModel.swift
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/DebugUI/ForceOptOut/DataBrokerForceOptOutViewModel.swift
@@ -23,14 +23,18 @@ 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()
     }
 
     private func loadNotRemovedOptOutData() {
         Task { @MainActor in
-            let brokerProfileData = await dataManager.fetchBrokerProfileQueryData(ignoresCache: true)
+            guard let brokerProfileData = try? dataManager.fetchBrokerProfileQueryData(ignoresCache: true) else {
+                assertionFailure()
+                return
+            }
             self.optOutData = brokerProfileData
                 .flatMap { profileData in
                     profileData.optOutOperationsData.map { ($0, profileData.dataBroker.name) }
@@ -70,6 +74,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/IPC/DataBrokerProtectionIPCClient.swift b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/IPC/DataBrokerProtectionIPCClient.swift
index 2aa3953437..1f1d2451b2 100644
--- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/IPC/DataBrokerProtectionIPCClient.swift
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/IPC/DataBrokerProtectionIPCClient.swift
@@ -27,6 +27,11 @@ public protocol IPCClientInterface: AnyObject {
     func schedulerStatusChanges(_ status: DataBrokerProtectionSchedulerStatus)
 }
 
+public protocol DBPLoginItemStatusChecker {
+    func doesHaveNecessaryPermissions() -> Bool
+    func isInCorrectDirectory() -> Bool
+}
+
 /// This is the XPC interface with parameters that can be packed properly
 @objc
 protocol XPCClientInterface: NSObjectProtocol {
@@ -36,6 +41,7 @@ protocol XPCClientInterface: NSObjectProtocol {
 public final class DataBrokerProtectionIPCClient: NSObject {
 
     private let pixelHandler: EventMapping<DataBrokerProtectionPixels>
+    private let loginItemStatusChecker: DBPLoginItemStatusChecker
 
     // MARK: - XPC Communication
 
@@ -52,8 +58,9 @@ public final class DataBrokerProtectionIPCClient: NSObject {
 
     // MARK: - Initializers
 
-    public init(machServiceName: String, pixelHandler: EventMapping<DataBrokerProtectionPixels>) {
+    public init(machServiceName: String, pixelHandler: EventMapping<DataBrokerProtectionPixels>, loginItemStatusChecker: DBPLoginItemStatusChecker) {
         self.pixelHandler = pixelHandler
+        self.loginItemStatusChecker = loginItemStatusChecker
         let clientInterface = NSXPCInterface(with: XPCClientInterface.self)
         let serverInterface = NSXPCInterface(with: XPCServerInterface.self)
 
@@ -65,6 +72,18 @@ public final class DataBrokerProtectionIPCClient: NSObject {
         super.init()
 
         xpc.delegate = self
+        xpc.onDisconnect = { [weak self] in
+            guard let self else { return }
+            Task { @MainActor in
+                try await Task.sleep(interval: .seconds(1))
+                // By calling register we make sure that XPC will connect as soon as it
+                // becomes available again, as requests are queued.  This helps ensure
+                // that the client app will always be connected to XPC.
+                self.register()
+            }
+        }
+
+        self.register()
     }
 }
 
@@ -73,7 +92,6 @@ public final class DataBrokerProtectionIPCClient: NSObject {
 extension DataBrokerProtectionIPCClient: IPCServerInterface {
 
     public func register() {
-        self.pixelHandler.fire(.ipcServerRegister)
         xpc.execute(call: { server in
             server.register()
         }, xpcReplyErrorHandler: { _ in
@@ -83,61 +101,93 @@ extension DataBrokerProtectionIPCClient: IPCServerInterface {
     }
 
     public func startScheduler(showWebView: Bool) {
-        self.pixelHandler.fire(.ipcServerStartScheduler)
+        self.pixelHandler.fire(.ipcServerStartSchedulerCalledByApp)
         xpc.execute(call: { server in
             server.startScheduler(showWebView: showWebView)
-        }, xpcReplyErrorHandler: { _ in
+        }, xpcReplyErrorHandler: { error in
+            self.pixelHandler.fire(.ipcServerStartSchedulerXPCError(error: error))
             // Intentional no-op as there's no completion block
             // If you add a completion block, please remember to call it here too!
         })
     }
 
     public func stopScheduler() {
-        self.pixelHandler.fire(.ipcServerStopScheduler)
+        self.pixelHandler.fire(.ipcServerStopSchedulerCalledByApp)
         xpc.execute(call: { server in
             server.stopScheduler()
-        }, xpcReplyErrorHandler: { _ in
+        }, xpcReplyErrorHandler: { error in
+            self.pixelHandler.fire(.ipcServerStopSchedulerXPCError(error: error))
             // Intentional no-op as there's no completion block
             // If you add a completion block, please remember to call it here too!
         })
     }
 
-    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)) {
-        self.pixelHandler.fire(.ipcServerScanAllBrokers)
+    public func startManualScan(showWebView: Bool,
+                                startTime: Date,
+                                completion: @escaping ((DataBrokerProtectionSchedulerErrorCollection?) -> Void)) {
+        self.pixelHandler.fire(.ipcServerScanAllBrokersCalledByApp)
+
+        guard loginItemStatusChecker.doesHaveNecessaryPermissions() else {
+            self.pixelHandler.fire(.ipcServerScanAllBrokersAttemptedToCallWithoutLoginItemPermissions)
+            let errors = DataBrokerProtectionSchedulerErrorCollection(oneTimeError: DataBrokerProtectionSchedulerError.loginItemDoesNotHaveNecessaryPermissions)
+            completion(errors)
+            return
+        }
+
+        guard loginItemStatusChecker.isInCorrectDirectory() else {
+            self.pixelHandler.fire(.ipcServerScanAllBrokersAttemptedToCallInWrongDirectory)
+            let errors = DataBrokerProtectionSchedulerErrorCollection(oneTimeError: DataBrokerProtectionSchedulerError.appInWrongDirectory)
+            completion(errors)
+            return
+        }
+
         xpc.execute(call: { server in
-            server.scanAllBrokers(showWebView: showWebView) { error in
-                self.pixelHandler.fire(.ipcServerScanAllBrokersCompletion(error: error))
-                completion(error)
+            server.startManualScan(showWebView: showWebView, startTime: startTime) { errors in
+                if let error = errors?.oneTimeError {
+                    let nsError = error as NSError
+                    let interruptedError = DataBrokerProtectionSchedulerError.operationsInterrupted as NSError
+                    if nsError.domain == interruptedError.domain,
+                       nsError.code == interruptedError.code {
+                        self.pixelHandler.fire(.ipcServerScanAllBrokersCompletionCalledOnAppAfterInterruption)
+                    } else {
+                        self.pixelHandler.fire(.ipcServerScanAllBrokersCompletionCalledOnAppWithError(error: error))
+                    }
+                } else {
+                    self.pixelHandler.fire(.ipcServerScanAllBrokersCompletionCalledOnAppWithoutError)
+                }
+                completion(errors)
             }
         }, xpcReplyErrorHandler: { error in
-            self.pixelHandler.fire(.ipcServerScanAllBrokersCompletion(error: error))
-            completion(error)
+            self.pixelHandler.fire(.ipcServerScanAllBrokersXPCError(error: 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))
         })
     }
 
@@ -161,6 +211,15 @@ extension DataBrokerProtectionIPCClient: IPCServerInterface {
             // If you add a completion block, please remember to call it here too!
         })
     }
+
+    public func getDebugMetadata(completion: @escaping (DBPBackgroundAgentMetadata?) -> Void) {
+        xpc.execute(call: { server in
+            server.getDebugMetadata(completion: completion)
+        }, xpcReplyErrorHandler: { error in
+            os_log("Error \(error.localizedDescription)")
+            completion(nil)
+        })
+    }
 }
 
 // MARK: - Incoming communication from the server
diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/IPC/DataBrokerProtectionIPCScheduler.swift b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/IPC/DataBrokerProtectionIPCScheduler.swift
index b69402626d..ea73c3e1a0 100644
--- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/IPC/DataBrokerProtectionIPCScheduler.swift
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/IPC/DataBrokerProtectionIPCScheduler.swift
@@ -23,7 +23,6 @@ import Common
 /// A scheduler that works through IPC to request the scheduling to a different process
 ///
 public final class DataBrokerProtectionIPCScheduler: DataBrokerProtectionScheduler {
-
     private let ipcClient: DataBrokerProtectionIPCClient
 
     public init(ipcClient: DataBrokerProtectionIPCClient) {
@@ -46,17 +45,21 @@ 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 startManualScan(showWebView: Bool,
+                                startTime: Date,
+                                completion: ((DataBrokerProtectionSchedulerErrorCollection?) -> Void)?) {
         let completion = completion ?? { _ in }
-        ipcClient.scanAllBrokers(showWebView: showWebView, completion: completion)
+        ipcClient.startManualScan(showWebView: showWebView, startTime: startTime, 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)
     }
@@ -64,4 +67,8 @@ public final class DataBrokerProtectionIPCScheduler: DataBrokerProtectionSchedul
     public func runAllOperations(showWebView: Bool) {
         ipcClient.runAllOperations(showWebView: showWebView)
     }
+
+    public func getDebugMetadata(completion: @escaping (DBPBackgroundAgentMetadata?) -> Void) {
+        ipcClient.getDebugMetadata(completion: completion)
+    }
 }
diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/IPC/DataBrokerProtectionIPCServer.swift b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/IPC/DataBrokerProtectionIPCServer.swift
index a2bc3d0e56..7f4ae3e840 100644
--- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/IPC/DataBrokerProtectionIPCServer.swift
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/IPC/DataBrokerProtectionIPCServer.swift
@@ -19,6 +19,60 @@
 import Foundation
 import XPCHelper
 
+@objc(DBPBackgroundAgentMetadata)
+public final class DBPBackgroundAgentMetadata: NSObject, NSSecureCoding {
+    enum Consts {
+        static let backgroundAgentVersionKey = "backgroundAgentVersion"
+        static let isAgentRunningKey = "isAgentRunning"
+        static let agentSchedulerStateKey = "agentSchedulerState"
+        static let lastSchedulerSessionStartTimestampKey = "lastSchedulerSessionStartTimestamp"
+    }
+
+    public static var supportsSecureCoding: Bool = true
+
+    let backgroundAgentVersion: String
+    let isAgentRunning: Bool
+    let agentSchedulerState: String
+    let lastSchedulerSessionStartTimestamp: Double?
+
+    init(backgroundAgentVersion: String,
+         isAgentRunning: Bool,
+         agentSchedulerState: String,
+         lastSchedulerSessionStartTimestamp: Double?) {
+        self.backgroundAgentVersion = backgroundAgentVersion
+        self.isAgentRunning = isAgentRunning
+        self.agentSchedulerState = agentSchedulerState
+        self.lastSchedulerSessionStartTimestamp = lastSchedulerSessionStartTimestamp
+    }
+
+    public init?(coder: NSCoder) {
+        guard let backgroundAgentVersion = coder.decodeObject(of: NSString.self,
+                                                              forKey: Consts.backgroundAgentVersionKey) as? String,
+              let agentSchedulerState = coder.decodeObject(of: NSString.self,
+                                                           forKey: Consts.agentSchedulerStateKey) as? String else {
+            return nil
+        }
+
+        self.backgroundAgentVersion = backgroundAgentVersion
+        self.isAgentRunning = coder.decodeBool(forKey: Consts.isAgentRunningKey)
+        self.agentSchedulerState = agentSchedulerState
+        self.lastSchedulerSessionStartTimestamp = coder.decodeObject(
+            of: NSNumber.self,
+            forKey: Consts.lastSchedulerSessionStartTimestampKey
+        )?.doubleValue
+    }
+
+    public func encode(with coder: NSCoder) {
+        coder.encode(self.backgroundAgentVersion as NSString, forKey: Consts.backgroundAgentVersionKey)
+        coder.encode(self.isAgentRunning, forKey: Consts.isAgentRunningKey)
+        coder.encode(self.agentSchedulerState as NSString, forKey: Consts.agentSchedulerStateKey)
+
+        if let lastSchedulerSessionStartTimestamp = self.lastSchedulerSessionStartTimestamp {
+            coder.encode(lastSchedulerSessionStartTimestamp as NSNumber, forKey: Consts.lastSchedulerSessionStartTimestampKey)
+        }
+    }
+}
+
 /// This protocol describes the server-side IPC interface for controlling the tunnel
 ///
 public protocol IPCServerInterface: AnyObject {
@@ -38,9 +92,13 @@ 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 startManualScan(showWebView: Bool,
+                         startTime: Date,
+                         completion: @escaping ((DataBrokerProtectionSchedulerErrorCollection?) -> Void))
+    func runQueuedOperations(showWebView: Bool,
+                             completion: @escaping ((DataBrokerProtectionSchedulerErrorCollection?) -> Void))
     func runAllOperations(showWebView: Bool)
 
     // MARK: - Debugging Features
@@ -48,6 +106,9 @@ public protocol IPCServerInterface: AnyObject {
     /// Opens a browser window with the specified domain
     ///
     func openBrowser(domain: String)
+
+    /// Returns background agent metadata for debugging purposes
+    func getDebugMetadata(completion: @escaping (DBPBackgroundAgentMetadata?) -> Void)
 }
 
 /// This protocol describes the server-side XPC interface.
@@ -73,9 +134,13 @@ 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 startManualScan(showWebView: Bool,
+                         startTime: Date,
+                         completion: @escaping ((DataBrokerProtectionSchedulerErrorCollection?) -> Void))
+    func runQueuedOperations(showWebView: Bool,
+                             completion: @escaping ((DataBrokerProtectionSchedulerErrorCollection?) -> Void))
     func runAllOperations(showWebView: Bool)
 
     // MARK: - Debugging Features
@@ -83,6 +148,8 @@ protocol XPCServerInterface {
     /// Opens a browser window with the specified domain
     ///
     func openBrowser(domain: String)
+
+    func getDebugMetadata(completion: @escaping (DBPBackgroundAgentMetadata?) -> Void)
 }
 
 public final class DataBrokerProtectionIPCServer {
@@ -143,15 +210,19 @@ 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)) {
-        serverDelegate?.scanAllBrokers(showWebView: showWebView, completion: completion)
+    func startManualScan(showWebView: Bool,
+                         startTime: Date,
+                         completion: @escaping ((DataBrokerProtectionSchedulerErrorCollection?) -> Void)) {
+        serverDelegate?.startManualScan(showWebView: showWebView, startTime: startTime, completion: completion)
     }
 
-    func runQueuedOperations(showWebView: Bool, completion: @escaping ((Error?) -> Void)) {
+    func runQueuedOperations(showWebView: Bool,
+                             completion: @escaping ((DataBrokerProtectionSchedulerErrorCollection?) -> Void)) {
         serverDelegate?.runQueuedOperations(showWebView: showWebView, completion: completion)
     }
 
@@ -162,4 +233,8 @@ extension DataBrokerProtectionIPCServer: XPCServerInterface {
     func openBrowser(domain: String) {
         serverDelegate?.openBrowser(domain: domain)
     }
+
+    func getDebugMetadata(completion: @escaping (DBPBackgroundAgentMetadata?) -> Void) {
+        serverDelegate?.getDebugMetadata(completion: completion)
+    }
 }
diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Model/DBPUICommunicationModel.swift b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Model/DBPUICommunicationModel.swift
index dc664cf412..d9dc3d80d0 100644
--- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Model/DBPUICommunicationModel.swift
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Model/DBPUICommunicationModel.swift
@@ -185,6 +185,50 @@ struct DBPUIScanHistory: DBPUISendableMessage {
     let sitesScanned: Int
 }
 
+struct DBPUIDebugMetadata: DBPUISendableMessage {
+    let lastRunAppVersion: String
+    let lastRunAgentVersion: String?
+    let isAgentRunning: Bool
+    let lastSchedulerOperationType: String? // scan or optOut
+    let lastSchedulerOperationTimestamp: Double?
+    let lastSchedulerOperationBrokerUrl: String?
+    let lastSchedulerErrorMessage: String?
+    let lastSchedulerErrorTimestamp: Double?
+    let lastSchedulerSessionStartTimestamp: Double?
+    let agentSchedulerState: String? // stopped, running or idle
+    let lastStartedSchedulerOperationType: String?
+    let lastStartedSchedulerOperationTimestamp: Double?
+    let lastStartedSchedulerOperationBrokerUrl: String?
+
+    init(lastRunAppVersion: String,
+         lastRunAgentVersion: String? = nil,
+         isAgentRunning: Bool = false,
+         lastSchedulerOperationType: String? = nil,
+         lastSchedulerOperationTimestamp: Double? = nil,
+         lastSchedulerOperationBrokerUrl: String? = nil,
+         lastSchedulerErrorMessage: String? = nil,
+         lastSchedulerErrorTimestamp: Double? = nil,
+         lastSchedulerSessionStartTimestamp: Double? = nil,
+         agentSchedulerState: String? = nil,
+         lastStartedSchedulerOperationType: String? = nil,
+         lastStartedSchedulerOperationTimestamp: Double? = nil,
+         lastStartedSchedulerOperationBrokerUrl: String? = nil) {
+        self.lastRunAppVersion = lastRunAppVersion
+        self.lastRunAgentVersion = lastRunAgentVersion
+        self.isAgentRunning = isAgentRunning
+        self.lastSchedulerOperationType = lastSchedulerOperationType
+        self.lastSchedulerOperationTimestamp = lastSchedulerOperationTimestamp
+        self.lastSchedulerOperationBrokerUrl = lastSchedulerOperationBrokerUrl
+        self.lastSchedulerErrorMessage = lastSchedulerErrorMessage
+        self.lastSchedulerErrorTimestamp = lastSchedulerErrorTimestamp
+        self.lastSchedulerSessionStartTimestamp = lastSchedulerSessionStartTimestamp
+        self.agentSchedulerState = agentSchedulerState
+        self.lastStartedSchedulerOperationType = lastStartedSchedulerOperationType
+        self.lastStartedSchedulerOperationTimestamp = lastStartedSchedulerOperationTimestamp
+        self.lastStartedSchedulerOperationBrokerUrl = lastStartedSchedulerOperationBrokerUrl
+    }
+}
+
 extension DBPUIInitialScanState {
     static var empty: DBPUIInitialScanState {
         .init(resultsFound: [DBPUIDataBrokerProfileMatch](),
diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Model/DBPUIViewModel.swift b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Model/DBPUIViewModel.swift
index ef1db86240..a43f6d9ae0 100644
--- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Model/DBPUIViewModel.swift
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Model/DBPUIViewModel.swift
@@ -20,10 +20,12 @@ import Foundation
 import Combine
 import WebKit
 import BrowserServicesKit
+import Common
 
 protocol DBPUIScanOps: AnyObject {
-    func startScan() -> Bool
+    func startScan(startDate: Date) -> Bool
     func updateCacheWithCurrentScans() async
+    func getBackgroundAgentMetadata() async -> DBPBackgroundAgentMetadata?
 }
 
 final class DBPUIViewModel {
@@ -35,6 +37,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,
@@ -71,12 +74,25 @@ final class DBPUIViewModel {
 }
 
 extension DBPUIViewModel: DBPUIScanOps {
-    func startScan() -> Bool {
-        scheduler.scanAllBrokers()
+    func startScan(startDate: Date) -> Bool {
+        scheduler.startManualScan(startTime: startDate)
         return true
     }
 
     func updateCacheWithCurrentScans() async {
-        _ = await dataManager.fetchBrokerProfileQueryData(ignoresCache: true)
+        do {
+            try dataManager.prepareBrokerProfileQueryDataCache()
+        } catch {
+            os_log("DBPUIViewModel error: updateCacheWithCurrentScans, error: %{public}@", log: .error, error.localizedDescription)
+            pixelHandler.fire(.generalError(error: error, functionOccurredIn: "DBPUIViewModel.updateCacheWithCurrentScans"))
+        }
+    }
+
+    func getBackgroundAgentMetadata() async -> DBPBackgroundAgentMetadata? {
+        return await withCheckedContinuation { continuation in
+            scheduler.getDebugMetadata { metadata in
+                continuation.resume(returning: metadata)
+            }
+        }
     }
 }
diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Model/DataBroker.swift b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Model/DataBroker.swift
index 5408f88ea7..41a5293846 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
@@ -172,14 +173,17 @@ struct DataBroker: Codable, Sendable {
         return optOutType == .parentSiteOptOut
     }
 
-    static func initFromResource(_ url: URL) -> DataBroker {
-        // swiftlint:disable:next force_try
-        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)
-        return broker
+    static func initFromResource(_ url: URL) throws -> DataBroker {
+        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 error: initFromResource, error: %{public}@", log: .error, error.localizedDescription)
+            throw error
+        }
     }
 }
 
diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Model/ProfileQuery.swift b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Model/ProfileQuery.swift
index c2cbde5fa5..b75bda9fb4 100644
--- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Model/ProfileQuery.swift
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Model/ProfileQuery.swift
@@ -80,7 +80,7 @@ extension ProfileQuery: Equatable {
         return
             lhs.firstName.lowercased() == rhs.firstName.lowercased() &&
             lhs.lastName.lowercased() == rhs.lastName.lowercased() &&
-            lhs.middleName?.lowercased() == rhs.middleName?.lowercased() &&
+            lhs.middleName.normalized() == rhs.middleName.normalized() &&
             lhs.suffix?.lowercased() == rhs.suffix?.lowercased() &&
             lhs.city.lowercased() == rhs.city.lowercased() &&
             lhs.state.lowercased() == rhs.state.lowercased() &&
@@ -94,6 +94,20 @@ extension ProfileQuery: Equatable {
     }
 }
 
+extension Optional where Wrapped == String {
+
+    /// Returns a comparable string optional for profile query optional fields.
+    /// - Returns nil if the string is blank
+    /// - Returns nil when the value is nil, or the lowercased String if present
+    func normalized() -> String? {
+        guard let nonNilString = self else {
+            return nil
+        }
+
+        return nonNilString.isBlank ? nil : nonNilString.lowercased()
+    }
+}
+
 extension Address: Equatable {
     static func == (lhs: Address, rhs: Address) -> Bool {
         return lhs.city.lowercased() == rhs.city.lowercased() &&
diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Operations/DataBrokerOperation.swift b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Operations/DataBrokerOperation.swift
index fb88d48e61..893ed9e350 100644
--- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Operations/DataBrokerOperation.swift
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Operations/DataBrokerOperation.swift
@@ -33,6 +33,7 @@ protocol DataBrokerOperation: CCFCommunicationDelegate {
     var captchaService: CaptchaServiceProtocol { get }
     var cookieHandler: CookieHandler { get }
     var stageCalculator: StageDurationCalculator { get }
+    var pixelHandler: EventMapping<DataBrokerProtectionPixels> { get }
 
     var webViewHandler: WebViewHandler? { get set }
     var actionsHandler: ActionsHandler? { get }
@@ -41,6 +42,7 @@ protocol DataBrokerOperation: CCFCommunicationDelegate {
     var shouldRunNextStep: () -> Bool { get }
     var retriesCountOnError: Int { get set }
     var clickAwaitTime: TimeInterval { get }
+    var postLoadingSiteStartTime: Date? { get set }
 
     func run(inputValue: InputValue,
              webViewHandler: WebViewHandler?,
@@ -151,11 +153,13 @@ extension DataBrokerOperation {
     }
 
     func complete(_ value: ReturnValue) {
+        self.firePostLoadingDurationPixel(hasError: false)
         self.continuation?.resume(returning: value)
         self.continuation = nil
     }
 
     func failed(with error: Error) {
+        self.firePostLoadingDurationPixel(hasError: true)
         self.continuation?.resume(throwing: error)
         self.continuation = nil
     }
@@ -175,6 +179,8 @@ extension DataBrokerOperation {
     // MARK: - CSSCommunicationDelegate
 
     func loadURL(url: URL) async {
+        let webSiteStartLoadingTime = Date()
+
         do {
             // https://app.asana.com/0/1204167627774280/1206912494469284/f
             if query.dataBroker.url == "spokeo.com" {
@@ -183,12 +189,31 @@ extension DataBrokerOperation {
                 }
             }
             try await webViewHandler?.load(url: url)
+            fireSiteLoadingPixel(startTime: webSiteStartLoadingTime, hasError: false)
+            postLoadingSiteStartTime = Date()
             await executeNextStep()
         } catch {
+            fireSiteLoadingPixel(startTime: webSiteStartLoadingTime, hasError: true)
             await onError(error: error)
         }
     }
 
+    private func fireSiteLoadingPixel(startTime: Date, hasError: Bool) {
+        if stageCalculator.isManualScan {
+            let dataBrokerURL = self.query.dataBroker.url
+            let durationInMs = (Date().timeIntervalSince(startTime) * 1000).rounded(.towardZero)
+            pixelHandler.fire(.initialScanSiteLoadDuration(duration: durationInMs, hasError: hasError, brokerURL: dataBrokerURL))
+        }
+    }
+
+    func firePostLoadingDurationPixel(hasError: Bool) {
+        if stageCalculator.isManualScan, let postLoadingSiteStartTime = self.postLoadingSiteStartTime {
+            let dataBrokerURL = self.query.dataBroker.url
+            let durationInMs = (Date().timeIntervalSince(postLoadingSiteStartTime) * 1000).rounded(.towardZero)
+            pixelHandler.fire(.initialScanPostLoadingDuration(duration: durationInMs, hasError: hasError, brokerURL: dataBrokerURL))
+        }
+    }
+
     func success(actionId: String, actionType: ActionType) async {
         switch actionType {
         case .click:
diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Operations/DataBrokerOperationRunner.swift b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Operations/DataBrokerOperationRunner.swift
index 15bfb11e9f..52a64c3fac 100644
--- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Operations/DataBrokerOperationRunner.swift
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Operations/DataBrokerOperationRunner.swift
@@ -24,12 +24,14 @@ protocol WebOperationRunner {
 
     func scan(_ profileQuery: BrokerProfileQueryData,
               stageCalculator: StageDurationCalculator,
+              pixelHandler: EventMapping<DataBrokerProtectionPixels>,
               showWebView: Bool,
               shouldRunNextStep: @escaping () -> Bool) async throws -> [ExtractedProfile]
 
     func optOut(profileQuery: BrokerProfileQueryData,
                 extractedProfile: ExtractedProfile,
                 stageCalculator: StageDurationCalculator,
+                pixelHandler: EventMapping<DataBrokerProtectionPixels>,
                 showWebView: Bool,
                 shouldRunNextStep: @escaping () -> Bool) async throws
 }
@@ -38,10 +40,12 @@ extension WebOperationRunner {
 
     func scan(_ profileQuery: BrokerProfileQueryData,
               stageCalculator: StageDurationCalculator,
+              pixelHandler: EventMapping<DataBrokerProtectionPixels>,
               shouldRunNextStep: @escaping () -> Bool) async throws -> [ExtractedProfile] {
 
         try await scan(profileQuery,
                        stageCalculator: stageCalculator,
+                       pixelHandler: pixelHandler,
                        showWebView: false,
                        shouldRunNextStep: shouldRunNextStep)
     }
@@ -49,11 +53,13 @@ extension WebOperationRunner {
     func optOut(profileQuery: BrokerProfileQueryData,
                 extractedProfile: ExtractedProfile,
                 stageCalculator: StageDurationCalculator,
+                pixelHandler: EventMapping<DataBrokerProtectionPixels>,
                 shouldRunNextStep: @escaping () -> Bool) async throws {
 
         try await optOut(profileQuery: profileQuery,
                          extractedProfile: extractedProfile,
                          stageCalculator: stageCalculator,
+                         pixelHandler: pixelHandler,
                          showWebView: false,
                          shouldRunNextStep: shouldRunNextStep)
     }
@@ -78,6 +84,7 @@ final class DataBrokerOperationRunner: WebOperationRunner {
 
     func scan(_ profileQuery: BrokerProfileQueryData,
               stageCalculator: StageDurationCalculator,
+              pixelHandler: EventMapping<DataBrokerProtectionPixels>,
               showWebView: Bool,
               shouldRunNextStep: @escaping () -> Bool) async throws -> [ExtractedProfile] {
         let scan = ScanOperation(
@@ -87,6 +94,7 @@ final class DataBrokerOperationRunner: WebOperationRunner {
             emailService: emailService,
             captchaService: captchaService,
             stageDurationCalculator: stageCalculator,
+            pixelHandler: pixelHandler,
             shouldRunNextStep: shouldRunNextStep
         )
         return try await scan.run(inputValue: (), showWebView: showWebView)
@@ -95,6 +103,7 @@ final class DataBrokerOperationRunner: WebOperationRunner {
     func optOut(profileQuery: BrokerProfileQueryData,
                 extractedProfile: ExtractedProfile,
                 stageCalculator: StageDurationCalculator,
+                pixelHandler: EventMapping<DataBrokerProtectionPixels>,
                 showWebView: Bool,
                 shouldRunNextStep: @escaping () -> Bool) async throws {
         let optOut = OptOutOperation(
@@ -104,6 +113,7 @@ final class DataBrokerOperationRunner: WebOperationRunner {
             emailService: emailService,
             captchaService: captchaService,
             stageCalculator: stageCalculator,
+            pixelHandler: pixelHandler,
             shouldRunNextStep: shouldRunNextStep
         )
         try await optOut.run(inputValue: extractedProfile, showWebView: showWebView)
diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Operations/DataBrokerOperationsCollection.swift b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Operations/DataBrokerOperationsCollection.swift
index d77c7c7d6b..eeae49e168 100644
--- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Operations/DataBrokerOperationsCollection.swift
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Operations/DataBrokerOperationsCollection.swift
@@ -19,14 +19,26 @@
 import Foundation
 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 {
 
     enum OperationType {
-        case scan
+        case manualScan
         case optOut
         case all
     }
 
+    public var error: Error?
+    public weak var errorDelegate: DataBrokerOperationsCollectionErrorDelegate?
+
     private let dataBrokerID: Int64
     private let database: DataBrokerProtectionRepository
     private let id = UUID()
@@ -107,8 +119,8 @@ final class DataBrokerOperationsCollection: Operation {
         switch operationType {
         case .optOut:
             operationsData = brokerProfileQueriesData.flatMap { $0.optOutOperationsData }
-        case .scan:
-            operationsData = brokerProfileQueriesData.compactMap { $0.scanOperationData }
+        case .manualScan:
+            operationsData = brokerProfileQueriesData.filter { $0.profileQuery.deprecated == false }.compactMap { $0.scanOperationData }
         case .all:
             operationsData = brokerProfileQueriesData.flatMap { $0.operationsData }
         }
@@ -126,8 +138,18 @@ 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)
+            errorDelegate?.dataBrokerOperationsCollection(self, didErrorBeforeStartingBrokerOperations: error)
+            return
+        }
+
         let brokerProfileQueriesData = allBrokerProfileQueryData.filter { $0.dataBroker.id == dataBrokerID }
 
         let filteredAndSortedOperationsData = filterAndSortOperationsData(brokerProfileQueriesData: brokerProfileQueriesData,
@@ -159,6 +181,7 @@ final class DataBrokerOperationsCollection: Operation {
                                                                                 runner: runner,
                                                                                 pixelHandler: pixelHandler,
                                                                                 showWebView: showWebView,
+                                                                                isManualScan: operationType == .manualScan,
                                                                                 userNotificationService: userNotificationService,
                                                                                 shouldRunNextStep: { [weak self] in
                     guard let self = self else { return false }
@@ -170,18 +193,17 @@ final class DataBrokerOperationsCollection: Operation {
                     try await Task.sleep(nanoseconds: UInt64(sleepInterval) * 1_000_000_000)
                 }
 
-                finish()
-
             } 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,
+                                                              whileRunningBrokerOperationData: operationData,
+                                                              withDataBrokerName: brokerProfileQueriesData.first?.dataBroker.name)
             }
         }
+
+        finish()
     }
 
     private func finish() {
diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Operations/DataBrokerProfileQueryOperationManager.swift b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Operations/DataBrokerProfileQueryOperationManager.swift
index f5c29ae8b7..f7eeb24d2b 100644
--- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Operations/DataBrokerProfileQueryOperationManager.swift
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Operations/DataBrokerProfileQueryOperationManager.swift
@@ -35,6 +35,7 @@ protocol OperationsManager {
                       runner: WebOperationRunner,
                       pixelHandler: EventMapping<DataBrokerProtectionPixels>,
                       showWebView: Bool,
+                      isManualScan: Bool,
                       userNotificationService: DataBrokerProtectionUserNotificationService,
                       shouldRunNextStep: @escaping () -> Bool) async throws
 }
@@ -47,6 +48,7 @@ extension OperationsManager {
                       runner: WebOperationRunner,
                       pixelHandler: EventMapping<DataBrokerProtectionPixels>,
                       userNotificationService: DataBrokerProtectionUserNotificationService,
+                      isManual: Bool,
                       shouldRunNextStep: @escaping () -> Bool) async throws {
 
         try await runOperation(operationData: operationData,
@@ -56,6 +58,7 @@ extension OperationsManager {
                                runner: runner,
                                pixelHandler: pixelHandler,
                                showWebView: false,
+                               isManualScan: isManual,
                                userNotificationService: userNotificationService,
                                shouldRunNextStep: shouldRunNextStep)
     }
@@ -70,6 +73,7 @@ struct DataBrokerProfileQueryOperationManager: OperationsManager {
                                runner: WebOperationRunner,
                                pixelHandler: EventMapping<DataBrokerProtectionPixels>,
                                showWebView: Bool = false,
+                               isManualScan: Bool = false,
                                userNotificationService: DataBrokerProtectionUserNotificationService,
                                shouldRunNextStep: @escaping () -> Bool) async throws {
 
@@ -80,6 +84,7 @@ struct DataBrokerProfileQueryOperationManager: OperationsManager {
                                        notificationCenter: notificationCenter,
                                        pixelHandler: pixelHandler,
                                        showWebView: showWebView,
+                                       isManual: isManualScan,
                                        userNotificationService: userNotificationService,
                                        shouldRunNextStep: shouldRunNextStep)
         } else if let optOutOperationData = operationData as? OptOutOperationData {
@@ -102,6 +107,7 @@ struct DataBrokerProfileQueryOperationManager: OperationsManager {
                                    notificationCenter: NotificationCenter,
                                    pixelHandler: EventMapping<DataBrokerProtectionPixels>,
                                    showWebView: Bool = false,
+                                   isManual: Bool = false,
                                    userNotificationService: DataBrokerProtectionUserNotificationService,
                                    shouldRunNextStep: @escaping () -> Bool) async throws {
         os_log("Running scan operation: %{public}@", log: .dataBrokerProtection, String(describing: brokerProfileQueryData.dataBroker.name))
@@ -112,30 +118,32 @@ 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)
         }
 
         let eventPixels = DataBrokerProtectionEventPixels(database: database, handler: pixelHandler)
-        let stageCalculator = DataBrokerProtectionStageDurationCalculator(dataBroker: brokerProfileQueryData.dataBroker.name, handler: pixelHandler)
+        let stageCalculator = DataBrokerProtectionStageDurationCalculator(dataBroker: brokerProfileQueryData.dataBroker.name,
+                                                                          handler: pixelHandler,
+                                                                          isManualScan: isManual)
 
         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)
+            let extractedProfiles = try await runner.scan(brokerProfileQueryData, stageCalculator: stageCalculator, pixelHandler: pixelHandler, showWebView: showWebView, shouldRunNextStep: shouldRunNextStep)
             os_log("Extracted profiles: %@", log: .dataBrokerProtection, extractedProfiles)
 
             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
@@ -144,8 +152,8 @@ struct DataBrokerProfileQueryOperationManager: OperationsManager {
                         if alreadyInDatabaseProfile.removedDate != nil {
                             let reAppereanceEvent = HistoryEvent(extractedProfileId: extractedProfile.id, brokerId: brokerId, profileQueryId: profileQueryId, type: .reAppearence)
                             eventPixels.fireReAppereanceEventPixel()
-                            database.add(reAppereanceEvent)
-                            database.updateRemovedDate(nil, on: id)
+                            try database.add(reAppereanceEvent)
+                            try database.updateRemovedDate(nil, on: id)
                         }
 
                         os_log("Extracted profile already exists in database: %@", log: .dataBrokerProtection, id.description)
@@ -175,7 +183,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
@@ -190,8 +198,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,
@@ -204,7 +212,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
@@ -242,9 +250,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
         }
 
@@ -292,7 +300,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,
@@ -317,31 +325,32 @@ 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,
                                     stageCalculator: stageDurationCalculator,
+                                    pixelHandler: pixelHandler,
                                     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)
 
             let updater = OperationPreferredDateUpdaterUseCase(database: database)
-            updater.updateChildrenBrokerForParentBroker(brokerProfileQueryData.dataBroker,
+            try 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 {
-            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,
@@ -394,7 +403,7 @@ struct DataBrokerProfileQueryOperationManager: OperationsManager {
             }
         }
 
-        database.add(event)
+        try? database.add(event)
 
         do {
             try updateOperationDataDates(
diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Operations/DataBrokerProtectionBrokerUpdater.swift b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Operations/DataBrokerProtectionBrokerUpdater.swift
index f3203334e2..cc0df841f6 100644
--- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Operations/DataBrokerProtectionBrokerUpdater.swift
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Operations/DataBrokerProtectionBrokerUpdater.swift
@@ -18,22 +18,29 @@
 
 import Foundation
 import Common
+import SecureStorage
 
 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
+            assertionFailure()
+            os_log("DataBrokerProtectionUpdater: error FileResources fetchBrokerFromResourceFiles, error: Bundle.module.resourceURL is nil", log: .error)
+            throw FileResourcesError.bundleResourceURLNil
         }
 
         do {
@@ -47,10 +54,10 @@ final class FileResources: ResourcesRepository {
                 $0.isJSON && !$0.hasFakePrefix
             }
 
-            return brokerJSONFiles.map(DataBroker.initFromResource(_:))
+            return try brokerJSONFiles.map(DataBroker.initFromResource(_:))
         } catch {
-            os_log("Error fetching brokers JSON files from resources", log: .dataBrokerProtection)
-            return nil
+            os_log("DataBrokerProtectionUpdater: error FileResources error: fetchBrokerFromResourceFiles, error: %{public}@", log: .error, error.localizedDescription)
+            throw error
         }
     }
 }
@@ -97,19 +104,22 @@ 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? {
-        if let vault = try? DataBrokerProtectionSecureVaultFactory.makeVault(errorReporter: nil) {
+        if let vault = try? DataBrokerProtectionSecureVaultFactory.makeVault(reporter: DataBrokerProtectionSecureVaultErrorReporter.shared) {
             return DataBrokerProtectionBrokerUpdater(vault: vault)
         }
 
@@ -118,13 +128,22 @@ public struct DataBrokerProtectionBrokerUpdater {
     }
 
     public func updateBrokers() {
-        guard let brokers = resources.fetchBrokerFromResourceFiles() else { return }
+        let brokers: [DataBroker]?
+        do {
+            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 }
 
         for broker in brokers {
             do {
                 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/OperationPreferredDateUpdater.swift b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Operations/OperationPreferredDateUpdater.swift
index 1b27e2025d..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 {
@@ -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,
@@ -70,16 +70,21 @@ 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)
+    func updateChildrenBrokerForParentBroker(_ parentBroker: DataBroker, profileQueryId: Int64) throws {
+        do {
+            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("OperationPreferredDateUpdaterUseCase error: updateChildrenBrokerForParentBroker, error: %{public}@", log: .error, error.localizedDescription)
+            throw error
         }
     }
 
@@ -102,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)
         }
     }
 
@@ -129,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)
         }
     }
 
@@ -146,11 +151,16 @@ struct OperationPreferredDateUpdaterUseCase: OperationPreferredDateUpdater {
     private func updatePreferredRunDate( _ date: Date?,
                                          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)
+                                         extractedProfileId: Int64?) throws {
+        do {
+            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("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/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
     }
diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Operations/OptOutOperation.swift b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Operations/OptOutOperation.swift
index bf5be40ecb..0a957a62f8 100644
--- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Operations/OptOutOperation.swift
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Operations/OptOutOperation.swift
@@ -40,6 +40,8 @@ final class OptOutOperation: DataBrokerOperation {
     private let operationAwaitTime: TimeInterval
     let shouldRunNextStep: () -> Bool
     let clickAwaitTime: TimeInterval
+    let pixelHandler: EventMapping<DataBrokerProtectionPixels>
+    var postLoadingSiteStartTime: Date?
 
     // 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
@@ -57,6 +59,7 @@ final class OptOutOperation: DataBrokerOperation {
          operationAwaitTime: TimeInterval = 3,
          clickAwaitTime: TimeInterval = 40,
          stageCalculator: StageDurationCalculator,
+         pixelHandler: EventMapping<DataBrokerProtectionPixels>,
          shouldRunNextStep: @escaping () -> Bool
     ) {
         self.privacyConfig = privacyConfig
@@ -69,6 +72,7 @@ final class OptOutOperation: DataBrokerOperation {
         self.shouldRunNextStep = shouldRunNextStep
         self.clickAwaitTime = clickAwaitTime
         self.cookieHandler = cookieHandler
+        self.pixelHandler = pixelHandler
     }
 
     func run(inputValue: ExtractedProfile,
diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Operations/ParentChildRelationship/MismatchCalculatorUseCase.swift b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Operations/ParentChildRelationship/MismatchCalculatorUseCase.swift
index ad3e963fe3..d4d83f7b2a 100644
--- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Operations/ParentChildRelationship/MismatchCalculatorUseCase.swift
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Operations/ParentChildRelationship/MismatchCalculatorUseCase.swift
@@ -41,13 +41,20 @@ struct MismatchCalculatorUseCase {
     let pixelHandler: EventMapping<DataBrokerProtectionPixels>
 
     func calculateMismatches() {
-        let brokerProfileQueryData = database.fetchAllBrokerProfileQueryData()
+        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 {
             guard let parentMatches = parent.scanOperationData.historyEvents.matchesForLastEvent() else { continue }
             let children = brokerProfileQueryData.filter {
-                $0.dataBroker.parent == parent.dataBroker.name &&
+                $0.dataBroker.parent == parent.dataBroker.url &&
                 $0.profileQuery.id == parent.profileQuery.id
             }
 
diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Operations/ScanOperation.swift b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Operations/ScanOperation.swift
index 10d2bd799b..f7bb9de995 100644
--- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Operations/ScanOperation.swift
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Operations/ScanOperation.swift
@@ -41,6 +41,8 @@ final class ScanOperation: DataBrokerOperation {
     let shouldRunNextStep: () -> Bool
     var retriesCountOnError: Int = 0
     let clickAwaitTime: TimeInterval
+    let pixelHandler: EventMapping<DataBrokerProtectionPixels>
+    var postLoadingSiteStartTime: Date?
 
     init(privacyConfig: PrivacyConfigurationManaging,
          prefs: ContentScopeProperties,
@@ -51,6 +53,7 @@ final class ScanOperation: DataBrokerOperation {
          operationAwaitTime: TimeInterval = 3,
          clickAwaitTime: TimeInterval = 0,
          stageDurationCalculator: StageDurationCalculator,
+         pixelHandler: EventMapping<DataBrokerProtectionPixels>,
          shouldRunNextStep: @escaping () -> Bool
     ) {
         self.privacyConfig = privacyConfig
@@ -63,9 +66,10 @@ final class ScanOperation: DataBrokerOperation {
         self.shouldRunNextStep = shouldRunNextStep
         self.clickAwaitTime = clickAwaitTime
         self.cookieHandler = cookieHandler
+        self.pixelHandler = pixelHandler
     }
 
-    func run(inputValue: Void,
+    func run(inputValue: InputValue,
              webViewHandler: WebViewHandler? = nil,
              actionsHandler: ActionsHandler? = nil,
              showWebView: Bool) async throws -> [ExtractedProfile] {
diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Pixels/DataBrokerProtectionBackendServicePixels.swift b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Pixels/DataBrokerProtectionBackendServicePixels.swift
new file mode 100644
index 0000000000..98d574a0b9
--- /dev/null
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Pixels/DataBrokerProtectionBackendServicePixels.swift
@@ -0,0 +1,65 @@
+//
+//  DataBrokerProtectionBackendServicePixels.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 Common
+import BrowserServicesKit
+
+public enum BackendServiceCallSite: String {
+    case extractEmailLink
+    case getEmail
+    case submitCaptchaInformationRequest
+    case submitCaptchaToBeResolvedRequest
+}
+
+protocol DataBrokerProtectionBackendServicePixels {
+    func fireGenerateEmailHTTPError(statusCode: Int)
+    func fireEmptyAccessToken(callSite: BackendServiceCallSite)
+}
+
+final class DefaultDataBrokerProtectionBackendServicePixels: DataBrokerProtectionBackendServicePixels {
+    private let pixelHandler: EventMapping<DataBrokerProtectionPixels>
+    private let settings: DataBrokerProtectionSettings
+    private let authRepository: AuthenticationRepository
+
+    init(pixelHandler: EventMapping<DataBrokerProtectionPixels> = DataBrokerProtectionPixelsHandler(),
+         settings: DataBrokerProtectionSettings = DataBrokerProtectionSettings(),
+         authRepository: AuthenticationRepository = KeychainAuthenticationData()) {
+        self.pixelHandler = pixelHandler
+        self.settings = settings
+        self.authRepository = authRepository
+    }
+
+    func fireGenerateEmailHTTPError(statusCode: Int) {
+        let environment = settings.selectedEnvironment.rawValue
+        let wasOnWaitlist = authRepository.getWaitlistTimestamp() != nil
+
+        pixelHandler.fire(.generateEmailHTTPErrorDaily(statusCode: statusCode,
+                                                       environment: environment,
+                                                       wasOnWaitlist: wasOnWaitlist))
+    }
+
+    func fireEmptyAccessToken(callSite: BackendServiceCallSite) {
+        let environment = settings.selectedEnvironment.rawValue
+        let wasOnWaitlist = authRepository.getWaitlistTimestamp() != nil
+
+        pixelHandler.fire(.emptyAccessTokenDaily(environment: environment,
+                                                 wasOnWaitlist: wasOnWaitlist,
+                                                 callSite: callSite))
+    }
+}
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/Pixels/DataBrokerProtectionEventPixels.swift b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Pixels/DataBrokerProtectionEventPixels.swift
index db8d89de19..589ab33afb 100644
--- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Pixels/DataBrokerProtectionEventPixels.swift
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Pixels/DataBrokerProtectionEventPixels.swift
@@ -87,7 +87,14 @@ final class DataBrokerProtectionEventPixels {
     }
 
     private func fireWeeklyReportPixels() {
-        let data = database.fetchAllBrokerProfileQueryData()
+        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
diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Pixels/DataBrokerProtectionPixels.swift b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Pixels/DataBrokerProtectionPixels.swift
index b8f2e8096c..ad7f3cd61d 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)"
         }
     }
 }
@@ -58,9 +60,21 @@ public enum DataBrokerProtectionPixels {
         static let hadReAppereance = "had_re-appearance"
         static let scanCoverage = "scan_coverage"
         static let removals = "removals"
+        static let environmentKey = "environment"
+        static let wasOnWaitlist = "was_on_waitlist"
+        static let httpCode = "http_code"
+        static let backendServiceCallSite = "backend_service_callsite"
+        static let isManualScan = "is_manual_scan"
+        static let durationInMs = "duration_in_ms"
+        static let profileQueries = "profile_queries"
+        static let hasError = "has_error"
+        static let brokerURL = "broker_url"
     }
 
     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
@@ -91,13 +105,29 @@ public enum DataBrokerProtectionPixels {
     case backgroundAgentRunOperationsAndStartSchedulerIfPossibleRunQueuedOperationsCallbackStartScheduler
 
     // IPC server events
-    case ipcServerRegister
-    case ipcServerStartScheduler
-    case ipcServerStopScheduler
+    case ipcServerStartSchedulerCalledByApp
+    case ipcServerStartSchedulerReceivedByAgent
+    case ipcServerStartSchedulerXPCError(error: Error?)
+
+    case ipcServerStopSchedulerCalledByApp
+    case ipcServerStopSchedulerReceivedByAgent
+    case ipcServerStopSchedulerXPCError(error: Error?)
+
+    case ipcServerScanAllBrokersAttemptedToCallWithoutLoginItemPermissions
+    case ipcServerScanAllBrokersAttemptedToCallInWrongDirectory
+    case ipcServerScanAllBrokersCalledByApp
+    case ipcServerScanAllBrokersReceivedByAgent
+    case ipcServerScanAllBrokersXPCError(error: Error?)
+
+    case ipcServerScanAllBrokersCompletedOnAgentWithoutError
+    case ipcServerScanAllBrokersCompletedOnAgentWithError(error: Error?)
+    case ipcServerScanAllBrokersCompletionCalledOnAppWithoutError
+    case ipcServerScanAllBrokersCompletionCalledOnAppWithError(error: Error?)
+    case ipcServerScanAllBrokersInterruptedOnAgent
+    case ipcServerScanAllBrokersCompletionCalledOnAppAfterInterruption
+
     case ipcServerOptOutAllBrokers
     case ipcServerOptOutAllBrokersCompletion(error: Error?)
-    case ipcServerScanAllBrokers
-    case ipcServerScanAllBrokersCompletion(error: Error?)
     case ipcServerRunQueuedOperations
     case ipcServerRunQueuedOperationsCompletion(error: Error?)
     case ipcServerRunAllOperations
@@ -113,9 +143,9 @@ public enum DataBrokerProtectionPixels {
     case dataBrokerProtectionNotificationOpenedAllRecordsRemoved
 
     // Scan/Search pixels
-    case scanSuccess(dataBroker: String, matchesFound: Int, duration: Double, tries: Int)
-    case scanFailed(dataBroker: String, duration: Double, tries: Int)
-    case scanError(dataBroker: String, duration: Double, category: String, details: String)
+    case scanSuccess(dataBroker: String, matchesFound: Int, duration: Double, tries: Int, isManualScan: Bool)
+    case scanFailed(dataBroker: String, duration: Double, tries: Int, isManualScan: Bool)
+    case scanError(dataBroker: String, duration: Double, category: String, details: String, isManualScan: Bool)
 
     // KPIs - engagement
     case dailyActiveUser
@@ -127,6 +157,29 @@ public enum DataBrokerProtectionPixels {
     case weeklyReportRemovals(removals: Int)
     case scanningEventNewMatch
     case scanningEventReAppearance
+
+    // Web UI - loading errors
+    case webUILoadingStarted(environment: String)
+    case webUILoadingFailed(errorCategory: String)
+    case webUILoadingSuccess(environment: String)
+
+    // Backend service errors
+    case generateEmailHTTPErrorDaily(statusCode: Int, environment: String, wasOnWaitlist: Bool)
+    case emptyAccessTokenDaily(environment: String, wasOnWaitlist: Bool, callSite: BackendServiceCallSite)
+
+    // Home View
+    case homeViewShowNoPermissionError
+    case homeViewShowWebUI
+    case homeViewShowBadPathError
+    case homeViewCTAMoveApplicationClicked
+    case homeViewCTAGrantPermissionClicked
+
+    // Initial scans pixels
+    // https://app.asana.com/0/1204006570077678/1206981742767458/f
+    case initialScanTotalDuration(duration: Double, profileQueries: Int)
+    case initialScanSiteLoadDuration(duration: Double, hasError: Bool, brokerURL: String)
+    case initialScanPostLoadingDuration(duration: Double, hasError: Bool, brokerURL: String)
+    case initialScanPreStartDuration(duration: Double)
 }
 
 extension DataBrokerProtectionPixels: PixelKitEvent {
@@ -159,6 +212,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"
@@ -167,13 +223,28 @@ extension DataBrokerProtectionPixels: PixelKitEvent {
         case .backgroundAgentRunOperationsAndStartSchedulerIfPossibleNoSavedProfile: return "m_mac_dbp_background-agent-run-operations-and-start-scheduler-if-possible_no-saved-profile"
         case .backgroundAgentRunOperationsAndStartSchedulerIfPossibleRunQueuedOperationsCallbackStartScheduler: return "m_mac_dbp_background-agent-run-operations-and-start-scheduler-if-possible_callback_start-scheduler"
 
-        case .ipcServerRegister: return "m_mac_dbp_ipc-server_register"
-        case .ipcServerStartScheduler: return "m_mac_dbp_ipc-server_start-scheduler"
-        case .ipcServerStopScheduler: return "m_mac_dbp_ipc-server_stop-scheduler"
+        case .ipcServerStartSchedulerCalledByApp: return "m_mac_dbp_ipc-server_start-scheduler_called-by-app"
+        case .ipcServerStartSchedulerReceivedByAgent: return "m_mac_dbp_ipc-server_start-scheduler_received-by-agent"
+        case .ipcServerStartSchedulerXPCError: return "m_mac_dbp_ipc-server_start-scheduler_xpc-error"
+
+        case .ipcServerStopSchedulerCalledByApp: return "m_mac_dbp_ipc-server_stop-scheduler_called-by-app"
+        case .ipcServerStopSchedulerReceivedByAgent: return "m_mac_dbp_ipc-server_stop-scheduler_received-by-agent"
+        case .ipcServerStopSchedulerXPCError: return "m_mac_dbp_ipc-server_stop-scheduler_xpc-error"
+
+        case .ipcServerScanAllBrokersAttemptedToCallWithoutLoginItemPermissions: return "m_mac_dbp_ipc-server_scan-all-brokers_attempted-to-call-without-login-item-permissions"
+        case .ipcServerScanAllBrokersAttemptedToCallInWrongDirectory: return "m_mac_dbp_ipc-server_scan-all-brokers_attempted-to-call-in-wrong-directory"
+        case .ipcServerScanAllBrokersCalledByApp: return "m_mac_dbp_ipc-server_scan-all-brokers_called-by-app"
+        case .ipcServerScanAllBrokersReceivedByAgent: return "m_mac_dbp_ipc-server_scan-all-brokers_received-by-agent"
+        case .ipcServerScanAllBrokersXPCError: return "m_mac_dbp_ipc-server_scan-all-brokers_xpc-error"
+        case .ipcServerScanAllBrokersCompletedOnAgentWithoutError: return "m_mac_dbp_ipc-server_scan-all-brokers_completed-on-agent_without-error"
+        case .ipcServerScanAllBrokersCompletedOnAgentWithError: return "m_mac_dbp_ipc-server_scan-all-brokers_completed-on-agent_with-error"
+        case .ipcServerScanAllBrokersCompletionCalledOnAppWithoutError: return "m_mac_dbp_ipc-server_scan-all-brokers_completion-called-on-app_without-error"
+        case .ipcServerScanAllBrokersCompletionCalledOnAppWithError: return "m_mac_dbp_ipc-server_scan-all-brokers_completion-called-on-app_with-error"
+        case .ipcServerScanAllBrokersInterruptedOnAgent: return "m_mac_dbp_ipc-server_scan-all-brokers_interrupted-on-agent"
+        case .ipcServerScanAllBrokersCompletionCalledOnAppAfterInterruption: return "m_mac_dbp_ipc-server_scan-all-brokers_completion-called-on-app_after-interruption"
+
         case .ipcServerOptOutAllBrokers: return "m_mac_dbp_ipc-server_opt-out-all-brokers"
         case .ipcServerOptOutAllBrokersCompletion: return "m_mac_dbp_ipc-server_opt-out-all-brokers_completion"
-        case .ipcServerScanAllBrokers: return "m_mac_dbp_ipc-server_scan-all-brokers"
-        case .ipcServerScanAllBrokersCompletion: return "m_mac_dbp_ipc-server_scan-all-brokers_completion"
         case .ipcServerRunQueuedOperations: return "m_mac_dbp_ipc-server_run-queued-operations"
         case .ipcServerRunQueuedOperationsCompletion: return "m_mac_dbp_ipc-server_run-queued-operations_completion"
         case .ipcServerRunAllOperations: return "m_mac_dbp_ipc-server_run-all-operations"
@@ -205,6 +276,27 @@ extension DataBrokerProtectionPixels: PixelKitEvent {
         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"
+
+        case .webUILoadingStarted: return "m_mac_dbp_web_ui_loading_started"
+        case .webUILoadingSuccess: return "m_mac_dbp_web_ui_loading_success"
+        case .webUILoadingFailed: return "m_mac_dbp_web_ui_loading_failed"
+
+            // Backend service errors
+        case .generateEmailHTTPErrorDaily: return "m_mac_dbp_service_email-generate-http-error"
+        case .emptyAccessTokenDaily: return "m_mac_dbp_service_empty-auth-token"
+
+            // Home View
+        case .homeViewShowNoPermissionError: return "m_mac_dbp_home_view_show-no-permission-error"
+        case .homeViewShowWebUI: return "m_mac_dbp_home_view_show-web-ui"
+        case .homeViewShowBadPathError: return "m_mac_dbp_home_view_show-bad-path-error"
+        case .homeViewCTAMoveApplicationClicked: return "m_mac_dbp_home_view-cta-move-application-clicked"
+        case .homeViewCTAGrantPermissionClicked: return "m_mac_dbp_home_view-cta-grant-permission-clicked"
+
+            // Initial scans pixels
+        case .initialScanTotalDuration: return "m_mac_dbp_initial_scan_duration"
+        case .initialScanSiteLoadDuration: return "m_mac_dbp_scan_broker_site_loaded"
+        case .initialScanPostLoadingDuration: return "m_mac_dbp_initial_scan_broker_post_loading"
+        case .initialScanPreStartDuration: return "m_mac_dbp_initial_scan_pre_start_duration"
         }
     }
 
@@ -223,6 +315,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):
@@ -270,6 +364,12 @@ extension DataBrokerProtectionPixels: PixelKitEvent {
             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 .webUILoadingStarted(let environment):
+            return [Consts.environmentKey: environment]
+        case .webUILoadingSuccess(let environment):
+            return [Consts.environmentKey: environment]
+        case .webUILoadingFailed(let error):
+            return [Consts.errorCategoryKey: error]
         case .backgroundAgentStarted,
                 .backgroundAgentRunOperationsAndStartSchedulerIfPossible,
                 .backgroundAgentRunOperationsAndStartSchedulerIfPossibleNoSavedProfile,
@@ -286,26 +386,63 @@ extension DataBrokerProtectionPixels: PixelKitEvent {
                 .dailyActiveUser,
                 .weeklyActiveUser,
                 .monthlyActiveUser,
+
                 .scanningEventNewMatch,
-                .scanningEventReAppearance:
+                .scanningEventReAppearance,
+                .homeViewShowNoPermissionError,
+                .homeViewShowWebUI,
+                .homeViewShowBadPathError,
+                .homeViewCTAMoveApplicationClicked,
+                .homeViewCTAGrantPermissionClicked,
+
+                .secureVaultInitError,
+                .secureVaultError:
             return [:]
-        case .ipcServerRegister,
-                .ipcServerStartScheduler,
-                .ipcServerStopScheduler,
+        case .ipcServerStartSchedulerCalledByApp,
+                .ipcServerStartSchedulerReceivedByAgent,
+                .ipcServerStartSchedulerXPCError,
+                .ipcServerStopSchedulerCalledByApp,
+                .ipcServerStopSchedulerReceivedByAgent,
+                .ipcServerStopSchedulerXPCError,
+                .ipcServerScanAllBrokersAttemptedToCallWithoutLoginItemPermissions,
+                .ipcServerScanAllBrokersAttemptedToCallInWrongDirectory,
+                .ipcServerScanAllBrokersCalledByApp,
+                .ipcServerScanAllBrokersReceivedByAgent,
+                .ipcServerScanAllBrokersXPCError,
+                .ipcServerScanAllBrokersCompletedOnAgentWithoutError,
+                .ipcServerScanAllBrokersCompletedOnAgentWithError,
+                .ipcServerScanAllBrokersCompletionCalledOnAppWithoutError,
+                .ipcServerScanAllBrokersCompletionCalledOnAppWithError,
+                .ipcServerScanAllBrokersInterruptedOnAgent,
+                .ipcServerScanAllBrokersCompletionCalledOnAppAfterInterruption,
                 .ipcServerOptOutAllBrokers,
                 .ipcServerOptOutAllBrokersCompletion,
-                .ipcServerScanAllBrokers,
-                .ipcServerScanAllBrokersCompletion,
                 .ipcServerRunQueuedOperations,
                 .ipcServerRunQueuedOperationsCompletion,
                 .ipcServerRunAllOperations:
             return [Consts.bundleIDParamKey: Bundle.main.bundleIdentifier ?? "nil"]
-        case .scanSuccess(let dataBroker, let matchesFound, let duration, let tries):
-            return [Consts.dataBrokerParamKey: dataBroker, Consts.matchesFoundKey: String(matchesFound), Consts.durationParamKey: String(duration), Consts.triesKey: String(tries)]
-        case .scanFailed(let dataBroker, let duration, let tries):
-            return [Consts.dataBrokerParamKey: dataBroker, Consts.durationParamKey: String(duration), Consts.triesKey: String(tries)]
-        case .scanError(let dataBroker, let duration, let category, let details):
-            return [Consts.dataBrokerParamKey: dataBroker, Consts.durationParamKey: String(duration), Consts.errorCategoryKey: category, Consts.errorDetailsKey: details]
+        case .scanSuccess(let dataBroker, let matchesFound, let duration, let tries, let isManualScan):
+            return [Consts.dataBrokerParamKey: dataBroker, Consts.matchesFoundKey: String(matchesFound), Consts.durationParamKey: String(duration), Consts.triesKey: String(tries), Consts.isManualScan: isManualScan.description]
+        case .scanFailed(let dataBroker, let duration, let tries, let isManualScan):
+            return [Consts.dataBrokerParamKey: dataBroker, Consts.durationParamKey: String(duration), Consts.triesKey: String(tries), Consts.isManualScan: isManualScan.description]
+        case .scanError(let dataBroker, let duration, let category, let details, let isManualScan):
+            return [Consts.dataBrokerParamKey: dataBroker, Consts.durationParamKey: String(duration), Consts.errorCategoryKey: category, Consts.errorDetailsKey: details, Consts.isManualScan: isManualScan.description]
+        case .generateEmailHTTPErrorDaily(let statusCode, let environment, let wasOnWaitlist):
+            return [Consts.environmentKey: environment,
+                    Consts.httpCode: String(statusCode),
+                    Consts.wasOnWaitlist: String(wasOnWaitlist)]
+        case .emptyAccessTokenDaily(let environment, let wasOnWaitlist, let backendServiceCallSite):
+            return [Consts.environmentKey: environment,
+                    Consts.wasOnWaitlist: String(wasOnWaitlist),
+                    Consts.backendServiceCallSite: backendServiceCallSite.rawValue]
+        case .initialScanTotalDuration(let duration, let profileQueries):
+            return [Consts.durationInMs: String(duration), Consts.profileQueries: String(profileQueries)]
+        case .initialScanSiteLoadDuration(let duration, let hasError, let brokerURL):
+            return [Consts.durationInMs: String(duration), Consts.hasError: hasError.description, Consts.brokerURL: brokerURL]
+        case .initialScanPostLoadingDuration(let duration, let hasError, let brokerURL):
+            return [Consts.durationInMs: String(duration), Consts.hasError: hasError.description, Consts.brokerURL: brokerURL]
+        case .initialScanPreStartDuration(let duration):
+            return [Consts.durationInMs: String(duration)]
         }
     }
 }
@@ -316,12 +453,38 @@ public class DataBrokerProtectionPixelsHandler: EventMapping<DataBrokerProtectio
     public init() {
         super.init { event, _, _, _ in
             switch event {
+            case .generateEmailHTTPErrorDaily:
+                PixelKit.fire(event, frequency: .daily)
+            case .emptyAccessTokenDaily:
+                PixelKit.fire(event, frequency: .daily)
             case .error(let error, _):
                 PixelKit.fire(DebugEvent(event, error: error))
-            case .ipcServerOptOutAllBrokersCompletion(error: let error),
-                    .ipcServerScanAllBrokersCompletion(error: let error),
-                    .ipcServerRunQueuedOperationsCompletion(error: let 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 .ipcServerStartSchedulerXPCError(error: let error),
+                    .ipcServerStopSchedulerXPCError(error: let error),
+                    .ipcServerScanAllBrokersXPCError(error: let error),
+                    .ipcServerScanAllBrokersCompletedOnAgentWithError(error: let error),
+                    .ipcServerScanAllBrokersCompletionCalledOnAppWithError(error: let error),
+                    .ipcServerOptOutAllBrokersCompletion(error: let error),
+                    .ipcServerRunQueuedOperationsCompletion(error: let error):
+                PixelKit.fire(DebugEvent(event, error: error), frequency: .dailyAndCount, includeAppVersionParameter: true)
+            case .ipcServerStartSchedulerCalledByApp,
+                    .ipcServerStartSchedulerReceivedByAgent,
+                    .ipcServerStopSchedulerCalledByApp,
+                    .ipcServerStopSchedulerReceivedByAgent,
+                    .ipcServerScanAllBrokersAttemptedToCallWithoutLoginItemPermissions,
+                    .ipcServerScanAllBrokersAttemptedToCallInWrongDirectory,
+                    .ipcServerScanAllBrokersCalledByApp,
+                    .ipcServerScanAllBrokersReceivedByAgent,
+                    .ipcServerScanAllBrokersCompletedOnAgentWithoutError,
+                    .ipcServerScanAllBrokersCompletionCalledOnAppWithoutError,
+                    .ipcServerScanAllBrokersInterruptedOnAgent,
+                    .ipcServerScanAllBrokersCompletionCalledOnAppAfterInterruption:
+                PixelKit.fire(event, frequency: .dailyAndCount, includeAppVersionParameter: true)
             case .parentChildMatches,
                     .optOutStart,
                     .optOutEmailGenerate,
@@ -342,11 +505,7 @@ public class DataBrokerProtectionPixelsHandler: EventMapping<DataBrokerProtectio
                     .backgroundAgentRunOperationsAndStartSchedulerIfPossibleNoSavedProfile,
                     .backgroundAgentRunOperationsAndStartSchedulerIfPossibleRunQueuedOperationsCallbackStartScheduler,
                     .backgroundAgentStartedStoppingDueToAnotherInstanceRunning,
-                    .ipcServerRegister,
-                    .ipcServerStartScheduler,
-                    .ipcServerStopScheduler,
                     .ipcServerOptOutAllBrokers,
-                    .ipcServerScanAllBrokers,
                     .ipcServerRunQueuedOperations,
                     .ipcServerRunAllOperations,
                     .scanSuccess,
@@ -366,9 +525,24 @@ public class DataBrokerProtectionPixelsHandler: EventMapping<DataBrokerProtectio
                     .weeklyReportScanning,
                     .weeklyReportRemovals,
                     .scanningEventNewMatch,
-                    .scanningEventReAppearance:
+                    .scanningEventReAppearance,
+                    .webUILoadingFailed,
+                    .webUILoadingStarted,
+                    .webUILoadingSuccess,
+                    .initialScanTotalDuration,
+                    .initialScanSiteLoadDuration,
+                    .initialScanPostLoadingDuration,
+                    .initialScanPreStartDuration:
 
                 PixelKit.fire(event)
+
+            case .homeViewShowNoPermissionError,
+                    .homeViewShowWebUI,
+                    .homeViewShowBadPathError,
+                    .homeViewCTAMoveApplicationClicked,
+                    .homeViewCTAGrantPermissionClicked:
+                PixelKit.fire(event, frequency: .dailyAndCount)
+
             }
         }
     }
diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Pixels/DataBrokerProtectionStageDurationCalculator.swift b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Pixels/DataBrokerProtectionStageDurationCalculator.swift
index f73f3706ad..745a9d2b50 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
@@ -37,6 +38,7 @@ enum Stage: String {
 
 protocol StageDurationCalculator {
     var attemptId: UUID { get }
+    var isManualScan: Bool { get }
 
     func durationSinceLastStage() -> Double
     func durationSinceStartTime() -> Double
@@ -61,6 +63,7 @@ protocol StageDurationCalculator {
 }
 
 final class DataBrokerProtectionStageDurationCalculator: StageDurationCalculator {
+    let isManualScan: Bool
     let handler: EventMapping<DataBrokerProtectionPixels>
     let attemptId: UUID
     let dataBroker: String
@@ -73,12 +76,14 @@ final class DataBrokerProtectionStageDurationCalculator: StageDurationCalculator
     init(attemptId: UUID = UUID(),
          startTime: Date = Date(),
          dataBroker: String,
-         handler: EventMapping<DataBrokerProtectionPixels>) {
+         handler: EventMapping<DataBrokerProtectionPixels>,
+         isManualScan: Bool = false) {
         self.attemptId = attemptId
         self.startTime = startTime
         self.lastStateTime = startTime
         self.dataBroker = dataBroker
         self.handler = handler
+        self.isManualScan = isManualScan
     }
 
     /// Returned in milliseconds
@@ -158,11 +163,11 @@ final class DataBrokerProtectionStageDurationCalculator: StageDurationCalculator
     }
 
     func fireScanSuccess(matchesFound: Int) {
-        handler.fire(.scanSuccess(dataBroker: dataBroker, matchesFound: matchesFound, duration: durationSinceStartTime(), tries: 1))
+        handler.fire(.scanSuccess(dataBroker: dataBroker, matchesFound: matchesFound, duration: durationSinceStartTime(), tries: 1, isManualScan: isManualScan))
     }
 
     func fireScanFailed() {
-        handler.fire(.scanFailed(dataBroker: dataBroker, duration: durationSinceStartTime(), tries: 1))
+        handler.fire(.scanFailed(dataBroker: dataBroker, duration: durationSinceStartTime(), tries: 1, isManualScan: isManualScan))
     }
 
     func fireScanError(error: Error) {
@@ -184,6 +189,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 {
@@ -197,7 +204,8 @@ final class DataBrokerProtectionStageDurationCalculator: StageDurationCalculator
                 dataBroker: dataBroker,
                 duration: durationSinceStartTime(),
                 category: errorCategory.toString,
-                details: error.localizedDescription
+                details: error.localizedDescription,
+                isManualScan: isManualScan
             )
         )
     }
diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Pixels/DataBrokerProtectionWebUIPixels.swift b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Pixels/DataBrokerProtectionWebUIPixels.swift
new file mode 100644
index 0000000000..6fdd4ab044
--- /dev/null
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Pixels/DataBrokerProtectionWebUIPixels.swift
@@ -0,0 +1,69 @@
+//
+//  DataBrokerProtectionWebUIPixels.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
+
+final class DataBrokerProtectionWebUIPixels {
+
+    enum PixelType {
+        case loading
+        case success
+    }
+
+    let pixelHandler: EventMapping<DataBrokerProtectionPixels>
+    private var wasHTTPErrorPixelFired = false
+
+    init(pixelHandler: EventMapping<DataBrokerProtectionPixels>) {
+        self.pixelHandler = pixelHandler
+    }
+
+    func firePixel(for error: Error) {
+        if wasHTTPErrorPixelFired {
+            wasHTTPErrorPixelFired = false // We reset the flag
+            return
+        }
+
+        let nsError = error as NSError
+
+        if nsError.domain == NSURLErrorDomain {
+            let statusCode = nsError.code
+            if statusCode >= 400 && statusCode < 600 {
+                pixelHandler.fire(.webUILoadingFailed(errorCategory: "httpError-\(statusCode)"))
+                wasHTTPErrorPixelFired = true
+            } else {
+                pixelHandler.fire(.webUILoadingFailed(errorCategory: "other-\(nsError.code)"))
+            }
+        } else {
+            pixelHandler.fire(.webUILoadingFailed(errorCategory: "other-\(nsError.code)"))
+        }
+    }
+
+    func firePixel(for selectedURL: DataBrokerProtectionWebUIURLType, type: PixelType) {
+        let environment = selectedURL == .custom ? "staging" : "production"
+
+        switch type {
+        case .loading:
+            pixelHandler.fire(.webUILoadingStarted(environment: environment))
+        case .success:
+            pixelHandler.fire(.webUILoadingSuccess(environment: environment))
+        }
+    }
+}
diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/advancedbackgroundchecks.com.json b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/advancedbackgroundchecks.com.json
index e14795a195..d514b04052 100644
--- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/advancedbackgroundchecks.com.json
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/advancedbackgroundchecks.com.json
@@ -1,7 +1,7 @@
 {
   "name": "AdvancedBackgroundChecks",
   "url": "advancedbackgroundchecks.com",
-  "version": "0.1.6",
+  "version": "0.1.7",
   "parent": "peoplefinders.com",
   "addedDatetime": 1678060800000,
   "steps": [
@@ -11,12 +11,12 @@
       "actions": [
         {
           "actionType": "navigate",
-          "id": "7967f064-e3c5-442d-8380-99cf752fb8df",
+          "id": "070b6417-8ccd-4111-b5ae-7ae470b0399a",
           "url": "https://www.advancedbackgroundchecks.com/names/${firstName}-${lastName}_${city}-${state}_age_${age}"
         },
         {
           "actionType": "extract",
-          "id": "6f6bb616-a4cb-4231-9abb-522722208f95",
+          "id": "d760163d-4a1f-476a-bc3e-4f3ccedc29f1",
           "selector": ".card-block",
           "profile": {
             "name": {
@@ -24,7 +24,7 @@
               "beforeText": "Age"
             },
             "alternativeNamesList": {
-              "selector": "(.//p[@class='card-text max-lines-1'])[1]",
+              "selector": ".//p[contains(@class, 'card-text') and strong[contains(text(), 'AKA')]]",
               "afterText": "AKA:",
               "separator": ","
             },
@@ -40,7 +40,7 @@
               "selector": "(.//p[@class='card-text'])[1]"
             },
             "relativesList": {
-              "selector": "(.//p[@class='card-text max-lines-1'])[2]",
+              "selector": ".//p[contains(@class, 'card-text') and strong[contains(text(), 'Related to')]]",
               "afterText": "Related to:",
               "separator": ","
             },
diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/neighbor.report.json b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/neighbor.report.json
index 8e09a3db50..e1a8c51741 100644
--- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/neighbor.report.json
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/neighbor.report.json
@@ -1,7 +1,7 @@
 {
   "name": "Neighbor Report",
   "url": "neighbor.report",
-  "version": "0.1.5",
+  "version": "0.1.6",
   "addedDatetime": 1703570400000,
   "steps": [
     {
@@ -10,12 +10,12 @@
       "actions": [
         {
           "actionType": "navigate",
-          "id": "22f67a44-d538-48a0-b6f4-c783123c6dfa",
+          "id": "6e589101-df53-4af7-bf6a-41376927f6ec",
           "url": "https://neighbor.report/${firstName}-${lastName}/${state|stateFull|hyphenated}/${city|hyphenated}"
         },
         {
           "actionType": "extract",
-          "id": "14ff868b-b6cc-485e-a5cf-93357a63c2ac",
+          "id": "1ec79c67-40b0-4f91-baf8-996073109092",
           "selector": ".lstd",
           "profile": {
             "name": {
@@ -53,12 +53,12 @@
       "actions": [
         {
           "actionType": "navigate",
-          "id": "477f4e90-686c-400e-8d45-65749ff60b5d",
+          "id": "d894a462-02c3-4f2a-966d-44aea2fbb6d4",
           "url": "https://neighbor.report/remove"
         },
         {
           "actionType": "fillForm",
-          "id": "335b078c-d27f-4045-8a36-2cc0c125d271",
+          "id": "7fbaf65f-c130-494b-8f61-a77cebb422f4",
           "selector": ".form-horizontal",
           "elements": [
             {
@@ -77,17 +77,17 @@
         },
         {
           "actionType": "getCaptchaInfo",
-          "id": "0ed843a1-2788-454c-a666-17906d2991cb",
+          "id": "23d6eb3e-2cfd-45f8-a0ca-b2168605173e",
           "selector": ".recaptcha-div"
         },
         {
           "actionType": "solveCaptcha",
-          "id": "e6f3b3c5-e61c-4e75-878d-cecbaae26013",
+          "id": "f0ea9801-8b8d-4e27-bd3f-bba0cdb4bf4a",
           "selector": ".recaptcha-div"
         },
         {
           "actionType": "click",
-          "id": "8544dcb5-5bd7-4045-91a8-23bbfad7bfc8",
+          "id": "2aa19f1d-1dbf-4465-8e40-857311bf7f37",
           "elements": [
             {
               "type": "button",
@@ -95,9 +95,20 @@
             }
           ]
         },
+        {
+          "actionType": "expectation",
+          "id": "2f4f23f8-4599-48a6-a52c-3ed630114a90",
+          "expectations": [
+            {
+              "type": "text",
+              "selector": "body",
+              "expect": "Remove persons"
+            }
+          ]
+        },
         {
           "actionType": "click",
-          "id": "6748ca30-0044-4e9a-8a35-5d686359688c",
+          "id": "1f411b2e-9f93-4519-ae35-7c0411b535e1",
           "elements": [
             {
               "type": "button",
@@ -111,7 +122,7 @@
         },
         {
           "actionType": "expectation",
-          "id": "a56fcc4c-fdd4-4d92-96b3-a8b89d10ca80",
+          "id": "2bf0a2dd-7d16-4d40-9091-61c96a1e6949",
           "expectations": [
             {
               "type": "text",
diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Scheduler/DataBrokerProtectionNoOpScheduler.swift b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Scheduler/DataBrokerProtectionNoOpScheduler.swift
index 98c06019ff..41e02edaca 100644
--- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Scheduler/DataBrokerProtectionNoOpScheduler.swift
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Scheduler/DataBrokerProtectionNoOpScheduler.swift
@@ -34,8 +34,10 @@ 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 startManualScan(showWebView: Bool, startTime: Date, completion: ((DataBrokerProtectionSchedulerErrorCollection?) -> Void)?) { }
     func runAllOperations(showWebView: Bool) { }
+    func getDebugMetadata(completion: (DBPBackgroundAgentMetadata?) -> Void) { }
 }
diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Scheduler/DataBrokerProtectionProcessor.swift b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Scheduler/DataBrokerProtectionProcessor.swift
index d6971d1a80..dee4d346e2 100644
--- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Scheduler/DataBrokerProtectionProcessor.swift
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Scheduler/DataBrokerProtectionProcessor.swift
@@ -55,13 +55,15 @@ final class DataBrokerProtectionProcessor {
     }
 
     // MARK: - Public functions
-    func runAllScanOperations(showWebView: Bool = false, completion: (() -> Void)? = nil) {
+    func startManualScans(showWebView: Bool = false,
+                          completion: ((DataBrokerProtectionSchedulerErrorCollection?) -> Void)? = nil) {
+
         operationQueue.cancelAllOperations()
-        runOperations(operationType: .scan,
+        runOperations(operationType: .manualScan,
                       priorityDate: nil,
-                      showWebView: showWebView) {
+                      showWebView: showWebView) { errors in
             os_log("Scans done", log: .dataBrokerProtection)
-            completion?()
+            completion?(errors)
             self.calculateMisMatches()
         }
     }
@@ -71,31 +73,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)
         }
     }
 
@@ -107,11 +112,11 @@ 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)
+        if let vault = try? DataBrokerProtectionSecureVaultFactory.makeVault(reporter: DataBrokerProtectionSecureVaultErrorReporter.shared) {
+            let brokerUpdater = DataBrokerProtectionBrokerUpdater(vault: vault, pixelHandler: pixelHandler)
             brokerUpdater.checkForUpdatesInBrokerJSONFiles()
         }
 
@@ -120,18 +125,30 @@ final class DataBrokerProtectionProcessor {
         // This will try to fire the event weekly report pixels
         eventPixels.tryToFireWeeklyPixels()
 
-        let brokersProfileData = database.fetchAllBrokerProfileQueryData()
-        let dataBrokerOperationCollections = createDataBrokerOperationCollections(from: brokersProfileData,
-                                                                                  operationType: operationType,
-                                                                                  priorityDate: priorityDate,
-                                                                                  showWebView: showWebView)
+        let dataBrokerOperationCollections: [DataBrokerOperationsCollection]
+
+        do {
+            let brokersProfileData = try database.fetchAllBrokerProfileQueryData()
+            dataBrokerOperationCollections = createDataBrokerOperationCollections(from: brokersProfileData,
+                                                                                      operationType: operationType,
+                                                                                      priorityDate: priorityDate,
+                                                                                      showWebView: showWebView)
 
-        for collection in dataBrokerOperationCollections {
-            operationQueue.addOperation(collection)
+            for collection in dataBrokerOperationCollections {
+                operationQueue.addOperation(collection)
+            }
+        } 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)
         }
     }
 
@@ -157,6 +174,7 @@ final class DataBrokerProtectionProcessor {
                                                                 pixelHandler: pixelHandler,
                                                                 userNotificationService: userNotificationService,
                                                                 showWebView: showWebView)
+                collection.errorDelegate = self
                 collections.append(collection)
 
                 visitedDataBrokerIDs.insert(dataBrokerID)
@@ -170,3 +188,22 @@ final class DataBrokerProtectionProcessor {
         os_log("Deinit DataBrokerProtectionProcessor", log: .dataBrokerProtection)
     }
 }
+
+extension DataBrokerProtectionProcessor: DataBrokerOperationsCollectionErrorDelegate {
+
+    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))
+        } 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 7ad31ed349..4e7d9a9846 100644
--- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Scheduler/DataBrokerProtectionScheduler.swift
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Scheduler/DataBrokerProtectionScheduler.swift
@@ -27,6 +27,50 @@ public enum DataBrokerProtectionSchedulerStatus: Codable {
     case running
 }
 
+public enum DataBrokerProtectionSchedulerError: Error {
+    case loginItemDoesNotHaveNecessaryPermissions
+    case appInWrongDirectory
+    case operationsInterrupted
+}
+
+@objc
+public class DataBrokerProtectionSchedulerErrorCollection: NSObject, NSSecureCoding {
+    /*
+     This needs to be an NSObject (rather than a struct) so it can be represented in Objective C
+     and confrom to NSSecureCoding for the IPC layer.
+     */
+
+    private enum NSSecureCodingKeys {
+        static let oneTimeError = "oneTimeError"
+        static let operationErrors = "operationErrors"
+    }
+
+    public let oneTimeError: Error?
+    public let operationErrors: [Error]?
+
+    public init(oneTimeError: Error? = nil, operationErrors: [Error]? = nil) {
+        self.oneTimeError = oneTimeError
+        self.operationErrors = operationErrors
+        super.init()
+    }
+
+    // MARK: - NSSecureCoding
+
+    public static var supportsSecureCoding: Bool {
+        return true
+    }
+
+    public func encode(with coder: NSCoder) {
+        coder.encode(oneTimeError, forKey: NSSecureCodingKeys.oneTimeError)
+        coder.encode(operationErrors, forKey: NSSecureCodingKeys.operationErrors)
+    }
+
+    public required init?(coder: NSCoder) {
+        oneTimeError = coder.decodeObject(of: NSError.self, forKey: NSSecureCodingKeys.oneTimeError)
+        operationErrors = coder.decodeArrayOfObjects(ofClass: NSError.self, forKey: NSSecureCodingKeys.operationErrors)
+    }
+}
+
 public protocol DataBrokerProtectionScheduler {
 
     var status: DataBrokerProtectionSchedulerStatus { get }
@@ -35,10 +79,14 @@ 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 startManualScan(showWebView: Bool, startTime: Date, completion: ((DataBrokerProtectionSchedulerErrorCollection?) -> Void)?)
+    func runQueuedOperations(showWebView: Bool, completion: ((DataBrokerProtectionSchedulerErrorCollection?) -> Void)?)
     func runAllOperations(showWebView: Bool)
+
+    /// Debug operations
+
+    func getDebugMetadata(completion: @escaping (DBPBackgroundAgentMetadata?) -> Void)
 }
 
 extension DataBrokerProtectionScheduler {
@@ -50,8 +98,8 @@ extension DataBrokerProtectionScheduler {
         runAllOperations(showWebView: false)
     }
 
-    public func scanAllBrokers() {
-        scanAllBrokers(showWebView: false, completion: nil)
+    public func startManualScan(startTime: Date) {
+        startManualScan(showWebView: false, startTime: startTime, completion: nil)
     }
 }
 
@@ -64,6 +112,14 @@ public final class DefaultDataBrokerProtectionScheduler: DataBrokerProtectionSch
         static let tolerance: TimeInterval = 20 * 60 // 20 minutes
     }
 
+    private enum DataBrokerProtectionCurrentOperation {
+        case idle
+        case queued
+        case manualScan
+        case optOutAll
+        case all
+    }
+
     private let privacyConfigManager: PrivacyConfigurationManaging
     private let contentScopeProperties: ContentScopeProperties
     private let dataManager: DataBrokerProtectionDataManager
@@ -74,6 +130,7 @@ public final class DefaultDataBrokerProtectionScheduler: DataBrokerProtectionSch
     private let emailService: EmailServiceProtocol
     private let captchaService: CaptchaServiceProtocol
     private let userNotificationService: DataBrokerProtectionUserNotificationService
+    private var currentOperation: DataBrokerProtectionCurrentOperation = .idle
 
     /// Ensures that only one scheduler operation is executed at the same time.
     ///
@@ -83,6 +140,8 @@ public final class DefaultDataBrokerProtectionScheduler: DataBrokerProtectionSch
 
     public var statusPublisher: Published<DataBrokerProtectionSchedulerStatus>.Publisher { $status }
 
+    private var lastSchedulerSessionStartTimestamp: Date?
+
     private lazy var dataBrokerProcessor: DataBrokerProtectionProcessor = {
 
         let runnerProvider = DataBrokerOperationRunnerProvider(privacyConfigManager: privacyConfigManager,
@@ -136,10 +195,29 @@ public final class DefaultDataBrokerProtectionScheduler: DataBrokerProtectionSch
                 completion(.finished)
                 return
             }
+
+            guard self.currentOperation != .manualScan else {
+                os_log("Manual scan in progress, returning...", log: .dataBrokerProtection)
+                completion(.finished)
+                return
+            }
+            self.lastSchedulerSessionStartTimestamp = Date()
             self.status = .running
             os_log("Scheduler running...", log: .dataBrokerProtection)
-            self.dataBrokerProcessor.runQueuedOperations(showWebView: showWebView) { [weak self] in
+            self.currentOperation = .queued
+            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
+                self?.currentOperation = .idle
                 completion(.finished)
             }
         }
@@ -153,41 +231,162 @@ public final class DefaultDataBrokerProtectionScheduler: DataBrokerProtectionSch
     }
 
     public func runAllOperations(showWebView: Bool = false) {
+        guard self.currentOperation != .manualScan else {
+            os_log("Manual scan in progress, returning...", log: .dataBrokerProtection)
+            return
+        }
+
         os_log("Running all operations...", log: .dataBrokerProtection)
-        self.dataBrokerProcessor.runAllOperations(showWebView: showWebView)
+        self.currentOperation = .all
+        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)
+                }
+            }
+            self?.currentOperation = .idle
+        }
     }
 
-    public func runQueuedOperations(showWebView: Bool = false, completion: ((Error?) -> Void)? = nil) {
+    public func runQueuedOperations(showWebView: Bool = false,
+                                    completion: ((DataBrokerProtectionSchedulerErrorCollection?) -> Void)? = nil) {
+        guard self.currentOperation != .manualScan else {
+            os_log("Manual scan in progress, returning...", log: .dataBrokerProtection)
+            return
+        }
+
         os_log("Running queued operations...", log: .dataBrokerProtection)
+        self.currentOperation = .queued
         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)
+            self?.currentOperation = .idle
+        })
 
     }
 
-    public func scanAllBrokers(showWebView: Bool = false, completion: ((Error?) -> Void)? = nil) {
+    public func startManualScan(showWebView: Bool = false,
+                                startTime: Date,
+                                completion: ((DataBrokerProtectionSchedulerErrorCollection?) -> Void)? = nil) {
+        pixelHandler.fire(.initialScanPreStartDuration(duration: (Date().timeIntervalSince(startTime) * 1000).rounded(.towardZero)))
+        let backgroundAgentManualScanStartTime = Date()
         stopScheduler()
 
         userNotificationService.requestNotificationPermission()
-
+        self.currentOperation = .manualScan
         os_log("Scanning all brokers...", log: .dataBrokerProtection)
-        dataBrokerProcessor.runAllScanOperations(showWebView: showWebView) { [weak self] in
+        dataBrokerProcessor.startManualScans(showWebView: showWebView) { [weak self] errors in
             guard let self = self else { return }
 
             self.startScheduler(showWebView: showWebView)
 
-            self.userNotificationService.sendFirstScanCompletedNotification()
+            if errors?.oneTimeError == nil {
+                self.userNotificationService.sendFirstScanCompletedNotification()
+            }
 
-            if self.dataManager.hasMatches() {
+            if let hasMatches = try? self.dataManager.hasMatches(),
+                hasMatches {
                 self.userNotificationService.scheduleCheckInNotificationIfPossible()
             }
 
-            completion?(nil)
+            if let errors = errors {
+                if let oneTimeError = errors.oneTimeError {
+                    switch oneTimeError {
+                    case DataBrokerProtectionSchedulerError.operationsInterrupted:
+                        os_log("Interrupted during DefaultDataBrokerProtectionScheduler.startManualScan in dataBrokerProcessor.runAllScanOperations(), error: %{public}@", log: .dataBrokerProtection, oneTimeError.localizedDescription)
+                    default:
+                        os_log("Error during DefaultDataBrokerProtectionScheduler.startManualScan in dataBrokerProcessor.runAllScanOperations(), error: %{public}@", log: .dataBrokerProtection, oneTimeError.localizedDescription)
+                        self.pixelHandler.fire(.generalError(error: oneTimeError, functionOccurredIn: "DefaultDataBrokerProtectionScheduler.startManualScan"))
+                    }
+                }
+                if let operationErrors = errors.operationErrors,
+                          operationErrors.count != 0 {
+                    os_log("Operation error(s) during DefaultDataBrokerProtectionScheduler.startManualScan in dataBrokerProcessor.runAllScanOperations(), count: %{public}d", log: .dataBrokerProtection, operationErrors.count)
+                }
+            }
+            self.currentOperation = .idle
+            fireManualScanCompletionPixel(startTime: backgroundAgentManualScanStartTime)
+            completion?(errors)
+        }
+    }
+
+    private func fireManualScanCompletionPixel(startTime: Date) {
+        do {
+            let profileQueries = try dataManager.profileQueriesCount()
+            let durationSinceStart = Date().timeIntervalSince(startTime) * 1000
+            self.pixelHandler.fire(.initialScanTotalDuration(duration: durationSinceStart.rounded(.towardZero),
+                                                             profileQueries: profileQueries))
+        } catch {
+            os_log("Manual Scan Error when trying to fetch the profile to get the profile queries", log: .dataBrokerProtection)
         }
     }
 
-    public func optOutAllBrokers(showWebView: Bool = false, completion: ((Error?) -> Void)?) {
+    public func optOutAllBrokers(showWebView: Bool = false,
+                                 completion: ((DataBrokerProtectionSchedulerErrorCollection?) -> Void)?) {
+
+        guard self.currentOperation != .manualScan else {
+            os_log("Manual scan in progress, returning...", log: .dataBrokerProtection)
+            return
+        }
+
         os_log("Opting out all brokers...", log: .dataBrokerProtection)
+        self.currentOperation = .optOutAll
         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)
+                }
+            }
+            self?.currentOperation = .idle
+            completion?(errors)
+        })
+    }
+
+    public func getDebugMetadata(completion: (DBPBackgroundAgentMetadata?) -> Void) {
+        if let backgroundAgentVersion = Bundle.main.releaseVersionNumber, let buildNumber = Bundle.main.object(forInfoDictionaryKey: "CFBundleVersion") as? String {
+            completion(DBPBackgroundAgentMetadata(backgroundAgentVersion: backgroundAgentVersion + " (build: \(buildNumber))",
+                                                  isAgentRunning: status == .running,
+                                                  agentSchedulerState: status.toString,
+                                                  lastSchedulerSessionStartTimestamp: lastSchedulerSessionStartTimestamp?.timeIntervalSince1970))
+        } else {
+            completion(DBPBackgroundAgentMetadata(backgroundAgentVersion: "ERROR: Error fetching background agent version",
+                                                  isAgentRunning: status == .running,
+                                                  agentSchedulerState: status.toString,
+                                                  lastSchedulerSessionStartTimestamp: lastSchedulerSessionStartTimestamp?.timeIntervalSince1970))
+        }
+    }
+}
+
+extension DataBrokerProtectionSchedulerStatus {
+    var toString: String {
+        switch self {
+        case .idle:
+            return "idle"
+        case .running:
+            return "running"
+        case .stopped:
+            return "stopped"
+        }
     }
 }
diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Services/CaptchaService.swift b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Services/CaptchaService.swift
index 7d86a649bd..c249359ef8 100644
--- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Services/CaptchaService.swift
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Services/CaptchaService.swift
@@ -125,13 +125,16 @@ struct CaptchaService: CaptchaServiceProtocol {
     private let urlSession: URLSession
     private let redeemUseCase: DataBrokerProtectionRedeemUseCase
     private let settings: DataBrokerProtectionSettings
+    private let servicePixel: DataBrokerProtectionBackendServicePixels
 
     init(urlSession: URLSession = URLSession.shared,
          redeemUseCase: DataBrokerProtectionRedeemUseCase = RedeemUseCase(),
-         settings: DataBrokerProtectionSettings = DataBrokerProtectionSettings()) {
+         settings: DataBrokerProtectionSettings = DataBrokerProtectionSettings(),
+         servicePixel: DataBrokerProtectionBackendServicePixels = DefaultDataBrokerProtectionBackendServicePixels()) {
         self.urlSession = urlSession
         self.redeemUseCase = redeemUseCase
         self.settings = settings
+        self.servicePixel = servicePixel
     }
 
     func submitCaptchaInformation(_ captchaInfo: GetCaptchaInfoResponse,
@@ -182,7 +185,12 @@ struct CaptchaService: CaptchaServiceProtocol {
 
         os_log("Submitting captcha request ...", log: .service)
         var request = URLRequest(url: url)
-        let authHeader = try await redeemUseCase.getAuthHeader()
+
+        guard let authHeader = redeemUseCase.getAuthHeader() else {
+            servicePixel.fireEmptyAccessToken(callSite: .submitCaptchaInformationRequest)
+            throw AuthenticationError.noAuthToken
+        }
+
         request.setValue(authHeader, forHTTPHeaderField: "Authorization")
         request.addValue("application/json; charset=utf-8", forHTTPHeaderField: "Content-Type")
 
@@ -206,7 +214,14 @@ struct CaptchaService: CaptchaServiceProtocol {
                                    pollingInterval: TimeInterval = 50,
                                    attemptId: UUID,
                                    shouldRunNextStep: @escaping () -> Bool) async throws -> CaptchaResolveData {
-        guard let captchaResolveResult = try? await submitCaptchaToBeResolvedRequest(transactionID, attemptId: attemptId) else {
+
+        let captchaResolveResult: CaptchaResult
+
+        do {
+            captchaResolveResult = try await submitCaptchaToBeResolvedRequest(transactionID, attemptId: attemptId)
+        } catch let error as AuthenticationError where error == .noAuthToken {
+            throw AuthenticationError.noAuthToken
+        } catch {
             throw CaptchaServiceError.errorWhenFetchingCaptchaResult
         }
 
@@ -257,7 +272,11 @@ struct CaptchaService: CaptchaServiceProtocol {
         }
 
         var request = URLRequest(url: url)
-        let authHeader = try await redeemUseCase.getAuthHeader()
+        guard let authHeader = redeemUseCase.getAuthHeader() else {
+            servicePixel.fireEmptyAccessToken(callSite: .submitCaptchaToBeResolvedRequest)
+            throw AuthenticationError.noAuthToken
+        }
+
         request.setValue(authHeader, forHTTPHeaderField: "Authorization")
         request.addValue("application/json; charset=utf-8", forHTTPHeaderField: "Content-Type")
         request.httpMethod = "GET"
diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Services/EmailService.swift b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Services/EmailService.swift
index 390484c9f7..8cd57ea70c 100644
--- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Services/EmailService.swift
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Services/EmailService.swift
@@ -27,6 +27,8 @@ public enum EmailError: Error, Equatable, Codable {
     case cantDecodeEmailLink
     case unknownStatusReceived(email: String)
     case cancelled
+    case httpError(statusCode: Int)
+    case unknownHTTPError
 }
 
 struct EmailData: Decodable {
@@ -51,13 +53,16 @@ struct EmailService: EmailServiceProtocol {
     public let urlSession: URLSession
     private let redeemUseCase: DataBrokerProtectionRedeemUseCase
     private let settings: DataBrokerProtectionSettings
+    private let servicePixel: DataBrokerProtectionBackendServicePixels
 
     init(urlSession: URLSession = URLSession.shared,
          redeemUseCase: DataBrokerProtectionRedeemUseCase = RedeemUseCase(),
-         settings: DataBrokerProtectionSettings = DataBrokerProtectionSettings()) {
+         settings: DataBrokerProtectionSettings = DataBrokerProtectionSettings(),
+         servicePixel: DataBrokerProtectionBackendServicePixels = DefaultDataBrokerProtectionBackendServicePixels()) {
         self.urlSession = urlSession
         self.redeemUseCase = redeemUseCase
         self.settings = settings
+        self.servicePixel = servicePixel
     }
 
     func getEmail(dataBrokerURL: String, attemptId: UUID) async throws -> EmailData {
@@ -73,10 +78,15 @@ struct EmailService: EmailServiceProtocol {
         }
 
         var request = URLRequest(url: url)
-        let authHeader = try await redeemUseCase.getAuthHeader()
+        guard let authHeader = redeemUseCase.getAuthHeader() else {
+            servicePixel.fireEmptyAccessToken(callSite: .getEmail)
+            throw AuthenticationError.noAuthToken
+        }
+
         request.setValue(authHeader, forHTTPHeaderField: "Authorization")
 
-        let (data, _) = try await urlSession.data(for: request)
+        let (data, response) = try await urlSession.data(for: request)
+        try validateHTTPResponse(response)
 
         do {
             return try JSONDecoder().decode(EmailData.self, from: data)
@@ -85,6 +95,18 @@ struct EmailService: EmailServiceProtocol {
         }
     }
 
+    private func validateHTTPResponse(_ response: URLResponse) throws {
+        if let httpResponse = response as? HTTPURLResponse {
+            if !(200...299).contains(httpResponse.statusCode) {
+                servicePixel.fireGenerateEmailHTTPError(statusCode: httpResponse.statusCode)
+                throw EmailError.httpError(statusCode: httpResponse.statusCode)
+            }
+        } else {
+            servicePixel.fireGenerateEmailHTTPError(statusCode: 0)
+            throw EmailError.unknownHTTPError
+        }
+    }
+
     func getConfirmationLink(from email: String,
                              numberOfRetries: Int = 100,
                              pollingInterval: TimeInterval = 30,
@@ -139,7 +161,11 @@ struct EmailService: EmailServiceProtocol {
 
         var request = URLRequest(url: url)
 
-        let authHeader = try await redeemUseCase.getAuthHeader()
+        guard let authHeader = redeemUseCase.getAuthHeader() else {
+            servicePixel.fireEmptyAccessToken(callSite: .extractEmailLink)
+            throw AuthenticationError.noAuthToken
+        }
+
         request.setValue(authHeader, forHTTPHeaderField: "Authorization")
 
         let (data, _) = try await urlSession.data(for: request)
diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Services/RedeemCodeServices.swift b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Services/RedeemCodeServices.swift
index 2814e194d1..60a71ad658 100644
--- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Services/RedeemCodeServices.swift
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Services/RedeemCodeServices.swift
@@ -34,15 +34,14 @@ public protocol DataBrokerProtectionRedeemUseCase {
 
     /// Returns the auth header needed for the authenticated endpoints.
     ///
-    /// In case there is no auth header present, tries to fetch a new access token with the saved invite code.
-    ///
-    /// - Returns: `String` a string that contains the bearer access token
-    func getAuthHeader() async throws -> String
+    /// - Returns: `String` a string that contains the bearer access token or nil
+    func getAuthHeader() -> String?
 }
 
 public protocol AuthenticationRepository {
     func getInviteCode() -> String?
     func getAccessToken() -> String?
+    func getWaitlistTimestamp() -> Int?
 
     func save(accessToken: String)
     func save(inviteCode: String)
@@ -77,19 +76,11 @@ public final class RedeemUseCase: DataBrokerProtectionRedeemUseCase {
         authenticationRepository.save(accessToken: accessToken)
     }
 
-    public func getAuthHeader() async throws -> String {
-        var accessToken = authenticationRepository.getAccessToken() ?? ""
-
-        if accessToken.isEmpty {
-            guard let inviteCode = authenticationRepository.getInviteCode() else {
-                throw AuthenticationError.noInviteCode
-            }
-
-            accessToken = try await authenticationService.redeem(inviteCode: inviteCode)
-            authenticationRepository.save(accessToken: accessToken)
+    public func getAuthHeader() -> String? {
+        guard let token = authenticationRepository.getAccessToken() else {
+            return nil
         }
-
-        return "bearer \(accessToken)"
+        return "bearer \(token)"
     }
 }
 
@@ -97,6 +88,7 @@ public final class KeychainAuthenticationData: AuthenticationRepository {
     enum DBPWaitlistKeys: String {
         case accessTokenKey = "dbp:accessTokenKey"
         case inviteCodeKey = "dbp:inviteCodeKey"
+        case waitlistTimestamp = "databrokerprotection.timestamp"
     }
 
     /// Hack to stop the bleeding on https://app.asana.com/0/1203581873609357/1206097441142301/f
@@ -127,6 +119,11 @@ public final class KeychainAuthenticationData: AuthenticationRepository {
         add(string: inviteCode, forField: .inviteCodeKey)
     }
 
+    public func getWaitlistTimestamp() -> Int? {
+        guard let timestampString = getString(forField: .waitlistTimestamp) else { return nil }
+        return Int(timestampString)
+    }
+
     public func reset() {
         deleteItem(forField: .inviteCodeKey)
         deleteItem(forField: .accessTokenKey)
@@ -199,6 +196,7 @@ public final class KeychainAuthenticationData: AuthenticationRepository {
 public enum AuthenticationError: Error, Equatable {
     case noInviteCode
     case cantGenerateURL
+    case noAuthToken
     case issueRedeemingInviteCode(error: String)
 }
 
diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/StatusItem/StatusBarMenu.swift b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/StatusItem/StatusBarMenu.swift
new file mode 100644
index 0000000000..369a42ee56
--- /dev/null
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/StatusItem/StatusBarMenu.swift
@@ -0,0 +1,71 @@
+//
+//  StatusBarMenu.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 AppKit
+
+public final class StatusBarMenu: NSObject {
+    private let statusItem: NSStatusItem
+    private let popover: StatusBarPopover
+
+    public override init() {
+        statusItem = NSStatusBar.system.statusItem(withLength: NSStatusItem.variableLength)
+        popover = StatusBarPopover()
+        popover.behavior = .transient
+        super.init()
+
+        setupStatusItem()
+    }
+
+    @objc
+    private func statusBarButtonTapped() {
+        togglePopover()
+    }
+
+    private func setupStatusItem() {
+        statusItem.button?.target = self
+        statusItem.button?.image = NSImage(systemSymbolName: NSImage.Name("person.crop.circle.badge.minus"), accessibilityDescription: nil)
+        statusItem.button?.action = #selector(statusBarButtonTapped)
+        statusItem.button?.sendAction(on: [.leftMouseUp])
+    }
+
+    // MARK: - Popover
+
+    private func togglePopover() {
+        if popover.isShown {
+            popover.close()
+        } else {
+            guard let button = statusItem.button else {
+                return
+            }
+
+            popover.show(relativeTo: button.bounds, of: button, preferredEdge: .maxY)
+            popover.contentViewController?.view.window?.makeKey()
+        }
+    }
+
+    // MARK: - Showing & Hiding the menu
+
+    public func show() {
+        statusItem.isVisible = true
+    }
+
+    public func hide() {
+        statusItem.isVisible = false
+    }
+}
diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/StatusItem/StatusBarMenuDebugInfoViewModel.swift b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/StatusItem/StatusBarMenuDebugInfoViewModel.swift
new file mode 100644
index 0000000000..9f3c15478c
--- /dev/null
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/StatusItem/StatusBarMenuDebugInfoViewModel.swift
@@ -0,0 +1,37 @@
+//
+//  StatusBarMenuDebugInfoViewModel.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 final class StatusBarMenuDebugInfoViewModel: ObservableObject {
+
+    var bundlePath: String
+    var version: String
+
+    public init(bundle: Bundle = .main) {
+        bundlePath = bundle.bundlePath
+
+        // swiftlint:disable:next force_cast
+        let shortVersion = Bundle.main.object(forInfoDictionaryKey: "CFBundleShortVersionString") as! String
+
+        // swiftlint:disable:next force_cast
+        let buildNumber = Bundle.main.object(forInfoDictionaryKey: "CFBundleVersion") as! String
+
+        version = shortVersion + " (build: " + buildNumber + ")"
+    }
+}
diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/StatusItem/StatusBarPopover.swift b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/StatusItem/StatusBarPopover.swift
new file mode 100644
index 0000000000..84cc931d30
--- /dev/null
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/StatusItem/StatusBarPopover.swift
@@ -0,0 +1,43 @@
+//
+//  StatusBarPopover.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 AppKit
+import SwiftUI
+
+public final class StatusBarPopover: NSPopover {
+
+    public required override init() {
+        super.init()
+
+        self.animates = false
+        self.behavior = .transient
+
+        setupContentController()
+    }
+
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+
+    private func setupContentController() {
+        let controller = NSHostingController(rootView: StatusBarPopoverView(viewModel: StatusBarMenuDebugInfoViewModel()))
+        contentViewController = controller
+        controller.view.frame = CGRect(origin: .zero, size: controller.view.intrinsicContentSize)
+    }
+}
diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/StatusItem/StatusBarPopoverView.swift b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/StatusItem/StatusBarPopoverView.swift
new file mode 100644
index 0000000000..2e9199dc21
--- /dev/null
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/StatusItem/StatusBarPopoverView.swift
@@ -0,0 +1,64 @@
+//
+//  StatusBarPopoverView.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
+
+struct StatusBarPopoverView: View {
+    let viewModel: StatusBarMenuDebugInfoViewModel
+
+    var body: some View {
+        VStack(alignment: .center, spacing: 10) {
+            HStack {
+                Text("Personal Information Removal")
+                    .font(.headline)
+                    .foregroundColor(.primary)
+                Spacer()
+            }
+
+            informationRow(title: "Version", details: viewModel.version)
+            informationRow(title: "Bundle Path", details: viewModel.bundlePath)
+        }
+        .padding()
+        .frame(width: 350, height: 200)
+    }
+
+    private func informationRow(title: String, details: String) -> some View {
+        VStack(spacing: 2) {
+            HStack {
+                Text(title)
+                    .font(.headline)
+                    .foregroundColor(.primary)
+                Spacer()
+            }
+            HStack {
+
+                Text(details)
+                    .font(.body)
+                    .foregroundColor(.secondary)
+                    .makeSelectable()
+                    .lineLimit(nil)
+             Spacer()
+            }
+        }
+    }
+}
+
+#Preview {
+    StatusBarPopoverView(viewModel: StatusBarMenuDebugInfoViewModel())
+}
diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Storage/DataBrokerProtectionDatabaseProvider.swift b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Storage/DataBrokerProtectionDatabaseProvider.swift
index a70ad31818..d346a51917 100644
--- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Storage/DataBrokerProtectionDatabaseProvider.swift
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Storage/DataBrokerProtectionDatabaseProvider.swift
@@ -394,8 +394,13 @@ final class DefaultDataBrokerProtectionDatabaseProvider: GRDBSecureStorageDataba
 
     func update(_ profileQuery: ProfileQueryDB) throws -> Int64 {
         try db.write { db in
-            try profileQuery.upsert(db)
-            return db.lastInsertedRowID
+            if let id = profileQuery.id {
+                try profileQuery.update(db)
+                return id
+            } else {
+                try profileQuery.insert(db)
+                return db.lastInsertedRowID
+            }
         }
     }
 
diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Storage/DataBrokerProtectionSecureVault.swift b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Storage/DataBrokerProtectionSecureVault.swift
index aa0e13a95e..c854055aab 100644
--- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Storage/DataBrokerProtectionSecureVault.swift
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Storage/DataBrokerProtectionSecureVault.swift
@@ -26,7 +26,7 @@ typealias DataBrokerProtectionVaultFactory = SecureVaultFactory<DefaultDataBroke
 let DataBrokerProtectionSecureVaultFactory: DataBrokerProtectionVaultFactory = SecureVaultFactory<DefaultDataBrokerProtectionSecureVault>(
     makeCryptoProvider: {
         return DataBrokerProtectionCryptoProvider()
-    }, makeKeyStoreProvider: {
+    }, makeKeyStoreProvider: { _ in
         return DataBrokerProtectionKeyStoreProvider()
     }, makeDatabaseProvider: { key in
         return try DefaultDataBrokerProtectionDatabaseProvider(key: key)
diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/UI/DBPUICommunicationLayer.swift b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/UI/DBPUICommunicationLayer.swift
index 9f77b8a675..31532d38d2 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
@@ -37,6 +37,7 @@ protocol DBPUICommunicationDelegate: AnyObject {
     func getInitialScanState() async -> DBPUIInitialScanState
     func getMaintananceScanState() async -> DBPUIScanAndOptOutMaintenanceState
     func getDataBrokers() async -> [DBPUIDataBroker]
+    func getBackgroundAgentMetadata() async -> DBPUIDebugMetadata
 }
 
 enum DBPUIReceivedMethodName: String {
@@ -55,6 +56,7 @@ enum DBPUIReceivedMethodName: String {
     case initialScanStatus
     case maintenanceScanStatus
     case getDataBrokers
+    case getBackgroundAgentMetadata
 }
 
 enum DBPUISendableMethodName: String {
@@ -71,7 +73,7 @@ struct DBPUICommunicationLayer: Subfeature {
     weak var delegate: DBPUICommunicationDelegate?
 
     private enum Constants {
-        static let version = 2
+        static let version = 3
     }
 
     internal init(webURLSettings: DataBrokerProtectionWebUIURLSettingsRepresentable) {
@@ -104,6 +106,7 @@ struct DBPUICommunicationLayer: Subfeature {
         case .initialScanStatus: return initialScanStatus
         case .maintenanceScanStatus: return maintenanceScanStatus
         case .getDataBrokers: return getDataBrokers
+        case .getBackgroundAgentMetadata: return getBackgroundAgentMetadata
         }
 
     }
@@ -127,9 +130,13 @@ 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 {
+            os_log("DBPUICommunicationLayer saveProfile, error: %{public}@", log: .error, error.localizedDescription)
+            return DBPUIStandardResponse(version: Constants.version, success: false)
+        }
     }
 
     func getCurrentUserProfile(params: Any, original: WKScriptMessage) async throws -> Encodable? {
@@ -141,8 +148,13 @@ 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 {
+            os_log("DBPUICommunicationLayer deleteUserProfileData, error: %{public}@", log: .error, error.localizedDescription)
+            return DBPUIStandardResponse(version: Constants.version, success: false)
+        }
     }
 
     func addNameToCurrentUserProfile(params: Any, original: WKScriptMessage) async throws -> Encodable? {
@@ -272,6 +284,10 @@ struct DBPUICommunicationLayer: Subfeature {
         return DBPUIDataBrokerList(dataBrokers: dataBrokers)
     }
 
+    func getBackgroundAgentMetadata(params: Any, origin: WKScriptMessage) async throws -> Encodable? {
+        return await delegate?.getBackgroundAgentMetadata()
+    }
+
     func sendMessageToUI(method: DBPUISendableMethodName, params: DBPUISendableMessage, into webView: WKWebView) {
         broker?.push(method: method.rawValue, params: params, for: self, into: webView)
     }
diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/UI/DataBrokerProtectionViewController.swift b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/UI/DataBrokerProtectionViewController.swift
index 9ac49e395a..4f26b33b8e 100644
--- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/UI/DataBrokerProtectionViewController.swift
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/UI/DataBrokerProtectionViewController.swift
@@ -18,7 +18,9 @@
 
 import Cocoa
 import SwiftUI
+import Common
 import BrowserServicesKit
+import PixelKit
 import WebKit
 import Combine
 
@@ -29,6 +31,8 @@ final public class DataBrokerProtectionViewController: NSViewController {
     private var loader: NSProgressIndicator!
     private let webUISettings: DataBrokerProtectionWebUIURLSettingsRepresentable
     private let webUIViewModel: DBPUIViewModel
+    private let pixelHandler: EventMapping<DataBrokerProtectionPixels>
+    private let webUIPixel: DataBrokerProtectionWebUIPixels
 
     private let openURLHandler: (URL?) -> Void
     private var reloadObserver: NSObjectProtocol?
@@ -43,6 +47,8 @@ final public class DataBrokerProtectionViewController: NSViewController {
         self.dataManager = dataManager
         self.openURLHandler = openURLHandler
         self.webUISettings = webUISettings
+        self.pixelHandler = DataBrokerProtectionPixelsHandler()
+        self.webUIPixel = DataBrokerProtectionWebUIPixels(pixelHandler: pixelHandler)
         self.webUIViewModel = DBPUIViewModel(dataManager: dataManager,
                                              scheduler: scheduler,
                                              webUISettings: webUISettings,
@@ -50,8 +56,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 {
-            _ = dataManager.fetchProfile(ignoresCache: true)
+            try? dataManager.prepareProfileCache()
         }
 
         super.init(nibName: nil, bundle: nil)
@@ -82,6 +90,7 @@ final public class DataBrokerProtectionViewController: NSViewController {
         addLoadingIndicator()
 
         if let url = URL(string: webUISettings.selectedURL) {
+            webUIPixel.firePixel(for: webUISettings.selectedURLType, type: .loading)
             webView?.load(url)
         } else {
             removeLoadingIndicator()
@@ -126,11 +135,40 @@ extension DataBrokerProtectionViewController: WKUIDelegate {
 
 extension DataBrokerProtectionViewController: WKNavigationDelegate {
 
+    public func webView(_ webView: WKWebView, didFail navigation: WKNavigation!, withError error: any Error) {
+        fireWebViewError(error)
+    }
+
+    public func webView(_ webView: WKWebView, didFailProvisionalNavigation navigation: WKNavigation!, withError error: any Error) {
+        fireWebViewError(error)
+    }
+
+    private func fireWebViewError(_ error: Error) {
+        webUIPixel.firePixel(for: error)
+        removeLoadingIndicator()
+    }
+
+    public func webView(_ webView: WKWebView, decidePolicyFor navigationResponse: WKNavigationResponse) async -> WKNavigationResponsePolicy {
+        guard let statusCode = (navigationResponse.response as? HTTPURLResponse)?.statusCode else {
+            // if there's no http status code to act on, exit and allow navigation
+            return .allow
+        }
+
+        if statusCode >= 400 {
+            webUIPixel.firePixel(for: NSError(domain: NSURLErrorDomain, code: statusCode))
+            return .cancel
+        }
+
+        return .allow
+    }
+
     public func webView(_ webView: WKWebView, didStartProvisionalNavigation navigation: WKNavigation!) {
         loader.startAnimation(nil)
     }
 
     public func webView(_ webView: WKWebView, didFinish navigation: WKNavigation!) {
         removeLoadingIndicator()
+
+        webUIPixel.firePixel(for: webUISettings.selectedURLType, type: .success)
     }
 }
diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/UI/UIMapper.swift b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/UI/UIMapper.swift
index d57e2d2442..ee89f641f2 100644
--- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/UI/UIMapper.swift
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/UI/UIMapper.swift
@@ -17,6 +17,7 @@
 //
 
 import Foundation
+import Common
 
 struct MapperToUI {
 
@@ -55,10 +56,15 @@ struct MapperToUI {
         // not by the total real cans that the app is doing.
         let profileQueriesGroupedByBroker = Dictionary(grouping: brokerProfileQueryData, by: { $0.dataBroker.name })
 
-        let totalScans = profileQueriesGroupedByBroker.reduce(0) { accumulator, element in
+        // We don't want to consider deprecated queries when reporting manual scans to the UI
+        let filteredProfileQueriesGroupedByBroker = profileQueriesGroupedByBroker.mapValues { queries in
+            queries.filter { !$0.profileQuery.deprecated }
+        }
+
+        let totalScans = filteredProfileQueriesGroupedByBroker.reduce(0) { accumulator, element in
             return accumulator + element.value.totalScans
         }
-        let currentScans = profileQueriesGroupedByBroker.reduce(0) { accumulator, element in
+        let currentScans = filteredProfileQueriesGroupedByBroker.reduce(0) { accumulator, element in
             return accumulator + element.value.currentScans
         }
 
@@ -115,7 +121,7 @@ struct MapperToUI {
                         let mirrorSiteMatch = mapToUI(mirrorSite.name, databrokerURL: mirrorSite.url, extractedProfile: extractedProfile)
 
                         if let extractedProfileRemovedDate = extractedProfile.removedDate,
-                            mirrorSite.shouldWeIncludeMirrorSite(for: extractedProfileRemovedDate) {
+                           mirrorSite.shouldWeIncludeMirrorSite(for: extractedProfileRemovedDate) {
                             removedProfiles.append(mirrorSiteMatch)
                         } else {
                             inProgressOptOuts.append(mirrorSiteMatch)
@@ -130,11 +136,11 @@ struct MapperToUI {
             value.compactMap { match in
                 guard let removedDate = match.date else { return nil }
                 return DBPUIOptOutMatch(dataBroker: key,
-                                 matches: value.count,
-                                 name: match.name,
-                                 alternativeNames: match.alternativeNames,
-                                 addresses: match.addresses,
-                                 date: removedDate)
+                                        matches: value.count,
+                                        name: match.name,
+                                        alternativeNames: match.alternativeNames,
+                                        addresses: match.addresses,
+                                        date: removedDate)
             }
         }.flatMap { $0 }
 
@@ -214,6 +220,67 @@ struct MapperToUI {
             return DBPUIScanDate(date: scansHappeningInTheNextEightDays.first!.date!, dataBrokers: scansHappeningInTheNextEightDays)
         }
     }
+
+    func mapToUIDebugMetadata(metadata: DBPBackgroundAgentMetadata?, brokerProfileQueryData: [BrokerProfileQueryData]) -> DBPUIDebugMetadata {
+        let currentAppVersion = Bundle.main.fullVersionNumber ?? "ERROR: Error fetching app version"
+
+        guard let metadata = metadata else {
+            return DBPUIDebugMetadata(lastRunAppVersion: currentAppVersion, isAgentRunning: false)
+        }
+
+        let lastOperation = brokerProfileQueryData.lastOperation
+        let lastStartedOperation = brokerProfileQueryData.lastStartedOperation
+        let lastError = brokerProfileQueryData.lastOperationThatErrored
+
+        let lastOperationBrokerURL = brokerProfileQueryData.filter { $0.dataBroker.id == lastOperation?.brokerId }.first?.dataBroker.url
+        let lastStartedOperationBrokerURL = brokerProfileQueryData.filter { $0.dataBroker.id == lastStartedOperation?.brokerId }.first?.dataBroker.url
+
+        let metadataUI = DBPUIDebugMetadata(lastRunAppVersion: currentAppVersion,
+                                            lastRunAgentVersion: metadata.backgroundAgentVersion,
+                                            isAgentRunning: true,
+                                            lastSchedulerOperationType: lastOperation?.toString,
+                                            lastSchedulerOperationTimestamp: lastOperation?.lastRunDate?.timeIntervalSince1970.withoutDecimals,
+                                            lastSchedulerOperationBrokerUrl: lastOperationBrokerURL,
+                                            lastSchedulerErrorMessage: lastError?.error,
+                                            lastSchedulerErrorTimestamp: lastError?.date.timeIntervalSince1970.withoutDecimals,
+                                            lastSchedulerSessionStartTimestamp: metadata.lastSchedulerSessionStartTimestamp,
+                                            agentSchedulerState: metadata.agentSchedulerState,
+                                            lastStartedSchedulerOperationType: lastStartedOperation?.toString,
+                                            lastStartedSchedulerOperationTimestamp: lastStartedOperation?.historyEvents.closestHistoryEvent?.date.timeIntervalSince1970.withoutDecimals,
+                                            lastStartedSchedulerOperationBrokerUrl: lastStartedOperationBrokerURL)
+
+#if DEBUG
+        do {
+            let encoder = JSONEncoder()
+            encoder.outputFormatting = .prettyPrinted
+            let jsonData = try encoder.encode(metadataUI)
+            if let jsonString = String(data: jsonData, encoding: .utf8) {
+                os_log("Metadata: %{public}s", log: OSLog.default, type: .info, jsonString)
+            }
+        } catch {
+            os_log("Error encoding struct to JSON: %{public}@", log: OSLog.default, type: .error, error.localizedDescription)
+        }
+#endif
+
+        return metadataUI
+    }
+}
+
+extension Bundle {
+    var fullVersionNumber: String? {
+        guard let appVersion = self.releaseVersionNumber,
+              let buildNumber = Bundle.main.object(forInfoDictionaryKey: "CFBundleVersion") as? String else {
+            return nil
+        }
+
+        return appVersion + " (build: \(buildNumber))"
+    }
+}
+
+extension TimeInterval {
+    var withoutDecimals: Double {
+        Double(Int(self))
+    }
 }
 
 extension Date {
@@ -241,6 +308,10 @@ extension String {
 
 fileprivate extension BrokerProfileQueryData {
 
+    var closestHistoryEvent: HistoryEvent? {
+        events.sorted(by: { $0.date > $1.date }).first
+    }
+
     var sitesScanned: [String] {
         if scanOperationData.lastRunDate != nil {
             let scanEvents = scanOperationData.scanStartedEvents()
@@ -267,26 +338,93 @@ fileprivate extension Array where Element == BrokerProfileQueryData {
 
     var totalScans: Int {
         guard let broker = self.first?.dataBroker else { return 0 }
+        return 1 + broker.mirrorSites.filter { $0.shouldWeIncludeMirrorSite() }.count
+    }
+
+    var currentScans: Int {
+        guard let broker = self.first?.dataBroker else { return 0 }
 
-        let areAllQueriesDeprecated = allSatisfy { $0.profileQuery.deprecated }
+        let didAllQueriesFinished = allSatisfy { $0.scanOperationData.lastRunDate != nil }
 
-        if areAllQueriesDeprecated {
+        if !didAllQueriesFinished {
             return 0
         } else {
             return 1 + broker.mirrorSites.filter { $0.shouldWeIncludeMirrorSite() }.count
         }
     }
 
-    var currentScans: Int {
-        guard let broker = self.first?.dataBroker else { return 0 }
+    var lastOperation: BrokerOperationData? {
+        let allOperations = flatMap { $0.operationsData }
+        let lastOperation = allOperations.sorted(by: {
+            if let date1 = $0.lastRunDate, let date2 = $1.lastRunDate {
+                return date1 > date2
+            } else if $0.lastRunDate != nil {
+                return true
+            } else {
+                return false
+            }
+        }).first
 
-        let areAllQueriesDeprecated = allSatisfy { $0.profileQuery.deprecated }
-        let didAllQueriesFinished = allSatisfy { $0.scanOperationData.lastRunDate != nil }
+        return lastOperation
+    }
 
-        if areAllQueriesDeprecated || !didAllQueriesFinished {
-            return 0
+    var lastOperationThatErrored: HistoryEvent? {
+        let lastError = flatMap { $0.operationsData }
+            .flatMap { $0.historyEvents }
+            .filter { $0.isError }
+            .sorted(by: { $0.date > $1.date })
+            .first
+
+        return lastError
+    }
+
+    var lastStartedOperation: BrokerOperationData? {
+        let allOperations = flatMap { $0.operationsData }
+
+        return allOperations.sorted(by: {
+            if let date1 = $0.historyEvents.closestHistoryEvent?.date, let date2 = $1.historyEvents.closestHistoryEvent?.date {
+                return date1 > date2
+            } else if $0.historyEvents.closestHistoryEvent?.date != nil {
+                return true
+            } else {
+                return false
+            }
+        }).first
+    }
+}
+
+fileprivate extension BrokerOperationData {
+    var toString: String {
+        if (self as? OptOutOperationData) != nil {
+            return "optOut"
         } else {
-            return 1 + broker.mirrorSites.filter { $0.shouldWeIncludeMirrorSite() }.count
+            return "scan"
+        }
+    }
+}
+
+fileprivate extension Array where Element == HistoryEvent {
+    var closestHistoryEvent: HistoryEvent? {
+        self.sorted(by: { $0.date > $1.date }).first
+    }
+}
+
+extension HistoryEvent {
+
+    var isError: Bool {
+        switch type {
+        case .error:
+            return true
+        default:
+            return false
+        }
+    }
+
+    var error: String? {
+        switch type {
+        case .error(let error):
+            return error.name
+        default: return nil
         }
     }
 }
diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Utils/DataBrokerProtectionSettings.swift b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Utils/DataBrokerProtectionSettings.swift
index 1d731fd0f4..78203fa40f 100644
--- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Utils/DataBrokerProtectionSettings.swift
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Utils/DataBrokerProtectionSettings.swift
@@ -17,6 +17,7 @@
 //
 
 import Foundation
+import Combine
 
 public final class DataBrokerProtectionSettings {
     private let defaults: UserDefaults
@@ -45,6 +46,8 @@ public final class DataBrokerProtectionSettings {
         self.init(defaults: .dbp)
     }
 
+    // MARK: - Environment
+
     public var selectedEnvironment: SelectedEnvironment {
         get {
             defaults.dataBrokerProtectionSelectedEnvironment
@@ -54,6 +57,22 @@ public final class DataBrokerProtectionSettings {
             defaults.dataBrokerProtectionSelectedEnvironment = newValue
         }
     }
+
+    // MARK: - Show in Menu Bar
+
+    public var showInMenuBarPublisher: AnyPublisher<Bool, Never> {
+        defaults.networkProtectionSettingShowInMenuBarPublisher
+    }
+
+    public var showInMenuBar: Bool {
+        get {
+            defaults.dataBrokerProtectionShowMenuBarIcon
+        }
+
+        set {
+            defaults.dataBrokerProtectionShowMenuBarIcon = newValue
+        }
+    }
 }
 
 extension UserDefaults {
@@ -61,6 +80,13 @@ extension UserDefaults {
         "dataBrokerProtectionSelectedEnvironmentRawValue"
     }
 
+    static let showMenuBarIconDefaultValue = false
+    private var showMenuBarIconKey: String {
+        "dataBrokerProtectionShowMenuBarIcon"
+    }
+
+    // MARK: - Environment
+
     @objc
     dynamic var dataBrokerProtectionSelectedEnvironmentRawValue: String {
         get {
@@ -81,4 +107,25 @@ extension UserDefaults {
             dataBrokerProtectionSelectedEnvironmentRawValue = newValue.rawValue
         }
     }
+
+    // MARK: - Show in Menu Bar
+
+    @objc
+    dynamic var dataBrokerProtectionShowMenuBarIcon: Bool {
+        get {
+            value(forKey: showMenuBarIconKey) as? Bool ?? Self.showMenuBarIconDefaultValue
+        }
+
+        set {
+            guard newValue != dataBrokerProtectionShowMenuBarIcon else {
+                return
+            }
+
+            set(newValue, forKey: showMenuBarIconKey)
+        }
+    }
+
+    var networkProtectionSettingShowInMenuBarPublisher: AnyPublisher<Bool, Never> {
+        publisher(for: \.dataBrokerProtectionShowMenuBarIcon).eraseToAnyPublisher()
+    }
 }
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
diff --git a/LocalPackages/DataBrokerProtection/Tests/DataBrokerProtectionTests/CaptchaServiceTests.swift b/LocalPackages/DataBrokerProtection/Tests/DataBrokerProtectionTests/CaptchaServiceTests.swift
index 48cb7d84be..9eca0082dd 100644
--- a/LocalPackages/DataBrokerProtection/Tests/DataBrokerProtectionTests/CaptchaServiceTests.swift
+++ b/LocalPackages/DataBrokerProtection/Tests/DataBrokerProtectionTests/CaptchaServiceTests.swift
@@ -21,6 +21,7 @@ import Foundation
 @testable import DataBrokerProtection
 
 final class CaptchaServiceTests: XCTestCase {
+    private let servicePixel = MockDataBrokerProtectionBackendServicePixels()
     let jsonEncoder = JSONEncoder()
 
     enum MockError: Error {
@@ -35,11 +36,15 @@ final class CaptchaServiceTests: XCTestCase {
 
     override func tearDown() async throws {
         MockURLProtocol.requestHandlerQueue.removeAll()
+        servicePixel.reset()
     }
 
     func testWhenSessionThrowsOnSubmittingCaptchaInfo_thenTheCorrectErrorIsThrown() async {
         MockURLProtocol.requestHandlerQueue.append({ _ in throw MockError.someError })
-        let sut = CaptchaService(urlSession: mockURLSession, redeemUseCase: MockRedeemUseCase(), settings: DataBrokerProtectionSettings(defaults: .standard))
+        let sut = CaptchaService(urlSession: mockURLSession,
+                                 redeemUseCase: MockRedeemUseCase(),
+                                 settings: DataBrokerProtectionSettings(defaults: .standard),
+                                 servicePixel: servicePixel)
 
         do {
             _ = try await sut.submitCaptchaInformation(GetCaptchaInfoResponse.mock, attemptId: UUID(), shouldRunNextStep: { true })
@@ -56,7 +61,10 @@ final class CaptchaServiceTests: XCTestCase {
     func testWhenFailureCriticalIsReturnedOnSubmittingCaptchaInfo_thenCriticalErrorWhenSubmittingCaptchaIsThrown() async {
         let response = CaptchaTransaction(message: .failureCritical, transactionId: nil)
         MockURLProtocol.requestHandlerQueue.append({ _ in (HTTPURLResponse.ok, try? self.jsonEncoder.encode(response)) })
-        let sut = CaptchaService(urlSession: mockURLSession, redeemUseCase: MockRedeemUseCase(), settings: DataBrokerProtectionSettings(defaults: .standard))
+        let sut = CaptchaService(urlSession: mockURLSession,
+                                 redeemUseCase: MockRedeemUseCase(),
+                                 settings: DataBrokerProtectionSettings(defaults: .standard),
+                                 servicePixel: servicePixel)
 
         do {
             _ = try await sut.submitCaptchaInformation(GetCaptchaInfoResponse.mock, attemptId: UUID(), shouldRunNextStep: { true })
@@ -73,7 +81,10 @@ final class CaptchaServiceTests: XCTestCase {
     func testWhenInvalidRequestIsReturnedOnSubmittingCaptchaInfo_thenInvalidRequestWhenSubmittingCaptchaIsThrown() async {
         let response = CaptchaTransaction(message: .invalidRequest, transactionId: nil)
         MockURLProtocol.requestHandlerQueue.append({ _ in (HTTPURLResponse.ok, try? self.jsonEncoder.encode(response)) })
-        let sut = CaptchaService(urlSession: mockURLSession, redeemUseCase: MockRedeemUseCase(), settings: DataBrokerProtectionSettings(defaults: .standard))
+        let sut = CaptchaService(urlSession: mockURLSession,
+                                 redeemUseCase: MockRedeemUseCase(),
+                                 settings: DataBrokerProtectionSettings(defaults: .standard),
+                                 servicePixel: servicePixel)
 
         do {
             _ = try await sut.submitCaptchaInformation(GetCaptchaInfoResponse.mock, attemptId: UUID(), shouldRunNextStep: { true })
@@ -94,7 +105,10 @@ final class CaptchaServiceTests: XCTestCase {
         MockURLProtocol.requestHandlerQueue.append(requestHandler)
         MockURLProtocol.requestHandlerQueue.append(requestHandler)
 
-        let sut = CaptchaService(urlSession: mockURLSession, redeemUseCase: MockRedeemUseCase(), settings: DataBrokerProtectionSettings(defaults: .standard))
+        let sut = CaptchaService(urlSession: mockURLSession,
+                                 redeemUseCase: MockRedeemUseCase(),
+                                 settings: DataBrokerProtectionSettings(defaults: .standard),
+                                 servicePixel: servicePixel)
 
         do {
             _ = try await sut.submitCaptchaInformation(GetCaptchaInfoResponse.mock, retries: 2, pollingInterval: 0.01, attemptId: UUID(), shouldRunNextStep: { true })
@@ -113,7 +127,10 @@ final class CaptchaServiceTests: XCTestCase {
         let requestHandler: RequestHandler = { _ in (HTTPURLResponse.ok, try? self.jsonEncoder.encode(captchaResult)) }
         MockURLProtocol.requestHandlerQueue.append(requestHandler)
 
-        let sut = CaptchaService(urlSession: mockURLSession, redeemUseCase: MockRedeemUseCase(), settings: DataBrokerProtectionSettings(defaults: .standard))
+        let sut = CaptchaService(urlSession: mockURLSession,
+                                 redeemUseCase: MockRedeemUseCase(),
+                                 settings: DataBrokerProtectionSettings(defaults: .standard),
+                                 servicePixel: servicePixel)
 
         do {
             _ = try await sut.submitCaptchaToBeResolved(for: "123456", attemptId: UUID(), shouldRunNextStep: { true })
@@ -132,7 +149,10 @@ final class CaptchaServiceTests: XCTestCase {
         let requestHandler: RequestHandler = { _ in (HTTPURLResponse.ok, try? self.jsonEncoder.encode(captchaResult)) }
         MockURLProtocol.requestHandlerQueue.append(requestHandler)
 
-        let sut = CaptchaService(urlSession: mockURLSession, redeemUseCase: MockRedeemUseCase(), settings: DataBrokerProtectionSettings(defaults: .standard))
+        let sut = CaptchaService(urlSession: mockURLSession,
+                                 redeemUseCase: MockRedeemUseCase(),
+                                 settings: DataBrokerProtectionSettings(defaults: .standard),
+                                 servicePixel: servicePixel)
 
         do {
             _ = try await sut.submitCaptchaToBeResolved(for: "123456", attemptId: UUID(), shouldRunNextStep: { true })
@@ -151,7 +171,10 @@ final class CaptchaServiceTests: XCTestCase {
         let requestHandler: RequestHandler = { _ in (HTTPURLResponse.ok, try? self.jsonEncoder.encode(captchaResult)) }
         MockURLProtocol.requestHandlerQueue.append(requestHandler)
 
-        let sut = CaptchaService(urlSession: mockURLSession, redeemUseCase: MockRedeemUseCase(), settings: DataBrokerProtectionSettings(defaults: .standard))
+        let sut = CaptchaService(urlSession: mockURLSession,
+                                 redeemUseCase: MockRedeemUseCase(),
+                                 settings: DataBrokerProtectionSettings(defaults: .standard),
+                                 servicePixel: servicePixel)
 
         do {
             _ = try await sut.submitCaptchaToBeResolved(for: "123456", attemptId: UUID(), shouldRunNextStep: { true })
@@ -172,7 +195,10 @@ final class CaptchaServiceTests: XCTestCase {
         MockURLProtocol.requestHandlerQueue.append(requestHandler)
         MockURLProtocol.requestHandlerQueue.append(requestHandler)
 
-        let sut = CaptchaService(urlSession: mockURLSession, redeemUseCase: MockRedeemUseCase(), settings: DataBrokerProtectionSettings(defaults: .standard))
+        let sut = CaptchaService(urlSession: mockURLSession,
+                                 redeemUseCase: MockRedeemUseCase(),
+                                 settings: DataBrokerProtectionSettings(defaults: .standard),
+                                 servicePixel: servicePixel)
 
         do {
             _ = try await sut.submitCaptchaToBeResolved(for: "123456", retries: 2, pollingInterval: 0.01, attemptId: UUID(), shouldRunNextStep: { true })
@@ -191,7 +217,10 @@ final class CaptchaServiceTests: XCTestCase {
         let requestHandler: RequestHandler = { _ in (HTTPURLResponse.ok, try? self.jsonEncoder.encode(captchaResult)) }
         MockURLProtocol.requestHandlerQueue.append(requestHandler)
 
-        let sut = CaptchaService(urlSession: mockURLSession, redeemUseCase: MockRedeemUseCase(), settings: DataBrokerProtectionSettings(defaults: .standard))
+        let sut = CaptchaService(urlSession: mockURLSession,
+                                 redeemUseCase: MockRedeemUseCase(),
+                                 settings: DataBrokerProtectionSettings(defaults: .standard),
+                                 servicePixel: servicePixel)
 
         do {
             let data = try await sut.submitCaptchaToBeResolved(for: "123456", retries: 2, pollingInterval: 1, attemptId: UUID(), shouldRunNextStep: { true })
@@ -200,6 +229,28 @@ final class CaptchaServiceTests: XCTestCase {
             XCTFail("Unexpected error thrown: \(error).")
         }
     }
+
+    func testWhenNoAuthTokenAvailable_noAuthTokenErrorIsThrown() async {
+        let redeemUseCase = MockRedeemUseCase()
+        redeemUseCase.shouldSendNilAuthHeader = true
+
+        let sut = CaptchaService(urlSession: mockURLSession,
+                                 redeemUseCase: redeemUseCase,
+                                 settings: DataBrokerProtectionSettings(defaults: .standard),
+                                 servicePixel: servicePixel)
+
+        do {
+            _ = try await sut.submitCaptchaToBeResolved(for: "123456", retries: 2, pollingInterval: 1, attemptId: UUID(), shouldRunNextStep: { true })
+            XCTFail("Expected an error to be thrown")
+        } catch {
+            guard let authenticationError = error as? AuthenticationError, authenticationError == .noAuthToken else {
+                XCTFail("Error is not AuthenticationError.noAuthToken")
+                return
+            }
+            XCTAssertTrue(servicePixel.fireEmptyAccessTokenWasCalled)
+            XCTAssertFalse(servicePixel.fireGenerateEmailHTTPErrorWasCalled)
+        }
+    }
 }
 
 extension GetCaptchaInfoResponse {
diff --git a/LocalPackages/DataBrokerProtection/Tests/DataBrokerProtectionTests/DataBrokerOperationActionTests.swift b/LocalPackages/DataBrokerProtection/Tests/DataBrokerProtectionTests/DataBrokerOperationActionTests.swift
index fdfc8469bf..cdbb776170 100644
--- a/LocalPackages/DataBrokerProtection/Tests/DataBrokerProtectionTests/DataBrokerOperationActionTests.swift
+++ b/LocalPackages/DataBrokerProtection/Tests/DataBrokerProtectionTests/DataBrokerOperationActionTests.swift
@@ -27,6 +27,7 @@ final class DataBrokerOperationActionTests: XCTestCase {
     let webViewHandler = WebViewHandlerMock()
     let emailService = EmailServiceMock()
     let captchaService = CaptchaServiceMock()
+    let pixelHandler = MockDataBrokerProtectionPixelsHandler()
     let stageCalulator = DataBrokerProtectionStageDurationCalculator(dataBroker: "broker", handler: MockDataBrokerProtectionPixelsHandler())
 
     override func tearDown() async throws {
@@ -47,6 +48,7 @@ final class DataBrokerOperationActionTests: XCTestCase {
             captchaService: captchaService,
             operationAwaitTime: 0,
             stageCalculator: stageCalulator,
+            pixelHandler: pixelHandler,
             shouldRunNextStep: { true }
         )
 
@@ -71,6 +73,7 @@ final class DataBrokerOperationActionTests: XCTestCase {
             captchaService: captchaService,
             operationAwaitTime: 0,
             stageCalculator: stageCalulator,
+            pixelHandler: pixelHandler,
             shouldRunNextStep: { true }
         )
 
@@ -102,6 +105,7 @@ final class DataBrokerOperationActionTests: XCTestCase {
             captchaService: captchaService,
             operationAwaitTime: 0,
             stageCalculator: stageCalulator,
+            pixelHandler: pixelHandler,
             shouldRunNextStep: { true }
         )
 
@@ -131,6 +135,7 @@ final class DataBrokerOperationActionTests: XCTestCase {
             captchaService: captchaService,
             operationAwaitTime: 0,
             stageCalculator: stageCalulator,
+            pixelHandler: pixelHandler,
             shouldRunNextStep: { true }
         )
         sut.webViewHandler = webViewHandler
@@ -153,6 +158,7 @@ final class DataBrokerOperationActionTests: XCTestCase {
             captchaService: captchaService,
             operationAwaitTime: 0,
             stageCalculator: stageCalulator,
+            pixelHandler: pixelHandler,
             shouldRunNextStep: { true }
         )
         emailService.shouldThrow = true
@@ -181,6 +187,7 @@ final class DataBrokerOperationActionTests: XCTestCase {
             operationAwaitTime: 0,
             clickAwaitTime: 0,
             stageCalculator: stageCalulator,
+            pixelHandler: pixelHandler,
             shouldRunNextStep: { true }
         )
         sut.webViewHandler = webViewHandler
@@ -200,6 +207,7 @@ final class DataBrokerOperationActionTests: XCTestCase {
             captchaService: captchaService,
             operationAwaitTime: 0,
             stageCalculator: stageCalulator,
+            pixelHandler: pixelHandler,
             shouldRunNextStep: { true }
         )
         sut.webViewHandler = webViewHandler
@@ -221,6 +229,7 @@ final class DataBrokerOperationActionTests: XCTestCase {
             captchaService: captchaService,
             operationAwaitTime: 0,
             stageCalculator: stageCalulator,
+            pixelHandler: pixelHandler,
             shouldRunNextStep: { true }
         )
         sut.webViewHandler = webViewHandler
@@ -243,6 +252,7 @@ final class DataBrokerOperationActionTests: XCTestCase {
             captchaService: captchaService,
             operationAwaitTime: 0,
             stageCalculator: stageCalulator,
+            pixelHandler: pixelHandler,
             shouldRunNextStep: { true }
         )
         let actionsHandler = ActionsHandler(step: step)
@@ -272,6 +282,7 @@ final class DataBrokerOperationActionTests: XCTestCase {
             captchaService: captchaService,
             operationAwaitTime: 0,
             stageCalculator: stageCalulator,
+            pixelHandler: pixelHandler,
             shouldRunNextStep: { true }
         )
         sut.webViewHandler = webViewHandler
@@ -294,6 +305,7 @@ final class DataBrokerOperationActionTests: XCTestCase {
             captchaService: captchaService,
             operationAwaitTime: 0,
             stageCalculator: stageCalulator,
+            pixelHandler: pixelHandler,
             shouldRunNextStep: { true }
         )
         sut.retriesCountOnError = 0
@@ -317,6 +329,7 @@ final class DataBrokerOperationActionTests: XCTestCase {
             captchaService: captchaService,
             operationAwaitTime: 0,
             stageCalculator: stageCalulator,
+            pixelHandler: pixelHandler,
             shouldRunNextStep: { true }
         )
         sut.webViewHandler = webViewHandler
@@ -335,6 +348,7 @@ final class DataBrokerOperationActionTests: XCTestCase {
             captchaService: captchaService,
             operationAwaitTime: 0,
             stageCalculator: stageCalulator,
+            pixelHandler: pixelHandler,
             shouldRunNextStep: { true }
         )
         sut.webViewHandler = webViewHandler
@@ -355,6 +369,7 @@ final class DataBrokerOperationActionTests: XCTestCase {
             captchaService: captchaService,
             operationAwaitTime: 0,
             stageCalculator: mockStageCalculator,
+            pixelHandler: pixelHandler,
             shouldRunNextStep: { true }
         )
 
@@ -374,6 +389,7 @@ final class DataBrokerOperationActionTests: XCTestCase {
             captchaService: captchaService,
             operationAwaitTime: 0,
             stageCalculator: mockStageCalculator,
+            pixelHandler: pixelHandler,
             shouldRunNextStep: { true }
         )
 
@@ -393,6 +409,7 @@ final class DataBrokerOperationActionTests: XCTestCase {
             captchaService: captchaService,
             operationAwaitTime: 0,
             stageCalculator: mockStageCalculator,
+            pixelHandler: pixelHandler,
             shouldRunNextStep: { true }
         )
 
@@ -412,6 +429,7 @@ final class DataBrokerOperationActionTests: XCTestCase {
             captchaService: captchaService,
             operationAwaitTime: 0,
             stageCalculator: mockStageCalculator,
+            pixelHandler: pixelHandler,
             shouldRunNextStep: { true }
         )
 
@@ -431,6 +449,7 @@ final class DataBrokerOperationActionTests: XCTestCase {
             cookieHandler: mockCookieHandler,
             operationAwaitTime: 0,
             stageCalculator: stageCalulator,
+            pixelHandler: pixelHandler,
             shouldRunNextStep: { true }
         )
 
@@ -452,6 +471,7 @@ final class DataBrokerOperationActionTests: XCTestCase {
             cookieHandler: mockCookieHandler,
             operationAwaitTime: 0,
             stageCalculator: stageCalulator,
+            pixelHandler: pixelHandler,
             shouldRunNextStep: { true }
         )
 
diff --git a/LocalPackages/DataBrokerProtection/Tests/DataBrokerProtectionTests/DataBrokerProfileQueryOperationManagerTests.swift b/LocalPackages/DataBrokerProtection/Tests/DataBrokerProtectionTests/DataBrokerProfileQueryOperationManagerTests.swift
index 70619e8736..19d92e74d6 100644
--- a/LocalPackages/DataBrokerProtection/Tests/DataBrokerProtectionTests/DataBrokerProfileQueryOperationManagerTests.swift
+++ b/LocalPackages/DataBrokerProtection/Tests/DataBrokerProtectionTests/DataBrokerProfileQueryOperationManagerTests.swift
@@ -20,6 +20,8 @@
 
 import XCTest
 import BrowserServicesKit
+import Common
+import PixelKit
 @testable import DataBrokerProtection
 
 final class DataBrokerProfileQueryOperationManagerTests: XCTestCase {
@@ -931,14 +933,13 @@ final class DataBrokerProfileQueryOperationManagerTests: XCTestCase {
 }
 
 final class MockWebOperationRunner: WebOperationRunner {
-
     var shouldScanThrow = false
     var shouldOptOutThrow = false
     var scanResults = [ExtractedProfile]()
     var wasScanCalled = false
     var wasOptOutCalled = false
 
-    func scan(_ profileQuery: BrokerProfileQueryData, stageCalculator: StageDurationCalculator, showWebView: Bool, shouldRunNextStep: @escaping () -> Bool) async throws -> [ExtractedProfile] {
+    func scan(_ profileQuery: BrokerProfileQueryData, stageCalculator: StageDurationCalculator, pixelHandler: EventMapping<DataBrokerProtectionPixels>, showWebView: Bool, shouldRunNextStep: @escaping () -> Bool) async throws -> [ExtractedProfile] {
         wasScanCalled = true
 
         if shouldScanThrow {
@@ -948,7 +949,7 @@ final class MockWebOperationRunner: WebOperationRunner {
         }
     }
 
-    func optOut(profileQuery: BrokerProfileQueryData, extractedProfile: ExtractedProfile, stageCalculator: StageDurationCalculator, showWebView: Bool, shouldRunNextStep: @escaping () -> Bool) async throws {
+    func optOut(profileQuery: BrokerProfileQueryData, extractedProfile: ExtractedProfile, stageCalculator: StageDurationCalculator, pixelHandler: EventMapping<DataBrokerProtectionPixels>, showWebView: Bool, shouldRunNextStep: @escaping () -> Bool) async throws {
         wasOptOutCalled = true
 
         if shouldOptOutThrow {
diff --git a/LocalPackages/DataBrokerProtection/Tests/DataBrokerProtectionTests/DataBrokerProtectionBackendServicePixelsTests.swift b/LocalPackages/DataBrokerProtection/Tests/DataBrokerProtectionTests/DataBrokerProtectionBackendServicePixelsTests.swift
new file mode 100644
index 0000000000..9acad52f24
--- /dev/null
+++ b/LocalPackages/DataBrokerProtection/Tests/DataBrokerProtectionTests/DataBrokerProtectionBackendServicePixelsTests.swift
@@ -0,0 +1,107 @@
+//
+//  DataBrokerProtectionBackendServicePixelsTests.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 DataBrokerProtection
+
+final class DataBrokerProtectionBackendServicePixelsTests: XCTestCase {
+    let mockHandler = MockDataBrokerProtectionPixelsHandler()
+    let mockRepository = MockAuthenticationRepository()
+    var settings: DataBrokerProtectionSettings!
+
+    override func setUpWithError() throws {
+        let suiteName = "com.dbp.tests.\(UUID().uuidString)"
+        let defaults =  UserDefaults(suiteName: suiteName) ?? UserDefaults.standard
+        settings = DataBrokerProtectionSettings(defaults: defaults)
+    }
+
+    override func tearDownWithError() throws {
+        mockHandler.clear()
+        mockRepository.reset()
+        settings = nil
+    }
+
+    func testSendHTTPErrorOnStagingAndNotWaitlist_thenValidatePixelSent() {
+        settings.selectedEnvironment = .staging
+        mockRepository.shouldSendNilWaitlistTimeStamp = true
+
+        let backendPixel = DefaultDataBrokerProtectionBackendServicePixels(pixelHandler: mockHandler,
+                                                                           settings: settings,
+                                                                           authRepository: mockRepository)
+
+        backendPixel.fireGenerateEmailHTTPError(statusCode: 200)
+        let lastPixel = MockDataBrokerProtectionPixelsHandler.lastPixelsFired.last
+
+        XCTAssertNotNil(lastPixel)
+        XCTAssertEqual(lastPixel?.params?[DataBrokerProtectionPixels.Consts.httpCode], "200", "Incorrect statusCode")
+        XCTAssertEqual(lastPixel?.params?[DataBrokerProtectionPixels.Consts.environmentKey], "staging", "Incorrect environment")
+        XCTAssertEqual(lastPixel?.params?[DataBrokerProtectionPixels.Consts.wasOnWaitlist], "false", "should be true")
+    }
+
+    func testSendHTTPErrorOnProductionAndWaitlist_thenValidatePixelSent() {
+        settings.selectedEnvironment = .production
+        let backendPixel = DefaultDataBrokerProtectionBackendServicePixels(pixelHandler: mockHandler,
+                                                                           settings: settings,
+                                                                           authRepository: mockRepository)
+
+        backendPixel.fireGenerateEmailHTTPError(statusCode: 123)
+        let lastPixel = MockDataBrokerProtectionPixelsHandler.lastPixelsFired.last
+
+        XCTAssertNotNil(lastPixel)
+        XCTAssertEqual(lastPixel?.params?[DataBrokerProtectionPixels.Consts.httpCode], "123", "Incorrect statusCode")
+        XCTAssertEqual(lastPixel?.params?[DataBrokerProtectionPixels.Consts.environmentKey], "production", "Incorrect environment")
+        XCTAssertEqual(lastPixel?.params?[DataBrokerProtectionPixels.Consts.wasOnWaitlist], "true", "should be true")
+    }
+
+    func testSendEmptyAccessTokenOnProductionAndWaitlistFromEmailCallsite_thenValidatePixelSent() {
+        settings.selectedEnvironment = .production
+        let backendPixel = DefaultDataBrokerProtectionBackendServicePixels(pixelHandler: mockHandler,
+                                                                           settings: settings,
+                                                                           authRepository: mockRepository)
+
+        backendPixel.fireEmptyAccessToken(callSite: .getEmail)
+
+        let lastPixel = MockDataBrokerProtectionPixelsHandler.lastPixelsFired.last
+
+        XCTAssertNotNil(lastPixel)
+        XCTAssertEqual(lastPixel?.params?[DataBrokerProtectionPixels.Consts.environmentKey], "production", "Incorrect environment")
+        XCTAssertEqual(lastPixel?.params?[DataBrokerProtectionPixels.Consts.wasOnWaitlist], "true", "should be true")
+        XCTAssertEqual(lastPixel?.params?[DataBrokerProtectionPixels.Consts.backendServiceCallSite], "getEmail", "Should be getEmail")
+
+    }
+
+    func testSendEmptyAccessTokenOnStagingAndNotOnWaitlistFromCaptchaCallsite_thenValidatePixelSent() {
+        settings.selectedEnvironment = .staging
+        mockRepository.shouldSendNilWaitlistTimeStamp = true
+
+        let backendPixel = DefaultDataBrokerProtectionBackendServicePixels(pixelHandler: mockHandler,
+                                                                           settings: settings,
+                                                                           authRepository: mockRepository)
+
+        backendPixel.fireEmptyAccessToken(callSite: .submitCaptchaInformationRequest)
+
+        let lastPixel = MockDataBrokerProtectionPixelsHandler.lastPixelsFired.last
+
+        XCTAssertNotNil(lastPixel)
+        XCTAssertEqual(lastPixel?.params?[DataBrokerProtectionPixels.Consts.environmentKey], "staging", "Incorrect environment")
+        XCTAssertEqual(lastPixel?.params?[DataBrokerProtectionPixels.Consts.wasOnWaitlist], "false", "should be false")
+        XCTAssertEqual(lastPixel?.params?[DataBrokerProtectionPixels.Consts.backendServiceCallSite], "submitCaptchaInformationRequest", "Should be getEmail")
+
+    }
+
+}
diff --git a/LocalPackages/DataBrokerProtection/Tests/DataBrokerProtectionTests/DataBrokerProtectionProfileTests.swift b/LocalPackages/DataBrokerProtection/Tests/DataBrokerProtectionTests/DataBrokerProtectionProfileTests.swift
index 616e1a5fa9..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: [
@@ -175,7 +176,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)
@@ -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]
@@ -217,7 +219,7 @@ final class DataBrokerProtectionProfileTests: XCTestCase {
             birthYear: 1980
         )
 
-        _=await database.save(newProfile)
+        _ = try! await database.save(newProfile)
 
         XCTAssertTrue(vault.wasSaveProfileQueryCalled)
         XCTAssertTrue(vault.wasUpdateProfileQueryCalled)
@@ -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]
@@ -259,7 +262,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/DataBrokerProtectionStageDurationCalculatorTests.swift b/LocalPackages/DataBrokerProtection/Tests/DataBrokerProtectionTests/DataBrokerProtectionStageDurationCalculatorTests.swift
index 8b899e12a1..c7aeee1db7 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
@@ -38,7 +39,7 @@ final class DataBrokerProtectionStageDurationCalculatorTests: XCTestCase {
 
         if let failurePixel = MockDataBrokerProtectionPixelsHandler.lastPixelsFired.last{
             switch failurePixel {
-            case .scanFailed(let broker, _, _):
+            case .scanFailed(let broker, _, _, _):
                 XCTAssertEqual(broker, "broker")
             default: XCTFail("The scan failed pixel should be fired")
             }
@@ -56,7 +57,7 @@ final class DataBrokerProtectionStageDurationCalculatorTests: XCTestCase {
 
         if let failurePixel = MockDataBrokerProtectionPixelsHandler.lastPixelsFired.last{
             switch failurePixel {
-            case .scanError(_, _, let category, _):
+            case .scanError(_, _, let category, _, _):
                 XCTAssertEqual(category, ErrorCategory.clientError(httpCode: 403).toString)
             default: XCTFail("The scan error pixel should be fired")
             }
@@ -74,7 +75,7 @@ final class DataBrokerProtectionStageDurationCalculatorTests: XCTestCase {
 
         if let failurePixel = MockDataBrokerProtectionPixelsHandler.lastPixelsFired.last{
             switch failurePixel {
-            case .scanError(_, _, let category, _):
+            case .scanError(_, _, let category, _, _):
                 XCTAssertEqual(category, ErrorCategory.serverError(httpCode: 500).toString)
             default: XCTFail("The scan error pixel should be fired")
             }
@@ -92,7 +93,7 @@ final class DataBrokerProtectionStageDurationCalculatorTests: XCTestCase {
 
         if let failurePixel = MockDataBrokerProtectionPixelsHandler.lastPixelsFired.last{
             switch failurePixel {
-            case .scanError(_, _, let category, _):
+            case .scanError(_, _, let category, _, _):
                 XCTAssertEqual(category, ErrorCategory.validationError.toString)
             default: XCTFail("The scan error pixel should be fired")
             }
@@ -111,7 +112,7 @@ final class DataBrokerProtectionStageDurationCalculatorTests: XCTestCase {
 
         if let failurePixel = MockDataBrokerProtectionPixelsHandler.lastPixelsFired.last{
             switch failurePixel {
-            case .scanError(_, _, let category, _):
+            case .scanError(_, _, let category, _, _):
                 XCTAssertEqual(category, ErrorCategory.networkError.toString)
             default: XCTFail("The scan error pixel should be fired")
             }
@@ -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)
@@ -130,7 +150,7 @@ final class DataBrokerProtectionStageDurationCalculatorTests: XCTestCase {
 
         if let failurePixel = MockDataBrokerProtectionPixelsHandler.lastPixelsFired.last{
             switch failurePixel {
-            case .scanError(_, _, let category, _):
+            case .scanError(_, _, let category, _, _):
                 XCTAssertEqual(category, ErrorCategory.unclassified.toString)
             default: XCTFail("The scan error pixel should be fired")
             }
diff --git a/LocalPackages/DataBrokerProtection/Tests/DataBrokerProtectionTests/DataBrokerProtectionWebUIPixelsTests.swift b/LocalPackages/DataBrokerProtection/Tests/DataBrokerProtectionTests/DataBrokerProtectionWebUIPixelsTests.swift
new file mode 100644
index 0000000000..f42517fb5a
--- /dev/null
+++ b/LocalPackages/DataBrokerProtection/Tests/DataBrokerProtectionTests/DataBrokerProtectionWebUIPixelsTests.swift
@@ -0,0 +1,168 @@
+//
+//  DataBrokerProtectionWebUIPixelsTests.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 DataBrokerProtectionWebUIPixelsTests: XCTestCase {
+
+    let handler = MockDataBrokerProtectionPixelsHandler()
+
+    override func tearDown() {
+        handler.clear()
+    }
+
+    func testWhenURLErrorIsHttp_thenCorrectPixelIsFired() {
+        let sut = DataBrokerProtectionWebUIPixels(pixelHandler: handler)
+
+        sut.firePixel(for: NSError(domain: NSURLErrorDomain, code: 404))
+
+        let lastPixelFired = MockDataBrokerProtectionPixelsHandler.lastPixelsFired.first!
+
+        XCTAssertEqual(
+            lastPixelFired.params!["error_category"],
+            "httpError-404"
+        )
+    }
+
+    func testWhenURLErrorIsNotHttp_thenCorrectPixelIsFired() {
+        let sut = DataBrokerProtectionWebUIPixels(pixelHandler: handler)
+
+        sut.firePixel(for: NSError(domain: NSURLErrorDomain, code: 100))
+
+        let lastPixelFired = MockDataBrokerProtectionPixelsHandler.lastPixelsFired.first!
+
+        XCTAssertEqual(
+            lastPixelFired.params!["error_category"],
+            "other-100"
+        )
+    }
+
+    func testWhenErrorIsNotURL_thenCorrectPixelIsFired() {
+        let sut = DataBrokerProtectionWebUIPixels(pixelHandler: handler)
+
+        sut.firePixel(for: NSError(domain: NSCocoaErrorDomain, code: 500))
+
+        let lastPixelFired = MockDataBrokerProtectionPixelsHandler.lastPixelsFired.first!
+
+        XCTAssertEqual(
+            lastPixelFired.params!["error_category"],
+            "other-500"
+        )
+    }
+
+    func testWhenSelectedURLisCustomAndLoading_thenStagingParamIsSent() {
+        let sut = DataBrokerProtectionWebUIPixels(pixelHandler: handler)
+
+        sut.firePixel(for: .custom, type: .loading)
+
+        let lastPixelFired = MockDataBrokerProtectionPixelsHandler.lastPixelsFired.first!
+
+        XCTAssertEqual(
+            lastPixelFired.name,
+            DataBrokerProtectionPixels.webUILoadingStarted(environment: "staging").name
+        )
+        XCTAssertEqual(
+            lastPixelFired.params!["environment"],
+            "staging"
+        )
+    }
+
+    func testWhenSelectedURLisProductionAndLoading_thenProductionParamIsSent() {
+        let sut = DataBrokerProtectionWebUIPixels(pixelHandler: handler)
+
+        sut.firePixel(for: .production, type: .loading)
+
+        let lastPixelFired = MockDataBrokerProtectionPixelsHandler.lastPixelsFired.first!
+
+        XCTAssertEqual(
+            lastPixelFired.name,
+            DataBrokerProtectionPixels.webUILoadingStarted(environment: "staging").name
+        )
+        XCTAssertEqual(
+            lastPixelFired.params!["environment"],
+            "production"
+        )
+    }
+
+    func testWhenSelectedURLisCustomAndSuccess_thenStagingParamIsSent() {
+        let sut = DataBrokerProtectionWebUIPixels(pixelHandler: handler)
+
+        sut.firePixel(for: .custom, type: .success)
+
+        let lastPixelFired = MockDataBrokerProtectionPixelsHandler.lastPixelsFired.first!
+
+        XCTAssertEqual(
+            lastPixelFired.name,
+            DataBrokerProtectionPixels.webUILoadingSuccess(environment: "staging").name
+        )
+        XCTAssertEqual(
+            lastPixelFired.params!["environment"],
+            "staging"
+        )
+    }
+
+    func testWhenSelectedURLisProductionAndSuccess_thenProductionParamIsSent() {
+        let sut = DataBrokerProtectionWebUIPixels(pixelHandler: handler)
+
+        sut.firePixel(for: .production, type: .success)
+
+        let lastPixelFired = MockDataBrokerProtectionPixelsHandler.lastPixelsFired.first!
+
+        XCTAssertEqual(
+            lastPixelFired.name,
+            DataBrokerProtectionPixels.webUILoadingSuccess(environment: "staging").name
+        )
+        XCTAssertEqual(
+            lastPixelFired.params!["environment"],
+            "production"
+        )
+    }
+
+    func testWhenHTTPPixelIsFired_weDoNotFireAnotherPixelRightAway() {
+        let sut = DataBrokerProtectionWebUIPixels(pixelHandler: handler)
+
+        sut.firePixel(for: NSError(domain: NSURLErrorDomain, code: 404))
+        sut.firePixel(for: NSError(domain: NSCocoaErrorDomain, code: 500))
+
+        let httpPixel = MockDataBrokerProtectionPixelsHandler.lastPixelsFired.first!
+
+        XCTAssertEqual(
+            httpPixel.params!["error_category"],
+            "httpError-404"
+        )
+        XCTAssertEqual(MockDataBrokerProtectionPixelsHandler.lastPixelsFired.count, 1) // We only fire one pixel
+    }
+
+    func testWhenHTTPPixelIsFired_weFireTheNextErrorPixelOnTheSecondTry() {
+        let sut = DataBrokerProtectionWebUIPixels(pixelHandler: handler)
+
+        sut.firePixel(for: NSError(domain: NSURLErrorDomain, code: 404))
+        sut.firePixel(for: NSError(domain: NSCocoaErrorDomain, code: 500))
+        sut.firePixel(for: NSError(domain: NSCocoaErrorDomain, code: 500))
+
+        let httpPixel = MockDataBrokerProtectionPixelsHandler.lastPixelsFired.first!
+
+        XCTAssertEqual(
+            httpPixel.params!["error_category"],
+            "httpError-404"
+        )
+        XCTAssertEqual(MockDataBrokerProtectionPixelsHandler.lastPixelsFired.count, 2) // We fire the HTTP pixel and the second cocoa error pixel
+    }
+}
diff --git a/LocalPackages/DataBrokerProtection/Tests/DataBrokerProtectionTests/EmailServiceTests.swift b/LocalPackages/DataBrokerProtection/Tests/DataBrokerProtectionTests/EmailServiceTests.swift
index fb9fd38a29..66bf08995e 100644
--- a/LocalPackages/DataBrokerProtection/Tests/DataBrokerProtectionTests/EmailServiceTests.swift
+++ b/LocalPackages/DataBrokerProtection/Tests/DataBrokerProtectionTests/EmailServiceTests.swift
@@ -21,6 +21,7 @@ import Foundation
 @testable import DataBrokerProtection
 
 final class EmailServiceTests: XCTestCase {
+    private let servicePixel = MockDataBrokerProtectionBackendServicePixels()
 
     enum MockError: Error {
         case someError
@@ -34,11 +35,15 @@ final class EmailServiceTests: XCTestCase {
 
     override func tearDown() async throws {
         MockURLProtocol.requestHandlerQueue.removeAll()
+        servicePixel.reset()
     }
 
     func testWhenSessionThrows_thenTheCorrectErrorIsThrown() async {
         MockURLProtocol.requestHandlerQueue.append({ _ in throw MockError.someError })
-        let sut = EmailService(urlSession: mockURLSession, redeemUseCase: MockRedeemUseCase(), settings: DataBrokerProtectionSettings(defaults: .standard))
+        let sut = EmailService(urlSession: mockURLSession,
+                               redeemUseCase: MockRedeemUseCase(),
+                               settings: DataBrokerProtectionSettings(defaults: .standard),
+                               servicePixel: servicePixel)
 
         do {
             _ = try await sut.getEmail(dataBrokerURL: "fakeBroker", attemptId: UUID())
@@ -59,7 +64,10 @@ final class EmailServiceTests: XCTestCase {
         let responseData = try? JSONSerialization.data(withJSONObject: responseDictionary, options: .prettyPrinted)
         MockURLProtocol.requestHandlerQueue.append({ _ in (HTTPURLResponse.ok, responseData) })
 
-        let sut = EmailService(urlSession: mockURLSession, redeemUseCase: MockRedeemUseCase(), settings: DataBrokerProtectionSettings(defaults: .standard))
+        let sut = EmailService(urlSession: mockURLSession,
+                               redeemUseCase: MockRedeemUseCase(),
+                               settings: DataBrokerProtectionSettings(defaults: .standard),
+                               servicePixel: servicePixel)
 
         do {
             _ = try await sut.getEmail(dataBrokerURL: "fakeBroker", attemptId: UUID())
@@ -78,7 +86,10 @@ final class EmailServiceTests: XCTestCase {
         let responseData = try? JSONSerialization.data(withJSONObject: responseDictionary, options: .prettyPrinted)
         MockURLProtocol.requestHandlerQueue.append({ _ in (HTTPURLResponse.ok, responseData) })
 
-        let sut = EmailService(urlSession: mockURLSession, redeemUseCase: MockRedeemUseCase(), settings: DataBrokerProtectionSettings(defaults: .standard))
+        let sut = EmailService(urlSession: mockURLSession,
+                               redeemUseCase: MockRedeemUseCase(),
+                               settings: DataBrokerProtectionSettings(defaults: .standard),
+                               servicePixel: servicePixel)
 
         do {
             let emailData = try await sut.getEmail(dataBrokerURL: "fakeBroker", attemptId: UUID())
@@ -94,7 +105,10 @@ final class EmailServiceTests: XCTestCase {
         let unknownResponse: RequestHandler = { _ in (HTTPURLResponse.ok, responseData) }
         MockURLProtocol.requestHandlerQueue.append(unknownResponse)
 
-        let sut = EmailService(urlSession: mockURLSession, redeemUseCase: MockRedeemUseCase(), settings: DataBrokerProtectionSettings(defaults: .standard))
+        let sut = EmailService(urlSession: mockURLSession,
+                               redeemUseCase: MockRedeemUseCase(),
+                               settings: DataBrokerProtectionSettings(defaults: .standard),
+                               servicePixel: servicePixel)
 
         do {
             _ = try await sut.getConfirmationLink(
@@ -121,7 +135,10 @@ final class EmailServiceTests: XCTestCase {
         MockURLProtocol.requestHandlerQueue.append(notReadyResponse)
         MockURLProtocol.requestHandlerQueue.append(notReadyResponse)
 
-        let sut = EmailService(urlSession: mockURLSession, redeemUseCase: MockRedeemUseCase(), settings: DataBrokerProtectionSettings(defaults: .standard))
+        let sut = EmailService(urlSession: mockURLSession,
+                               redeemUseCase: MockRedeemUseCase(),
+                               settings: DataBrokerProtectionSettings(defaults: .standard),
+                               servicePixel: servicePixel)
 
         do {
             _ = try await sut.getConfirmationLink(
@@ -151,7 +168,10 @@ final class EmailServiceTests: XCTestCase {
         MockURLProtocol.requestHandlerQueue.append(notReadyResponse)
         MockURLProtocol.requestHandlerQueue.append(successResponse)
 
-        let sut = EmailService(urlSession: mockURLSession, redeemUseCase: MockRedeemUseCase(), settings: DataBrokerProtectionSettings(defaults: .standard))
+        let sut = EmailService(urlSession: mockURLSession,
+                               redeemUseCase: MockRedeemUseCase(),
+                               settings: DataBrokerProtectionSettings(defaults: .standard),
+                               servicePixel: servicePixel)
 
         do {
             let url = try await sut.getConfirmationLink(
@@ -172,7 +192,10 @@ final class EmailServiceTests: XCTestCase {
         let responseData = try? JSONSerialization.data(withJSONObject: responseDictionary, options: .prettyPrinted)
         MockURLProtocol.requestHandlerQueue.append({ _ in (HTTPURLResponse.ok, responseData) })
 
-        let sut = EmailService(urlSession: mockURLSession, redeemUseCase: MockRedeemUseCase(), settings: DataBrokerProtectionSettings(defaults: .standard))
+        let sut = EmailService(urlSession: mockURLSession,
+                               redeemUseCase: MockRedeemUseCase(),
+                               settings: DataBrokerProtectionSettings(defaults: .standard),
+                               servicePixel: servicePixel)
 
         do {
             _ = try await sut.getConfirmationLink(
@@ -196,7 +219,10 @@ final class EmailServiceTests: XCTestCase {
         let responseData = try? JSONEncoder().encode(invalidLink)
         MockURLProtocol.requestHandlerQueue.append({ _ in (HTTPURLResponse.ok, responseData) })
 
-        let sut = EmailService(urlSession: mockURLSession, redeemUseCase: MockRedeemUseCase(), settings: DataBrokerProtectionSettings(defaults: .standard))
+        let sut = EmailService(urlSession: mockURLSession,
+                               redeemUseCase: MockRedeemUseCase(),
+                               settings: DataBrokerProtectionSettings(defaults: .standard),
+                               servicePixel: servicePixel)
 
         do {
             _ = try await sut.getConfirmationLink(
@@ -220,7 +246,10 @@ final class EmailServiceTests: XCTestCase {
         let responseData = try? JSONEncoder().encode(validURL)
         MockURLProtocol.requestHandlerQueue.append({ _ in (HTTPURLResponse.ok, responseData) })
 
-        let sut = EmailService(urlSession: mockURLSession, redeemUseCase: MockRedeemUseCase(), settings: DataBrokerProtectionSettings(defaults: .standard))
+        let sut = EmailService(urlSession: mockURLSession,
+                               redeemUseCase: MockRedeemUseCase(),
+                               settings: DataBrokerProtectionSettings(defaults: .standard),
+                               servicePixel: servicePixel)
 
         do {
             let url = try await sut.getConfirmationLink(
@@ -235,4 +264,43 @@ final class EmailServiceTests: XCTestCase {
             XCTFail("Unexpected. It should not throw")
         }
     }
+
+    func testWhenNoAuthTokenAvailable_noAuthTokenErrorIsThrown() async {
+        let redeemUseCase = MockRedeemUseCase()
+        redeemUseCase.shouldSendNilAuthHeader = true
+        let sut = EmailService(urlSession: mockURLSession,
+                               redeemUseCase: redeemUseCase,
+                               settings: DataBrokerProtectionSettings(defaults: .standard),
+                               servicePixel: servicePixel)
+
+        do {
+            _ = try await sut.getEmail(dataBrokerURL: "fakeBroker", attemptId: UUID())
+            XCTFail("Expected an error to be thrown")
+        } catch {
+            guard let authenticationError = error as? AuthenticationError, authenticationError == .noAuthToken else {
+                XCTFail("Error is not AuthenticationError.noAuthToken")
+                return
+            }
+            XCTAssertTrue(servicePixel.fireEmptyAccessTokenWasCalled)
+            XCTAssertFalse(servicePixel.fireGenerateEmailHTTPErrorWasCalled)
+        }
+    }
+
+    func testWhen401IsReceived_thenWeSubmit401ErrorPixel() async {
+        MockURLProtocol.requestHandlerQueue.append({ _ in (HTTPURLResponse.noAuth, nil) })
+
+        let sut = EmailService(urlSession: mockURLSession,
+                               redeemUseCase: MockRedeemUseCase(),
+                               settings: DataBrokerProtectionSettings(defaults: .standard),
+                               servicePixel: servicePixel)
+
+        do {
+            _ = try await sut.getEmail(dataBrokerURL: "fakeBroker", attemptId: UUID())
+            XCTFail("Expected an error to be thrown")
+        } catch {
+            XCTAssertFalse(servicePixel.fireEmptyAccessTokenWasCalled)
+            XCTAssertTrue(servicePixel.fireGenerateEmailHTTPErrorWasCalled)
+            XCTAssertEqual(servicePixel.statusCode, 401)
+        }
+    }
 }
diff --git a/LocalPackages/DataBrokerProtection/Tests/DataBrokerProtectionTests/MapperToUITests.swift b/LocalPackages/DataBrokerProtection/Tests/DataBrokerProtectionTests/MapperToUITests.swift
index 6629f5c0be..b7fc620d08 100644
--- a/LocalPackages/DataBrokerProtection/Tests/DataBrokerProtectionTests/MapperToUITests.swift
+++ b/LocalPackages/DataBrokerProtection/Tests/DataBrokerProtectionTests/MapperToUITests.swift
@@ -105,6 +105,22 @@ final class MapperToUITests: XCTestCase {
         XCTAssertEqual(result.resultsFound.count, 1)
     }
 
+    func testWhenScansHaveDeprecatedProfileQueriesThatDidNotRun_thenThoseAreNotTakenIntoAccount() {
+        let brokerProfileQueryData: [BrokerProfileQueryData] = [
+            .mock(dataBrokerName: "Broker #1", lastRunDate: Date(), extractedProfile: .mockWithRemovedDate),
+            .mock(dataBrokerName: "Broker #1", lastRunDate: Date()),
+            .mock(dataBrokerName: "Broker #1", lastRunDate: nil, deprecated: true),
+            .mock(dataBrokerName: "Broker #2", lastRunDate: Date()),
+            .mock(dataBrokerName: "Broker #3", lastRunDate: Date(), extractedProfile: .mockWithRemovedDate, deprecated: true)
+        ]
+
+        let result = sut.initialScanState(brokerProfileQueryData)
+
+        XCTAssertEqual(result.scanProgress.totalScans, 2)
+        XCTAssertEqual(result.scanProgress.currentScans, 2)
+        XCTAssertEqual(result.resultsFound.count, 1)
+    }
+
     func testInProgressAndCompletedOptOuts_areMappedCorrectly() {
         let brokerProfileQueryData: [BrokerProfileQueryData] = [
             .mock(extractedProfile: .mockWithRemovedDate),
diff --git a/LocalPackages/DataBrokerProtection/Tests/DataBrokerProtectionTests/MismatchCalculatorUseCaseTests.swift b/LocalPackages/DataBrokerProtection/Tests/DataBrokerProtectionTests/MismatchCalculatorUseCaseTests.swift
index db0607d891..f10a26fb67 100644
--- a/LocalPackages/DataBrokerProtection/Tests/DataBrokerProtectionTests/MismatchCalculatorUseCaseTests.swift
+++ b/LocalPackages/DataBrokerProtection/Tests/DataBrokerProtectionTests/MismatchCalculatorUseCaseTests.swift
@@ -170,7 +170,7 @@ extension BrokerProfileQueryData {
                 steps: [Step](),
                 version: "1.0.0",
                 schedulingConfig: DataBrokerScheduleConfig.mock,
-                parent: "parent"
+                parent: "parent.com"
             ),
             profileQuery: ProfileQuery(firstName: "John", lastName: "Doe", city: "Miami", state: "FL", birthYear: 50),
             scanOperationData: ScanOperationData(brokerId: 2, profileQueryId: 1, historyEvents: historyEvents)
diff --git a/LocalPackages/DataBrokerProtection/Tests/DataBrokerProtectionTests/Mocks.swift b/LocalPackages/DataBrokerProtection/Tests/DataBrokerProtectionTests/Mocks.swift
index 0581735b88..9b60fe4812 100644
--- a/LocalPackages/DataBrokerProtection/Tests/DataBrokerProtectionTests/Mocks.swift
+++ b/LocalPackages/DataBrokerProtection/Tests/DataBrokerProtectionTests/Mocks.swift
@@ -309,6 +309,14 @@ final class CaptchaServiceMock: CaptchaServiceProtocol {
 }
 
 final class MockRedeemUseCase: DataBrokerProtectionRedeemUseCase {
+    var shouldSendNilAuthHeader = false
+
+    func getAuthHeader() -> String? {
+        if shouldSendNilAuthHeader {
+            return nil
+        }
+        return "auth header"
+    }
 
     func shouldAskForInviteCode() -> Bool {
         false
@@ -318,8 +326,8 @@ final class MockRedeemUseCase: DataBrokerProtectionRedeemUseCase {
 
     }
 
-    func getAuthHeader() async throws -> String {
-        return "auth header"
+    func reset() {
+        shouldSendNilAuthHeader = false
     }
 }
 
@@ -344,11 +352,11 @@ final class MockAuthenticationService: DataBrokerProtectionAuthenticationService
 }
 
 final class MockAuthenticationRepository: AuthenticationRepository {
-
     var shouldSendNilInviteCode = false
     var shouldSendNilAccessToken = false
     var wasInviteCodeSaveCalled = false
     var wasAccessTokenSaveCalled = false
+    var shouldSendNilWaitlistTimeStamp = false
 
     func getInviteCode() -> String? {
         if shouldSendNilInviteCode {
@@ -374,11 +382,19 @@ final class MockAuthenticationRepository: AuthenticationRepository {
         wasAccessTokenSaveCalled = true
     }
 
+    func getWaitlistTimestamp() -> Int? {
+        if shouldSendNilWaitlistTimeStamp {
+            return nil
+        }
+        return 123
+    }
+
     func reset() {
         shouldSendNilInviteCode = false
         shouldSendNilAccessToken = false
         wasInviteCodeSaveCalled = false
         wasAccessTokenSaveCalled = false
+        shouldSendNilWaitlistTimeStamp = false
     }
 }
 
@@ -706,10 +722,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? {
@@ -854,6 +868,7 @@ final class MockAppVersion: AppVersionNumberProvider {
 }
 
 final class MockStageDurationCalculator: StageDurationCalculator {
+    var isManualScan: Bool = false
     var attemptId: UUID = UUID()
     var stage: Stage?
 
@@ -924,3 +939,24 @@ final class MockStageDurationCalculator: StageDurationCalculator {
         self.stage = nil
     }
 }
+
+final class MockDataBrokerProtectionBackendServicePixels: DataBrokerProtectionBackendServicePixels {
+    var fireEmptyAccessTokenWasCalled = false
+    var fireGenerateEmailHTTPErrorWasCalled = false
+    var statusCode: Int?
+
+    func fireGenerateEmailHTTPError(statusCode: Int) {
+        fireGenerateEmailHTTPErrorWasCalled = true
+        self.statusCode = statusCode
+    }
+
+    func fireEmptyAccessToken(callSite: BackendServiceCallSite) {
+        fireEmptyAccessTokenWasCalled = true
+    }
+
+    func reset() {
+        fireEmptyAccessTokenWasCalled = false
+        fireGenerateEmailHTTPErrorWasCalled = false
+        statusCode = 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/DataBrokerProtection/Tests/DataBrokerProtectionTests/ProfileQueryTests.swift b/LocalPackages/DataBrokerProtection/Tests/DataBrokerProtectionTests/ProfileQueryTests.swift
new file mode 100644
index 0000000000..d52b4666b3
--- /dev/null
+++ b/LocalPackages/DataBrokerProtection/Tests/DataBrokerProtectionTests/ProfileQueryTests.swift
@@ -0,0 +1,52 @@
+//
+//  ProfileQueryTests.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 ProfileQueryTests: XCTestCase {
+
+    func testWhenTwoProfileQueryHaveANilAndAnEmptyMiddleName_theyAreStillTheSameQuery() {
+        let profileQueryOne = ProfileQuery(firstName: "John", lastName: "Doe", middleName: nil, city: "Miami", state: "FL", birthYear: 1950)
+        let profileQueryTwo = ProfileQuery(firstName: "John", lastName: "Doe", middleName: "", city: "Miami", state: "FL", birthYear: 1950)
+
+        XCTAssertTrue(profileQueryOne == profileQueryTwo)
+    }
+
+    func testWhenTwoProfileQueryHaveANilAndABlankMiddleName_theyAreStillTheSameQuery() {
+        let profileQueryOne = ProfileQuery(firstName: "John", lastName: "Doe", middleName: nil, city: "Miami", state: "FL", birthYear: 1950)
+        let profileQueryTwo = ProfileQuery(firstName: "John", lastName: "Doe", middleName: "        ", city: "Miami", state: "FL", birthYear: 1950)
+
+        XCTAssertTrue(profileQueryOne == profileQueryTwo)
+    }
+
+    func testWhenTwoProfileQueryHaveTheSameMiddleNames_theyAreTheSameQuery() {
+        let profileQueryOne = ProfileQuery(firstName: "John", lastName: "Doe", middleName: "M", city: "Miami", state: "FL", birthYear: 1950)
+        let profileQueryTwo = ProfileQuery(firstName: "John", lastName: "Doe", middleName: "M", city: "Miami", state: "FL", birthYear: 1950)
+
+        XCTAssertTrue(profileQueryOne == profileQueryTwo)
+    }
+
+    func testWhenTwoProfileQueryHaveDifferentMiddleNames_theyAreDifferentQueries() {
+        let profileQueryOne = ProfileQuery(firstName: "John", lastName: "Doe", middleName: "M.", city: "Miami", state: "FL", birthYear: 1950)
+        let profileQueryTwo = ProfileQuery(firstName: "John", lastName: "Doe", middleName: "J.", city: "Miami", state: "FL", birthYear: 1950)
+
+        XCTAssertFalse(profileQueryOne == profileQueryTwo)
+    }
+}
diff --git a/LocalPackages/DataBrokerProtection/Tests/DataBrokerProtectionTests/RedeemUseCaseTests.swift b/LocalPackages/DataBrokerProtection/Tests/DataBrokerProtectionTests/RedeemUseCaseTests.swift
index 856a978ea2..25fa7defc0 100644
--- a/LocalPackages/DataBrokerProtection/Tests/DataBrokerProtectionTests/RedeemUseCaseTests.swift
+++ b/LocalPackages/DataBrokerProtection/Tests/DataBrokerProtectionTests/RedeemUseCaseTests.swift
@@ -69,22 +69,22 @@ final class RedeemUseCaseTests: XCTestCase {
 
         let sut = RedeemUseCase(authenticationService: service, authenticationRepository: repository)
 
-        let accessToken = try? await sut.getAuthHeader()
+        let accessToken = sut.getAuthHeader()
 
         XCTAssertNil(accessToken)
         XCTAssertFalse(service.wasRedeemCalled)
         XCTAssertFalse(repository.wasAccessTokenSaveCalled)
     }
 
-    func testWhenGetAuthHeadersHasEmptyAccessToken_thenWeRedeemAndSave() async {
+    func testWhenGetAuthHeadersHasEmptyAccessToken_thenWeReturnNil() async {
         repository.shouldSendNilInviteCode = false
         repository.shouldSendNilAccessToken = true
         let sut = RedeemUseCase(authenticationService: service, authenticationRepository: repository)
 
-        _ = try? await sut.getAuthHeader()
+        let result = sut.getAuthHeader()
 
-        XCTAssertTrue(service.wasRedeemCalled)
-        XCTAssertTrue(repository.wasAccessTokenSaveCalled)
+        XCTAssertNil(result)
+        XCTAssertFalse(repository.wasAccessTokenSaveCalled)
     }
 
     func testWhenGetAuthHeadersHasAccessToken_thenWeReturnHeaderWithoutRedeeming() async {
@@ -92,7 +92,7 @@ final class RedeemUseCaseTests: XCTestCase {
         repository.shouldSendNilAccessToken = false
         let sut = RedeemUseCase(authenticationService: service, authenticationRepository: repository)
 
-        let accessToken = try? await sut.getAuthHeader()
+        let accessToken = sut.getAuthHeader()
 
         XCTAssertEqual(accessToken, "bearer accessToken")
         XCTAssertFalse(service.wasRedeemCalled)
diff --git a/LocalPackages/DataBrokerProtection/Tests/DataBrokerProtectionTests/Utils.swift b/LocalPackages/DataBrokerProtection/Tests/DataBrokerProtectionTests/Utils.swift
index 4f919b8bea..6be4d5004b 100644
--- a/LocalPackages/DataBrokerProtection/Tests/DataBrokerProtectionTests/Utils.swift
+++ b/LocalPackages/DataBrokerProtection/Tests/DataBrokerProtectionTests/Utils.swift
@@ -58,6 +58,7 @@ func areDatesEqualsOnDayMonthAndYear(date1: Date?, date2: Date?) -> Bool {
 
 extension HTTPURLResponse {
     static let ok = HTTPURLResponse(url: URL(string: "http://www.example.com")!, statusCode: 200, httpVersion: nil, headerFields: [String: String]())!
+    static let noAuth = HTTPURLResponse(url: URL(string: "http://www.example.com")!, statusCode: 401, httpVersion: nil, headerFields: [String: String]())!
 }
 
 typealias RequestHandler = ((URLRequest) throws -> (HTTPURLResponse, Data?))
diff --git a/LocalPackages/LoginItems/Package.swift b/LocalPackages/LoginItems/Package.swift
index b1a72a5caa..f34f4344f1 100644
--- a/LocalPackages/LoginItems/Package.swift
+++ b/LocalPackages/LoginItems/Package.swift
@@ -13,7 +13,6 @@ let package = Package(
         ),
     ],
     dependencies: [
-        .package(url: "https://github.com/duckduckgo/apple-toolbox.git", exact: "2.0.0"),
     ],
     targets: [
         .target(
@@ -22,8 +21,7 @@ let package = Package(
             ],
             swiftSettings: [
                 .define("DEBUG", .when(configuration: .debug))
-            ],
-            plugins: [.plugin(name: "SwiftLintPlugin", package: "apple-toolbox")]
+            ]
         ),
     ]
 )
diff --git a/LocalPackages/NetworkProtectionMac/Package.swift b/LocalPackages/NetworkProtectionMac/Package.swift
index ad277828b7..a027d241cb 100644
--- a/LocalPackages/NetworkProtectionMac/Package.swift
+++ b/LocalPackages/NetworkProtectionMac/Package.swift
@@ -31,12 +31,11 @@ let package = Package(
         .library(name: "NetworkProtectionUI", targets: ["NetworkProtectionUI"]),
     ],
     dependencies: [
-        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "132.0.1"),
+        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "144.0.0"),
+        .package(url: "https://github.com/airbnb/lottie-spm", exact: "4.4.1"),
         .package(path: "../XPCHelper"),
         .package(path: "../SwiftUIExtensions"),
         .package(path: "../LoginItems"),
-        .package(url: "https://github.com/duckduckgo/apple-toolbox.git", exact: "2.0.0"),
-        .package(path: "../PixelKit"),
     ],
     targets: [
         // MARK: - NetworkProtectionIPC
@@ -46,11 +45,11 @@ let package = Package(
             dependencies: [
                 .product(name: "NetworkProtection", package: "BrowserServicesKit"),
                 .product(name: "XPCHelper", package: "XPCHelper"),
+                .product(name: "PixelKit", package: "BrowserServicesKit"),
             ],
             swiftSettings: [
                 .define("DEBUG", .when(configuration: .debug))
-            ],
-            plugins: [.plugin(name: "SwiftLintPlugin", package: "apple-toolbox")]
+            ]
         ),
 
         // MARK: - NetworkProtectionProxy
@@ -59,12 +58,11 @@ let package = Package(
             name: "NetworkProtectionProxy",
             dependencies: [
                 .product(name: "NetworkProtection", package: "BrowserServicesKit"),
-                .product(name: "PixelKit", package: "PixelKit"),
+                .product(name: "PixelKit", package: "BrowserServicesKit"),
             ],
             swiftSettings: [
                 .define("DEBUG", .when(configuration: .debug))
-            ],
-            plugins: [.plugin(name: "SwiftLintPlugin", package: "apple-toolbox")]
+            ]
         ),
 
         // MARK: - NetworkProtectionUI
@@ -73,17 +71,17 @@ let package = Package(
             name: "NetworkProtectionUI",
             dependencies: [
                 .product(name: "NetworkProtection", package: "BrowserServicesKit"),
+                .product(name: "PixelKit", package: "BrowserServicesKit"),
                 .product(name: "SwiftUIExtensions", package: "SwiftUIExtensions"),
                 .product(name: "LoginItems", package: "LoginItems"),
-                .product(name: "PixelKit", package: "PixelKit"),
+                .product(name: "Lottie", package: "lottie-spm")
             ],
             resources: [
                 .copy("Resources/Assets.xcassets")
             ],
             swiftSettings: [
                 .define("DEBUG", .when(configuration: .debug))
-            ],
-            plugins: [.plugin(name: "SwiftLintPlugin", package: "apple-toolbox")]
+            ]
         ),
 
         .testTarget(
@@ -92,9 +90,8 @@ let package = Package(
                 "NetworkProtectionUI",
                 .product(name: "NetworkProtectionTestUtils", package: "BrowserServicesKit"),
                 .product(name: "LoginItems", package: "LoginItems"),
-                .product(name: "PixelKitTestingUtilities", package: "PixelKit"),
-            ],
-            plugins: [.plugin(name: "SwiftLintPlugin", package: "apple-toolbox")]
+                .product(name: "PixelKitTestingUtilities", package: "BrowserServicesKit"),
+            ]
         ),
     ]
 )
diff --git a/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/Invite/NetworkProtectionInviteDialog.swift b/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionIPC/Observers/DataVolumeObserverThroughIPC.swift
similarity index 51%
rename from DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/Invite/NetworkProtectionInviteDialog.swift
rename to LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionIPC/Observers/DataVolumeObserverThroughIPC.swift
index 64e3aa7c3b..ee605da45a 100644
--- a/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/Invite/NetworkProtectionInviteDialog.swift
+++ b/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionIPC/Observers/DataVolumeObserverThroughIPC.swift
@@ -1,7 +1,7 @@
 //
-//  NetworkProtectionInviteDialog.swift
+//  DataVolumeObserverThroughIPC.swift
 //
-//  Copyright © 2023 DuckDuckGo. All rights reserved.
+//  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.
@@ -16,25 +16,25 @@
 //  limitations under the License.
 //
 
-#if NETWORK_PROTECTION
-
-import SwiftUI
+import Combine
+import Foundation
 import NetworkProtection
-import SwiftUIExtensions
-
-struct NetworkProtectionInviteDialog: View {
-    @ObservedObject var model: NetworkProtectionInviteViewModel
-
-    var body: some View {
-        switch model.currentDialog {
-        case .codeEntry:
-            InviteCodeView(viewModel: model.inviteCodeViewModel)
-        case .success:
-            InviteCodeSuccessView(viewModel: model.successCodeViewModel)
-        case .none:
-            EmptyView()
-        }
+
+public final class DataVolumeObserverThroughIPC: DataVolumeObserver {
+
+    private let subject = CurrentValueSubject<DataVolume, Never>(.init())
+
+    // MARK: - DataVolumeObserver
+
+    public lazy var publisher = subject.eraseToAnyPublisher()
+
+    public var recentValue: DataVolume {
+        subject.value
     }
-}
 
-#endif
+    // MARK: - Publishing Updates
+
+    func publish(_ dataVolume: DataVolume) {
+        subject.send(dataVolume)
+    }
+}
diff --git a/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionIPC/TunnelControllerIPCClient.swift b/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionIPC/TunnelControllerIPCClient.swift
index d1b978f777..a3aafbbe11 100644
--- a/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionIPC/TunnelControllerIPCClient.swift
+++ b/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionIPC/TunnelControllerIPCClient.swift
@@ -26,6 +26,7 @@ public protocol IPCClientInterface: AnyObject {
     func errorChanged(_ error: String?)
     func serverInfoChanged(_ serverInfo: NetworkProtectionStatusServerInfo)
     func statusChanged(_ status: ConnectionStatus)
+    func dataVolumeUpdated(_ dataVolume: DataVolume)
 }
 
 /// This is the XPC interface with parameters that can be packed properly
@@ -34,6 +35,7 @@ protocol XPCClientInterface {
     func errorChanged(error: String?)
     func serverInfoChanged(payload: Data)
     func statusChanged(payload: Data)
+    func dataVolumeUpdated(payload: Data)
 }
 
 public final class TunnelControllerIPCClient {
@@ -47,6 +49,7 @@ public final class TunnelControllerIPCClient {
     public var serverInfoObserver = ConnectionServerInfoObserverThroughIPC()
     public var connectionErrorObserver = ConnectionErrorObserverThroughIPC()
     public var connectionStatusObserver = ConnectionStatusObserverThroughIPC()
+    public var dataVolumeObserver = DataVolumeObserverThroughIPC()
 
     /// The delegate.
     ///
@@ -65,7 +68,8 @@ public final class TunnelControllerIPCClient {
             clientDelegate: self.clientDelegate,
             serverInfoObserver: self.serverInfoObserver,
             connectionErrorObserver: self.connectionErrorObserver,
-            connectionStatusObserver: self.connectionStatusObserver
+            connectionStatusObserver: self.connectionStatusObserver,
+            dataVolumeObserver: self.dataVolumeObserver
         )
 
         xpc = XPCClient(
@@ -86,6 +90,8 @@ public final class TunnelControllerIPCClient {
                 self.register()
             }
         }
+
+        self.register()
     }
 }
 
@@ -95,15 +101,18 @@ private final class TunnelControllerXPCClientDelegate: XPCClientInterface {
     let serverInfoObserver: ConnectionServerInfoObserverThroughIPC
     let connectionErrorObserver: ConnectionErrorObserverThroughIPC
     let connectionStatusObserver: ConnectionStatusObserverThroughIPC
+    let dataVolumeObserver: DataVolumeObserverThroughIPC
 
     init(clientDelegate: IPCClientInterface?,
          serverInfoObserver: ConnectionServerInfoObserverThroughIPC,
          connectionErrorObserver: ConnectionErrorObserverThroughIPC,
-         connectionStatusObserver: ConnectionStatusObserverThroughIPC) {
+         connectionStatusObserver: ConnectionStatusObserverThroughIPC,
+         dataVolumeObserver: DataVolumeObserverThroughIPC) {
         self.clientDelegate = clientDelegate
         self.serverInfoObserver = serverInfoObserver
         self.connectionErrorObserver = connectionErrorObserver
         self.connectionStatusObserver = connectionStatusObserver
+        self.dataVolumeObserver = dataVolumeObserver
     }
 
     func errorChanged(error: String?) {
@@ -128,6 +137,15 @@ private final class TunnelControllerXPCClientDelegate: XPCClientInterface {
         connectionStatusObserver.publish(status)
         clientDelegate?.statusChanged(status)
     }
+
+    func dataVolumeUpdated(payload: Data) {
+        guard let dataVolume = try? JSONDecoder().decode(DataVolume.self, from: payload) else {
+            return
+        }
+
+        dataVolumeObserver.publish(dataVolume)
+        clientDelegate?.dataVolumeUpdated(dataVolume)
+    }
 }
 
 // MARK: - Outgoing communication to the server
@@ -142,22 +160,22 @@ extension TunnelControllerIPCClient: IPCServerInterface {
         })
     }
 
-    public func start() {
+    public func start(completion: @escaping (Error?) -> Void) {
         xpc.execute(call: { server in
-            server.start()
-        }, xpcReplyErrorHandler: { _ in
-            // Intentional no-op as there's no completion block
-            // If you add a completion block, please remember to call it here too!
-        })
+            server.start(completion: completion)
+        }, xpcReplyErrorHandler: completion)
     }
 
-    public func stop() {
+    public func stop(completion: @escaping (Error?) -> Void) {
         xpc.execute(call: { server in
-            server.stop()
-        }, xpcReplyErrorHandler: { _ in
-            // Intentional no-op as there's no completion block
-            // If you add a completion block, please remember to call it here too!
-        })
+            server.stop(completion: completion)
+        }, xpcReplyErrorHandler: completion)
+    }
+
+    public func fetchLastError(completion: @escaping (Error?) -> Void) {
+        xpc.execute(call: { server in
+            server.fetchLastError(completion: completion)
+        }, xpcReplyErrorHandler: completion)
     }
 
     public func debugCommand(_ command: DebugCommand) async throws {
diff --git a/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionIPC/TunnelControllerIPCServer.swift b/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionIPC/TunnelControllerIPCServer.swift
index 3fe62c74f3..ef5a8d015a 100644
--- a/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionIPC/TunnelControllerIPCServer.swift
+++ b/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionIPC/TunnelControllerIPCServer.swift
@@ -31,11 +31,23 @@ public protocol IPCServerInterface: AnyObject {
 
     /// Start the VPN tunnel.
     ///
-    func start()
+    /// - Parameters:
+    ///     - completion: the completion closure.  This will be called as soon as the IPC request has been processed, and won't
+    ///         signal successful completion of the request.
+    ///
+    func start(completion: @escaping (Error?) -> Void)
 
     /// Stop the VPN tunnel.
     ///
-    func stop()
+    /// - Parameters:
+    ///     - completion: the completion closure.  This will be called as soon as the IPC request has been processed, and won't
+    ///         signal successful completion of the request.
+    ///
+    func stop(completion: @escaping (Error?) -> Void)
+
+    /// Fetches the last error directly from the tunnel manager.
+    ///
+    func fetchLastError(completion: @escaping (Error?) -> Void)
 
     /// Debug commands
     ///
@@ -57,11 +69,15 @@ protocol XPCServerInterface {
 
     /// Start the VPN tunnel.
     ///
-    func start()
+    func start(completion: @escaping (Error?) -> Void)
 
     /// Stop the VPN tunnel.
     ///
-    func stop()
+    func stop(completion: @escaping (Error?) -> Void)
+
+    /// Fetches the last error directly from the tunnel manager.
+    ///
+    func fetchLastError(completion: @escaping (Error?) -> Void)
 
     /// Debug commands
     ///
@@ -135,6 +151,20 @@ extension TunnelControllerIPCServer: IPCClientInterface {
             client.statusChanged(payload: payload)
         }
     }
+
+    public func dataVolumeUpdated(_ dataVolume: DataVolume) {
+        let payload: Data
+
+        do {
+            payload = try JSONEncoder().encode(dataVolume)
+        } catch {
+            return
+        }
+
+        xpc.forEachClient { client in
+            client.dataVolumeUpdated(payload: payload)
+        }
+    }
 }
 
 // MARK: - Incoming communication from a client
@@ -144,12 +174,16 @@ extension TunnelControllerIPCServer: XPCServerInterface {
         serverDelegate?.register()
     }
 
-    func start() {
-        serverDelegate?.start()
+    func start(completion: @escaping (Error?) -> Void) {
+        serverDelegate?.start(completion: completion)
+    }
+
+    func stop(completion: @escaping (Error?) -> Void) {
+        serverDelegate?.stop(completion: completion)
     }
 
-    func stop() {
-        serverDelegate?.stop()
+    func fetchLastError(completion: @escaping (Error?) -> Void) {
+        serverDelegate?.fetchLastError(completion: completion)
     }
 
     func debugCommand(_ payload: Data, completion: @escaping (Error?) -> Void) {
diff --git a/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionProxy/Pixels/TransparentProxyControllerPixel.swift b/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionProxy/Pixels/TransparentProxyControllerPixel.swift
index b4c9b8cebb..97c759b30d 100644
--- a/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionProxy/Pixels/TransparentProxyControllerPixel.swift
+++ b/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionProxy/Pixels/TransparentProxyControllerPixel.swift
@@ -19,15 +19,17 @@
 import Foundation
 import PixelKit
 
-extension TransparentProxyController.StartError: PixelKitEventErrorDetails {
-    public var underlyingError: Error? {
+extension TransparentProxyController.StartError: CustomNSError {
+    public var errorUserInfo: [String: Any] {
         switch self {
         case .failedToLoadConfiguration(let underlyingError),
                 .failedToSaveConfiguration(let underlyingError),
                 .failedToStartProvider(let underlyingError):
-            return underlyingError
+            return [
+                NSUnderlyingErrorKey: underlyingError as NSError
+            ]
         default:
-            return nil
+            return [:]
         }
     }
 }
diff --git a/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/Extensions/LottieView+withIntro.swift b/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/Extensions/LottieView+withIntro.swift
new file mode 100644
index 0000000000..bfa0e14367
--- /dev/null
+++ b/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/Extensions/LottieView+withIntro.swift
@@ -0,0 +1,51 @@
+//
+//  LottieView+withIntro.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 Lottie
+
+extension LottieView where Placeholder: View {
+    public struct LoopWithIntroTiming {
+        let skipIntro: Bool
+        let introStartFrame: AnimationFrameTime
+        let introEndFrame: AnimationFrameTime
+        let loopStartFrame: AnimationFrameTime
+        let loopEndFrame: AnimationFrameTime
+    }
+
+    public func playing(withIntro timing: LoopWithIntroTiming, isAnimating: Binding<Bool> = .constant(true)) -> Lottie.LottieView<Placeholder> {
+        configure { uiView in
+            if uiView.isAnimationPlaying, !isAnimating.wrappedValue {
+                uiView.stop()
+                return
+            }
+
+            guard isAnimating.wrappedValue, !uiView.isAnimationPlaying else { return }
+
+            if uiView.loopMode == .playOnce, uiView.currentProgress == 1 { return }
+
+            if timing.skipIntro {
+                uiView.play(fromFrame: timing.loopStartFrame, toFrame: timing.loopEndFrame, loopMode: .loop)
+            } else {
+                uiView.play(fromFrame: timing.introStartFrame, toFrame: timing.introEndFrame, loopMode: .playOnce) { _ in
+                    uiView.play(fromFrame: timing.loopStartFrame, toFrame: timing.loopEndFrame, loopMode: .loop)
+                }
+            }
+        }
+    }
+}
diff --git a/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/Extensions/UserText+NetworkProtectionUI.swift b/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/Extensions/UserText+NetworkProtectionUI.swift
index 402f85098f..0236302a96 100644
--- a/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/Extensions/UserText+NetworkProtectionUI.swift
+++ b/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/Extensions/UserText+NetworkProtectionUI.swift
@@ -19,7 +19,8 @@
 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 networkProtectionStatusHeaderMessageOff = NSLocalizedString("network.protection.status.header.message.off", value: "Connect to secure all of your device’s\nInternet traffic.", comment: "Message label text for the status view when VPN is disconnected")
+    static let networkProtectionStatusHeaderMessageOn = NSLocalizedString("network.protection.status.header.message.on", value: "All device Internet traffic is being secured\nthrough the VPN.", comment: "Message label text for the status view when VPN is connected")
     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: "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.")
@@ -28,6 +29,11 @@ final class UserText {
     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"
 
+    static let netPVPNLocationNearest = NSLocalizedString("network.protection.vpn.location.nearest", value: "(Nearest)", comment: "Description of the location type in the VPN status view")
+    static let vpnLocationConnected = NSLocalizedString("network.protection.vpn.location.connected", value: "Connected Location", comment: "Description of the location type in the VPN status view")
+    static let vpnLocationSelected = NSLocalizedString("network.protection.vpn.location.selected", value: "Selected Location", comment: "Description of the location type in the VPN status view")
+    static let vpnDataVolume = NSLocalizedString("network.protection.vpn.data-volume", value: "Data Volume", comment: "Title for the data volume section in the VPN status view")
+
     // MARK: - Onboarding
 
     static let networkProtectionOnboardingInstallExtensionTitle = NSLocalizedString("network.protection.onboarding.install.extension.title", value: "Install VPN System Extension", comment: "Title for the onboarding install-vpn-extension step")
diff --git a/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/Menu/StatusBarMenu.swift b/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/Menu/StatusBarMenu.swift
index 1833f8482e..5e02caa125 100644
--- a/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/Menu/StatusBarMenu.swift
+++ b/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/Menu/StatusBarMenu.swift
@@ -32,7 +32,18 @@ public final class StatusBarMenu: NSObject {
     private let model: StatusBarMenuModel
 
     private let statusItem: NSStatusItem
-    private let popover: NetworkProtectionPopover
+    private var popover: NetworkProtectionPopover?
+
+    private let controller: TunnelController
+    private let statusReporter: NetworkProtectionStatusReporter
+    private let onboardingStatusPublisher: OnboardingStatusPublisher
+    private let appLauncher: AppLaunching
+    private let menuItems: () -> [MenuItem]
+    private let agentLoginItem: LoginItem?
+    private let isMenuBarStatusView: Bool
+    private let userDefaults: UserDefaults
+    private let locationFormatter: VPNLocationFormatting
+    private let uninstallHandler: () async -> Void
 
     // MARK: - NetP Icon publisher
 
@@ -58,6 +69,7 @@ public final class StatusBarMenu: NSObject {
                 agentLoginItem: LoginItem?,
                 isMenuBarStatusView: Bool,
                 userDefaults: UserDefaults,
+                locationFormatter: VPNLocationFormatting,
                 uninstallHandler: @escaping () async -> Void) {
 
         self.model = model
@@ -65,17 +77,16 @@ public final class StatusBarMenu: NSObject {
         self.statusItem = statusItem
         self.iconPublisher = NetworkProtectionIconPublisher(statusReporter: statusReporter, iconProvider: iconProvider)
 
-        popover = NetworkProtectionPopover(controller: controller,
-                                           onboardingStatusPublisher: onboardingStatusPublisher,
-                                           statusReporter: statusReporter,
-                                           appLauncher: appLauncher,
-                                           menuItems: menuItems,
-                                           agentLoginItem: agentLoginItem,
-                                           isMenuBarStatusView: isMenuBarStatusView,
-                                           userDefaults: userDefaults,
-                                           uninstallHandler: uninstallHandler)
-
-        popover.behavior = .transient
+        self.controller = controller
+        self.statusReporter = statusReporter
+        self.onboardingStatusPublisher = onboardingStatusPublisher
+        self.appLauncher = appLauncher
+        self.menuItems = menuItems
+        self.agentLoginItem = agentLoginItem
+        self.isMenuBarStatusView = isMenuBarStatusView
+        self.userDefaults = userDefaults
+        self.locationFormatter = locationFormatter
+        self.uninstallHandler = uninstallHandler
 
         super.init()
 
@@ -112,22 +123,35 @@ public final class StatusBarMenu: NSObject {
     // MARK: - Popover
 
     private func togglePopover(isOptionKeyPressed: Bool) {
-        if popover.isShown {
+        if let popover, popover.isShown {
             popover.close()
+            self.popover = nil
         } else {
             guard let button = statusItem.button else {
                 return
             }
 
-            popover.setShowsDebugInformation(isOptionKeyPressed)
-            popover.show(relativeTo: button.bounds, of: button, preferredEdge: .maxY)
+            popover = NetworkProtectionPopover(controller: controller,
+                                               onboardingStatusPublisher: onboardingStatusPublisher,
+                                               statusReporter: statusReporter,
+                                               appLauncher: appLauncher,
+                                               menuItems: menuItems,
+                                               agentLoginItem: agentLoginItem,
+                                               isMenuBarStatusView: isMenuBarStatusView,
+                                               userDefaults: userDefaults,
+                                               locationFormatter: locationFormatter,
+                                               uninstallHandler: uninstallHandler)
+            popover?.behavior = .transient
+
+            popover?.setShowsDebugInformation(isOptionKeyPressed)
+            popover?.show(relativeTo: button.bounds, of: button, preferredEdge: .minY)
         }
     }
 
     // MARK: - Context
 
     private func showContextMenu() {
-        if popover.isShown {
+        if let popover, popover.isShown {
             popover.close()
         }
 
diff --git a/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/NetworkProtectionAsset.swift b/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/NetworkProtectionAsset.swift
index dfa7a23850..a8288b7dbd 100644
--- a/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/NetworkProtectionAsset.swift
+++ b/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/NetworkProtectionAsset.swift
@@ -19,11 +19,12 @@
 import Foundation
 
 public enum NetworkProtectionAsset: String, CaseIterable {
-    case ipAddressIcon = "IP-16"
-    case serverLocationIcon = "Server-Location-16"
-    case vpnDisabledImage = "VPN-Disabled-128"
-    case vpnEnabledImage = "VPN-128"
+    case vpnDisabledImage = "VPNDisabled"
+    case vpnEnabledImage = "VPN"
     case vpnIcon = "VPN-16"
+    case nearestAvailable = "VPNLocation"
+    case dataReceived = "VPNDownload"
+    case dataSent = "VPNUpload"
 
     // Apple Icons
     case appleVaultIcon = "apple-vault-icon"
diff --git a/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/NetworkProtectionColor.swift b/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/NetworkProtectionColor.swift
index 010085527a..2145e2da36 100644
--- a/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/NetworkProtectionColor.swift
+++ b/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/NetworkProtectionColor.swift
@@ -31,6 +31,7 @@ extension Color {
 ///
 enum NetworkProtectionColor: String {
     case defaultText = "TextColor"
+    case secondaryText = "SecondaryColor"
     case linkColor = "LinkBlueColor"
     case onboardingButtonBackgroundColor = "OnboardingButtonBackgroundColor"
 #if swift(<5.9)
diff --git a/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/NetworkProtectionIconPublisher.swift b/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/NetworkProtectionIconPublisher.swift
index c6c4527539..f886f92357 100644
--- a/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/NetworkProtectionIconPublisher.swift
+++ b/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/NetworkProtectionIconPublisher.swift
@@ -60,13 +60,13 @@ public final class NetworkProtectionIconPublisher {
     // MARK: - Subscribing to NetP updates
 
     private func subscribeToConnectionStatusChanges() {
-        statusChangeCancellable = statusReporter.statusObserver.publisher.sink { [weak self] _ in
+        statusChangeCancellable = statusReporter.statusObserver.publisher.receive(on: RunLoop.main).sink { [weak self] _ in
             self?.updateMenuIcon()
         }
     }
 
     private func subscribeToConnectionIssues() {
-        connectivityIssuesCancellable = statusReporter.connectivityIssuesObserver.publisher.sink { [weak self] _ in
+        connectivityIssuesCancellable = statusReporter.connectivityIssuesObserver.publisher.receive(on: RunLoop.main).sink { [weak self] _ in
             self?.updateMenuIcon()
         }
     }
diff --git a/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/NetworkProtectionPopover.swift b/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/NetworkProtectionPopover.swift
index 0acbf84065..4236e963aa 100644
--- a/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/NetworkProtectionPopover.swift
+++ b/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/NetworkProtectionPopover.swift
@@ -48,7 +48,7 @@ public final class NetworkProtectionPopover: NSPopover {
     private let debugInformationPublisher = CurrentValueSubject<Bool, Never>(false)
     private let statusReporter: NetworkProtectionStatusReporter
     private let model: NetworkProtectionStatusView.Model
-    private var appLifecycleCancellable: AnyCancellable?
+    private var appLifecycleCancellables = Set<AnyCancellable>()
 
     public required init(controller: TunnelController,
                          onboardingStatusPublisher: OnboardingStatusPublisher,
@@ -58,6 +58,7 @@ public final class NetworkProtectionPopover: NSPopover {
                          agentLoginItem: LoginItem?,
                          isMenuBarStatusView: Bool,
                          userDefaults: UserDefaults,
+                         locationFormatter: VPNLocationFormatting,
                          uninstallHandler: @escaping () async -> Void) {
 
         self.statusReporter = statusReporter
@@ -70,6 +71,7 @@ public final class NetworkProtectionPopover: NSPopover {
                                                        agentLoginItem: agentLoginItem,
                                                        isMenuBarStatusView: isMenuBarStatusView,
                                                        userDefaults: userDefaults,
+                                                       locationFormatter: locationFormatter,
                                                        uninstallHandler: uninstallHandler)
 
         super.init()
@@ -101,11 +103,22 @@ public final class NetworkProtectionPopover: NSPopover {
     // MARK: - Status Refresh
 
     private func subscribeToAppLifecycleEvents() {
-        appLifecycleCancellable = NotificationCenter
+        NotificationCenter
             .default
             .publisher(for: NSApplication.didBecomeActiveNotification)
-            .sink { [weak self] _ in
-                self?.model.refreshLoginItemStatus()
+            .sink { [weak self] _ in self?.model.refreshLoginItemStatus() }
+            .store(in: &appLifecycleCancellables)
+
+        NotificationCenter
+            .default
+            .publisher(for: NSApplication.didResignActiveNotification)
+            .sink { [weak self] _ in self?.closePopoverIfOnboarded() }
+            .store(in: &appLifecycleCancellables)
+    }
+
+    private func closePopoverIfOnboarded() {
+        if self.model.onboardingStatus == .completed {
+            self.close()
         }
     }
 
diff --git a/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/Resources/Assets.xcassets/Colors/SecondaryColor.colorset/Contents.json b/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/Resources/Assets.xcassets/Colors/SecondaryColor.colorset/Contents.json
new file mode 100644
index 0000000000..8f7e96555c
--- /dev/null
+++ b/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/Resources/Assets.xcassets/Colors/SecondaryColor.colorset/Contents.json
@@ -0,0 +1,38 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "0.600",
+          "blue" : "0x00",
+          "green" : "0x00",
+          "red" : "0x00"
+        }
+      },
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "0.850",
+          "blue" : "0xFF",
+          "green" : "0xFF",
+          "red" : "0xFF"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/Resources/Assets.xcassets/Icons/IP-16.imageset/IP-16.pdf b/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/Resources/Assets.xcassets/Icons/IP-16.imageset/IP-16.pdf
deleted file mode 100644
index f68365bd0a..0000000000
Binary files a/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/Resources/Assets.xcassets/Icons/IP-16.imageset/IP-16.pdf and /dev/null differ
diff --git a/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/Resources/Assets.xcassets/Icons/Server-Location-16.imageset/Contents.json b/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/Resources/Assets.xcassets/Icons/Server-Location-16.imageset/Contents.json
deleted file mode 100644
index e020cd9994..0000000000
--- a/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/Resources/Assets.xcassets/Icons/Server-Location-16.imageset/Contents.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "Server-Location-16.pdf",
-      "idiom" : "universal"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  },
-  "properties" : {
-    "template-rendering-intent" : "template"
-  }
-}
diff --git a/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/Resources/Assets.xcassets/Icons/Server-Location-16.imageset/Server-Location-16.pdf b/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/Resources/Assets.xcassets/Icons/Server-Location-16.imageset/Server-Location-16.pdf
deleted file mode 100644
index b1f213c7b9..0000000000
Binary files a/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/Resources/Assets.xcassets/Icons/Server-Location-16.imageset/Server-Location-16.pdf and /dev/null differ
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
deleted file mode 100644
index 54953a618c..0000000000
Binary files a/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/Resources/Assets.xcassets/Icons/VPN-128.imageset/Network-Protetion-VPN-128.pdf and /dev/null differ
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
deleted file mode 100644
index bee84f6a0a..0000000000
Binary files a/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/Resources/Assets.xcassets/Icons/VPN-Disabled-128.imageset/Network-Protetion-VPN-Disabled-128.pdf and /dev/null differ
diff --git a/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/Resources/Assets.xcassets/Icons/VPN.imageset/Contents.json b/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/Resources/Assets.xcassets/Icons/VPN.imageset/Contents.json
new file mode 100644
index 0000000000..7d29a35569
--- /dev/null
+++ b/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/Resources/Assets.xcassets/Icons/VPN.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "VPN.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/Resources/Assets.xcassets/Icons/VPN.imageset/VPN.pdf b/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/Resources/Assets.xcassets/Icons/VPN.imageset/VPN.pdf
new file mode 100644
index 0000000000..e4423e08d1
Binary files /dev/null and b/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/Resources/Assets.xcassets/Icons/VPN.imageset/VPN.pdf differ
diff --git a/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/Resources/Assets.xcassets/Icons/VPNDisabled.imageset/Contents.json b/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/Resources/Assets.xcassets/Icons/VPNDisabled.imageset/Contents.json
new file mode 100644
index 0000000000..4c65d209a8
--- /dev/null
+++ b/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/Resources/Assets.xcassets/Icons/VPNDisabled.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "VPNDisabled.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/Resources/Assets.xcassets/Icons/VPNDisabled.imageset/VPNDisabled.pdf b/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/Resources/Assets.xcassets/Icons/VPNDisabled.imageset/VPNDisabled.pdf
new file mode 100644
index 0000000000..1577b6fc56
Binary files /dev/null and b/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/Resources/Assets.xcassets/Icons/VPNDisabled.imageset/VPNDisabled.pdf differ
diff --git a/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/Resources/Assets.xcassets/Icons/IP-16.imageset/Contents.json b/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/Resources/Assets.xcassets/Icons/VPNDownload.imageset/Contents.json
similarity index 63%
rename from LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/Resources/Assets.xcassets/Icons/IP-16.imageset/Contents.json
rename to LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/Resources/Assets.xcassets/Icons/VPNDownload.imageset/Contents.json
index 657dbb1f2c..e030aab433 100644
--- a/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/Resources/Assets.xcassets/Icons/IP-16.imageset/Contents.json
+++ b/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/Resources/Assets.xcassets/Icons/VPNDownload.imageset/Contents.json
@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "IP-16.pdf",
+      "filename" : "vpn-download.pdf",
       "idiom" : "universal"
     }
   ],
@@ -10,6 +10,6 @@
     "version" : 1
   },
   "properties" : {
-    "template-rendering-intent" : "template"
+    "template-rendering-intent" : "original"
   }
 }
diff --git a/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/Resources/Assets.xcassets/Icons/VPNDownload.imageset/vpn-download.pdf b/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/Resources/Assets.xcassets/Icons/VPNDownload.imageset/vpn-download.pdf
new file mode 100644
index 0000000000..d5288602de
Binary files /dev/null and b/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/Resources/Assets.xcassets/Icons/VPNDownload.imageset/vpn-download.pdf differ
diff --git a/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/Resources/Assets.xcassets/Icons/VPNLocation.imageset/Contents.json b/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/Resources/Assets.xcassets/Icons/VPNLocation.imageset/Contents.json
new file mode 100644
index 0000000000..09ed1f69f3
--- /dev/null
+++ b/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/Resources/Assets.xcassets/Icons/VPNLocation.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "VPNLocation.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/Resources/Assets.xcassets/Icons/VPNLocation.imageset/VPNLocation.pdf b/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/Resources/Assets.xcassets/Icons/VPNLocation.imageset/VPNLocation.pdf
new file mode 100644
index 0000000000..ddcabe468b
Binary files /dev/null and b/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/Resources/Assets.xcassets/Icons/VPNLocation.imageset/VPNLocation.pdf differ
diff --git a/DuckDuckGo/Assets.xcassets/Images/NetworkProtectionWaitlist/Card-16.imageset/Contents.json b/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/Resources/Assets.xcassets/Icons/VPNUpload.imageset/Contents.json
similarity index 64%
rename from DuckDuckGo/Assets.xcassets/Images/NetworkProtectionWaitlist/Card-16.imageset/Contents.json
rename to LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/Resources/Assets.xcassets/Icons/VPNUpload.imageset/Contents.json
index 0030995444..c7fec6a1a8 100644
--- a/DuckDuckGo/Assets.xcassets/Images/NetworkProtectionWaitlist/Card-16.imageset/Contents.json
+++ b/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/Resources/Assets.xcassets/Icons/VPNUpload.imageset/Contents.json
@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "Card-16.pdf",
+      "filename" : "vpn-upload.pdf",
       "idiom" : "universal"
     }
   ],
@@ -10,6 +10,6 @@
     "version" : 1
   },
   "properties" : {
-    "template-rendering-intent" : "template"
+    "template-rendering-intent" : "original"
   }
 }
diff --git a/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/Resources/Assets.xcassets/Icons/VPNUpload.imageset/vpn-upload.pdf b/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/Resources/Assets.xcassets/Icons/VPNUpload.imageset/vpn-upload.pdf
new file mode 100644
index 0000000000..4cc3e7eced
Binary files /dev/null and b/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/Resources/Assets.xcassets/Icons/VPNUpload.imageset/vpn-upload.pdf differ
diff --git a/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/SwiftUI/MenuItemCustomButton.swift b/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/SwiftUI/MenuItemCustomButton.swift
new file mode 100644
index 0000000000..cdd8bd79c8
--- /dev/null
+++ b/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/SwiftUI/MenuItemCustomButton.swift
@@ -0,0 +1,88 @@
+//
+//  MenuItemCustomButton.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
+
+struct MenuItemCustomButton<Label: View>: View {
+    @Environment(\.colorScheme) private var colorScheme
+    private var label: (Bool) -> Label
+    private let action: () async -> Void
+
+    private let highlightAnimationStepSpeed = 0.05
+
+    @State private var isHovered = false
+    @State private var animatingTap = false
+
+    init(action: @escaping () async -> Void, @ViewBuilder label: @escaping (Bool) -> Label) {
+        self.action = action
+        self.label = label
+    }
+
+    var body: some View {
+        Button(action: {
+            buttonTapped()
+        }) {
+            HStack {
+                label(isHovered)
+            }.padding([.top, .bottom], 3)
+                .padding([.leading, .trailing], 9)
+        }
+        .frame(maxWidth: .infinity, alignment: .leading)
+        .background(
+            buttonBackground(highlighted: isHovered)
+        )
+        .contentShape(Rectangle())
+        .cornerRadius(4)
+        .onTapGesture {
+            buttonTapped()
+        }
+        .onHover { hovering in
+            if !animatingTap {
+                isHovered = hovering
+            }
+        }
+        .buttonStyle(PlainButtonStyle())
+    }
+
+    private func buttonBackground(highlighted: Bool) -> some View {
+        if highlighted {
+            return AnyView(
+                VisualEffectView(material: .selection, blendingMode: .withinWindow, state: .active, isEmphasized: true))
+        } else {
+            return AnyView(Color.clear)
+        }
+    }
+
+    private func buttonTapped() {
+        animatingTap = true
+        isHovered = false
+
+        DispatchQueue.main.asyncAfter(deadline: .now() + highlightAnimationStepSpeed) {
+            isHovered = true
+
+            DispatchQueue.main.asyncAfter(deadline: .now() + highlightAnimationStepSpeed) {
+                animatingTap = false
+
+                Task {
+                    await action()
+                }
+            }
+        }
+    }
+}
diff --git a/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/Views/PromptActionView/PromptActionView.swift b/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/Views/PromptActionView/PromptActionView.swift
index 8304b3ac0b..372f25aa52 100644
--- a/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/Views/PromptActionView/PromptActionView.swift
+++ b/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/Views/PromptActionView/PromptActionView.swift
@@ -18,6 +18,7 @@
 
 import Foundation
 import SwiftUI
+import SwiftUIExtensions
 
 fileprivate extension View {
     func applyStepTitleAttributes() -> some View {
@@ -30,35 +31,6 @@ fileprivate extension View {
             .foregroundColor(Color(.defaultText))
     }
 
-    @ViewBuilder
-    func applyStepButtonAttributes(colorScheme: ColorScheme) -> some View {
-        switch colorScheme {
-        case .dark:
-            self.buttonStyle(.plain)
-                .padding(.horizontal, 12)
-                .padding(.vertical, 0)
-                .frame(height: 20, alignment: .center)
-                .background(Color(.onboardingButtonBackgroundColor))
-                .cornerRadius(5)
-                .shadow(color: .black.opacity(0.2), radius: 0.5, x: 0, y: 1)
-                .shadow(color: .black.opacity(0.05), radius: 0.5, x: 0, y: 0)
-                .shadow(color: .black.opacity(0.1), radius: 0, x: 0, y: 0)
-        default:
-            self.buttonStyle(.plain)
-                .padding(.horizontal, 12)
-                .padding(.vertical, 0)
-                .frame(height: 20, alignment: .center)
-                .background(Color(.onboardingButtonBackgroundColor))
-                .cornerRadius(5)
-                .shadow(color: .black.opacity(0.1), radius: 0.5, x: 0, y: 1)
-                .shadow(color: .black.opacity(0.05), radius: 0.5, x: 0, y: 0)
-                .overlay(
-                    RoundedRectangle(cornerRadius: 5)
-                        .inset(by: -0.25)
-                        .stroke(.black.opacity(0.1), lineWidth: 0.5)
-                )
-        }
-    }
 }
 
 struct PromptActionView: View {
@@ -95,7 +67,7 @@ struct PromptActionView: View {
                         .multilineText()
 
                         Button(model.actionTitle, action: model.action)
-                            .applyStepButtonAttributes(colorScheme: colorScheme)
+                            .keyboardShortcut(.defaultAction)
                             .padding(.top, 3)
                     }
 
diff --git a/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/Views/StatusView/NetworkProtectionStatusView.swift b/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/Views/StatusView/NetworkProtectionStatusView.swift
index aae033b17d..bc3caa84c3 100644
--- a/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/Views/StatusView/NetworkProtectionStatusView.swift
+++ b/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/Views/StatusView/NetworkProtectionStatusView.swift
@@ -82,7 +82,7 @@ public struct NetworkProtectionStatusView: View {
             bottomMenuView()
         }
         .padding(5)
-        .frame(maxWidth: 350, alignment: .top)
+        .frame(width: 350, alignment: .top)
         .transition(.slide)
     }
 
diff --git a/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/Views/StatusView/NetworkProtectionStatusViewModel.swift b/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/Views/StatusView/NetworkProtectionStatusViewModel.swift
index 7df51daf58..eb5509a68f 100644
--- a/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/Views/StatusView/NetworkProtectionStatusViewModel.swift
+++ b/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/Views/StatusView/NetworkProtectionStatusViewModel.swift
@@ -119,6 +119,7 @@ extension NetworkProtectionStatusView {
                     isMenuBarStatusView: Bool,
                     runLoopMode: RunLoop.Mode? = nil,
                     userDefaults: UserDefaults,
+                    locationFormatter: VPNLocationFormatting,
                     uninstallHandler: @escaping () async -> Void) {
 
             self.tunnelController = controller
@@ -135,6 +136,8 @@ extension NetworkProtectionStatusView {
             tunnelControllerViewModel = TunnelControllerViewModel(controller: tunnelController,
                                                                   onboardingStatusPublisher: onboardingStatusPublisher,
                                                                   statusReporter: statusReporter,
+                                                                  vpnSettings: .init(defaults: userDefaults),
+                                                                  locationFormatter: locationFormatter,
                                                                   appLauncher: appLauncher)
 
             connectionStatus = statusReporter.statusObserver.recentValue
diff --git a/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/Views/TunnelControllerView/TunnelControllerView.swift b/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/Views/TunnelControllerView/TunnelControllerView.swift
index 5f724d601d..c4ede6adeb 100644
--- a/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/Views/TunnelControllerView/TunnelControllerView.swift
+++ b/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/Views/TunnelControllerView/TunnelControllerView.swift
@@ -20,6 +20,7 @@ import SwiftUI
 import SwiftUIExtensions
 import Combine
 import NetworkProtection
+import Lottie
 
 fileprivate extension Font {
     enum NetworkProtection {
@@ -27,6 +28,14 @@ fileprivate extension Font {
             .system(size: 13, weight: .regular, design: .default)
         }
 
+        static var dataVolume: Font {
+            .system(size: 13, weight: .regular, design: .default)
+        }
+
+        static var location: Font {
+            .system(size: 13, weight: .regular, design: .default)
+        }
+
         static var content: Font {
             .system(size: 13, weight: .regular, design: .default)
         }
@@ -59,9 +68,12 @@ private enum Opacity {
         colorScheme == .light ? Double(0.6) : Double(0.5)
     }
 
+    static func dataVolume(colorScheme: ColorScheme) -> Double {
+        colorScheme == .light ? Double(0.6) : Double(0.5)
+    }
+
     static let content = Double(0.58)
     static let label = Double(0.9)
-    static let description = Double(0.9)
     static let link = Double(1)
 
     static func sectionHeader(colorScheme: ColorScheme) -> Double {
@@ -84,16 +96,25 @@ fileprivate extension View {
             .foregroundColor(Color(.defaultText))
     }
 
+    func applyDataVolumeAttributes(colorScheme: ColorScheme) -> some View {
+        opacity(Opacity.dataVolume(colorScheme: colorScheme))
+            .font(.NetworkProtection.dataVolume)
+            .foregroundColor(Color(.defaultText))
+    }
+
+    func applyLocationAttributes() -> some View {
+        font(.NetworkProtection.location)
+    }
+
     func applyContentAttributes(colorScheme: ColorScheme) -> some View {
         opacity(Opacity.content)
             .font(.NetworkProtection.content)
             .foregroundColor(Color(.defaultText))
     }
 
-    func applyDescriptionAttributes(colorScheme: ColorScheme) -> some View {
-        opacity(Opacity.description)
-            .font(.NetworkProtection.description)
-            .foregroundColor(Color(.defaultText))
+    func applyDescriptionAttributes() -> some View {
+        font(.NetworkProtection.description)
+            .foregroundColor(Color(.secondaryText))
     }
 
     func applyLabelAttributes(colorScheme: ColorScheme) -> some View {
@@ -151,6 +172,8 @@ public struct TunnelControllerView: View {
             Divider()
                 .padding(EdgeInsets(top: 5, leading: 9, bottom: 5, trailing: 9))
 
+            locationView()
+
             if model.showServerDetails {
                 connectionStatusView()
                     .disabled(on: !isEnabled)
@@ -164,26 +187,108 @@ public struct TunnelControllerView: View {
     ///
     private func headerView() -> some View {
         VStack(spacing: 0) {
-            HStack {
-                Spacer()
-                Image(model.mainImageAsset)
-                Spacer()
-            }
+            headerAnimationView()
+                .frame(width: 100, height: 75)
 
             Text(model.featureStatusDescription)
                 .applyTitleAttributes(colorScheme: colorScheme)
                 .padding([.top], 8)
                 .multilineText()
 
-            Text(UserText.networkProtectionStatusViewFeatureDesc)
+            Text(model.isToggleOn.wrappedValue ? UserText.networkProtectionStatusHeaderMessageOn : UserText.networkProtectionStatusHeaderMessageOff)
                 .multilineText()
                 .multilineTextAlignment(.center)
-                .applyDescriptionAttributes(colorScheme: colorScheme)
+                .applyDescriptionAttributes()
                 .fixedSize(horizontal: false, vertical: true)
                 .padding(EdgeInsets(top: 8, leading: 16, bottom: 16, trailing: 16))
         }
     }
 
+    @ViewBuilder
+    private func headerAnimationView() -> some View {
+        if colorScheme == .light {
+            headerAnimationView("vpn-light-mode")
+        } else {
+            headerAnimationView("vpn-dark-mode")
+        }
+    }
+
+    @ViewBuilder
+    private func headerAnimationView(_ animationName: String) -> some View {
+        LottieView(animation: .named(animationName))
+            .playing(withIntro: .init(
+                    skipIntro: model.isVPNEnabled && !model.isToggleDisabled,
+                    introStartFrame: 0,
+                    introEndFrame: 100,
+                    loopStartFrame: 130,
+                    loopEndFrame: 370
+                ), isAnimating: $model.isVPNEnabled)
+}
+
+    @ViewBuilder
+    private func statusBadge(isConnected: Bool) -> some View {
+        Circle()
+            .fill(isConnected ? .green : .yellow)
+            .frame(width: 8, height: 8)
+    }
+
+    /// Connected/Selected location
+    ///
+    private func locationView() -> some View {
+        VStack(alignment: .leading, spacing: 0) {
+            Text(model.isVPNEnabled ? UserText.vpnLocationConnected : UserText.vpnLocationSelected)
+                .applySectionHeaderAttributes(colorScheme: colorScheme)
+                .padding(EdgeInsets(top: 6, leading: 9, bottom: 6, trailing: 9))
+
+            MenuItemCustomButton {
+                model.showLocationSettings()
+                dismiss()
+            } label: { isHovered in
+                HStack(alignment: .center, spacing: 10) {
+                    if let emoji = model.emoji {
+                        Text(emoji)
+                            .font(.system(size: 13))
+                            .frame(width: 26, height: 26)
+                            .background(Color(hex: "B2B2B2").opacity(0.3))
+                            .clipShape(Circle())
+                    } else if model.wantsNearestLocation {
+                        ZStack {
+                            Circle()
+                                .fill(Color(hex: "B2B2B2").opacity(0.3))
+                                .frame(width: 26, height: 26)
+                            if isHovered {
+                                Image(NetworkProtectionAsset.nearestAvailable)
+                                    .renderingMode(.template)
+                                    .foregroundColor(.white)
+                                    .frame(width: 16, height: 16)
+                            } else {
+                                Image(NetworkProtectionAsset.nearestAvailable)
+                                    .renderingMode(colorScheme == .light ? .original : .template)
+                                    .frame(width: 16, height: 16)
+                            }
+                        }
+                    }
+                    if #available(macOS 12, *) {
+                        if isHovered {
+                            Text(model.plainLocation)
+                                .applyLocationAttributes()
+                                .foregroundColor(.white)
+                        } else {
+                            Text(model.formattedLocation(colorScheme: colorScheme))
+                                .applyLocationAttributes()
+                        }
+                    } else {
+                        Text(model.plainLocation)
+                            .applyLocationAttributes()
+                            .foregroundColor(isHovered ? .white: Color(.defaultText))
+                    }
+                }
+            }
+
+            dividerRow()
+        }
+    }
+
     /// Connection status: server IP address and location
     ///
     private func connectionStatusView() -> some View {
@@ -192,19 +297,11 @@ public struct TunnelControllerView: View {
                 .applySectionHeaderAttributes(colorScheme: colorScheme)
                 .padding(EdgeInsets(top: 6, leading: 9, bottom: 6, trailing: 9))
 
-            MenuItemButton(
-                iconName: .serverLocationIcon,
-                title: UserText.networkProtectionStatusViewLocation,
-                detailTitle: model.serverLocation,
-                textColor: Color(.defaultText)) {
-                    model.showLocationSettings()
-                    dismiss()
-            }.applyMenuAttributes()
-
-            connectionStatusRow(icon: .ipAddressIcon,
-                                title: UserText.networkProtectionStatusViewIPAddress,
+            connectionStatusRow(title: UserText.networkProtectionStatusViewIPAddress,
                                 details: model.serverAddress)
 
+            dataVolumeRow(title: UserText.vpnDataVolume, dataVolume: model.formattedDataVolume)
+
             dividerRow()
         }
     }
@@ -227,6 +324,8 @@ public struct TunnelControllerView: View {
 
                 Spacer(minLength: 8)
 
+                statusBadge(isConnected: model.isToggleOn.wrappedValue)
+
                 Text(model.connectionStatusDescription)
                     .applyTimerAttributes(colorScheme: colorScheme)
                     .fixedSize()
@@ -241,11 +340,8 @@ public struct TunnelControllerView: View {
         .padding(EdgeInsets(top: 3, leading: 9, bottom: 3, trailing: 9))
     }
 
-    private func connectionStatusRow(icon: NetworkProtectionAsset, title: String, details: String) -> some View {
+    private func connectionStatusRow(title: String, details: String) -> some View {
         HStack(spacing: 0) {
-            Image(icon)
-                .padding([.trailing], 8)
-
             Text(title)
                 .applyLabelAttributes(colorScheme: colorScheme)
                 .fixedSize()
@@ -257,6 +353,32 @@ public struct TunnelControllerView: View {
                 .applyConnectionStatusDetailAttributes(colorScheme: colorScheme)
                 .fixedSize()
         }
+        .padding(EdgeInsets(top: 6, leading: 10, bottom: 0, trailing: 9))
+    }
+
+    private func dataVolumeRow(title: String, dataVolume: TunnelControllerViewModel.FormattedDataVolume) -> some View {
+        HStack(spacing: 0) {
+            Text(title)
+                .applyLabelAttributes(colorScheme: colorScheme)
+                .fixedSize()
+
+            Spacer(minLength: 2)
+
+            Group {
+                Image(NetworkProtectionAsset.dataReceived)
+                    .renderingMode(colorScheme == .light ? .original : .template)
+                    .frame(width: 12, height: 12)
+                Text(dataVolume.dataReceived)
+                    .applyDataVolumeAttributes(colorScheme: colorScheme)
+                Image(NetworkProtectionAsset.dataSent)
+                    .renderingMode(colorScheme == .light ? .original : .template)
+                    .frame(width: 12, height: 12)
+                    .padding(.leading, 4)
+                Text(dataVolume.dataSent)
+                    .applyDataVolumeAttributes(colorScheme: colorScheme)
+            }
+            .fixedSize()
+        }
         .padding(EdgeInsets(top: 6, leading: 10, bottom: 6, trailing: 9))
     }
 }
diff --git a/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/Views/TunnelControllerView/TunnelControllerViewModel.swift b/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/Views/TunnelControllerView/TunnelControllerViewModel.swift
index f2dae8b810..5c63ecea7e 100644
--- a/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/Views/TunnelControllerView/TunnelControllerViewModel.swift
+++ b/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/Views/TunnelControllerView/TunnelControllerViewModel.swift
@@ -23,11 +23,20 @@ import SwiftUI
 
 @MainActor
 public final class TunnelControllerViewModel: ObservableObject {
+    public struct FormattedDataVolume: Equatable {
+        public let dataSent: String
+        public let dataReceived: String
+    }
 
     /// The NetP service.
     ///
     private let tunnelController: TunnelController
 
+    /// Whether the VPN is enabled
+    /// This is determined based on the connection status, same as the iOS version
+    @Published
+    public var isVPNEnabled = false
+
     /// The type of extension that's being used for NetP
     ///
     @Published
@@ -47,6 +56,17 @@ public final class TunnelControllerViewModel: ObservableObject {
     ///
     private let statusReporter: NetworkProtectionStatusReporter
 
+    private let vpnSettings: VPNSettings
+
+    private let locationFormatter: VPNLocationFormatting
+
+    private static let byteCountFormatter: ByteCountFormatter = {
+        let formatter = ByteCountFormatter()
+        formatter.allowsNonnumericFormatting = false
+        formatter.allowedUnits = [.useKB, .useMB, .useGB]
+        return formatter
+    }()
+
     private let appLauncher: AppLaunching
 
     // MARK: - Misc
@@ -61,23 +81,7 @@ public final class TunnelControllerViewModel: ObservableObject {
     private static let statusDispatchQueue = DispatchQueue(label: "com.duckduckgo.NetworkProtectionStatusView.statusDispatchQueue", qos: .userInteractive)
     private static let connectivityIssuesDispatchQueue = DispatchQueue(label: "com.duckduckgo.NetworkProtectionStatusView.connectivityIssuesDispatchQueue", qos: .userInteractive)
     private static let serverInfoDispatchQueue = DispatchQueue(label: "com.duckduckgo.NetworkProtectionStatusView.serverInfoDispatchQueue", qos: .userInteractive)
-
-    // MARK: - Feature Image
-
-    var mainImageAsset: NetworkProtectionAsset {
-        switch connectionStatus {
-        case .connected:
-            return .vpnEnabledImage
-        case .disconnecting:
-            if case .connected = previousConnectionStatus {
-                return .vpnEnabledImage
-            } else {
-                return .vpnDisabledImage
-            }
-        default:
-            return .vpnDisabledImage
-        }
-    }
+    private static let dataVolumeDispatchQueue = DispatchQueue(label: "com.duckduckgo.NetworkProtectionStatusView.dataVolumeDispatchQueue", qos: .userInteractive)
 
     // MARK: - Initialization & Deinitialization
 
@@ -85,17 +89,23 @@ public final class TunnelControllerViewModel: ObservableObject {
                 onboardingStatusPublisher: OnboardingStatusPublisher,
                 statusReporter: NetworkProtectionStatusReporter,
                 runLoopMode: RunLoop.Mode? = nil,
+                vpnSettings: VPNSettings,
+                locationFormatter: VPNLocationFormatting,
                 appLauncher: AppLaunching) {
 
         self.tunnelController = controller
         self.onboardingStatusPublisher = onboardingStatusPublisher
         self.statusReporter = statusReporter
         self.runLoopMode = runLoopMode
+        self.vpnSettings = vpnSettings
+        self.locationFormatter = locationFormatter
         self.appLauncher = appLauncher
 
         connectionStatus = statusReporter.statusObserver.recentValue
+        formattedDataVolume = statusReporter.dataVolumeObserver.recentValue.formatted(using: Self.byteCountFormatter)
         internalServerAddress = statusReporter.serverInfoObserver.recentValue.serverAddress
-        internalServerLocation = statusReporter.serverInfoObserver.recentValue.serverLocation?.serverLocation
+        internalServerAttributes = statusReporter.serverInfoObserver.recentValue.serverLocation
+        internalServerLocation = internalServerAttributes?.serverLocation
 
         // Particularly useful when unit testing with an initial status of our choosing.
         refreshInternalIsRunning()
@@ -103,6 +113,7 @@ public final class TunnelControllerViewModel: ObservableObject {
         subscribeToOnboardingStatusChanges()
         subscribeToStatusChanges()
         subscribeToServerInfoChanges()
+        subscribeToDataVolumeUpdates()
     }
 
     deinit {
@@ -130,6 +141,12 @@ public final class TunnelControllerViewModel: ObservableObject {
 
             Task { @MainActor in
                 self.connectionStatus = status
+                switch status {
+                case .connected, .connecting:
+                    self.isVPNEnabled = true
+                default:
+                    self.isVPNEnabled = false
+                }
             }
         }
             .store(in: &cancellables)
@@ -146,12 +163,22 @@ public final class TunnelControllerViewModel: ObservableObject {
 
             Task { @MainActor in
                 self.internalServerAddress = serverInfo.serverAddress
-                self.internalServerLocation = serverInfo.serverLocation?.serverLocation
+                self.internalServerAttributes = serverInfo.serverLocation
+                self.internalServerLocation = self.internalServerAttributes?.serverLocation
             }
         }
             .store(in: &cancellables)
     }
 
+    private func subscribeToDataVolumeUpdates() {
+        statusReporter.dataVolumeObserver.publisher
+            .subscribe(on: Self.dataVolumeDispatchQueue)
+            .map { $0.formatted(using: Self.byteCountFormatter) }
+            .receive(on: DispatchQueue.main)
+            .assign(to: \.formattedDataVolume, onWeaklyHeld: self)
+            .store(in: &cancellables)
+    }
+
     // MARK: - ON/OFF Toggle
 
     private func startTimer() {
@@ -273,9 +300,7 @@ public final class TunnelControllerViewModel: ObservableObject {
             } else if connectionStatus == .disconnecting {
                 toggleTransition = .switchingOff(locallyInitiated: false)
             }
-        case .switchingOn(let locallyInitiated), .switchingOff(let locallyInitiated):
-            guard !locallyInitiated else { break }
-
+        case .switchingOn, .switchingOff:
             if connectionStatus == .connecting {
                 toggleTransition = .switchingOn(locallyInitiated: false)
             } else if connectionStatus == .disconnecting {
@@ -437,6 +462,36 @@ public final class TunnelControllerViewModel: ObservableObject {
         }
     }
 
+    @Published
+    private var internalServerAttributes: NetworkProtectionServerInfo.ServerAttributes?
+
+    @Published
+    var formattedDataVolume: FormattedDataVolume
+
+    var wantsNearestLocation: Bool {
+        guard case .nearest = vpnSettings.selectedLocation else { return false }
+        return true
+    }
+
+    var emoji: String? {
+        locationFormatter.emoji(for: internalServerAttributes?.country,
+                                preferredLocation: vpnSettings.selectedLocation)
+    }
+
+    var plainLocation: String {
+        locationFormatter.string(from: internalServerLocation,
+                                 preferredLocation: vpnSettings.selectedLocation)
+    }
+
+    @available(macOS 12, *)
+    func formattedLocation(colorScheme: ColorScheme) -> AttributedString {
+        let opacity = colorScheme == .light ? Double(0.6) : Double(0.5)
+        return locationFormatter.string(from: internalServerLocation,
+                                        preferredLocation: vpnSettings.selectedLocation,
+                                        locationTextColor: Color(.defaultText),
+                                        preferredLocationTextColor: Color(.defaultText).opacity(opacity))
+    }
+
     // MARK: - Toggling VPN
 
     /// Start the VPN.
@@ -448,8 +503,6 @@ public final class TunnelControllerViewModel: ObservableObject {
 
         Task { @MainActor in
             await tunnelController.start()
-
-            toggleTransition = .idle
             refreshInternalIsRunning()
         }
     }
@@ -461,7 +514,6 @@ public final class TunnelControllerViewModel: ObservableObject {
 
         Task { @MainActor in
             await tunnelController.stop()
-            toggleTransition = .idle
             refreshInternalIsRunning()
         }
     }
@@ -478,3 +530,10 @@ public final class TunnelControllerViewModel: ObservableObject {
         }
     }
 }
+
+extension DataVolume {
+    func formatted(using formatter: ByteCountFormatter) -> TunnelControllerViewModel.FormattedDataVolume {
+        .init(dataSent: formatter.string(fromByteCount: bytesSent),
+              dataReceived: formatter.string(fromByteCount: bytesReceived))
+    }
+}
diff --git a/LocalPackages/NetworkProtectionMac/Tests/NetworkProtectionProxyTests/TransparentProxyControllerPixelTests.swift b/LocalPackages/NetworkProtectionMac/Tests/NetworkProtectionProxyTests/TransparentProxyControllerPixelTests.swift
index bd21fe50d1..5a87e778c4 100644
--- a/LocalPackages/NetworkProtectionMac/Tests/NetworkProtectionProxyTests/TransparentProxyControllerPixelTests.swift
+++ b/LocalPackages/NetworkProtectionMac/Tests/NetworkProtectionProxyTests/TransparentProxyControllerPixelTests.swift
@@ -55,13 +55,20 @@ final class TransparentProxyControllerPixelTests: XCTestCase {
     static let startInitiatedFullPixelName = "m_mac_vpn_proxy_controller_start_initiated"
     static let startSuccessFullPixelName = "m_mac_vpn_proxy_controller_start_success"
 
-    enum TestError: PixelKitEventErrorDetails {
+    enum TestError: CustomNSError {
         case testError
 
         static let underlyingError = NSError(domain: "test", code: 1)
 
-        var underlyingError: Error? {
-            Self.underlyingError
+        public var errorUserInfo: [String: Any] {
+            switch self {
+            case .testError(let underlyingError):
+                return [
+                    NSUnderlyingErrorKey: underlyingError as NSError
+                ]
+            default:
+                return [:]
+            }
         }
     }
 
diff --git a/LocalPackages/NetworkProtectionMac/Tests/NetworkProtectionUITests/MockVPNLocationFormatter.swift b/LocalPackages/NetworkProtectionMac/Tests/NetworkProtectionUITests/MockVPNLocationFormatter.swift
new file mode 100644
index 0000000000..05abc170a5
--- /dev/null
+++ b/LocalPackages/NetworkProtectionMac/Tests/NetworkProtectionUITests/MockVPNLocationFormatter.swift
@@ -0,0 +1,36 @@
+//
+//  MockVPNLocationFormatter.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 NetworkProtection
+
+struct MockVPNLocationFormatter: VPNLocationFormatting {
+    func emoji(for country: String?, preferredLocation someLocation: VPNSettings.SelectedLocation) -> String? {
+        nil
+    }
+
+    func string(from location: String?, preferredLocation: NetworkProtection.VPNSettings.SelectedLocation) -> String {
+        ""
+    }
+
+    @available(macOS 12, *)
+    func string(from location: String?, preferredLocation: NetworkProtection.VPNSettings.SelectedLocation, locationTextColor: Color, preferredLocationTextColor: Color) -> AttributedString {
+        ""
+    }
+}
diff --git a/LocalPackages/NetworkProtectionMac/Tests/NetworkProtectionUITests/NetworkProtectionAssetTests.swift b/LocalPackages/NetworkProtectionMac/Tests/NetworkProtectionUITests/NetworkProtectionAssetTests.swift
index 31f40a4ab6..b49d24d5b4 100644
--- a/LocalPackages/NetworkProtectionMac/Tests/NetworkProtectionUITests/NetworkProtectionAssetTests.swift
+++ b/LocalPackages/NetworkProtectionMac/Tests/NetworkProtectionUITests/NetworkProtectionAssetTests.swift
@@ -28,11 +28,12 @@ final class NetworkProtectionAssetTests: XCTestCase {
     ///
     func testAssetEnumValuesAreUnchanged() {
         let assetsAndExpectedRawValues: [NetworkProtectionAsset: String] = [
-            .ipAddressIcon: "IP-16",
-            .serverLocationIcon: "Server-Location-16",
-            .vpnDisabledImage: "VPN-Disabled-128",
-            .vpnEnabledImage: "VPN-128",
+            .vpnDisabledImage: "VPNDisabled",
+            .vpnEnabledImage: "VPN",
             .vpnIcon: "VPN-16",
+            .nearestAvailable: "VPNLocation",
+            .dataReceived: "VPNDownload",
+            .dataSent: "VPNUpload",
             .appleVaultIcon: "apple-vault-icon",
             .appleVPNIcon: "apple-vpn-icon",
             .appleSystemSettingsIcon: "apple-system-settings-icon",
diff --git a/LocalPackages/NetworkProtectionMac/Tests/NetworkProtectionUITests/NetworkProtectionStatusBarMenuTests.swift b/LocalPackages/NetworkProtectionMac/Tests/NetworkProtectionUITests/NetworkProtectionStatusBarMenuTests.swift
index 5b9e7e0dea..967f92c995 100644
--- a/LocalPackages/NetworkProtectionMac/Tests/NetworkProtectionUITests/NetworkProtectionStatusBarMenuTests.swift
+++ b/LocalPackages/NetworkProtectionMac/Tests/NetworkProtectionUITests/NetworkProtectionStatusBarMenuTests.swift
@@ -58,6 +58,7 @@ final class StatusBarMenuTests: XCTestCase {
             agentLoginItem: nil,
             isMenuBarStatusView: false,
             userDefaults: .standard,
+            locationFormatter: MockVPNLocationFormatter(),
             uninstallHandler: { })
 
         menu.show()
@@ -83,6 +84,7 @@ final class StatusBarMenuTests: XCTestCase {
             agentLoginItem: nil,
             isMenuBarStatusView: false,
             userDefaults: .standard,
+            locationFormatter: MockVPNLocationFormatter(),
             uninstallHandler: { })
 
         menu.hide()
diff --git a/LocalPackages/NetworkProtectionMac/Tests/NetworkProtectionUITests/Pixels/VPNPrivacyProPixelTests.swift b/LocalPackages/NetworkProtectionMac/Tests/NetworkProtectionUITests/Pixels/VPNPrivacyProPixelTests.swift
index 05e05a5827..21d5472f49 100644
--- a/LocalPackages/NetworkProtectionMac/Tests/NetworkProtectionUITests/Pixels/VPNPrivacyProPixelTests.swift
+++ b/LocalPackages/NetworkProtectionMac/Tests/NetworkProtectionUITests/Pixels/VPNPrivacyProPixelTests.swift
@@ -61,10 +61,12 @@ final class VPNPrivacyProPixelTests: XCTestCase {
     ///
     func testVPNPixelFireExpectations() {
         fire(VPNPrivacyProPixel.vpnAccessRevokedDialogShown,
+             frequency: .dailyAndCount,
              and: .expect(pixelName: "m_mac_vpn_access_revoked_dialog_shown"),
              file: #filePath,
              line: #line)
         fire(VPNPrivacyProPixel.vpnBetaStoppedWhenPrivacyProEnabled,
+             frequency: .dailyAndCount,
              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 83caf2cff6..e7785da3f4 100644
--- a/LocalPackages/NetworkProtectionMac/Tests/NetworkProtectionUITests/TunnelControllerViewModelTests.swift
+++ b/LocalPackages/NetworkProtectionMac/Tests/NetworkProtectionUITests/TunnelControllerViewModelTests.swift
@@ -36,12 +36,14 @@ final class TunnelControllerViewModelTests: XCTestCase {
         let connectionErrorObserver: ConnectionErrorObserver
         let connectivityIssuesObserver: ConnectivityIssueObserver
         let controllerErrorMessageObserver: ControllerErrorMesssageObserver
+        let dataVolumeObserver: DataVolumeObserver
 
         init(status: ConnectionStatus,
              isHavingConnectivityIssues: Bool = false,
              serverInfo: NetworkProtectionStatusServerInfo = MockStatusReporter.defaultServerInfo,
              tunnelErrorMessage: String? = nil,
-             controllerErrorMessage: String? = nil) {
+             controllerErrorMessage: String? = nil,
+             dataVolume: DataVolume = .init()) {
 
             let mockStatusObserver = MockConnectionStatusObserver()
             mockStatusObserver.subject.send(status)
@@ -62,6 +64,10 @@ final class TunnelControllerViewModelTests: XCTestCase {
             let mockControllerErrorMessageObserver = MockControllerErrorMesssageObserver()
             mockControllerErrorMessageObserver.subject.send(controllerErrorMessage)
             controllerErrorMessageObserver = mockControllerErrorMessageObserver
+
+            let mockDataVolumeObserver = MockDataVolumeObserver()
+            mockDataVolumeObserver.subject.send(dataVolume)
+            dataVolumeObserver = mockDataVolumeObserver
         }
 
         func forceRefresh() {
@@ -104,6 +110,8 @@ final class TunnelControllerViewModelTests: XCTestCase {
             controller: controller,
             onboardingStatusPublisher: Just(OnboardingStatus.completed).eraseToAnyPublisher(),
             statusReporter: statusReporter,
+            vpnSettings: .init(defaults: .standard),
+            locationFormatter: MockVPNLocationFormatter(),
             appLauncher: MockAppLauncher())
 
         let isToggleOn = model.isToggleOn.wrappedValue
@@ -124,6 +132,8 @@ final class TunnelControllerViewModelTests: XCTestCase {
             controller: controller,
             onboardingStatusPublisher: Just(OnboardingStatus.completed).eraseToAnyPublisher(),
             statusReporter: statusReporter,
+            vpnSettings: .init(defaults: .standard),
+            locationFormatter: MockVPNLocationFormatter(),
             appLauncher: MockAppLauncher())
 
         XCTAssertEqual(model.connectionStatusDescription, UserText.networkProtectionStatusDisconnecting)
@@ -151,6 +161,8 @@ final class TunnelControllerViewModelTests: XCTestCase {
             controller: controller,
             onboardingStatusPublisher: Just(OnboardingStatus.completed).eraseToAnyPublisher(),
             statusReporter: statusReporter,
+            vpnSettings: .init(defaults: .standard),
+            locationFormatter: MockVPNLocationFormatter(),
             appLauncher: MockAppLauncher())
 
         let isToggleOn = model.isToggleOn.wrappedValue
@@ -160,7 +172,7 @@ final class TunnelControllerViewModelTests: XCTestCase {
         XCTAssertEqual(model.featureStatusDescription, UserText.networkProtectionStatusViewFeatureOn)
         XCTAssertTrue(model.showServerDetails)
         XCTAssertEqual(model.serverAddress, mockServerIP)
-        XCTAssertEqual(model.serverLocation, "El Segundo, CA...")
+        XCTAssertEqual(model.serverLocation, "El Segundo, United States...")
     }
 
     /// We expect the model to properly reflect the connecting status.
@@ -173,6 +185,8 @@ final class TunnelControllerViewModelTests: XCTestCase {
             controller: controller,
             onboardingStatusPublisher: Just(OnboardingStatus.completed).eraseToAnyPublisher(),
             statusReporter: statusReporter,
+            vpnSettings: .init(defaults: .standard),
+            locationFormatter: MockVPNLocationFormatter(),
             appLauncher: MockAppLauncher())
 
         XCTAssertEqual(model.connectionStatusDescription, UserText.networkProtectionStatusConnecting)
@@ -181,6 +195,24 @@ final class TunnelControllerViewModelTests: XCTestCase {
         XCTAssertFalse(model.showServerDetails)
     }
 
+    /// We expect the model to properly reflect the data volume.
+    ///
+    @MainActor
+    func testProperlyReflectsDataVolume() async throws {
+        let controller = MockTunnelController()
+        let statusReporter = MockStatusReporter(status: .connected(connectedDate: Date()),
+                                                dataVolume: .init(bytesSent: 512000, bytesReceived: 1024000))
+        let model = TunnelControllerViewModel(
+            controller: controller,
+            onboardingStatusPublisher: Just(OnboardingStatus.completed).eraseToAnyPublisher(),
+            statusReporter: statusReporter,
+            vpnSettings: .init(defaults: .standard),
+            locationFormatter: MockVPNLocationFormatter(),
+            appLauncher: MockAppLauncher())
+
+        XCTAssertEqual(model.formattedDataVolume, .init(dataSent: "512 KB", dataReceived: "1 MB"))
+    }
+
     /// We expect that setting the model's `isRunning` to `true`, will start the VPN.
     ///
     @MainActor
@@ -191,6 +223,8 @@ final class TunnelControllerViewModelTests: XCTestCase {
             controller: controller,
             onboardingStatusPublisher: Just(OnboardingStatus.completed).eraseToAnyPublisher(),
             statusReporter: statusReporter,
+            vpnSettings: .init(defaults: .standard),
+            locationFormatter: MockVPNLocationFormatter(),
             appLauncher: MockAppLauncher())
         let networkProtectionWasStarted = expectation(description: "The model started the VPN when appropriate")
 
@@ -221,6 +255,8 @@ final class TunnelControllerViewModelTests: XCTestCase {
             controller: controller,
             onboardingStatusPublisher: Just(OnboardingStatus.completed).eraseToAnyPublisher(),
             statusReporter: statusReporter,
+            vpnSettings: .init(defaults: .standard),
+            locationFormatter: MockVPNLocationFormatter(),
             appLauncher: MockAppLauncher())
 
         let networkProtectionWasStopped = expectation(description: "The model stopped the VPN when appropriate")
diff --git a/LocalPackages/PixelKit/.gitignore b/LocalPackages/PixelKit/.gitignore
deleted file mode 100644
index 3b29812086..0000000000
--- a/LocalPackages/PixelKit/.gitignore
+++ /dev/null
@@ -1,9 +0,0 @@
-.DS_Store
-/.build
-/Packages
-/*.xcodeproj
-xcuserdata/
-DerivedData/
-.swiftpm/config/registries.json
-.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
-.netrc
diff --git a/LocalPackages/PixelKit/.swiftpm/xcode/package.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/LocalPackages/PixelKit/.swiftpm/xcode/package.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
deleted file mode 100644
index 18d981003d..0000000000
--- a/LocalPackages/PixelKit/.swiftpm/xcode/package.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>IDEDidComputeMac32BitWarning</key>
-	<true/>
-</dict>
-</plist>
diff --git a/LocalPackages/PixelKit/Package.swift b/LocalPackages/PixelKit/Package.swift
deleted file mode 100644
index 6a7ff1cc6f..0000000000
--- a/LocalPackages/PixelKit/Package.swift
+++ /dev/null
@@ -1,54 +0,0 @@
-// swift-tools-version: 5.7
-// The swift-tools-version declares the minimum version of Swift required to build this package.
-
-import PackageDescription
-
-let package = Package(
-    name: "PixelKit",
-    platforms: [
-        .macOS("11.4")
-    ],
-    products: [
-        // Products define the executables and libraries a package produces, and make them visible to other packages.
-        .library(
-            name: "PixelKit",
-            targets: ["PixelKit"]
-        ),
-        .library(
-            name: "PixelKitTestingUtilities",
-            targets: ["PixelKitTestingUtilities"]
-        )
-    ],
-    dependencies: [
-        .package(url: "https://github.com/duckduckgo/apple-toolbox.git", exact: "2.0.0"),
-    ],
-    targets: [
-        .target(
-            name: "PixelKit",
-            dependencies: [
-            ],
-            swiftSettings: [
-                .define("DEBUG", .when(configuration: .debug)),
-            ],
-            plugins: [.plugin(name: "SwiftLintPlugin", package: "apple-toolbox")]
-        ),
-        .testTarget(
-            name: "PixelKitTests",
-            dependencies: [
-                "PixelKit",
-                "PixelKitTestingUtilities",
-            ],
-            swiftSettings: [
-                .define("DEBUG", .when(configuration: .debug))
-            ],
-            plugins: [.plugin(name: "SwiftLintPlugin", package: "apple-toolbox")]
-        ),
-        .target(
-            name: "PixelKitTestingUtilities",
-            dependencies: [
-                "PixelKit",
-            ],
-            plugins: [.plugin(name: "SwiftLintPlugin", package: "apple-toolbox")]
-        )
-    ]
-)
diff --git a/LocalPackages/PixelKit/README.md b/LocalPackages/PixelKit/README.md
deleted file mode 100644
index 9d5094a7d8..0000000000
--- a/LocalPackages/PixelKit/README.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# PixelKit
-
-This package is meant to provide basic support for firing pixel across different targets.
-
-This package was designed to not really know specific pixels.  Those can be defined
-individually by each target importing this package, or through more specialized
-shared packages. 
-
-This design decision is meant to make PixelKit lean and to make it possible to use it
-for future apps we may decide to make, without it having to carry over all of the business
-domain logic for any single app.
diff --git a/LocalPackages/PixelKit/Sources/PixelKit/PixelKit+Parameters.swift b/LocalPackages/PixelKit/Sources/PixelKit/PixelKit+Parameters.swift
deleted file mode 100644
index e368d38db5..0000000000
--- a/LocalPackages/PixelKit/Sources/PixelKit/PixelKit+Parameters.swift
+++ /dev/null
@@ -1,113 +0,0 @@
-//
-//  PixelKit+Parameters.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
-
-public extension PixelKit {
-
-    enum Parameters: Hashable {
-        public static let duration = "duration"
-        public static let test = "test"
-        public static let appVersion = "appVersion"
-        public static let pixelSource = "pixelSource"
-        public static let osMajorVersion = "osMajorVersion"
-
-        public static let errorCode = "e"
-        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 = "ud"
-        public static let underlyingErrorSQLiteCode = "sqlrc"
-        public static let underlyingErrorSQLiteExtendedCode = "sqlerc"
-
-        public static let keychainFieldName = "fieldName"
-        public static let keychainErrorCode = "keychain_error_code"
-
-        public static let emailCohort = "cohort"
-        public static let emailLastUsed = "duck_address_last_used"
-
-        public static let assertionMessage = "message"
-        public static let assertionFile = "file"
-        public static let assertionLine = "line"
-
-        public static let function = "function"
-        public static let line = "line"
-
-        public static let latency = "latency"
-        public static let server = "server"
-        public static let networkType = "net_type"
-
-        // Pixel experiments
-        public static let experimentCohort = "cohort"
-
-        // Dashboard
-        public static let dashboardTriggerOrigin = "trigger_origin"
-
-        // VPN
-        public static let vpnBreakageCategory = "breakageCategory"
-        public static let vpnBreakageDescription = "breakageDescription"
-        public static let vpnBreakageMetadata = "breakageMetadata"
-
-        public static let reason = "reason"
-    }
-
-    enum Values {
-        public static let test = "1"
-    }
-
-}
-
-public protocol ErrorWithPixelParameters {
-
-    var errorParameters: [String: String] { get }
-
-}
-
-public extension Error {
-
-    var pixelParameters: [String: String] {
-        var params = [String: String]()
-
-        if let errorWithUserInfo = self as? ErrorWithPixelParameters {
-            params = errorWithUserInfo.errorParameters
-        }
-
-        let nsError = self as NSError
-
-        params[PixelKit.Parameters.errorCode] = "\(nsError.code)"
-        params[PixelKit.Parameters.errorDomain] = nsError.domain
-
-        if let underlyingError = nsError.userInfo[NSUnderlyingErrorKey] as? NSError {
-            params[PixelKit.Parameters.underlyingErrorCode] = "\(underlyingError.code)"
-            params[PixelKit.Parameters.underlyingErrorDomain] = underlyingError.domain
-        }
-
-        if let sqlErrorCode = nsError.userInfo["SQLiteResultCode"] as? NSNumber {
-            params[PixelKit.Parameters.underlyingErrorSQLiteCode] = "\(sqlErrorCode.intValue)"
-        }
-
-        if let sqlExtendedErrorCode = nsError.userInfo["SQLiteExtendedResultCode"] as? NSNumber {
-            params[PixelKit.Parameters.underlyingErrorSQLiteExtendedCode] = "\(sqlExtendedErrorCode.intValue)"
-        }
-
-        return params
-    }
-
-}
diff --git a/LocalPackages/PixelKit/Sources/PixelKit/PixelKit.swift b/LocalPackages/PixelKit/Sources/PixelKit/PixelKit.swift
deleted file mode 100644
index ea94093fcb..0000000000
--- a/LocalPackages/PixelKit/Sources/PixelKit/PixelKit.swift
+++ /dev/null
@@ -1,398 +0,0 @@
-//
-//  PixelKit.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 os.log // swiftlint:disable:this enforce_os_log_wrapper
-
-public final class PixelKit {
-    /// `true` if a request is fired, `false` otherwise
-    public typealias CompletionBlock = (Bool, Error?) -> Void
-
-    /// The frequency with which a pixel is sent to our endpoint.
-    ///
-    public enum Frequency {
-        /// The default frequency for pixels. This fires pixels with the event names as-is.
-        case standard
-
-        /// Sent only once ever. The timestamp for this pixel is stored. Name for pixels of this type must end with `_u`.
-        case justOnce
-
-        /// Sent once per day. The last timestamp for this pixel is stored and compared to the current date. Pixels of this type will have `_d` appended to their name.
-        case dailyOnly
-
-        /// Sent once per day with a `_d` suffix, in addition to every time it is called with a `_c` suffix.
-        /// This means a pixel will get sent twice the first time it is called per-day, and subsequent calls that day will only send the `_c` variant.
-        /// This is useful in situations where pixels receive spikes in volume, as the daily pixel can be used to determine how many users are actually affected.
-        case dailyAndContinuous
-    }
-
-    public enum Header {
-        public static let acceptEncoding = "Accept-Encoding"
-        public static let acceptLanguage = "Accept-Language"
-        public static let userAgent = "User-Agent"
-        public static let ifNoneMatch = "If-None-Match"
-        public static let moreInfo = "X-DuckDuckGo-MoreInfo"
-        public static let client = "X-DuckDuckGo-Client"
-    }
-
-    /// A closure typealias to request sending pixels through the network.
-    ///
-    public typealias FireRequest = (
-        _ pixelName: String,
-        _ headers: [String: String],
-        _ parameters: [String: String],
-        _ allowedQueryReservedCharacters: CharacterSet?,
-        _ callBackOnMainThread: Bool,
-        _ onComplete: @escaping CompletionBlock) -> Void
-
-    public typealias Event = PixelKitEvent
-
-    public static let duckDuckGoMorePrivacyInfo = URL(string: "https://help.duckduckgo.com/duckduckgo-help-pages/privacy/atb/")!
-
-    private let defaults: UserDefaults
-
-    private static let defaultDailyPixelCalendar: Calendar = {
-        var calendar = Calendar.current
-        calendar.timeZone = TimeZone(secondsFromGMT: 0)!
-        return calendar
-    }()
-
-    private var dateFormatter: DateFormatter = {
-        let dateFormatter = DateFormatter()
-        dateFormatter.calendar = defaultDailyPixelCalendar
-        dateFormatter.timeZone = defaultDailyPixelCalendar.timeZone
-        dateFormatter.dateFormat = "yyyy-MM-dd"
-        return dateFormatter
-    }()
-
-    private let dateGenerator: () -> Date
-
-    public private(set) static var shared: PixelKit?
-    private let appVersion: String
-    private let defaultHeaders: [String: String]
-    private let log: OSLog
-    private let fireRequest: FireRequest
-
-    /// Sets up PixelKit for the entire app.
-    ///
-    /// - Parameters:
-    /// - `dryRun`: if `true`, simulate requests and "send" them at an accelerated rate (once every 2 minutes instead of once a day)
-    /// - `source`: if set, adds a `pixelSource` parameter to the pixel call; this can be used to specify which target is sending the pixel
-    /// - `fireRequest`: this is not triggered when `dryRun` is `true`
-    public static func setUp(dryRun: Bool = false,
-                             appVersion: String,
-                             source: String? = nil,
-                             defaultHeaders: [String: String],
-                             log: OSLog,
-                             defaults: UserDefaults,
-                             fireRequest: @escaping FireRequest) {
-        shared = PixelKit(dryRun: dryRun,
-                          appVersion: appVersion,
-                          source: source,
-                          defaultHeaders: defaultHeaders,
-                          log: log,
-                          defaults: defaults,
-                          fireRequest: fireRequest)
-    }
-
-    static func tearDown() {
-        shared = nil
-    }
-
-    private var dryRun: Bool
-    private let source: String?
-    private let pixelCalendar: Calendar
-
-    init(dryRun: Bool,
-         appVersion: String,
-         source: String? = nil,
-         defaultHeaders: [String: String],
-         log: OSLog,
-         dailyPixelCalendar: Calendar? = nil,
-         dateGenerator: @escaping () -> Date = Date.init,
-         defaults: UserDefaults,
-         fireRequest: @escaping FireRequest) {
-
-        self.dryRun = dryRun
-        self.appVersion = appVersion
-        self.source = source
-        self.defaultHeaders = defaultHeaders
-        self.log = log
-        self.pixelCalendar = dailyPixelCalendar ?? Self.defaultDailyPixelCalendar
-        self.dateGenerator = dateGenerator
-        self.defaults = defaults
-        self.fireRequest = fireRequest
-    }
-
-    // swiftlint:disable:next cyclomatic_complexity
-    private func fire(pixelNamed pixelName: String,
-                      frequency: Frequency,
-                      withHeaders headers: [String: String]?,
-                      withAdditionalParameters params: [String: String]?,
-                      withError error: Error?,
-                      allowedQueryReservedCharacters: CharacterSet?,
-                      includeAppVersionParameter: Bool,
-                      onComplete: @escaping CompletionBlock) {
-
-        var newParams = params ?? [:]
-
-        if includeAppVersionParameter {
-            newParams[Parameters.appVersion] = appVersion
-        }
-
-        if let source {
-            newParams[Parameters.pixelSource] = source
-        }
-
-        if let error {
-            newParams.appendErrorPixelParams(error: error)
-        }
-
-        #if DEBUG
-            newParams[Parameters.test] = Values.test
-        #endif
-
-        var headers = headers ?? defaultHeaders
-        headers[Header.moreInfo] = "See " + Self.duckDuckGoMorePrivacyInfo.absoluteString
-        headers[Header.client] = "macOS"
-
-        switch frequency {
-        case .standard:
-            fireRequestWrapper(pixelName, headers, newParams, allowedQueryReservedCharacters, true, onComplete)
-        case .justOnce:
-            guard pixelName.hasSuffix("_u") else {
-                assertionFailure("Unique pixel: must end with _u")
-                return
-            }
-            if !pixelHasBeenFiredEver(pixelName) {
-                fireRequestWrapper(pixelName, headers, newParams, allowedQueryReservedCharacters, true, onComplete)
-                updatePixelLastFireDate(pixelName: pixelName)
-            } else {
-                printDebugInfo(pixelName: pixelName, parameters: newParams, skipped: true)
-            }
-        case .dailyOnly:
-            if !pixelHasBeenFiredToday(pixelName) {
-                fireRequestWrapper(pixelName + "_d", headers, newParams, allowedQueryReservedCharacters, true, onComplete)
-                updatePixelLastFireDate(pixelName: pixelName)
-            } else {
-                printDebugInfo(pixelName: pixelName + "_d", parameters: newParams, skipped: true)
-            }
-        case .dailyAndContinuous:
-            if !pixelHasBeenFiredToday(pixelName) {
-                fireRequestWrapper(pixelName + "_d", headers, newParams, allowedQueryReservedCharacters, true, onComplete)
-                updatePixelLastFireDate(pixelName: pixelName)
-            } else {
-                printDebugInfo(pixelName: pixelName + "_d", parameters: newParams, skipped: true)
-            }
-
-            fireRequestWrapper(pixelName + "_c", headers, newParams, allowedQueryReservedCharacters, true, onComplete)
-        }
-    }
-
-    private func printDebugInfo(pixelName: String, parameters: [String: String], skipped: Bool = false) {
-#if DEBUG
-        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
-    }
-
-    private func fireRequestWrapper(
-        _ pixelName: String,
-        _ headers: [String: String],
-        _ parameters: [String: String],
-        _ allowedQueryReservedCharacters: CharacterSet?,
-        _ callBackOnMainThread: Bool,
-        _ onComplete: @escaping CompletionBlock) {
-        guard !dryRun else {
-            printDebugInfo(pixelName: pixelName, parameters: parameters)
-
-            // simulate server response time for Dry Run mode
-            DispatchQueue.main.asyncAfter(deadline: .now() + 0.1) {
-                onComplete(true, nil)
-            }
-
-            return
-        }
-
-        fireRequest(pixelName, headers, parameters, allowedQueryReservedCharacters, callBackOnMainThread, onComplete)
-    }
-
-    private func prefixedName(for event: Event) -> String {
-        if event.name.hasPrefix("m_mac_") {
-            return event.name
-        }
-
-        if let debugEvent = event as? DebugEvent {
-            return "m_mac_debug_\(debugEvent.name)"
-        } else {
-            return "m_mac_\(event.name)"
-        }
-    }
-
-    public func fire(_ event: Event,
-                     frequency: Frequency = .standard,
-                     withHeaders headers: [String: String]? = nil,
-                     withAdditionalParameters params: [String: String]? = nil,
-                     withError error: Error? = nil,
-                     allowedQueryReservedCharacters: CharacterSet? = nil,
-                     includeAppVersionParameter: Bool = true,
-                     onComplete: @escaping CompletionBlock = { _, _ in }) {
-
-        let pixelName = prefixedName(for: event)
-
-        if !dryRun {
-            if frequency == .dailyOnly, pixelHasBeenFiredToday(pixelName) {
-                onComplete(false, nil)
-                return
-            } else if frequency == .justOnce, pixelHasBeenFiredEver(pixelName) {
-                onComplete(false, nil)
-                return
-            }
-        }
-
-        let newParams: [String: String]?
-        switch (event.parameters, params) {
-        case (.some(let parameters), .none):
-            newParams = parameters
-        case (.none, .some(let parameters)):
-            newParams = parameters
-        case (.some(let params1), .some(let params2)):
-            newParams = params1.merging(params2) { $1 }
-        case (.none, .none):
-            newParams = nil
-        }
-
-        let newError: Error?
-
-        if let event = event as? PixelKitEventV2 {
-            // For v2 events we only consider the error specified in the event
-            // and purposedly ignore the parameter in this call.
-            // This is to encourage moving the error over to the protocol error
-            // instead of still relying on the parameter of this call.
-            newError = event.error
-        } else {
-            newError = error
-        }
-
-        fire(pixelNamed: pixelName,
-             frequency: frequency,
-             withHeaders: headers,
-             withAdditionalParameters: newParams,
-             withError: newError,
-             allowedQueryReservedCharacters: allowedQueryReservedCharacters,
-             includeAppVersionParameter: includeAppVersionParameter,
-             onComplete: onComplete)
-    }
-
-    public static func fire(_ event: Event,
-                            frequency: Frequency = .standard,
-                            withHeaders headers: [String: String] = [:],
-                            withAdditionalParameters parameters: [String: String]? = nil,
-                            withError error: Error? = nil,
-                            allowedQueryReservedCharacters: CharacterSet? = nil,
-                            includeAppVersionParameter: Bool = true,
-                            onComplete: @escaping CompletionBlock = { _, _ in }) {
-
-        Self.shared?.fire(event,
-                          frequency: frequency,
-                          withHeaders: headers,
-                          withAdditionalParameters: parameters,
-                          withError: error,
-                          allowedQueryReservedCharacters: allowedQueryReservedCharacters,
-                          includeAppVersionParameter: includeAppVersionParameter,
-                          onComplete: onComplete)
-    }
-
-    private func dateString(for date: Date?) -> String? {
-        guard let date else { return nil }
-        return dateFormatter.string(from: date)
-    }
-
-    public static func dateString(for date: Date?) -> String {
-        Self.shared?.dateString(for: date) ?? ""
-    }
-
-    public static func pixelLastFireDate(event: Event) -> Date? {
-        Self.shared?.pixelLastFireDate(event: event)
-    }
-
-    public func pixelLastFireDate(pixelName: String) -> Date? {
-        defaults.object(forKey: userDefaultsKeyName(forPixelName: pixelName)) as? Date
-    }
-
-    public func pixelLastFireDate(event: Event) -> Date? {
-        pixelLastFireDate(pixelName: prefixedName(for: event))
-    }
-
-    private func updatePixelLastFireDate(pixelName: String) {
-        defaults.set(dateGenerator(), forKey: userDefaultsKeyName(forPixelName: pixelName))
-    }
-
-    private func pixelHasBeenFiredToday(_ name: String) -> Bool {
-        guard !dryRun else {
-            if let lastFireDate = pixelLastFireDate(pixelName: name),
-               let twoMinsAgo = pixelCalendar.date(byAdding: .minute, value: -2, to: dateGenerator()) {
-                return lastFireDate >= twoMinsAgo
-            }
-
-            return false
-        }
-
-        if let lastFireDate = pixelLastFireDate(pixelName: name) {
-            return pixelCalendar.isDate(dateGenerator(), inSameDayAs: lastFireDate)
-        }
-
-        return false
-    }
-
-    private func pixelHasBeenFiredEver(_ name: String) -> Bool {
-        pixelLastFireDate(pixelName: name) != nil
-    }
-
-    private func userDefaultsKeyName(forPixelName pixelName: String) -> String {
-        dryRun
-            ? "com.duckduckgo.network-protection.pixel.\(pixelName).dry-run"
-            : "com.duckduckgo.network-protection.pixel.\(pixelName)"
-    }
-
-}
-
-extension Dictionary where Key == String, Value == String {
-
-    mutating func appendErrorPixelParams(error: Error) {
-        let nsError = error as NSError
-
-        self[PixelKit.Parameters.errorCode] = "\(nsError.code)"
-        self[PixelKit.Parameters.errorDomain] = nsError.domain
-
-        if let error = error as? PixelKitEventErrorDetails,
-           let underlyingError = error.underlyingError {
-
-            let underlyingNSError = underlyingError as NSError
-            self[PixelKit.Parameters.underlyingErrorCode] = "\(underlyingNSError.code)"
-            self[PixelKit.Parameters.underlyingErrorDomain] = underlyingNSError.domain
-        } else if let underlyingError = nsError.userInfo["NSUnderlyingError"] as? NSError {
-            self[PixelKit.Parameters.underlyingErrorCode] = "\(underlyingError.code)"
-            self[PixelKit.Parameters.underlyingErrorDomain] = underlyingError.domain
-        } else if let sqlErrorCode = nsError.userInfo["NSSQLiteErrorDomain"] as? NSNumber {
-            self[PixelKit.Parameters.underlyingErrorCode] = "\(sqlErrorCode.intValue)"
-            self[PixelKit.Parameters.underlyingErrorDomain] = "NSSQLiteErrorDomain"
-        }
-    }
-
-}
diff --git a/LocalPackages/PixelKit/Sources/PixelKit/PixelKitEvent.swift b/LocalPackages/PixelKit/Sources/PixelKit/PixelKitEvent.swift
deleted file mode 100644
index ca352f3347..0000000000
--- a/LocalPackages/PixelKit/Sources/PixelKit/PixelKitEvent.swift
+++ /dev/null
@@ -1,100 +0,0 @@
-//
-//  PixelKitEvent.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
-
-/// An event that can be fired using PixelKit.
-///
-public protocol PixelKitEvent {
-    var name: String { get }
-    var parameters: [String: String]? { get }
-}
-
-/// Implementation of ``PixelKitEvent`` with specific logic for debug events.
-///
-public final class DebugEvent: PixelKitEvent {
-    public enum EventType {
-        case assertionFailure(message: String, file: StaticString, line: UInt)
-        case custom(_ event: PixelKitEvent)
-    }
-
-    public let eventType: EventType
-    public let error: Error?
-
-    public init(eventType: EventType, error: Error? = nil) {
-        self.eventType = eventType
-        self.error = error
-    }
-
-    public init(_ event: PixelKitEvent, error: Error? = nil) {
-        self.eventType = .custom(event)
-        self.error = error
-    }
-
-    public var name: String {
-        switch eventType {
-        case .assertionFailure:
-            return "assertion_failure"
-        case .custom(let event):
-            return event.name
-        }
-    }
-
-    public var parameters: [String: String]? {
-        var params: [String: String]
-
-        if case let .custom(event) = eventType,
-           let eventParams = event.parameters {
-            params = eventParams
-        } else {
-            params = [String: String]()
-        }
-
-        if let errorWithUserInfo = error as? ErrorWithPixelParameters {
-            params = errorWithUserInfo.errorParameters
-        }
-
-        if case let .assertionFailure(message, file, line) = eventType {
-            params[PixelKit.Parameters.assertionMessage] = message
-            params[PixelKit.Parameters.assertionFile] = String(file)
-            params[PixelKit.Parameters.assertionLine] = String(line)
-        }
-
-        if let error = error {
-            let nsError = error as NSError
-
-            params[PixelKit.Parameters.errorCode] = "\(nsError.code)"
-            params[PixelKit.Parameters.errorDomain] = nsError.domain
-
-            if let underlyingError = nsError.userInfo["NSUnderlyingError"] as? NSError {
-                params[PixelKit.Parameters.underlyingErrorCode] = "\(underlyingError.code)"
-                params[PixelKit.Parameters.underlyingErrorDomain] = underlyingError.domain
-            }
-
-            if let sqlErrorCode = nsError.userInfo["SQLiteResultCode"] as? NSNumber {
-                params[PixelKit.Parameters.underlyingErrorSQLiteCode] = "\(sqlErrorCode.intValue)"
-            }
-
-            if let sqlExtendedErrorCode = nsError.userInfo["SQLiteExtendedResultCode"] as? NSNumber {
-                params[PixelKit.Parameters.underlyingErrorSQLiteExtendedCode] = "\(sqlExtendedErrorCode.intValue)"
-            }
-        }
-
-        return params
-    }
-}
diff --git a/LocalPackages/PixelKit/Sources/PixelKit/PixelKitEventV2.swift b/LocalPackages/PixelKit/Sources/PixelKit/PixelKitEventV2.swift
deleted file mode 100644
index 811bf4643d..0000000000
--- a/LocalPackages/PixelKit/Sources/PixelKit/PixelKitEventV2.swift
+++ /dev/null
@@ -1,69 +0,0 @@
-//
-//  PixelKitEventV2.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
-
-public protocol PixelKitEventErrorDetails: Error {
-    var underlyingError: Error? { get }
-}
-
-extension PixelKitEventErrorDetails {
-    var underlyingErrorParameters: [String: String] {
-        guard let nsError = underlyingError as? NSError else {
-            return [:]
-        }
-
-        return [
-            PixelKit.Parameters.underlyingErrorCode: "\(nsError.code)",
-            PixelKit.Parameters.underlyingErrorDomain: nsError.domain
-        ]
-    }
-}
-
-/// New version of this protocol that allows us to maintain backwards-compatibility with PixelKitEvent
-///
-/// This new implementation seeks to unify the handling of standard pixel parameters inside PixelKit.
-/// The starting example of how this can be useful is error parameter handling - this protocol allows
-/// the implementer to speciy an error without having to know about the parametrization of the error.
-///
-/// The reason this wasn't done directly in `PixelKitEvent` is to reduce the risk of breaking existing
-/// pixels, and to allow us to migrate towards this incrementally.
-///
-public protocol PixelKitEventV2: PixelKitEvent {
-    var error: Error? { get }
-}
-
-extension PixelKitEventV2 {
-    var pixelParameters: [String: String] {
-        guard let error else {
-            return [:]
-        }
-
-        let nsError = error as NSError
-        var parameters = [
-            PixelKit.Parameters.errorCode: "\(nsError.code)",
-            PixelKit.Parameters.errorDomain: nsError.domain,
-        ]
-
-        if let error = error as? PixelKitEventErrorDetails {
-            parameters.merge(error.underlyingErrorParameters, uniquingKeysWith: { $1 })
-        }
-
-        return parameters
-    }
-}
diff --git a/LocalPackages/PixelKit/Sources/PixelKitTestingUtilities/PixelFireExpectations.swift b/LocalPackages/PixelKit/Sources/PixelKitTestingUtilities/PixelFireExpectations.swift
deleted file mode 100644
index db56d6664b..0000000000
--- a/LocalPackages/PixelKit/Sources/PixelKitTestingUtilities/PixelFireExpectations.swift
+++ /dev/null
@@ -1,62 +0,0 @@
-//
-//  PixelFireExpectations.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 PixelKit
-
-/// Structure containing information about a pixel fire event.
-///
-/// This is useful for test validation for libraries that rely on PixelKit, to make sure the pixels contain
-/// all of the fields they are supposed to contain..
-///
-public struct PixelFireExpectations {
-    let pixelName: String
-    var error: Error?
-    var underlyingError: Error?
-    var customFields: [String: String]?
-
-    /// 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/PixelKitMock.swift b/LocalPackages/PixelKit/Sources/PixelKitTestingUtilities/PixelKitMock.swift
new file mode 100644
index 0000000000..dd9bf5390f
--- /dev/null
+++ b/LocalPackages/PixelKit/Sources/PixelKitTestingUtilities/PixelKitMock.swift
@@ -0,0 +1,66 @@
+//
+//  PixelKitMock.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
+import XCTest
+
+public final class PixelKitMock: PixelFiring {
+
+    /// An array of fire calls, in order, that this mock expects
+    ///
+    private let expectedFireCalls: [ExpectedFireCall]
+
+    /// The actual fire calls
+    ///
+    private var actualFireCalls = [ExpectedFireCall]()
+
+    public init(expecting expectedFireCalls: [ExpectedFireCall]) {
+        self.expectedFireCalls = expectedFireCalls
+    }
+
+    public func fire(_ event: PixelKitEventV2) {
+        fire(event, frequency: .standard)
+    }
+
+    public func fire(_ event: PixelKitEventV2, frequency: PixelKit.Frequency) {
+        let fireCall = ExpectedFireCall(pixel: event, frequency: frequency)
+        actualFireCalls.append(fireCall)
+    }
+
+    public func verifyExpectations(file: StaticString, line: UInt) {
+        XCTAssertEqual(expectedFireCalls, actualFireCalls, file: file, line: line)
+    }
+}
+
+public struct ExpectedFireCall: Equatable {
+    let pixel: PixelKitEventV2
+    let frequency: PixelKit.Frequency
+
+    public init(pixel: PixelKitEventV2, frequency: PixelKit.Frequency) {
+        self.pixel = pixel
+        self.frequency = frequency
+    }
+
+    public static func == (lhs: ExpectedFireCall, rhs: ExpectedFireCall) -> Bool {
+        lhs.pixel.name == rhs.pixel.name
+        && lhs.pixel.parameters == rhs.pixel.parameters
+        && (lhs.pixel.error as? NSError) == (rhs.pixel.error as? NSError)
+        && lhs.frequency == rhs.frequency
+    }
+}
diff --git a/LocalPackages/PixelKit/Sources/PixelKitTestingUtilities/ValidatePixel.swift b/LocalPackages/PixelKit/Sources/PixelKitTestingUtilities/ValidatePixel.swift
deleted file mode 100644
index 00547deb5b..0000000000
--- a/LocalPackages/PixelKit/Sources/PixelKitTestingUtilities/ValidatePixel.swift
+++ /dev/null
@@ -1,50 +0,0 @@
-//
-//  ValidatePixel.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 PixelKit
-import XCTest
-
-public final class PixelRequestValidator {
-    public init() {}
-
-    public func validateBasicPixelParams(
-        expectedAppVersion: String,
-        expectedUserAgent: String,
-        requestParameters parameters: [String: String],
-        requestHeaders headers: [String: String]) {
-
-        XCTAssertEqual(parameters[PixelKit.Parameters.test], "1")
-        XCTAssertEqual(parameters[PixelKit.Parameters.appVersion], expectedAppVersion)
-
-        XCTAssertEqual(headers[PixelKit.Header.userAgent], expectedUserAgent)
-        XCTAssertEqual(headers[PixelKit.Header.acceptEncoding], "gzip;q=1.0, compress;q=0.5")
-        XCTAssertNotNil(headers[PixelKit.Header.acceptLanguage])
-        XCTAssertNotNil(headers[PixelKit.Header.moreInfo], PixelKit.duckDuckGoMorePrivacyInfo.absoluteString)
-    }
-
-    public func validateDebugPixelParams(
-        expectedError: Error?,
-        requestParameters parameters: [String: String]) {
-
-        if let error = expectedError as? NSError {
-            XCTAssertEqual(parameters[PixelKit.Parameters.errorCode], "\(error.code)")
-            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
deleted file mode 100644
index 9017d8774a..0000000000
--- a/LocalPackages/PixelKit/Sources/PixelKitTestingUtilities/XCTestCase+PixelKit.swift
+++ /dev/null
@@ -1,145 +0,0 @@
-//
-//  XCTestCase+PixelKit.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
-@testable import PixelKit
-import XCTest
-
-public extension XCTestCase {
-
-    // MARK: - Parameters
-
-    /// List of standard pixel parameters.
-    ///
-    /// This is useful to support filtering these parameters out if needed.
-    ///
-    private static var standardPixelParameters = [
-        PixelKit.Parameters.appVersion,
-        PixelKit.Parameters.pixelSource,
-        PixelKit.Parameters.test
-    ]
-
-    /// List of errror pixel parameters
-    ///
-    private static var errorPixelParameters = [
-        PixelKit.Parameters.errorCode,
-        PixelKit.Parameters.errorDomain
-    ]
-
-    /// List of underlying error pixel parameters
-    ///
-    private static var underlyingErrorPixelParameters = [
-        PixelKit.Parameters.underlyingErrorCode,
-        PixelKit.Parameters.underlyingErrorDomain
-    ]
-
-    /// Filter out the standard parameters.
-    ///
-    private static func filterStandardPixelParameters(from parameters: [String: String]) -> [String: String] {
-        parameters.filter { element in
-            !standardPixelParameters.contains(element.key)
-        }
-    }
-
-    static var pixelPlatformPrefix: String {
-#if os(macOS)
-        return "m_mac_"
-#else
-        // Intentionally left blank for now because PixelKit currently doesn't support
-        // other platforms, but if we decide to implement another platform this'll fail
-        // and indicate that we need a value here.
-#endif
-    }
-
-    /// 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
-
-            if let underlyingError = nsError.userInfo[NSUnderlyingErrorKey] as? NSError {
-                expectedParameters[PixelKit.Parameters.underlyingErrorCode] = "\(underlyingError.code)"
-                expectedParameters[PixelKit.Parameters.underlyingErrorDomain] = underlyingError.domain
-            }
-        }
-
-        return expectedParameters
-    }
-
-    // MARK: - Misc Convenience
-
-    private var userDefaults: UserDefaults {
-        UserDefaults(suiteName: "testing_\(UUID().uuidString)")!
-    }
-
-    // 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 = 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",
-                       defaultHeaders: [:],
-                       log: .disabled,
-                       defaults: userDefaults) { firedPixelName, _, firedParameters, _, _, completion in
-            callbackExecutedExpectation.fulfill()
-
-            let firedParameters = Self.filterStandardPixelParameters(from: firedParameters)
-
-            // Internal validations
-
-            XCTAssertEqual(firedPixelName, expectedPixelName, file: file, line: line)
-
-            XCTAssertTrue(knownExpectedParameters.allSatisfy { (key, value) in
-                firedParameters[key] == value
-            })
-
-            // Expectations
-            XCTAssertEqual(firedPixelName, expectations.pixelName)
-            XCTAssertEqual(firedParameters, expectations.parameters)
-
-            completion(true, nil)
-        }
-
-        PixelKit.fire(event)
-        waitForExpectations(timeout: 0.1)
-    }
-}
diff --git a/LocalPackages/PixelKit/Tests/PixelKitTests/PixelKitTests.swift b/LocalPackages/PixelKit/Tests/PixelKitTests/PixelKitTests.swift
deleted file mode 100644
index b9576d6a6a..0000000000
--- a/LocalPackages/PixelKit/Tests/PixelKitTests/PixelKitTests.swift
+++ /dev/null
@@ -1,333 +0,0 @@
-//
-//  PixelKitTests.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
-@testable import PixelKit
-import os.log // swiftlint:disable:this enforce_os_log_wrapper
-
-final class PixelKitTests: XCTestCase {
-
-    private func userDefaults() -> UserDefaults {
-        UserDefaults(suiteName: "testing_\(UUID().uuidString)")!
-    }
-
-    /// Test events for convenience
-    ///
-    private enum TestEvent: String, PixelKitEvent {
-        case testEvent
-        case testEventWithoutParameters
-        case dailyEvent
-        case dailyEventWithoutParameters
-        case dailyAndContinuousEvent
-        case dailyAndContinuousEventWithoutParameters
-        case uniqueEvent
-
-        var name: String {
-            switch self {
-            case .uniqueEvent:
-                return "\(rawValue)_u"
-            default:
-                return rawValue
-            }
-        }
-
-        var parameters: [String: String]? {
-            switch self {
-            case .testEvent, .dailyEvent, .dailyAndContinuousEvent, .uniqueEvent:
-                return [
-                    "eventParam1": "eventParamValue1",
-                    "eventParam2": "eventParamValue2"
-                ]
-            case .testEventWithoutParameters, .dailyEventWithoutParameters, .dailyAndContinuousEventWithoutParameters:
-                return nil
-            }
-        }
-
-        var frequency: PixelKit.Frequency {
-            switch self {
-            case .testEvent, .testEventWithoutParameters:
-                return .standard
-            case .uniqueEvent:
-                return .justOnce
-            case .dailyEvent, .dailyEventWithoutParameters:
-                return .dailyOnly
-            case .dailyAndContinuousEvent, .dailyAndContinuousEventWithoutParameters:
-                return .dailyAndContinuous
-            }
-        }
-    }
-
-    /// Test that a dry run won't execute the fire request callback.
-    ///
-    func testDryRunWontExecuteCallback() async {
-        let appVersion = "1.0.5"
-        let headers: [String: String] = [:]
-        let log = OSLog.disabled
-
-        let pixelKit = PixelKit(dryRun: true, appVersion: appVersion, defaultHeaders: headers, log: log, dailyPixelCalendar: nil, defaults: userDefaults()) { _, _, _, _, _, _ in
-
-            XCTFail("This callback should not be executed when doing a dry run")
-        }
-
-        pixelKit.fire(TestEvent.testEvent)
-    }
-
-    /// Tests firing a sample pixel and ensuring that all fields are properly set in the fire request callback.
-    ///
-    func testFiringASamplePixel() {
-        // Prepare test parameters
-        let appVersion = "1.0.5"
-        let headers = ["a": "2", "b": "3", "c": "2000"]
-        let log = OSLog(subsystem: "TestSubsystem", category: "TestCategory")
-        let event = TestEvent.testEvent
-        let userDefaults = userDefaults()
-
-        // Set expectations
-        let expectedPixelName = "m_mac_\(event.name)"
-        let fireCallbackCalled = expectation(description: "Expect the pixel firing callback to be called")
-
-        // Prepare mock to validate expectations
-        let pixelKit = PixelKit(dryRun: false,
-                                appVersion: appVersion,
-                                defaultHeaders: headers,
-                                log: log,
-                                dailyPixelCalendar: nil,
-                                defaults: userDefaults) { firedPixelName, firedHeaders, parameters, _, _, _ in
-
-            fireCallbackCalled.fulfill()
-
-            XCTAssertEqual(expectedPixelName, firedPixelName)
-            XCTAssertTrue(headers.allSatisfy({ key, value in
-                firedHeaders[key] == value
-            }))
-
-            XCTAssertEqual(firedHeaders[PixelKit.Header.moreInfo], "See \(PixelKit.duckDuckGoMorePrivacyInfo)")
-
-            XCTAssertEqual(parameters[PixelKit.Parameters.appVersion], appVersion)
-#if DEBUG
-            XCTAssertEqual(parameters[PixelKit.Parameters.test], PixelKit.Values.test)
-#else
-            XCTAssertNil(parameters[PixelKit.Parameters.test])
-#endif
-        }
-
-        // Run test
-        pixelKit.fire(event)
-
-        // Wait for expectations to be fulfilled
-        wait(for: [fireCallbackCalled], timeout: 0.5)
-    }
-
-    /// We test firing a daily pixel for the first time executes the fire request callback with the right parameters
-    ///
-    func testFiringDailyPixelForTheFirstTime() {
-        // Prepare test parameters
-        let appVersion = "1.0.5"
-        let headers = ["a": "2", "b": "3", "c": "2000"]
-        let log = OSLog(subsystem: "TestSubsystem", category: "TestCategory")
-        let event = TestEvent.dailyEvent
-        let userDefaults = userDefaults()
-
-        // Set expectations
-        let expectedPixelName = "m_mac_\(event.name)_d"
-        let expectedMoreInfoString = "See \(PixelKit.duckDuckGoMorePrivacyInfo)"
-        let fireCallbackCalled = expectation(description: "Expect the pixel firing callback to be called")
-
-        // Prepare mock to validate expectations
-        let pixelKit = PixelKit(dryRun: false,
-                                appVersion: appVersion,
-                                defaultHeaders: headers,
-                                log: log,
-                                dailyPixelCalendar: nil,
-                                defaults: userDefaults) { firedPixelName, firedHeaders, parameters, _, _, _ in
-
-            fireCallbackCalled.fulfill()
-
-            XCTAssertEqual(expectedPixelName, firedPixelName)
-            XCTAssertTrue(headers.allSatisfy({ key, value in
-                firedHeaders[key] == value
-            }))
-
-            XCTAssertEqual(firedHeaders[PixelKit.Header.moreInfo], expectedMoreInfoString)
-            XCTAssertEqual(parameters[PixelKit.Parameters.appVersion], appVersion)
-#if DEBUG
-            XCTAssertEqual(parameters[PixelKit.Parameters.test], PixelKit.Values.test)
-#else
-            XCTAssertNil(parameters[PixelKit.Parameters.test])
-#endif
-        }
-
-        // Run test
-        pixelKit.fire(event, frequency: .dailyOnly)
-
-        // Wait for expectations to be fulfilled
-        wait(for: [fireCallbackCalled], timeout: 0.5)
-    }
-
-    /// We test firing a daily pixel a second time does not execute the fire request callback.
-    ///
-    func testDailyPixelDoubleFiringFrequency() {
-        // Prepare test parameters
-        let appVersion = "1.0.5"
-        let headers = ["a": "2", "b": "3", "c": "2000"]
-        let log = OSLog(subsystem: "TestSubsystem", category: "TestCategory")
-        let event = TestEvent.dailyEvent
-        let userDefaults = userDefaults()
-
-        // Set expectations
-        let expectedPixelName = "m_mac_\(event.name)_d"
-        let expectedMoreInfoString = "See \(PixelKit.duckDuckGoMorePrivacyInfo)"
-        let fireCallbackCalled = expectation(description: "Expect the pixel firing callback to be called")
-        fireCallbackCalled.expectedFulfillmentCount = 1
-        fireCallbackCalled.assertForOverFulfill = true
-
-        // Prepare mock to validate expectations
-        let pixelKit = PixelKit(dryRun: false,
-                                appVersion: appVersion,
-                                defaultHeaders: headers,
-                                log: log,
-                                dailyPixelCalendar: nil,
-                                defaults: userDefaults) { firedPixelName, firedHeaders, parameters, _, _, _ in
-
-            fireCallbackCalled.fulfill()
-
-            XCTAssertEqual(expectedPixelName, firedPixelName)
-            XCTAssertTrue(headers.allSatisfy({ key, value in
-                firedHeaders[key] == value
-            }))
-
-            XCTAssertEqual(firedHeaders[PixelKit.Header.moreInfo], expectedMoreInfoString)
-            XCTAssertEqual(parameters[PixelKit.Parameters.appVersion], appVersion)
-#if DEBUG
-            XCTAssertEqual(parameters[PixelKit.Parameters.test], PixelKit.Values.test)
-#else
-            XCTAssertNil(parameters[PixelKit.Parameters.test])
-#endif
-        }
-
-        // Run test
-        pixelKit.fire(event, frequency: .dailyOnly)
-        pixelKit.fire(event, frequency: .dailyOnly)
-
-        // Wait for expectations to be fulfilled
-        wait(for: [fireCallbackCalled], timeout: 0.5)
-    }
-
-    /// Test firing a daily pixel a few times
-    func testDailyPixelFrequency() {
-        // Prepare test parameters
-        let appVersion = "1.0.5"
-        let headers = ["a": "2", "b": "3", "c": "2000"]
-        let log = OSLog(subsystem: "TestSubsystem", category: "TestCategory")
-        let event = TestEvent.dailyEvent
-        let userDefaults = userDefaults()
-
-        let timeMachine = TimeMachine()
-
-        // Set expectations
-        let fireCallbackCalled = expectation(description: "Expect the pixel firing callback to be called")
-        fireCallbackCalled.expectedFulfillmentCount = 3
-        fireCallbackCalled.assertForOverFulfill = true
-
-        // Prepare mock to validate expectations
-        let pixelKit = PixelKit(dryRun: false,
-                                appVersion: appVersion,
-                                defaultHeaders: headers,
-                                log: log,
-                                dailyPixelCalendar: nil,
-                                dateGenerator: timeMachine.now,
-                                defaults: userDefaults) { _, _, _, _, _, _ in
-            fireCallbackCalled.fulfill()
-        }
-
-        // Run test
-        pixelKit.fire(event, frequency: .dailyOnly) // Fired
-
-        timeMachine.travel(by: 60 * 60 * 2)
-        pixelKit.fire(event, frequency: .dailyOnly) // Skipped (2 hours since last fire)
-
-        timeMachine.travel(by: 60 * 60 * 24 + 1000)
-        pixelKit.fire(event, frequency: .dailyOnly) // Fired (24 hours + 1000 seconds since last fire)
-
-        timeMachine.travel(by: 60 * 60 * 10)
-        pixelKit.fire(event, frequency: .dailyOnly) // Skipped (10 hours since last fire)
-
-        timeMachine.travel(by: 60 * 60 * 14)
-        pixelKit.fire(event, frequency: .dailyOnly) // Fired (24 hours since last fire)
-
-        // Wait for expectations to be fulfilled
-        wait(for: [fireCallbackCalled], timeout: 0.5)
-    }
-
-    /// Test firing a unique pixel
-    func testUniquePixel() {
-        // Prepare test parameters
-        let appVersion = "1.0.5"
-        let headers = ["a": "2", "b": "3", "c": "2000"]
-        let log = OSLog(subsystem: "TestSubsystem", category: "TestCategory")
-        let event = TestEvent.uniqueEvent
-        let userDefaults = userDefaults()
-
-        let timeMachine = TimeMachine()
-
-        // Set expectations
-        let fireCallbackCalled = expectation(description: "Expect the pixel firing callback to be called")
-        fireCallbackCalled.expectedFulfillmentCount = 1
-        fireCallbackCalled.assertForOverFulfill = true
-
-        let pixelKit = PixelKit(dryRun: false,
-                                appVersion: appVersion,
-                                defaultHeaders: headers,
-                                log: log,
-                                dailyPixelCalendar: nil,
-                                dateGenerator: timeMachine.now,
-                                defaults: userDefaults) { _, _, _, _, _, _ in
-            fireCallbackCalled.fulfill()
-        }
-
-        // Run test
-        pixelKit.fire(event, frequency: .justOnce) // Fired
-
-        timeMachine.travel(by: 60 * 60 * 2)
-        pixelKit.fire(event, frequency: .justOnce) // Skipped (already fired)
-
-        timeMachine.travel(by: 60 * 60 * 24 + 1000)
-        pixelKit.fire(event, frequency: .justOnce) // Skipped (already fired)
-
-        timeMachine.travel(by: 60 * 60 * 10)
-        pixelKit.fire(event, frequency: .justOnce) // Skipped (already fired)
-
-        timeMachine.travel(by: 60 * 60 * 14)
-        pixelKit.fire(event, frequency: .justOnce) // Skipped (already fired)
-
-        // Wait for expectations to be fulfilled
-        wait(for: [fireCallbackCalled], timeout: 0.5)
-    }
-}
-
-private class TimeMachine {
-    private var date = Date(timeIntervalSince1970: 0)
-
-    func travel(by timeInterval: TimeInterval) {
-        date = date.addingTimeInterval(timeInterval)
-    }
-
-    func now() -> Date {
-        date
-    }
-}
diff --git a/LocalPackages/Screenshot 2024-03-14 alle 13.19.29.png b/LocalPackages/Screenshot 2024-03-14 alle 13.19.29.png
new file mode 100644
index 0000000000..7ddccad49d
Binary files /dev/null and b/LocalPackages/Screenshot 2024-03-14 alle 13.19.29.png differ
diff --git a/LocalPackages/SubscriptionUI/Package.swift b/LocalPackages/SubscriptionUI/Package.swift
index e8c434c700..7eb918dbc2 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: "132.0.1"),
+        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "144.0.0"),
         .package(path: "../SwiftUIExtensions")
     ],
     targets: [
@@ -24,7 +24,11 @@ let package = Package(
             ],
             resources: [
                 .process("Resources")
-            ]),
+            ],
+            swiftSettings: [
+                .define("DEBUG", .when(configuration: .debug))
+            ]
+        ),
         .testTarget(
             name: "SubscriptionUITests",
             dependencies: ["SubscriptionUI"]),
diff --git a/LocalPackages/SubscriptionUI/Sources/SubscriptionUI/Preferences/PreferencesSubscriptionView.swift b/LocalPackages/SubscriptionUI/Sources/SubscriptionUI/Preferences/PreferencesSubscriptionView.swift
index db764f58e1..a0e31c7d4b 100644
--- a/LocalPackages/SubscriptionUI/Sources/SubscriptionUI/Preferences/PreferencesSubscriptionView.swift
+++ b/LocalPackages/SubscriptionUI/Sources/SubscriptionUI/Preferences/PreferencesSubscriptionView.swift
@@ -185,9 +185,13 @@ public struct PreferencesSubscriptionView: View {
             TextMenuItemCaption(UserText.preferencesSubscriptionExpiredCaption)
         } buttons: {
             // We need to improve re-purchase flow
-            /* Button(UserText.viewPlansButtonTitle) { model.purchaseAction() }
-                .buttonStyle(DefaultActionButtonStyle(enabled: true)) */
+             Button(UserText.viewPlansExpiredButtonTitle) { model.purchaseAction() }
+                .buttonStyle(DefaultActionButtonStyle(enabled: true))
             Menu {
+                Button(UserText.addToAnotherDeviceButton) {
+                    model.userEventHandler(.addToAnotherDeviceClick)
+                    showingSheet.toggle()
+                }
                 Button(UserText.removeFromThisDeviceButton, action: {
                     showingRemoveConfirmationDialog.toggle()
                 })
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
index d43daeb9b9..a971e48c07 100644
Binary files a/LocalPackages/SubscriptionUI/Sources/SubscriptionUI/Resources/Subscription.xcassets/Icons/subscription-expired-icon.imageset/subscription-expired-icon.pdf and b/LocalPackages/SubscriptionUI/Sources/SubscriptionUI/Resources/Subscription.xcassets/Icons/subscription-expired-icon.imageset/subscription-expired-icon.pdf differ
diff --git a/LocalPackages/SubscriptionUI/Sources/SubscriptionUI/UserText.swift b/LocalPackages/SubscriptionUI/Sources/SubscriptionUI/UserText.swift
index fed703c3f7..f917d58b71 100644
--- a/LocalPackages/SubscriptionUI/Sources/SubscriptionUI/UserText.swift
+++ b/LocalPackages/SubscriptionUI/Sources/SubscriptionUI/UserText.swift
@@ -30,7 +30,7 @@ enum UserText {
 
     static let personalInformationRemovalServiceTitle = NSLocalizedString("subscription.preferences.services.personal.information.removal.title", value: "Personal Information Removal", comment: "Title for the Personal Information Removal service listed in the subscription preferences pane")
     static let personalInformationRemovalServiceDescription = NSLocalizedString("subscription.preferences.services.personal.information.removal.description", value: "Find and remove your personal information from sites that store and sell it.", comment: "Description for the Personal Information Removal service listed in the subscription preferences pane")
-    static let personalInformationRemovalServiceButtonTitle = NSLocalizedString("subscription.preferences.services.personal.information.removal.button.title", value: "Get Started", comment: "Title for the Personal Information Removal service button to open its settings")
+    static let personalInformationRemovalServiceButtonTitle = NSLocalizedString("subscription.preferences.services.personal.information.removal.button.title", value: "Open", comment: "Title for the Personal Information Removal service button to open its settings")
 
     static let identityTheftRestorationServiceTitle = NSLocalizedString("subscription.preferences.services.identity.theft.restoration.title", value: "Identity Theft Restoration", comment: "Title for the Identity Theft Restoration service listed in the subscription preferences pane")
     static let identityTheftRestorationServiceDescription = NSLocalizedString("subscription.preferences.services.identity.theft.restoration.description", value: "Restore stolen accounts and financial losses in the event of identity theft.", comment: "Description for the Identity Theft Restoration service listed in the subscription preferences pane")
@@ -55,7 +55,7 @@ enum UserText {
     }
 
     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.")
+        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)
     }
 
@@ -64,8 +64,8 @@ enum UserText {
 
     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")
-    static let removeFromThisDeviceButton = NSLocalizedString("subscription.preferences.remove.from.this.device.button", value: "Remove From This Device...", comment: "Button to remove subscription from this device")
+    static let changePlanOrBillingButton = NSLocalizedString("subscription.preferences.change.plan.or.billing.button", value: "Change Plan or Billing…", comment: "Button to add subscription to another device")
+    static let removeFromThisDeviceButton = NSLocalizedString("subscription.preferences.remove.from.this.device.button", value: "Remove From This Device…", comment: "Button to remove subscription from this device")
 
     // MARK: Preferences when subscription is inactive
     static let preferencesSubscriptionInactiveHeader = NSLocalizedString("subscription.preferences.subscription.inactive.header", value: "Subscribe to Privacy Pro", comment: "Header for the subscription preferences pane when the subscription is inactive")
@@ -75,12 +75,13 @@ enum UserText {
     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 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 viewPlansExpiredButtonTitle = NSLocalizedString("subscription.preferences.button.view.plans", value: "View Plans…", comment: "Button for viewing subscription plans on expired subscription")
     static let manageDevicesButton = NSLocalizedString("subscription.preferences.manage.devices.button", value: "Manage Devices", comment: "Button to manage devices")
 
     // MARK: - Change plan or billing dialogs
diff --git a/LocalPackages/SwiftUIExtensions/Package.swift b/LocalPackages/SwiftUIExtensions/Package.swift
index 21a5703a9c..345fffe0e8 100644
--- a/LocalPackages/SwiftUIExtensions/Package.swift
+++ b/LocalPackages/SwiftUIExtensions/Package.swift
@@ -11,7 +11,6 @@ let package = Package(
         .library(name: "PreferencesViews", targets: ["PreferencesViews"]),
     ],
     dependencies: [
-        .package(url: "https://github.com/duckduckgo/apple-toolbox.git", exact: "2.0.0"),
     ],
     targets: [
         .target(
@@ -20,8 +19,7 @@ let package = Package(
             ],
             swiftSettings: [
                 .define("DEBUG", .when(configuration: .debug))
-            ],
-            plugins: [.plugin(name: "SwiftLintPlugin", package: "apple-toolbox")]
+            ]
         ),
         .target(
             name: "PreferencesViews",
@@ -30,8 +28,7 @@ let package = Package(
             ],
             swiftSettings: [
                 .define("DEBUG", .when(configuration: .debug))
-            ],
-            plugins: [.plugin(name: "SwiftLintPlugin", package: "apple-toolbox")]
+            ]
         ),
     ]
 )
diff --git a/LocalPackages/SwiftUIExtensions/Sources/PreferencesViews/Assets.xcassets/Colors/Contents.json b/LocalPackages/SwiftUIExtensions/Sources/PreferencesViews/Assets.xcassets/Colors/Contents.json
new file mode 100644
index 0000000000..73c00596a7
--- /dev/null
+++ b/LocalPackages/SwiftUIExtensions/Sources/PreferencesViews/Assets.xcassets/Colors/Contents.json
@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/LocalPackages/SwiftUIExtensions/Sources/PreferencesViews/Assets.xcassets/Colors/LinkBlueColor.colorset/Contents.json b/LocalPackages/SwiftUIExtensions/Sources/PreferencesViews/Assets.xcassets/Colors/LinkBlueColor.colorset/Contents.json
new file mode 100644
index 0000000000..bb413935ee
--- /dev/null
+++ b/LocalPackages/SwiftUIExtensions/Sources/PreferencesViews/Assets.xcassets/Colors/LinkBlueColor.colorset/Contents.json
@@ -0,0 +1,78 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0xEE",
+          "green" : "0x69",
+          "red" : "0x39"
+        }
+      },
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0xF6",
+          "green" : "0x94",
+          "red" : "0x71"
+        }
+      },
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "contrast",
+          "value" : "high"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0.933",
+          "green" : "0.412",
+          "red" : "0.224"
+        }
+      },
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        },
+        {
+          "appearance" : "contrast",
+          "value" : "high"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0.965",
+          "green" : "0.580",
+          "red" : "0.443"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/SwiftUI/MultilineTextHeightFixer.swift b/LocalPackages/SwiftUIExtensions/Sources/SwiftUIExtensions/MultilineTextHeightFixer.swift
similarity index 98%
rename from LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/SwiftUI/MultilineTextHeightFixer.swift
rename to LocalPackages/SwiftUIExtensions/Sources/SwiftUIExtensions/MultilineTextHeightFixer.swift
index 43b81b54c9..9a6e693e43 100644
--- a/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/SwiftUI/MultilineTextHeightFixer.swift
+++ b/LocalPackages/SwiftUIExtensions/Sources/SwiftUIExtensions/MultilineTextHeightFixer.swift
@@ -39,7 +39,7 @@ private struct MultilineTextHeightFixer: ViewModifier {
     }
 }
 
-extension View {
+public extension View {
 
     /// Meant to be used for multiline-text.  This is currently only applying a modifier
     ///
diff --git a/LocalPackages/SyncUI/Package.swift b/LocalPackages/SyncUI/Package.swift
index 63994d4a45..f02671a7ff 100644
--- a/LocalPackages/SyncUI/Package.swift
+++ b/LocalPackages/SyncUI/Package.swift
@@ -14,7 +14,6 @@ let package = Package(
     ],
     dependencies: [
         .package(path: "../SwiftUIExtensions"),
-        .package(url: "https://github.com/duckduckgo/apple-toolbox.git", exact: "2.0.0"),
     ],
     targets: [
         .target(
@@ -28,15 +27,13 @@ let package = Package(
             ],
             swiftSettings: [
                 .define("DEBUG", .when(configuration: .debug))
-            ],
-            plugins: [.plugin(name: "SwiftLintPlugin", package: "apple-toolbox")]
+            ]
         ),
         .testTarget(
             name: "SyncUITests",
             dependencies: [
                 "SyncUI",
-            ],
-            plugins: [.plugin(name: "SwiftLintPlugin", package: "apple-toolbox")]
+            ]
         ),
     ]
 )
diff --git a/LocalPackages/SyncUI/Sources/SyncUI/Resources/Localizable.xcstrings b/LocalPackages/SyncUI/Sources/SyncUI/Resources/Localizable.xcstrings
index a899610e5c..dc53430490 100644
--- a/LocalPackages/SyncUI/Sources/SyncUI/Resources/Localizable.xcstrings
+++ b/LocalPackages/SyncUI/Sources/SyncUI/Resources/Localizable.xcstrings
@@ -119,6 +119,126 @@
         }
       }
     },
+    "alert.sync-device-auth-error" : {
+      "comment" : "Title for an error alert",
+      "extractionState" : "extracted_with_value",
+      "localizations" : {
+        "de" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Sync & Backup Error"
+          }
+        },
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "Sync & Backup Error"
+          }
+        },
+        "es" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Sync & Backup Error"
+          }
+        },
+        "fr" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Sync & Backup Error"
+          }
+        },
+        "it" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Sync & Backup Error"
+          }
+        },
+        "nl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Sync & Backup Error"
+          }
+        },
+        "pl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Sync & Backup Error"
+          }
+        },
+        "pt" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Sync & Backup Error"
+          }
+        },
+        "ru" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Sync & Backup Error"
+          }
+        }
+      }
+    },
+    "alert.sync-device-auth-error-button" : {
+      "comment" : "Button Title of an error alert",
+      "extractionState" : "extracted_with_value",
+      "localizations" : {
+        "de" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Go to Settings"
+          }
+        },
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "Go to Settings"
+          }
+        },
+        "es" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Go to Settings"
+          }
+        },
+        "fr" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Go to Settings"
+          }
+        },
+        "it" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Go to Settings"
+          }
+        },
+        "nl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Go to Settings"
+          }
+        },
+        "pl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Go to Settings"
+          }
+        },
+        "pt" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Go to Settings"
+          }
+        },
+        "ru" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Go to Settings"
+          }
+        }
+      }
+    },
     "alert.sync-error" : {
       "comment" : "Title for sync error alert",
       "extractionState" : "extracted_with_value",
@@ -179,6 +299,66 @@
         }
       }
     },
+    "alert.unable-to-authenticate-device" : {
+      "comment" : "Description for  unable to authenticate error",
+      "extractionState" : "extracted_with_value",
+      "localizations" : {
+        "de" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "A device password is required to use Sync & Backup."
+          }
+        },
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "A device password is required to use Sync & Backup."
+          }
+        },
+        "es" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "A device password is required to use Sync & Backup."
+          }
+        },
+        "fr" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "A device password is required to use Sync & Backup."
+          }
+        },
+        "it" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "A device password is required to use Sync & Backup."
+          }
+        },
+        "nl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "A device password is required to use Sync & Backup."
+          }
+        },
+        "pl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "A device password is required to use Sync & Backup."
+          }
+        },
+        "pt" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "A device password is required to use Sync & Backup."
+          }
+        },
+        "ru" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "A device password is required to use Sync & Backup."
+          }
+        }
+      }
+    },
     "alert.unable-to-create-recovery-pdf-description" : {
       "comment" : "Description for unable to create recovery pdf error",
       "extractionState" : "extracted_with_value",
@@ -4743,11 +4923,59 @@
       "comment" : "Alert message for multiple invalid bookmark being filtered out of synced data",
       "extractionState" : "extracted_with_value",
       "localizations" : {
+        "de" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Some bookmarks (%d) can't sync because some of their fields exceed the character limit."
+          }
+        },
         "en" : {
           "stringUnit" : {
             "state" : "new",
             "value" : "Some bookmarks (%d) can't sync because some of their fields exceed the character limit."
           }
+        },
+        "es" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Some bookmarks (%d) can't sync because some of their fields exceed the character limit."
+          }
+        },
+        "fr" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Some bookmarks (%d) can't sync because some of their fields exceed the character limit."
+          }
+        },
+        "it" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Some bookmarks (%d) can't sync because some of their fields exceed the character limit."
+          }
+        },
+        "nl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Some bookmarks (%d) can't sync because some of their fields exceed the character limit."
+          }
+        },
+        "pl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Some bookmarks (%d) can't sync because some of their fields exceed the character limit."
+          }
+        },
+        "pt" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Some bookmarks (%d) can't sync because some of their fields exceed the character limit."
+          }
+        },
+        "ru" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Some bookmarks (%d) can't sync because some of their fields exceed the character limit."
+          }
         }
       }
     },
@@ -4755,11 +4983,59 @@
       "comment" : "Alert message for 1 invalid bookmark being filtered out of synced data",
       "extractionState" : "extracted_with_value",
       "localizations" : {
+        "de" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Your bookmark for %@ can't sync because one of its fields exceeds the character limit."
+          }
+        },
         "en" : {
           "stringUnit" : {
             "state" : "new",
             "value" : "Your bookmark for %@ can't sync because one of its fields exceeds the character limit."
           }
+        },
+        "es" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Your bookmark for %@ can't sync because one of its fields exceeds the character limit."
+          }
+        },
+        "fr" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Your bookmark for %@ can't sync because one of its fields exceeds the character limit."
+          }
+        },
+        "it" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Your bookmark for %@ can't sync because one of its fields exceeds the character limit."
+          }
+        },
+        "nl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Your bookmark for %@ can't sync because one of its fields exceeds the character limit."
+          }
+        },
+        "pl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Your bookmark for %@ can't sync because one of its fields exceeds the character limit."
+          }
+        },
+        "pt" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Your bookmark for %@ can't sync because one of its fields exceeds the character limit."
+          }
+        },
+        "ru" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Your bookmark for %@ can't sync because one of its fields exceeds the character limit."
+          }
         }
       }
     },
@@ -4767,11 +5043,59 @@
       "comment" : "Alert title for invalid bookmarks being filtered out of synced data",
       "extractionState" : "extracted_with_value",
       "localizations" : {
+        "de" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Some bookmarks are not syncing due to excessively long content in certain fields."
+          }
+        },
         "en" : {
           "stringUnit" : {
             "state" : "new",
             "value" : "Some bookmarks are not syncing due to excessively long content in certain fields."
           }
+        },
+        "es" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Some bookmarks are not syncing due to excessively long content in certain fields."
+          }
+        },
+        "fr" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Some bookmarks are not syncing due to excessively long content in certain fields."
+          }
+        },
+        "it" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Some bookmarks are not syncing due to excessively long content in certain fields."
+          }
+        },
+        "nl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Some bookmarks are not syncing due to excessively long content in certain fields."
+          }
+        },
+        "pl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Some bookmarks are not syncing due to excessively long content in certain fields."
+          }
+        },
+        "pt" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Some bookmarks are not syncing due to excessively long content in certain fields."
+          }
+        },
+        "ru" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Some bookmarks are not syncing due to excessively long content in certain fields."
+          }
         }
       }
     },
@@ -4779,11 +5103,59 @@
       "comment" : "Alert message for multiple invalid logins being filtered out of synced data",
       "extractionState" : "extracted_with_value",
       "localizations" : {
+        "de" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Some passwords (n) can't sync because some of their fields exceed the character limit."
+          }
+        },
         "en" : {
           "stringUnit" : {
             "state" : "new",
             "value" : "Some passwords (n) can't sync because some of their fields exceed the character limit."
           }
+        },
+        "es" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Some passwords (n) can't sync because some of their fields exceed the character limit."
+          }
+        },
+        "fr" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Some passwords (n) can't sync because some of their fields exceed the character limit."
+          }
+        },
+        "it" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Some passwords (n) can't sync because some of their fields exceed the character limit."
+          }
+        },
+        "nl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Some passwords (n) can't sync because some of their fields exceed the character limit."
+          }
+        },
+        "pl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Some passwords (n) can't sync because some of their fields exceed the character limit."
+          }
+        },
+        "pt" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Some passwords (n) can't sync because some of their fields exceed the character limit."
+          }
+        },
+        "ru" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Some passwords (n) can't sync because some of their fields exceed the character limit."
+          }
         }
       }
     },
@@ -4791,11 +5163,59 @@
       "comment" : "Alert message for 1 invalid login being filtered out of synced data",
       "extractionState" : "extracted_with_value",
       "localizations" : {
+        "de" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Your password for %@ can't sync because one of its fields exceeds the character limit."
+          }
+        },
         "en" : {
           "stringUnit" : {
             "state" : "new",
             "value" : "Your password for %@ can't sync because one of its fields exceeds the character limit."
           }
+        },
+        "es" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Your password for %@ can't sync because one of its fields exceeds the character limit."
+          }
+        },
+        "fr" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Your password for %@ can't sync because one of its fields exceeds the character limit."
+          }
+        },
+        "it" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Your password for %@ can't sync because one of its fields exceeds the character limit."
+          }
+        },
+        "nl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Your password for %@ can't sync because one of its fields exceeds the character limit."
+          }
+        },
+        "pl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Your password for %@ can't sync because one of its fields exceeds the character limit."
+          }
+        },
+        "pt" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Your password for %@ can't sync because one of its fields exceeds the character limit."
+          }
+        },
+        "ru" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Your password for %@ can't sync because one of its fields exceeds the character limit."
+          }
         }
       }
     },
@@ -4803,11 +5223,59 @@
       "comment" : "Alert title for invalid logins being filtered out of synced data",
       "extractionState" : "extracted_with_value",
       "localizations" : {
+        "de" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Some logins are not syncing due to excessively long content in certain fields."
+          }
+        },
         "en" : {
           "stringUnit" : {
             "state" : "new",
             "value" : "Some logins are not syncing due to excessively long content in certain fields."
           }
+        },
+        "es" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Some logins are not syncing due to excessively long content in certain fields."
+          }
+        },
+        "fr" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Some logins are not syncing due to excessively long content in certain fields."
+          }
+        },
+        "it" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Some logins are not syncing due to excessively long content in certain fields."
+          }
+        },
+        "nl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Some logins are not syncing due to excessively long content in certain fields."
+          }
+        },
+        "pl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Some logins are not syncing due to excessively long content in certain fields."
+          }
+        },
+        "pt" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Some logins are not syncing due to excessively long content in certain fields."
+          }
+        },
+        "ru" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Some logins are not syncing due to excessively long content in certain fields."
+          }
         }
       }
     },
@@ -5953,4 +6421,4 @@
     }
   },
   "version" : "1.0"
-}
+}
\ No newline at end of file
diff --git a/LocalPackages/SyncUI/Sources/SyncUI/ViewModels/ManagementDialogModel.swift b/LocalPackages/SyncUI/Sources/SyncUI/ViewModels/ManagementDialogModel.swift
index eaf0aa2808..39d22256e3 100644
--- a/LocalPackages/SyncUI/Sources/SyncUI/ViewModels/ManagementDialogModel.swift
+++ b/LocalPackages/SyncUI/Sources/SyncUI/ViewModels/ManagementDialogModel.swift
@@ -32,6 +32,7 @@ public protocol ManagementDialogModelDelegate: AnyObject {
     func recoveryCodePasted(_ code: String)
     func enterRecoveryCodePressed()
     func copyCode()
+    func openSystemPasswordSettings()
 }
 
 public final class ManagementDialogModel: ObservableObject {
@@ -54,6 +55,8 @@ public final class ManagementDialogModel: ObservableObject {
     }
 
     public func endFlow() {
+        syncErrorMessage?.type.onButtonPressed(delegate: delegate)
+        syncErrorMessage = nil
         currentDialog = nil
     }
 
diff --git a/LocalPackages/SyncUI/Sources/SyncUI/ViewModels/ManagementViewModel.swift b/LocalPackages/SyncUI/Sources/SyncUI/ViewModels/ManagementViewModel.swift
index 0ad1a50478..9c17db0f43 100644
--- a/LocalPackages/SyncUI/Sources/SyncUI/ViewModels/ManagementViewModel.swift
+++ b/LocalPackages/SyncUI/Sources/SyncUI/ViewModels/ManagementViewModel.swift
@@ -68,9 +68,15 @@ public enum SyncErrorType {
     case unableToRemoveDevice
     case invalidCode
     case unableCreateRecoveryPDF
+    case unableToAuthenticateOnDevice
 
     var title: String {
-        return UserText.syncErrorAlertTitle
+        switch self {
+        case .unableToAuthenticateOnDevice:
+            return UserText.syncDeviceAuthenticationErrorAlertTitle
+        default:
+            return UserText.syncErrorAlertTitle
+        }
     }
 
     var description: String {
@@ -93,6 +99,26 @@ public enum SyncErrorType {
             return UserText.invalidCodeDescription
         case .unableCreateRecoveryPDF:
             return UserText.unableCreateRecoveryPdfDescription
+        case .unableToAuthenticateOnDevice:
+            return UserText.unableToAuthenticateDevice
+        }
+    }
+
+    var buttonTitle: String {
+        switch self {
+        case .unableToAuthenticateOnDevice:
+            return UserText.syncDeviceAuthenticationErrorAlertButton
+        default:
+            return UserText.ok
+        }
+    }
+
+    func onButtonPressed(delegate: ManagementDialogModelDelegate?) {
+        switch self {
+        case .unableToAuthenticateOnDevice:
+            delegate?.openSystemPasswordSettings()
+        default:
+            break
         }
     }
 }
diff --git a/LocalPackages/SyncUI/Sources/SyncUI/Views/ManagementDialog.swift b/LocalPackages/SyncUI/Sources/SyncUI/Views/ManagementDialog.swift
index 6af2621ee1..fb8fa0b623 100644
--- a/LocalPackages/SyncUI/Sources/SyncUI/Views/ManagementDialog.swift
+++ b/LocalPackages/SyncUI/Sources/SyncUI/Views/ManagementDialog.swift
@@ -30,6 +30,7 @@ public enum ManagementDialogKind: Equatable {
     case syncWithServer
     case enterRecoveryCode(code: String)
     case recoverSyncedData
+    case empty
 }
 
 public struct ManagementDialog: View {
@@ -49,6 +50,10 @@ public struct ManagementDialog: View {
         return typeDescription + "\n" + errorDescription
     }
 
+    var buttonTitle: String {
+        return model.syncErrorMessage?.type.buttonTitle ?? UserText.ok
+    }
+
     public init(model: ManagementDialogModel, recoveryCodeModel: RecoveryCodeViewModel = .init()) {
         self.model = model
         self.recoveryCodeModel = recoveryCodeModel
@@ -60,7 +65,7 @@ public struct ManagementDialog: View {
                 Alert(
                     title: Text(errorTitle),
                     message: Text(errorDescription),
-                    dismissButton: .default(Text(UserText.ok)) {
+                    dismissButton: .default(Text(buttonTitle)) {
                         model.endFlow()
                     }
                 )
diff --git a/LocalPackages/SyncUI/Sources/SyncUI/internal/UserText.swift b/LocalPackages/SyncUI/Sources/SyncUI/internal/UserText.swift
index ad9b47b13e..0bff100318 100644
--- a/LocalPackages/SyncUI/Sources/SyncUI/internal/UserText.swift
+++ b/LocalPackages/SyncUI/Sources/SyncUI/internal/UserText.swift
@@ -190,6 +190,9 @@ enum UserText {
     }
 
     static let syncErrorAlertTitle = NSLocalizedString("alert.sync-error", bundle: Bundle.module, value: "Sync & Backup Error", comment: "Title for sync error alert")
+    static let syncDeviceAuthenticationErrorAlertTitle = NSLocalizedString("alert.sync-device-auth-error", bundle: Bundle.module, value: "Sync & Backup Error", comment: "Title for an error alert")
+    static let syncDeviceAuthenticationErrorAlertButton = NSLocalizedString("alert.sync-device-auth-error-button", bundle: Bundle.module, value: "Go to Settings", comment: "Button Title of an error alert")
+    static let unableToAuthenticateDevice = NSLocalizedString("alert.unable-to-authenticate-device", bundle: Bundle.module, value: "A device password is required to use Sync & Backup.", comment: "Description for  unable to authenticate error")
     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")
     static let unableToMergeTwoAccountsDescription = NSLocalizedString("alert.unable-to-merge-two-accounts-description", bundle: Bundle.module, value: "To pair these devices, turn off Sync & Backup on one device then tap \"Sync With Another Device\" on the other device.", comment: "Description for unable to merge two accounts error")
diff --git a/LocalPackages/SystemExtensionManager/Package.swift b/LocalPackages/SystemExtensionManager/Package.swift
index bf7cce608f..17bd4254da 100644
--- a/LocalPackages/SystemExtensionManager/Package.swift
+++ b/LocalPackages/SystemExtensionManager/Package.swift
@@ -16,7 +16,6 @@ let package = Package(
         ),
     ],
     dependencies: [
-        .package(url: "https://github.com/duckduckgo/apple-toolbox.git", exact: "2.0.0"),
     ],
     targets: [
         // Targets are the basic building blocks of a package, defining a module or a test suite.
@@ -27,8 +26,7 @@ let package = Package(
             ],
             swiftSettings: [
                 .define("DEBUG", .when(configuration: .debug))
-            ],
-            plugins: [.plugin(name: "SwiftLintPlugin", package: "apple-toolbox")]
+            ]
         )
     ]
 )
diff --git a/LocalPackages/XPCHelper/Package.swift b/LocalPackages/XPCHelper/Package.swift
index 2d7086116f..b831106cf9 100644
--- a/LocalPackages/XPCHelper/Package.swift
+++ b/LocalPackages/XPCHelper/Package.swift
@@ -30,7 +30,6 @@ let package = Package(
         .library(name: "XPCHelper", targets: ["XPCHelper"]),
     ],
     dependencies: [
-        .package(url: "https://github.com/duckduckgo/apple-toolbox.git", exact: "2.0.0"),
     ],
     targets: [
         .target(
@@ -40,8 +39,7 @@ let package = Package(
             ],
             swiftSettings: [
                 .define("DEBUG", .when(configuration: .debug))
-            ],
-            plugins: [.plugin(name: "SwiftLintPlugin", package: "apple-toolbox")]
+            ]
         ),
 
         .target(
diff --git a/UITests/AddressBarKeyboardShortcutsTests.swift b/UITests/AddressBarKeyboardShortcutsTests.swift
new file mode 100644
index 0000000000..bf97489e5d
--- /dev/null
+++ b/UITests/AddressBarKeyboardShortcutsTests.swift
@@ -0,0 +1,269 @@
+//
+//  AddressBarKeyboardShortcutsTests.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 AddressBarKeyboardShortcutsTests: XCTestCase {
+    private var app: XCUIApplication!
+    private var urlStringForAddressBar: String!
+    private var urlForAddressBar: URL!
+
+    private var addressBarTextField: XCUIElement!
+    override class func setUp() {
+        UITests.firstRun()
+        UITests.setAutocompleteToggleBeforeTestcaseRuns(false) // We don't want changes in the address bar that we don't create
+    }
+
+    override func setUpWithError() throws {
+        continueAfterFailure = false
+        app = XCUIApplication()
+        app.launchEnvironment["UITEST_MODE"] = "1"
+        urlStringForAddressBar = "https://duckduckgo.com/duckduckgo-help-pages/results/translation/"
+        urlForAddressBar = URL(string: urlStringForAddressBar)
+        addressBarTextField = app.windows.textFields["AddressBarViewController.addressBarTextField"]
+        app.launch()
+        app.typeKey("w", modifierFlags: [.command, .option, .shift]) // Let's enforce a single window
+        app.typeKey("n", modifierFlags: .command)
+        addressBarTextField.typeURL(urlForAddressBar, pressingEnter: false)
+    }
+
+    func test_addressBar_url_canBeSelected() throws {
+        addressBarTextField.typeKey("a", modifierFlags: .command) // This is the behavior under test, but we will have to verify it indirectly
+
+        addressBarTextField.typeKey("c", modifierFlags: .command) // Having selected it all, let's copy it
+        addressBarTextField.typeKey(.delete, modifierFlags: []) // And delete it
+        addressBarTextField.typeKey(.leftArrow, modifierFlags: .command) // Now let's go to the beginning of the address bar, which should be empty
+        addressBarTextField.typeKey("v", modifierFlags: .command) // And paste it
+        let addressFieldContentsWithoutTagline = try XCTUnwrap(addressBarTextField.value as? String).removingTagLine()
+
+        XCTAssertEqual(
+            urlStringForAddressBar,
+            addressFieldContentsWithoutTagline,
+            "If the contents of the address bar after typing the original url, selecting it, copying it, deleting all, and pasting it, aren't the same as the original contents we typed in, the URL was not successfully selected."
+        )
+    }
+
+    func test_addressBar_end_canBeNavigatedToWithCommandRightArrow() throws {
+        addressBarTextField.typeKey(.rightArrow, modifierFlags: .command) // This is the behavior under test, but we will have to verify it indirectly
+
+        let charactersToTrimFromSuffix = 13
+        for _ in 1 ... charactersToTrimFromSuffix {
+            addressBarTextField.typeKey(.leftArrow, modifierFlags: [.shift])
+        }
+        app.typeKey(.delete, modifierFlags: .command)
+        let addressFieldContentsAfterDelete = try XCTUnwrap(addressBarTextField.value as? String).removingTagLine()
+        let urlMinusDeletedCharacters: String = try XCTUnwrap(String(urlStringForAddressBar.dropLast(charactersToTrimFromSuffix)))
+
+        XCTAssertEqual(
+            urlMinusDeletedCharacters,
+            addressFieldContentsAfterDelete,
+            "If the contents of the address bar minus the last \(charactersToTrimFromSuffix) characters from selecting backwards and deleting doesn't match the original URL string minus its last \(charactersToTrimFromSuffix), we were not at the end of the address bar string after typing command-right-arrow"
+        )
+    }
+
+    func test_addressBar_beginning_canBeNavigatedToWithCommandLeftArrow() throws {
+        addressBarTextField.typeKey(.leftArrow, modifierFlags: .command) // This is the behavior under test, but we will have to verify it indirectly
+
+        let charactersToTrimFromPrefix = 5
+        for _ in 1 ... charactersToTrimFromPrefix {
+            addressBarTextField.typeKey(.rightArrow, modifierFlags: [.shift])
+        }
+
+        app.typeKey(.delete, modifierFlags: .command)
+        let addressFieldContentsAfterDelete = try XCTUnwrap(addressBarTextField.value as? String).removingTagLine()
+        let urlMinusDeletedCharacters: String = try XCTUnwrap(String(urlStringForAddressBar.dropFirst(charactersToTrimFromPrefix)))
+
+        XCTAssertEqual(
+            urlMinusDeletedCharacters,
+            addressFieldContentsAfterDelete,
+            "If the contents of the address bar minus the first \(charactersToTrimFromPrefix) characters from selecting forwards and deleting doesn't match the original URL string minus its first \(charactersToTrimFromPrefix), we were not at the start of the address bar string after typing command-left-arrow"
+        )
+    }
+
+    /// An important note about this test: option-arrow does not navigate through URL components, but through certain word boundary characters such as
+    /// "/", and possibly including others such as "-", and ".", meaning that it often navigates through URL components as a side-effect, but not
+    /// always. The list of word boundary characters isn't documented. This test tests whether option-arrow moves the caret between two backslashes
+    /// where no other word boundary characters are present: it doesn't try to test other word boundaries, and it isn't a test which demonstrates
+    /// movement between URL components, since results would be different if there were a word boundary character inside of the components it targets.
+    /// This is also true of the option-right-arrow test.
+    func test_addressBar_caret_canNavigateThroughWordBoundariesUsingOptionLeftArrow() throws {
+        addressBarTextField.typeKey(.rightArrow, modifierFlags: .command) // move caret to end
+        addressBarTextField.typeKey(.leftArrow, modifierFlags: .option) // Step back twice using option-left-arrow
+
+        addressBarTextField.typeKey(.leftArrow, modifierFlags: .option) // This is the behavior under test, but we will have to verify it indirectly
+        addressBarTextField.typeKey(.rightArrow, modifierFlags: [.command, .shift]) // Select all text to the right of the caret
+        addressBarTextField.typeKey(.delete, modifierFlags: []) // Delete it
+        let addressFieldContentsAfterDelete = try XCTUnwrap(addressBarTextField.value as? String).removingTagLine()
+        let urlMinusDeletedCharacters: String = try XCTUnwrap(String(urlStringForAddressBar.replacingOccurrences(
+            of: "results/translation/",
+            // Delete the last two components we expected to be deleted in our address bar navigation process from the original reference string for
+            // comparison
+            with: ""
+        )))
+
+        XCTAssertEqual(
+            urlMinusDeletedCharacters,
+            addressFieldContentsAfterDelete,
+            "If the address field contents after we have navigated using option-left-arrow do not match our expectation string, that means that at the time we selected the remainder of the address bar string and deleted it, option-left-arrow had not navigated the caret to the insertion point it should have."
+        )
+    }
+
+    /// Note: please read `test_addressBar_caret_canNavigateThroughWordBoundariesUsingOptionLeftArrow()`
+    /// for more information about what this test tests, and does not test.
+    func test_addressBar_caret_canNavigateThroughWordBoundariesUsingOptionRightArrow() throws {
+        addressBarTextField.typeKey(.rightArrow, modifierFlags: .command) // move caret to end
+        addressBarTextField.typeKey(.leftArrow, modifierFlags: .option) // Step back twice using option-left-arrow.
+        addressBarTextField
+            .typeKey(.leftArrow,
+                     modifierFlags: .option) // Arranging so we can test option-right-arrow in an area with no other word boundary characters.
+
+        addressBarTextField.typeKey(.rightArrow, modifierFlags: .option) // This is the behavior under test, but we will have to verify it indirectly
+        addressBarTextField.typeKey(.leftArrow, modifierFlags: [.option, .shift]) // Select the component to the left of the caret
+        addressBarTextField.typeKey(.delete, modifierFlags: []) // Delete it
+        let addressFieldContentsAfterDelete = try XCTUnwrap(addressBarTextField.value as? String).removingTagLine()
+        let urlMinusDeletedCharacters: String = try XCTUnwrap(String(urlStringForAddressBar.replacingOccurrences(
+            of: "results",
+            // Delete the last component we expected to be deleted in our address bar navigation process from the original reference string for
+            // comparison
+            with: ""
+        )))
+
+        XCTAssertEqual(
+            urlMinusDeletedCharacters,
+            addressFieldContentsAfterDelete,
+            "If the address field contents after we have navigated using option-right-arrow and deleted part of the URL to the left of the caret insertion point do not match our expectation string, that means that at the time we selected the part of the address bar string next to the insertion point and deleted it, option-right-arrow had not navigated the caret to the insertion point it should have."
+        )
+    }
+
+    func test_addressBar_url_word_canBeSelectedByDoubleClick() throws {
+        addressBarTextField
+            .typeKey(.leftArrow,
+                     modifierFlags: .command) // let's go to the beginning of the address bar, so our coordinate will be slightly reliable despite
+        // window width. Even though this means we are selecting the scheme prefix as our "word", it is a good example of a text run within word
+        // boundaries, and this is the only reliable position for a word double-click to select because the end of the address bar has the Visit
+        // tagline, and the middle could contain anything.
+        let addressBarTextFieldCoordinate = addressBarTextField.coordinate(withNormalizedOffset: CGVector(dx: 0.01, dy: 0.5))
+        addressBarTextFieldCoordinate.doubleClick() // this is the behavior under test, but we will have to evaluate it indirectly.
+        addressBarTextField.typeKey("c", modifierFlags: .command) // Copy the selected word
+        addressBarTextField.typeKey("a", modifierFlags: .command) // Select all
+        addressBarTextField.typeKey(.delete, modifierFlags: []) // Delete all
+        addressBarTextField.typeKey("v", modifierFlags: .command) // Paste the selected word
+        let addressFieldContentsAfterDelete = try XCTUnwrap(addressBarTextField.value as? String).removingTagLine()
+
+        XCTAssertEqual(
+            addressFieldContentsAfterDelete,
+            "https",
+            "When we double-click at the beginning of the URL, copy the selected text, delete the entire contents of the address bar, and then paste, if it doesn't equal https, that means we didn't successfully double-click a text run within word boundaries at the beginning of the address bar."
+        )
+    }
+
+    func test_addressBar_nearestLeftHandCharacterShouldBeDeletedByFnDelete() throws {
+        addressBarTextField.typeKey(.rightArrow, modifierFlags: .command) // move caret to end
+        addressBarTextField.typeKey(.leftArrow, modifierFlags: .option) // Step back twice using option-left-arrow.
+        addressBarTextField.typeKey(.leftArrow, modifierFlags: .option)
+
+        addressBarTextField.typeKey(.delete, modifierFlags: .function)
+        let addressFieldContentsAfterDelete = try XCTUnwrap(addressBarTextField.value as? String).removingTagLine()
+
+        XCTAssertEqual("https://duckduckgo.com/duckduckgo-help-pagesresults/translation/", addressFieldContentsAfterDelete)
+    }
+
+    func test_addressBar_nearestLeftHandWordWithinBoundariesShouldBeDeletedByOptDelete() throws {
+        addressBarTextField.typeKey(.rightArrow, modifierFlags: .command) // move caret to end
+        addressBarTextField.typeKey(.leftArrow, modifierFlags: .option) // Step back once using option-left-arrow.
+
+        addressBarTextField.typeKey(.delete, modifierFlags: .option)
+        let addressFieldContentsAfterDelete = try XCTUnwrap(addressBarTextField.value as? String).removingTagLine()
+
+        XCTAssertEqual("https://duckduckgo.com/duckduckgo-help-pages/translation/", addressFieldContentsAfterDelete)
+    }
+
+    func test_addressBar_allTextToTheLeftShouldBeDeletedByCommandDelete() throws {
+        addressBarTextField.typeKey(.rightArrow, modifierFlags: .command) // move caret to end
+        addressBarTextField.typeKey(.leftArrow, modifierFlags: .option) // Step back once using option-left-arrow.
+
+        addressBarTextField.typeKey(.delete, modifierFlags: .command)
+        let addressFieldContentsAfterDelete = try XCTUnwrap(addressBarTextField.value as? String).removingTagLine()
+
+        XCTAssertEqual("translation/", addressFieldContentsAfterDelete)
+    }
+
+    func test_addressBar_nearestRightHandCharacterShouldBeDeletedByFnForwardDelete() throws {
+        addressBarTextField.typeKey(.rightArrow, modifierFlags: .command) // move caret to end
+        addressBarTextField.typeKey(.leftArrow, modifierFlags: .option) // Step back twice using option-left-arrow.
+        addressBarTextField.typeKey(.leftArrow, modifierFlags: .option)
+
+        addressBarTextField.typeKey(.forwardDelete, modifierFlags: .function)
+        let addressFieldContentsAfterDelete = try XCTUnwrap(addressBarTextField.value as? String).removingTagLine()
+
+        XCTAssertEqual("https://duckduckgo.com/duckduckgo-help-pages/esults/translation/", addressFieldContentsAfterDelete)
+    }
+
+    func test_addressBar_nearestRightHandWordWithinBoundariesShouldBeDeletedByOptForwardDelete() throws {
+        addressBarTextField.typeKey(.rightArrow, modifierFlags: .command) // move caret to end
+        addressBarTextField.typeKey(.leftArrow, modifierFlags: .option) // Step back once using option-left-arrow.
+
+        addressBarTextField
+            .typeKey(.forwardDelete, modifierFlags: .option)
+        let addressFieldContentsAfterDelete = try XCTUnwrap(addressBarTextField.value as? String).removingTagLine()
+
+        XCTAssertEqual("https://duckduckgo.com/duckduckgo-help-pages/results//", addressFieldContentsAfterDelete)
+    }
+
+    func test_addressBar_allTextToTheRightShouldBeDeletedByCommandForwardDelete() throws {
+        addressBarTextField.typeKey(.rightArrow, modifierFlags: .command) // move caret to end
+        addressBarTextField.typeKey(.leftArrow, modifierFlags: .option) // Step back once using option-left-arrow.
+
+        addressBarTextField
+            .typeKey(.forwardDelete, modifierFlags: .command)
+        let addressFieldContentsAfterDelete = try XCTUnwrap(addressBarTextField.value as? String).removingTagLine()
+
+        XCTAssertEqual("https://duckduckgo.com/duckduckgo-help-pages/results/", addressFieldContentsAfterDelete)
+    }
+
+    func test_addressBar_commandZShouldUndoLastAction() throws {
+        addressBarTextField.typeKey(.rightArrow, modifierFlags: .command) // move caret to end
+        addressBarTextField.typeKey(.leftArrow, modifierFlags: .option) // Step back once using option-left-arrow.
+        addressBarTextField
+            .typeKey(.forwardDelete, modifierFlags: .command) // Delete word
+
+        addressBarTextField.typeKey("z", modifierFlags: .command) // Undo deletion
+        let addressFieldContentsAfterDelete = try XCTUnwrap(addressBarTextField.value as? String).removingTagLine()
+
+        XCTAssertEqual(urlStringForAddressBar, addressFieldContentsAfterDelete)
+    }
+
+    func test_addressBar_shiftCommandZShouldRedoLastUndoneAction() throws {
+        addressBarTextField.typeKey(.rightArrow, modifierFlags: .command) // move caret to end
+        addressBarTextField.typeKey(.leftArrow, modifierFlags: .option) // Step back once using option-left-arrow.
+        addressBarTextField
+            .typeKey(.forwardDelete, modifierFlags: .command) // Delete word
+        addressBarTextField.typeKey("z", modifierFlags: .command) // Undo deletion
+
+        addressBarTextField.typeKey("z", modifierFlags: [.shift, .command]) // Redo deletion
+        let addressFieldContentsAfterDelete = try XCTUnwrap(addressBarTextField.value as? String).removingTagLine()
+
+        XCTAssertEqual("https://duckduckgo.com/duckduckgo-help-pages/results/", addressFieldContentsAfterDelete)
+    }
+}
+
+private extension String {
+    func removingTagLine() -> String {
+        return self.components(separatedBy: " ").first ?? self // If there is no space in the URL, the tagline isn't attached
+    }
+}
diff --git a/UITests/AutocompleteTests.swift b/UITests/AutocompleteTests.swift
index 2b02369b58..94bb74b822 100644
--- a/UITests/AutocompleteTests.swift
+++ b/UITests/AutocompleteTests.swift
@@ -16,7 +16,6 @@
 //  limitations under the License.
 //
 
-import Common
 import XCTest
 
 class AutocompleteTests: XCTestCase {
@@ -32,6 +31,11 @@ class AutocompleteTests: XCTestCase {
     private var siteTitleForBookmarkedSite: String!
     private var siteTitleForHistorySite: String!
 
+    override class func setUp() {
+        UITests.firstRun()
+        UITests.setAutocompleteToggleBeforeTestcaseRuns(true) // These tests require autocomplete to be on
+    }
+
     override func setUpWithError() throws {
         continueAfterFailure = false
         app = XCUIApplication()
@@ -54,7 +58,6 @@ class AutocompleteTests: XCTestCase {
     }
 
     func test_suggestions_showsTypedTitleOfBookmarkedPageAsBookmark() throws {
-        let siteTitleForBookmarkedSite = try XCTUnwrap(siteTitleForBookmarkedSite)
         app.typeText(siteTitleForBookmarkedSite)
         XCTAssertTrue(
             suggestionsTableView.waitForExistence(timeout: UITests.Timeouts.elementExistence),
@@ -82,7 +85,6 @@ class AutocompleteTests: XCTestCase {
     }
 
     func test_suggestions_showsTypedTitleOfHistoryPageAsHistory() throws {
-        let siteTitleForHistorySite = try XCTUnwrap(siteTitleForHistorySite)
         app.typeText(siteTitleForHistorySite)
         XCTAssertTrue(
             suggestionsTableView.waitForExistence(timeout: UITests.Timeouts.elementExistence),
@@ -110,18 +112,20 @@ class AutocompleteTests: XCTestCase {
     }
 
     func test_suggestions_showsTypedTitleOfWebsiteNotInBookmarksOrHistoryAsWebsite() throws {
-        let websiteURLString = "https://www.duckduckgo.com"
+        let websiteString = "https://www.duckduckgo.com"
+        let websiteURL = try XCTUnwrap(URL(string: websiteString), "Couldn't create URL from string \(websiteString)")
         XCTAssertTrue(
             addressBarTextField.waitForExistence(timeout: UITests.Timeouts.elementExistence),
             "The address bar text field didn't become available in a reasonable timeframe."
         )
-        addressBarTextField.typeText(websiteURLString)
+
+        addressBarTextField.typeURL(websiteURL, pressingEnter: false)
         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
+        let suggestionCellWithWebsite = suggestionsTableView.tableRows.cells.staticTexts[websiteURL.absoluteString].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."
@@ -145,9 +149,6 @@ class AutocompleteTests: XCTestCase {
 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."
@@ -160,7 +161,7 @@ private extension AutocompleteTests {
             "The address bar text field didn't become available in a reasonable timeframe."
         )
 
-        addressBarTextField.typeText("\(urlForBookmarks.absoluteString)\r")
+        addressBarTextField.typeURL(urlForBookmarks)
         XCTAssertTrue(
             app.windows.webViews[siteTitleForBookmarkedSite].waitForExistence(timeout: UITests.Timeouts.elementExistence),
             "Visited site didn't load with the expected title in a reasonable timeframe."
@@ -202,7 +203,7 @@ private extension AutocompleteTests {
             "The address bar text field didn't become available in a reasonable timeframe."
         )
 
-        addressBarTextField.typeText("\(urlForHistory.absoluteString)\r")
+        addressBarTextField.typeURL(urlForHistory)
         XCTAssertTrue(
             app.windows.webViews[siteTitleForHistorySite].waitForExistence(timeout: UITests.Timeouts.elementExistence),
             "Visited site didn't load with the expected title in a reasonable timeframe."
diff --git a/UITests/BookmarksAndFavoritesTests.swift b/UITests/BookmarksAndFavoritesTests.swift
new file mode 100644
index 0000000000..7c9bb93673
--- /dev/null
+++ b/UITests/BookmarksAndFavoritesTests.swift
@@ -0,0 +1,729 @@
+//
+//  BookmarksAndFavoritesTests.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 BookmarksAndFavoritesTests: XCTestCase {
+    private var app: XCUIApplication!
+    private var pageTitle: String!
+    private var urlForBookmarksBar: URL!
+    private let titleStringLength = 12
+
+    private var addressBarBookmarkButton: XCUIElement!
+    private var addressBarTextField: XCUIElement!
+    private var bookmarkDialogBookmarkFolderDropdown: XCUIElement!
+    private var bookmarkPageContextMenuItem: XCUIElement!
+    private var bookmarkPageMenuItem: XCUIElement!
+    private var bookmarksBarCollectionView: XCUIElement!
+    private var bookmarksDialogAddToFavoritesCheckbox: XCUIElement!
+    private var bookmarksManagementAccessoryImageView: XCUIElement!
+    private var bookmarksMenu: XCUIElement!
+    private var bookmarksTabPopup: XCUIElement!
+    private var bookmarkTableCellViewFavIconImageView: XCUIElement!
+    private var bookmarkTableCellViewMenuButton: XCUIElement!
+    private var contextualMenuAddBookmarkToFavoritesMenuItem: XCUIElement!
+    private var contextualMenuDeleteBookmarkMenuItem: XCUIElement!
+    private var contextualMenuRemoveBookmarkFromFavoritesMenuItem: XCUIElement!
+    private var defaultBookmarkDialogButton: XCUIElement!
+    private var defaultBookmarkOtherButton: XCUIElement!
+    private var favoriteGridAddFavoriteButton: XCUIElement!
+    private var favoriteThisPageMenuItem: XCUIElement!
+    private var manageBookmarksMenuItem: XCUIElement!
+    private var openBookmarksMenuItem: XCUIElement!
+    private var optionsButton: XCUIElement!
+    private var removeFavoritesContextMenuItem: XCUIElement!
+    private var resetBookMarksMenuItem: XCUIElement!
+    private var settingsAppearanceButton: XCUIElement!
+    private var showBookmarksBarPreferenceToggle: XCUIElement!
+    private var showBookmarksBarAlways: XCUIElement!
+    private var showBookmarksBarPopup: XCUIElement!
+    private var showFavoritesPreferenceToggle: XCUIElement!
+
+    override class func setUp() {
+        UITests.firstRun()
+    }
+
+    override func setUpWithError() throws {
+        continueAfterFailure = false
+        app = XCUIApplication()
+        app.launchEnvironment["UITEST_MODE"] = "1"
+        pageTitle = UITests.randomPageTitle(length: titleStringLength)
+        urlForBookmarksBar = UITests.simpleServedPage(titled: pageTitle)
+        addressBarBookmarkButton = app.buttons["AddressBarButtonsViewController.bookmarkButton"]
+        addressBarTextField = app.windows.textFields["AddressBarViewController.addressBarTextField"]
+        bookmarkDialogBookmarkFolderDropdown = app.popUpButtons["bookmark.add.folder.dropdown"]
+        bookmarkPageContextMenuItem = app.menuItems["ContextMenuManager.bookmarkPageMenuItem"]
+        bookmarkPageMenuItem = app.menuItems["MoreOptionsMenu.bookmarkPage"]
+        bookmarksBarCollectionView = app.collectionViews["BookmarksBarViewController.bookmarksBarCollectionView"]
+        bookmarksDialogAddToFavoritesCheckbox = app.checkBoxes["bookmark.add.add.to.favorites.button"]
+        bookmarksManagementAccessoryImageView = app.images["BookmarkTableCellView.accessoryImageView"]
+        bookmarksMenu = app.menuBarItems["Bookmarks"]
+        bookmarksTabPopup = app.popUpButtons["Bookmarks"]
+        bookmarkTableCellViewFavIconImageView = app.images["BookmarkTableCellView.favIconImageView"]
+        bookmarkTableCellViewMenuButton = app.buttons["BookmarkTableCellView.menuButton"]
+        contextualMenuAddBookmarkToFavoritesMenuItem = app.menuItems["ContextualMenu.addBookmarkToFavoritesMenuItem"]
+        contextualMenuDeleteBookmarkMenuItem = app.menuItems["ContextualMenu.deleteBookmark"]
+        contextualMenuRemoveBookmarkFromFavoritesMenuItem = app.menuItems["ContextualMenu.removeBookmarkFromFavoritesMenuItem"]
+        defaultBookmarkDialogButton = app.buttons["BookmarkDialogButtonsView.defaultButton"]
+        defaultBookmarkOtherButton = app.buttons["BookmarkDialogButtonsView.otherButton"]
+        favoriteGridAddFavoriteButton = app.staticTexts["HomePage.Models.FavoriteModel.addButton"]
+        favoriteThisPageMenuItem = app.menuItems["MainMenu.favoriteThisPage"]
+        manageBookmarksMenuItem = app.menuItems["MainMenu.manageBookmarksMenuItem"]
+        openBookmarksMenuItem = app.menuItems["MoreOptionsMenu.openBookmarks"]
+        optionsButton = app.buttons["NavigationBarViewController.optionsButton"]
+        removeFavoritesContextMenuItem = app.menuItems["HomePage.Views.removeFavorite"]
+        resetBookMarksMenuItem = app.menuItems["MainMenu.resetBookmarks"]
+        settingsAppearanceButton = app.buttons["PreferencesSidebar.appearanceButton"]
+        showBookmarksBarAlways = app.menuItems["Preferences.AppearanceView.showBookmarksBarAlways"]
+        showBookmarksBarPopup = app.popUpButtons["Preferences.AppearanceView.showBookmarksBarPopUp"]
+        showBookmarksBarPreferenceToggle = app.checkBoxes["Preferences.AppearanceView.showBookmarksBarPreferenceToggle"]
+        showFavoritesPreferenceToggle = app.checkBoxes["Preferences.AppearanceView.showFavoritesToggle"]
+
+        app.launch()
+        resetBookmarks()
+        app.typeKey("w", modifierFlags: [.command, .option, .shift]) // Let's enforce a single window
+        app.typeKey("n", modifierFlags: .command)
+    }
+
+    func test_bookmarks_canBeAddedTo_withContextClickBookmarkThisPage() {
+        openSiteToBookmark(bookmarkingViaDialog: false, escapingDialog: false)
+        app.windows.webViews[pageTitle].rightClick()
+        bookmarkPageContextMenuItem.clickAfterExistenceTestSucceeds()
+        XCTAssertTrue( // Check Add Bookmark dialog for existence but don't click on it
+            defaultBookmarkDialogButton.waitForExistence(timeout: UITests.Timeouts.elementExistence),
+            "The \"Add bookmark\" dialog option button didn't appear with the expected title in a reasonable timeframe."
+        )
+        XCTAssertTrue(
+            addressBarBookmarkButton.waitForExistence(timeout: UITests.Timeouts.elementExistence),
+            "The address bar bookmark button didn't appear with the expected title in a reasonable timeframe."
+        )
+        XCTAssertTrue(
+            bookmarkDialogBookmarkFolderDropdown.waitForExistence(timeout: UITests.Timeouts.elementExistence),
+            "The \"Add bookmark\" dialog's bookmark folder dropdown didn't appear with the expected title in a reasonable timeframe."
+        )
+        let bookmarkDialogBookmarkFolderDropdownValue = try? XCTUnwrap( // Bookmark dialog must default to "Bookmarks" folder
+            bookmarkDialogBookmarkFolderDropdown.value as? String,
+            "It wasn't possible to get the value of the \"Add bookmark\" dialog's bookmark folder dropdown as String"
+        )
+        XCTAssertEqual(
+            bookmarkDialogBookmarkFolderDropdownValue,
+            "Bookmarks",
+            "The accessibility value of the \"Add bookmark\" dialog's bookmark folder dropdown must be \"Bookmarks\"."
+        )
+        let addressBarBookmarkButtonValue = try? XCTUnwrap(
+            addressBarBookmarkButton.value as? String,
+            "It wasn't possible to get the value of the address bar bookmark button as String"
+        )
+
+        XCTAssertEqual( // The bookmark icon is already in a filled state and it isn't necessary to click the add button
+            addressBarBookmarkButtonValue,
+            "Bookmarked",
+            "The accessibility value of the address bar bookmark button must be \"Bookmarked\", which indicates the icon in the filled state."
+        )
+
+        bookmarksMenu.clickAfterExistenceTestSucceeds()
+        XCTAssertTrue( // And the bookmark is found in the Bookmarks menu
+            app.menuItems[pageTitle].waitForExistence(timeout: UITests.Timeouts.elementExistence),
+            "The bookmark in the \"Bookmarks\" menu with the title of the test page didn't appear with the expected title in a reasonable timeframe."
+        )
+    }
+
+    func test_bookmarks_canBeAddedTo_withSettingsItemBookmarkThisPage() {
+        openSiteToBookmark(bookmarkingViaDialog: false, escapingDialog: false)
+        optionsButton.clickAfterExistenceTestSucceeds()
+        openBookmarksMenuItem.hoverAfterExistenceTestSucceeds()
+        bookmarkPageMenuItem.clickAfterExistenceTestSucceeds()
+        XCTAssertTrue( // Check Add Bookmark dialog for existence but don't click on it
+            defaultBookmarkDialogButton.waitForExistence(timeout: UITests.Timeouts.elementExistence),
+            "The \"Add bookmark\" dialog option button didn't appear with the expected title in a reasonable timeframe."
+        )
+        XCTAssertTrue(
+            addressBarBookmarkButton.waitForExistence(timeout: UITests.Timeouts.elementExistence),
+            "The address bar bookmark button didn't appear with the expected title in a reasonable timeframe."
+        )
+        XCTAssertTrue(
+            bookmarkDialogBookmarkFolderDropdown.waitForExistence(timeout: UITests.Timeouts.elementExistence),
+            "The \"Add bookmark\" dialog's bookmark folder dropdown didn't appear with the expected title in a reasonable timeframe."
+        )
+        let bookmarkDialogBookmarkFolderDropdownValue = try? XCTUnwrap(
+            bookmarkDialogBookmarkFolderDropdown.value as? String,
+            "It wasn't possible to get the value of the \"Add bookmark\" dialog's bookmark folder dropdown as String"
+        )
+        XCTAssertEqual( // Bookmark dialog must default to "Bookmarks" folder
+            bookmarkDialogBookmarkFolderDropdownValue,
+            "Bookmarks",
+            "The accessibility value of the \"Add bookmark\" dialog's bookmark folder dropdown must be \"Bookmarks\"."
+        )
+
+        let addressBarBookmarkButtonValue = try? XCTUnwrap(
+            addressBarBookmarkButton.value as? String,
+            "It wasn't possible to get the value of the address bar bookmark button as String"
+        )
+        XCTAssertEqual( // The bookmark icon is already in a filled state and it isn't necessary to click the add button
+            addressBarBookmarkButtonValue,
+            "Bookmarked",
+            "The accessibility value of the address bar bookmark button must be \"Bookmarked\", which indicates the icon in the filled state."
+        )
+
+        bookmarksMenu.clickAfterExistenceTestSucceeds()
+        XCTAssertTrue( // And the bookmark is found in the Bookmarks menu
+            app.menuItems[pageTitle].waitForExistence(timeout: UITests.Timeouts.elementExistence),
+            "The bookmark in the \"Bookmarks\" menu with the title of the test page didn't appear with the expected title in a reasonable timeframe."
+        )
+    }
+
+    func test_bookmarks_canBeAddedTo_byClickingBookmarksButtonInAddressBar() {
+        openSiteToBookmark(bookmarkingViaDialog: false, escapingDialog: false)
+        // In order to directly click the bookmark button in the address bar, we need to hover over something in the bar area
+        optionsButton.hoverAfterExistenceTestSucceeds()
+        addressBarBookmarkButton.clickAfterExistenceTestSucceeds()
+        XCTAssertTrue( // Check Add Bookmark dialog for existence but don't click on it
+            defaultBookmarkDialogButton.waitForExistence(timeout: UITests.Timeouts.elementExistence),
+            "The \"Add bookmark\" dialog option button didn't appear with the expected title in a reasonable timeframe."
+        )
+        XCTAssertTrue(
+            bookmarkDialogBookmarkFolderDropdown.waitForExistence(timeout: UITests.Timeouts.elementExistence),
+            "The \"Add bookmark\" dialog's bookmark folder dropdown didn't appear with the expected title in a reasonable timeframe."
+        )
+        let bookmarkDialogBookmarkFolderDropdownValue = try? XCTUnwrap(
+            bookmarkDialogBookmarkFolderDropdown.value as? String,
+            "It wasn't possible to get the value of the \"Add bookmark\" dialog's bookmark folder dropdown as String"
+        )
+
+        XCTAssertEqual( // Bookmark dialog must default to "Bookmarks" folder
+            bookmarkDialogBookmarkFolderDropdownValue,
+            "Bookmarks",
+            "The accessibility value of the \"Add bookmark\" dialog's bookmark folder dropdown must be \"Bookmarks\"."
+        )
+        let addressBarBookmarkButtonValue = try? XCTUnwrap(
+            addressBarBookmarkButton.value as? String,
+            "It wasn't possible to get the value of the address bar bookmark button as String"
+        )
+        XCTAssertEqual( // The bookmark icon is already in a filled state and it isn't necessary to click the add button
+            addressBarBookmarkButtonValue,
+            "Bookmarked",
+            "The accessibility value of the address bar bookmark button must be \"Bookmarked\", which indicates the icon in the filled state."
+        )
+
+        bookmarksMenu.clickAfterExistenceTestSucceeds()
+        XCTAssertTrue( // And the bookmark is found in the Bookmarks menu
+            app.menuItems[pageTitle].waitForExistence(timeout: UITests.Timeouts.elementExistence),
+            "The bookmark in the \"Bookmarks\" menu with the title of the test page didn't appear with the expected title in a reasonable timeframe."
+        )
+    }
+
+    func test_favorites_canBeAddedTo_byClickingFavoriteThisPageMenuBarItem() {
+        openSiteToBookmark(bookmarkingViaDialog: false, escapingDialog: false)
+        bookmarksMenu.clickAfterExistenceTestSucceeds()
+        favoriteThisPageMenuItem.clickAfterExistenceTestSucceeds()
+
+        XCTAssertTrue( // Check Add Bookmark dialog for existence but don't click on it
+            defaultBookmarkDialogButton.waitForExistence(timeout: UITests.Timeouts.elementExistence),
+            "The \"Add bookmark\" dialog option button didn't appear with the expected title in a reasonable timeframe."
+        )
+        let addressBarBookmarkButtonValue = try? XCTUnwrap(
+            addressBarBookmarkButton.value as? String,
+            "It wasn't possible to get the value of the address bar bookmark button as String"
+        )
+        XCTAssertEqual( // The bookmark icon is already in a filled state and it isn't necessary to click the add button
+            addressBarBookmarkButtonValue,
+            "Bookmarked",
+            "The accessibility value of the address bar bookmark button must be \"Bookmarked\", which indicates the icon in the filled state."
+        )
+        XCTAssertTrue( // Check Add Bookmark dialog for existence but don't click on it
+            defaultBookmarkDialogButton.waitForExistence(timeout: UITests.Timeouts.elementExistence),
+            "The \"Add bookmark\" dialog option button didn't appear with the expected title in a reasonable timeframe."
+        )
+        XCTAssertTrue(
+            bookmarksDialogAddToFavoritesCheckbox.waitForExistence(timeout: UITests.Timeouts.elementExistence),
+            "The add to favorites checkbox in the add bookmark dialog didn't appear with the expected title in a reasonable timeframe."
+        )
+
+        let bookmarksDialogAddToFavoritesCheckboxValue = try? XCTUnwrap(
+            bookmarksDialogAddToFavoritesCheckbox.value as? Bool,
+            "It wasn't possible to get the value of the bookmarks dialog's add to favorites checkbox as Bool"
+        )
+        XCTAssertEqual( // The favorite checkbox in the dialog is already checked
+            bookmarksDialogAddToFavoritesCheckboxValue,
+            true,
+            "The the value of the bookmarks dialog's add to favorites checkbox must be checked, which indicates that the item has been favorited."
+        )
+    }
+
+    func test_favorites_canBeAddedTo_byClickingAddFavoriteInAddBookmarkPopover() {
+        openSiteToBookmark(bookmarkingViaDialog: false, escapingDialog: false)
+        // In order to directly click the bookmark button in the address bar, we need to hover over something in the bar area
+        optionsButton.hoverAfterExistenceTestSucceeds()
+
+        addressBarBookmarkButton.clickAfterExistenceTestSucceeds()
+        XCTAssertTrue( // Check Add Bookmark dialog for existence before adding to favorites
+            defaultBookmarkDialogButton.waitForExistence(timeout: UITests.Timeouts.elementExistence),
+            "The \"Add bookmark\" dialog option button didn't appear with the expected title in a reasonable timeframe."
+        )
+
+        bookmarksDialogAddToFavoritesCheckbox.clickAfterExistenceTestSucceeds()
+        let bookmarksDialogAddToFavoritesCheckboxValue = try? XCTUnwrap(
+            bookmarksDialogAddToFavoritesCheckbox.value as? Bool,
+            "It wasn't possible to get the value of the bookmarks dialog's add to favorites checkbox as Bool"
+        )
+        XCTAssertEqual( // The favorite checkbox in the dialog is already checked
+            bookmarksDialogAddToFavoritesCheckboxValue,
+            true,
+            "The the value of the bookmarks dialog's add to favorites checkbox must be checked, which indicates that the item has been favorited."
+        )
+    }
+
+    func test_favorites_canBeManuallyAddedTo_byClickingAddFavoriteInNewTabPage() throws {
+        toggleBookmarksBarShowFavoritesOn()
+
+        favoriteGridAddFavoriteButton.clickAfterExistenceTestSucceeds()
+        let pageTitleForAddFavoriteDialog: String = try XCTUnwrap(pageTitle, "Couldn't unwrap page title")
+        let urlForAddFavoriteDialog = try XCTUnwrap(urlForBookmarksBar, "Couldn't unwrap page url")
+        app.typeText("\(pageTitleForAddFavoriteDialog)\t")
+        app.typeURL(urlForAddFavoriteDialog)
+        let newFavorite = app.otherElements.staticTexts[pageTitleForAddFavoriteDialog]
+
+        XCTAssertTrue(
+            newFavorite.waitForExistence(timeout: UITests.Timeouts.elementExistence),
+            "The new favorite on the new tab page did not become available in a reasonable timeframe."
+        )
+    }
+
+    func test_favorites_canBeAddedToFromManageBookmarksView() {
+        openSiteToBookmark(bookmarkingViaDialog: true, escapingDialog: true)
+        bookmarksMenu.clickAfterExistenceTestSucceeds()
+        manageBookmarksMenuItem.clickAfterExistenceTestSucceeds()
+        bookmarkTableCellViewFavIconImageView.hoverAfterExistenceTestSucceeds()
+        bookmarkTableCellViewMenuButton.clickAfterExistenceTestSucceeds()
+
+        contextualMenuAddBookmarkToFavoritesMenuItem.clickAfterExistenceTestSucceeds()
+        XCTAssertTrue(
+            bookmarksManagementAccessoryImageView.waitForExistence(timeout: UITests.Timeouts.elementExistence),
+            "Bookmarks accessory view favorites indicator didn't load with the expected title in a reasonable timeframe."
+        )
+        let bookmarksManagementAccessoryImageViewValue = try? XCTUnwrap(
+            bookmarksManagementAccessoryImageView.value as? String,
+            "It wasn't possible to get the value of the bookmarks management accessory image view as String"
+        )
+
+        XCTAssertEqual(
+            bookmarksManagementAccessoryImageViewValue,
+            "Favorited",
+            "The accessibility value of the favorite accessory view on the bookmark management view must be \"Favorited\"."
+        )
+    }
+
+    func test_bookmarks_canBeViewedInBookmarkMenuItem() {
+        openSiteToBookmark(bookmarkingViaDialog: true, escapingDialog: true)
+        addressBarBookmarkButton.clickAfterExistenceTestSucceeds()
+
+        bookmarksMenu.clickAfterExistenceTestSucceeds()
+        let bookmarkedItemInMenu = app.menuItems[pageTitle]
+
+        XCTAssertTrue(
+            bookmarkedItemInMenu.waitForExistence(timeout: UITests.Timeouts.elementExistence),
+            "Bookmarked page couldn't be detected in the bookmarks menu in a reasonable timeframe."
+        )
+    }
+
+    func test_bookmarks_canBeViewedInAddressBarBookmarkDialog() {
+        openSiteToBookmark(bookmarkingViaDialog: true, escapingDialog: true)
+        XCTAssertTrue(
+            addressBarBookmarkButton.waitForExistence(timeout: UITests.Timeouts.elementExistence),
+            "Address bar bookmark button didn't load with the expected title in a reasonable timeframe."
+        )
+        let addressBarBookmarkButtonValue = try? XCTUnwrap(
+            addressBarBookmarkButton.value as? String,
+            "It wasn't possible to get the value of the bookmarks management accessory image view as String"
+        )
+        XCTAssertEqual(
+            addressBarBookmarkButtonValue,
+            "Bookmarked",
+            "The accessibility value of the Address Bar Bookmark Button must be \"Bookmarked\"."
+        )
+
+        addressBarBookmarkButton.click()
+        let bookMarkDialogBookmarkTitle = app.textFields[pageTitle]
+
+        XCTAssertTrue(
+            bookMarkDialogBookmarkTitle.waitForExistence(timeout: UITests.Timeouts.elementExistence),
+            "The bookmarked url title wasn't found in the bookmark dialog in a bookmarked state in a reasonable timeframe."
+        )
+    }
+
+    func test_bookmarksTab_canBeViewedViaMenuItemManageBookmarks() {
+        openSiteToBookmark(bookmarkingViaDialog: true, escapingDialog: true)
+        bookmarksMenu.clickAfterExistenceTestSucceeds()
+
+        manageBookmarksMenuItem.clickAfterExistenceTestSucceeds()
+
+        XCTAssertTrue(
+            bookmarksTabPopup.waitForExistence(timeout: UITests.Timeouts.elementExistence),
+            "Bookmarks tab bookmarks popup didn't load with the expected title in a reasonable timeframe."
+        )
+    }
+
+    func test_favorites_appearWithTheCorrectIndicatorInBookmarksTab() {
+        openSiteToBookmark(bookmarkingViaDialog: true, escapingDialog: false)
+        XCTAssertTrue(
+            bookmarksDialogAddToFavoritesCheckbox.waitForExistence(timeout: UITests.Timeouts.elementExistence),
+            "The add to favorites checkbox in the add bookmark dialog didn't appear with the expected title in a reasonable timeframe."
+        )
+        let bookmarksDialogAddToFavoritesCheckboxValue = try? XCTUnwrap(
+            bookmarksDialogAddToFavoritesCheckbox.value as? Bool,
+            "It wasn't possible to get the value of the bookmarks dialog's add to favorites checkbox as Bool"
+        )
+        if bookmarksDialogAddToFavoritesCheckboxValue == false {
+            bookmarksDialogAddToFavoritesCheckbox.click()
+        }
+        app.typeKey(.escape, modifierFlags: []) // Exit dialog
+
+        bookmarksMenu.clickAfterExistenceTestSucceeds()
+        manageBookmarksMenuItem.clickAfterExistenceTestSucceeds()
+        XCTAssertTrue(
+            bookmarksTabPopup.waitForExistence(timeout: UITests.Timeouts.elementExistence),
+            "Bookmarks tab bookmarks popup didn't load with the expected title in a reasonable timeframe."
+        )
+        XCTAssertTrue(
+            bookmarksManagementAccessoryImageView.waitForExistence(timeout: UITests.Timeouts.elementExistence),
+            "Bookmarks accessory view favorites indicator didn't load with the expected title in a reasonable timeframe."
+        )
+        let bookmarksManagementAccessoryImageViewValue = try? XCTUnwrap(
+            bookmarksManagementAccessoryImageView.value as? String,
+            "It wasn't possible to get the value of the bookmarks management accessory image view as String"
+        )
+
+        XCTAssertEqual(
+            bookmarksManagementAccessoryImageViewValue,
+            "Favorited",
+            "The accessibility value of the favorite accessory view on the bookmark management view must be \"Favorited\"."
+        )
+    }
+
+    func test_favorites_appearInNewTabFavoritesGrid() throws {
+        openSiteToBookmark(bookmarkingViaDialog: true, escapingDialog: false)
+        XCTAssertTrue(
+            bookmarksDialogAddToFavoritesCheckbox.waitForExistence(timeout: UITests.Timeouts.elementExistence),
+            "The add to favorites checkbox in the add bookmark dialog didn't appear with the expected title in a reasonable timeframe."
+        )
+        let bookmarksDialogAddToFavoritesCheckboxValue = try? XCTUnwrap(
+            bookmarksDialogAddToFavoritesCheckbox.value as? Bool,
+            "It wasn't possible to get the value of the bookmarks dialog's add to favorites checkbox as Bool"
+        )
+        if bookmarksDialogAddToFavoritesCheckboxValue == false {
+            bookmarksDialogAddToFavoritesCheckbox.click()
+        }
+        app.typeKey(.escape, modifierFlags: []) // Exit dialog
+
+        toggleBookmarksBarShowFavoritesOn()
+        let unwrappedPageTitle = try XCTUnwrap(pageTitle, "It wasn't possible to unwrap pageTitle")
+        let firstFavoriteInGridMatchingTitle = app.staticTexts["HomePage.Models.FavoriteModel.\(unwrappedPageTitle)"].firstMatch
+
+        XCTAssertTrue(
+            firstFavoriteInGridMatchingTitle.waitForExistence(timeout: UITests.Timeouts.elementExistence),
+            "The favorited item in the grid did not become available in a reasonable timeframe."
+        )
+    }
+
+    func test_favorites_canBeRemovedFromAddressBarBookmarkDialog() {
+        openSiteToBookmark(bookmarkingViaDialog: true, escapingDialog: false)
+        XCTAssertTrue(
+            bookmarksDialogAddToFavoritesCheckbox.waitForExistence(timeout: UITests.Timeouts.elementExistence),
+            "The add to favorites checkbox in the add bookmark dialog didn't appear with the expected title in a reasonable timeframe."
+        )
+        let bookmarksDialogAddToFavoritesCheckboxValue = try? XCTUnwrap(
+            bookmarksDialogAddToFavoritesCheckbox.value as? Bool,
+            "It wasn't possible to get the value of the bookmarks dialog's add to favorites checkbox as Bool"
+        )
+        if bookmarksDialogAddToFavoritesCheckboxValue == false {
+            bookmarksDialogAddToFavoritesCheckbox.click() // Favorite the bookmark
+        }
+        app.typeKey(.escape, modifierFlags: []) // Exit dialog
+
+        XCTAssertTrue(
+            addressBarBookmarkButton.waitForExistence(timeout: UITests.Timeouts.elementExistence),
+            "Address bar bookmark button didn't load with the expected title in a reasonable timeframe."
+        )
+        let addressBarBookmarkButtonValue = try? XCTUnwrap(
+            addressBarBookmarkButton.value as? String,
+            "It wasn't possible to get the value of the bookmarks management accessory image view as String"
+        )
+        XCTAssertEqual(
+            addressBarBookmarkButtonValue,
+            "Bookmarked",
+            "The accessibility value of the Address Bar Bookmark Button must be \"Bookmarked\"."
+        )
+        addressBarBookmarkButton.click()
+        XCTAssertTrue(
+            bookmarksDialogAddToFavoritesCheckbox.waitForExistence(timeout: UITests.Timeouts.elementExistence),
+            "The add to favorites checkbox in the add bookmark dialog didn't appear with the expected title in a reasonable timeframe."
+        )
+        let bookmarksDialogAddToFavoritesCheckboxNewValue = try? XCTUnwrap(
+            bookmarksDialogAddToFavoritesCheckbox.value as? Bool,
+            "It wasn't possible to get the value of the bookmarks dialog's add to favorites checkbox as Bool"
+        )
+        if bookmarksDialogAddToFavoritesCheckboxNewValue == true {
+            bookmarksDialogAddToFavoritesCheckbox.click() // Unfavorite the bookmark
+        }
+        let bookmarksDialogAddToFavoritesCheckboxLastValue = try? XCTUnwrap(
+            bookmarksDialogAddToFavoritesCheckbox.value as? Bool,
+            "It wasn't possible to get the value of the bookmarks dialog's add to favorites checkbox as Bool"
+        )
+        let addToFavoritesLabel = "Add to Favorites"
+
+        XCTAssertEqual(
+            bookmarksDialogAddToFavoritesCheckboxLastValue,
+            false,
+            "The favorite checkbox in the add bookmark dialog must now be unchecked"
+        )
+        XCTAssertEqual(
+            bookmarksDialogAddToFavoritesCheckbox.label,
+            addToFavoritesLabel,
+            "The label of the add to favorites checkbox must now be \"\(addToFavoritesLabel)\""
+        )
+    }
+
+    func test_favorites_canBeRemovedFromManageBookmarks() {
+        openSiteToBookmark(bookmarkingViaDialog: true, escapingDialog: false)
+        XCTAssertTrue(
+            bookmarksDialogAddToFavoritesCheckbox.waitForExistence(timeout: UITests.Timeouts.elementExistence),
+            "The add to favorites checkbox in the add bookmark dialog didn't appear with the expected title in a reasonable timeframe."
+        )
+        let bookmarksDialogAddToFavoritesCheckboxValue = try? XCTUnwrap(
+            bookmarksDialogAddToFavoritesCheckbox.value as? Bool,
+            "It wasn't possible to get the value of the bookmarks dialog's add to favorites checkbox as Bool"
+        )
+        if bookmarksDialogAddToFavoritesCheckboxValue == false {
+            bookmarksDialogAddToFavoritesCheckbox.click() // Favorite the bookmark
+        }
+        app.typeKey(.escape, modifierFlags: []) // Exit dialog
+
+        bookmarksMenu.clickAfterExistenceTestSucceeds()
+        manageBookmarksMenuItem.clickAfterExistenceTestSucceeds()
+        bookmarkTableCellViewFavIconImageView.hoverAfterExistenceTestSucceeds()
+        bookmarkTableCellViewMenuButton.clickAfterExistenceTestSucceeds()
+        contextualMenuRemoveBookmarkFromFavoritesMenuItem.clickAfterExistenceTestSucceeds()
+
+        XCTAssertTrue(
+            bookmarksManagementAccessoryImageView.waitForNonExistence(timeout: UITests.Timeouts.elementExistence),
+            "Bookmarks accessory view favorites indicator didn't disappear from the view in a reasonable timeframe."
+        )
+    }
+
+    func test_favorites_canBeRemovedFromNewTabViaContextClick() throws {
+        toggleBookmarksBarShowFavoritesOn()
+        openSiteToBookmark(bookmarkingViaDialog: true, escapingDialog: false)
+        XCTAssertTrue(
+            bookmarksDialogAddToFavoritesCheckbox.waitForExistence(timeout: UITests.Timeouts.elementExistence),
+            "The add to favorites checkbox in the add bookmark dialog didn't appear with the expected title in a reasonable timeframe."
+        )
+        let bookmarksDialogAddToFavoritesCheckboxValue = try? XCTUnwrap(
+            bookmarksDialogAddToFavoritesCheckbox.value as? Bool,
+            "It wasn't possible to get the value of the bookmarks dialog's add to favorites checkbox as Bool"
+        )
+        if bookmarksDialogAddToFavoritesCheckboxValue == false {
+            bookmarksDialogAddToFavoritesCheckbox.click() // Favorite the bookmark
+        }
+        app.typeKey(.escape, modifierFlags: []) // Exit dialog
+        app.typeKey("w", modifierFlags: [.command, .option, .shift]) // Close all windows
+        app.typeKey("n", modifierFlags: .command) // New window
+
+        let unwrappedPageTitle = try XCTUnwrap(pageTitle, "It wasn't possible to unwrap pageTitle")
+        let firstFavoriteInGridMatchingTitle = app.staticTexts["HomePage.Models.FavoriteModel.\(unwrappedPageTitle)"].firstMatch
+        XCTAssertTrue(
+            firstFavoriteInGridMatchingTitle.waitForExistence(timeout: UITests.Timeouts.elementExistence),
+            "The favorited item in the grid did not become available in a reasonable timeframe."
+        )
+        firstFavoriteInGridMatchingTitle.rightClick()
+        removeFavoritesContextMenuItem.clickAfterExistenceTestSucceeds()
+
+        XCTAssertTrue(
+            firstFavoriteInGridMatchingTitle.waitForNonExistence(timeout: UITests.Timeouts.elementExistence),
+            "The favorited item in the grid did not disappear in a reasonable timeframe."
+        )
+    }
+
+    func test_bookmark_canBeRemovedViaAddressBarIconClick() {
+        toggleShowBookmarksBarAlwaysOn()
+        app.typeKey("w", modifierFlags: [.command, .option, .shift])
+        app.typeKey("n", modifierFlags: .command)
+        openSiteToBookmark(bookmarkingViaDialog: true, escapingDialog: true)
+
+        addressBarBookmarkButton.clickAfterExistenceTestSucceeds()
+        defaultBookmarkOtherButton.clickAfterExistenceTestSucceeds()
+        app.typeKey(.escape, modifierFlags: []) // Exit dialog
+        app.typeKey("w", modifierFlags: [.command, .option, .shift])
+        app.typeKey("n", modifierFlags: .command)
+
+        XCTAssertTrue(
+            app.staticTexts[pageTitle].waitForNonExistence(timeout: UITests.Timeouts.elementExistence),
+            "Since there is no bookmark of the page, and we show bookmarks in the bookmark bar, the title of the page should not appear in a new browser window anywhere."
+        )
+    }
+
+    func test_bookmark_canBeRemovedFromBookmarksTabViaHoverAndContextMenu() {
+        app.typeKey("w", modifierFlags: [.command, .option, .shift])
+        app.typeKey("n", modifierFlags: .command)
+        openSiteToBookmark(bookmarkingViaDialog: true, escapingDialog: true)
+
+        bookmarksMenu.clickAfterExistenceTestSucceeds()
+        manageBookmarksMenuItem.clickAfterExistenceTestSucceeds()
+        bookmarkTableCellViewFavIconImageView.hoverAfterExistenceTestSucceeds()
+        bookmarkTableCellViewMenuButton.clickAfterExistenceTestSucceeds()
+        contextualMenuDeleteBookmarkMenuItem.clickAfterExistenceTestSucceeds()
+        app.typeKey("w", modifierFlags: [.command, .option, .shift])
+        app.typeKey("n", modifierFlags: .command)
+
+        XCTAssertTrue(
+            app.staticTexts[pageTitle].waitForNonExistence(timeout: UITests.Timeouts.elementExistence),
+            "Since there is no bookmark of the page, and we show bookmarks in the bookmark bar, the title of the page should not appear in a new browser window anywhere."
+        )
+    }
+
+    func test_bookmark_canBeRemovedFromBookmarksBarViaRightClick() {
+//        This test uses coordinates (instead of accessibility IDs) to address the elements of the right click. As the writer of this test, I see this
+//        as a fragile test hook. However, I think it is preferable to making changes to the UI element it tests for this test alone. The reason is
+//        that the bookmark item on the bookmark bar isn't yet an accessibility-enabled UI element and doesn't appear to have a natural anchor point
+//        from which we can set its accessibility values without redesigning it. However, redesigning a road-tested UI element for a single test isn't
+//        a
+//        good idea, since the road-testing is also (valuable) testing and we don't want a single test to be the driver of a possible behavioral
+//        change in existing interface.
+//
+//        My advice is to keep this as-is for now, with an awareness that it can fail if the coordinates of the items in the right-click menu change,
+//        or if the system where the testing is done has accessibility settings which change scaling. When the time comes to update this element, into
+//        SwiftUI, or into a general accessibility revision (for end-user accessibility rather than UI test accessibility), that will be the natural
+//        time to correct this test and give it accessibility ID access. Until then, I have added some hinting in the failure reason to explain why
+//        this test can fail while the app is working correctly. -Halle Winkler
+
+        toggleShowBookmarksBarAlwaysOn()
+        app.typeKey("w", modifierFlags: [.command, .option, .shift])
+        app.typeKey("n", modifierFlags: .command)
+        openSiteToBookmark(bookmarkingViaDialog: true, escapingDialog: true)
+        app.typeKey("w", modifierFlags: [.command, .option, .shift])
+        app.typeKey("n", modifierFlags: .command)
+
+        XCTAssertTrue(
+            bookmarksBarCollectionView.waitForExistence(timeout: UITests.Timeouts.elementExistence),
+            "The bookmarks bar collection view failed to become available in a reasonable timeframe."
+        )
+        let bookmarkBarBookmarkIcon = bookmarksBarCollectionView.images.firstMatch
+        XCTAssertTrue(
+            bookmarkBarBookmarkIcon.waitForExistence(timeout: UITests.Timeouts.elementExistence),
+            "The bookmarks bar bookmark icon failed to become available in a reasonable timeframe."
+        )
+        let bookmarkBarBookmarkIconCoordinate = bookmarkBarBookmarkIcon.coordinate(withNormalizedOffset: CGVector(dx: 0.5, dy: 0.5))
+        let deleteContextMenuItemCoordinate = bookmarkBarBookmarkIcon.coordinate(withNormalizedOffset: CGVector(dx: 0.9, dy: 9.0))
+        bookmarkBarBookmarkIconCoordinate.rightClick()
+        deleteContextMenuItemCoordinate.click()
+        app.typeKey("w", modifierFlags: [.command, .option, .shift])
+        app.typeKey("n", modifierFlags: .command)
+
+        XCTAssertTrue(
+            app.staticTexts[pageTitle].waitForNonExistence(timeout: UITests.Timeouts.elementExistence),
+            "Since there is no bookmark of the page, and we show bookmarks in the bookmark bar, the title of the page should not appear in a new browser window anywhere. In this specific test, it is highly probable that the reason for a failure (when this area of the app appears to be working correctly) is the contextual menu being rearranged, since it has to address the menu elements by coordinate."
+        )
+    }
+}
+
+private extension BookmarksAndFavoritesTests {
+    /// Reset the bookmarks so we can rely on a single bookmark's existence
+    func resetBookmarks() {
+        app.typeKey("n", modifierFlags: [.command]) // Can't use debug menu without a window
+        XCTAssertTrue(
+            resetBookMarksMenuItem.waitForExistence(timeout: UITests.Timeouts.elementExistence),
+            "Reset bookmarks menu item didn't become available in a reasonable timeframe."
+        )
+        resetBookMarksMenuItem.click()
+    }
+
+    /// Make sure that we can reply on the bookmarks bar always appearing
+    func toggleShowBookmarksBarAlwaysOn() {
+        app.typeKey(",", modifierFlags: [.command]) // Open settings
+
+        XCTAssertTrue(
+            settingsAppearanceButton.waitForExistence(timeout: UITests.Timeouts.elementExistence),
+            "The user settings appearance section button didn't become available in a reasonable timeframe."
+        )
+        settingsAppearanceButton.click(forDuration: 0.5, thenDragTo: settingsAppearanceButton)
+        XCTAssertTrue(
+            showBookmarksBarPreferenceToggle.waitForExistence(timeout: UITests.Timeouts.elementExistence),
+            "The toggle for showing the bookmarks bar didn't become available in a reasonable timeframe."
+        )
+
+        let showBookmarksBarIsChecked = try? XCTUnwrap(
+            showBookmarksBarPreferenceToggle.value as? Bool,
+            "It wasn't possible to get the \"Show bookmarks bar\" value as a Bool"
+        )
+        if showBookmarksBarIsChecked == false {
+            showBookmarksBarPreferenceToggle.click()
+        }
+        XCTAssertTrue(
+            showBookmarksBarPopup.waitForExistence(timeout: UITests.Timeouts.elementExistence),
+            "The \"Show Bookmarks Bar\" popup button didn't become available in a reasonable timeframe."
+        )
+        showBookmarksBarPopup.click()
+        XCTAssertTrue(
+            showBookmarksBarAlways.waitForExistence(timeout: UITests.Timeouts.elementExistence),
+            "The \"Show Bookmarks Bar Always\" button didn't become available in a reasonable timeframe."
+        )
+        showBookmarksBarAlways.click()
+    }
+
+    /// Make sure that appearance tab has been used to set "show favorites" to true
+    func toggleBookmarksBarShowFavoritesOn() {
+        app.typeKey(",", modifierFlags: [.command]) // Open settings
+
+        XCTAssertTrue(
+            settingsAppearanceButton.waitForExistence(timeout: UITests.Timeouts.elementExistence),
+            "The user settings appearance section button didn't become available in a reasonable timeframe."
+        )
+        settingsAppearanceButton.click(forDuration: 0.5, thenDragTo: settingsAppearanceButton)
+
+        XCTAssertTrue(
+            showFavoritesPreferenceToggle.waitForExistence(timeout: UITests.Timeouts.elementExistence),
+            "The user settings appearance section show favorites toggle didn't become available in a reasonable timeframe."
+        )
+        let showFavoritesPreferenceToggleIsChecked = showFavoritesPreferenceToggle.value as? Bool
+        if showFavoritesPreferenceToggleIsChecked == false { // If untoggled,
+            showFavoritesPreferenceToggle.click() // Toggle "show favorites"
+        }
+        app.typeKey("w", modifierFlags: [.command, .option, .shift]) // Close settings and everything else
+        app.typeKey("n", modifierFlags: .command) // New window
+    }
+
+    /// Open the initial site to be bookmarked, bookmarking it and/or escaping out of the dialog only if needed
+    /// - Parameter bookmarkingViaDialog: open bookmark dialog, adding bookmark
+    /// - Parameter escapingDialog: `esc` key to leave dialog
+    func openSiteToBookmark(bookmarkingViaDialog: Bool, escapingDialog: Bool) {
+        XCTAssertTrue(
+            addressBarTextField.waitForExistence(timeout: UITests.Timeouts.elementExistence),
+            "The address bar text field didn't become available in a reasonable timeframe."
+        )
+        addressBarTextField.typeURL(urlForBookmarksBar)
+        XCTAssertTrue(
+            app.windows.webViews[pageTitle].waitForExistence(timeout: UITests.Timeouts.elementExistence),
+            "Visited site didn't load with the expected title in a reasonable timeframe."
+        )
+        if bookmarkingViaDialog {
+            app.typeKey("d", modifierFlags: [.command]) // Add bookmark
+            if escapingDialog {
+                app.typeKey(.escape, modifierFlags: []) // Exit dialog
+            }
+        }
+    }
+}
diff --git a/UITests/BookmarksBarTests.swift b/UITests/BookmarksBarTests.swift
new file mode 100644
index 0000000000..2d233cdfbd
--- /dev/null
+++ b/UITests/BookmarksBarTests.swift
@@ -0,0 +1,224 @@
+//
+//  BookmarksBarTests.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 BookmarksBarTests: XCTestCase {
+    private var app: XCUIApplication!
+    private var pageTitle: String!
+    private var urlForBookmarksBar: URL!
+    private var settingsWindow: XCUIElement!
+    private var siteWindow: XCUIElement!
+    private var defaultBookmarkDialogButton: XCUIElement!
+    private var resetBookMarksMenuItem: XCUIElement!
+    private var showBookmarksBarPreferenceToggle: XCUIElement!
+    private var showBookmarksBarPopup: XCUIElement!
+    private var showBookmarksBarAlways: XCUIElement!
+    private var showBookmarksBarNewTabOnly: XCUIElement!
+    private var bookmarksBarCollectionView: XCUIElement!
+    private var addressBarTextField: XCUIElement!
+    private let titleStringLength = 12
+
+    override class func setUp() {
+        UITests.firstRun()
+    }
+
+    override func setUpWithError() throws {
+        continueAfterFailure = false
+        app = XCUIApplication()
+        app.launchEnvironment["UITEST_MODE"] = "1"
+        defaultBookmarkDialogButton = app.buttons["BookmarkDialogButtonsView.defaultButton"]
+        showBookmarksBarPreferenceToggle = app.checkBoxes["Preferences.AppearanceView.showBookmarksBarPreferenceToggle"]
+        resetBookMarksMenuItem = app.menuItems["MainMenu.resetBookmarks"]
+        showBookmarksBarPopup = app.popUpButtons["Preferences.AppearanceView.showBookmarksBarPopUp"]
+        showBookmarksBarAlways = app.menuItems["Preferences.AppearanceView.showBookmarksBarAlways"]
+        showBookmarksBarNewTabOnly = app.menuItems["Preferences.AppearanceView.showBookmarksBarNewTabOnly"]
+        bookmarksBarCollectionView = app.collectionViews["BookmarksBarViewController.bookmarksBarCollectionView"]
+        addressBarTextField = app.windows.textFields["AddressBarViewController.addressBarTextField"]
+        pageTitle = UITests.randomPageTitle(length: titleStringLength)
+        urlForBookmarksBar = UITests.simpleServedPage(titled: pageTitle)
+        app.launch()
+        app.typeKey("w", modifierFlags: [.command, .option, .shift]) // Close windows
+        app.typeKey("n", modifierFlags: [.command]) // Guarantee a single window
+        resetBookmarksAndAddOneBookmark()
+        app.typeKey("w", modifierFlags: [.command, .option, .shift]) // Close windows
+        openSettingsAndSetShowBookmarksBarToUnchecked()
+        openSecondWindowAndVisitSite()
+        siteWindow = app.windows.containing(.webView, identifier: pageTitle).firstMatch
+    }
+
+    func test_bookmarksBar_whenShowBookmarksBarAlwaysIsSelected_alwaysDynamicallyAppearsOnWindow() throws {
+        app.typeKey("w", modifierFlags: [.command])
+        XCTAssertTrue(
+            showBookmarksBarPreferenceToggle.waitForExistence(timeout: UITests.Timeouts.elementExistence),
+            "The toggle for showing the bookmarks bar didn't become available in a reasonable timeframe."
+        )
+
+        let showBookmarksBarIsChecked = try? XCTUnwrap(
+            showBookmarksBarPreferenceToggle.value as? Bool,
+            "It wasn't possible to get the \"Show bookmarks bar\" value as a Bool"
+        )
+        if showBookmarksBarIsChecked == false {
+            showBookmarksBarPreferenceToggle.click()
+        }
+        XCTAssertTrue(
+            showBookmarksBarPopup.waitForExistence(timeout: UITests.Timeouts.elementExistence),
+            "The \"Show Bookmarks Bar\" popup button didn't become available in a reasonable timeframe."
+        )
+        showBookmarksBarPopup.click()
+        XCTAssertTrue(
+            showBookmarksBarAlways.waitForExistence(timeout: UITests.Timeouts.elementExistence),
+            "The \"Show Bookmarks Bar Always\" button didn't become available in a reasonable timeframe."
+        )
+        showBookmarksBarAlways.click()
+
+        XCTAssertTrue(
+            bookmarksBarCollectionView.waitForExistence(timeout: UITests.Timeouts.elementExistence),
+            "The bookmarksBarCollectionView should exist on a website window when we have selected \"Always Show Bookmarks Bar\" in the settings"
+        )
+    }
+
+    func test_bookmarksBar_whenShowBookmarksNewTabOnlyIsSelected_onlyAppearsOnANewTabUntilASiteIsLoaded() throws {
+        app.typeKey("w", modifierFlags: [.command]) // Close site window
+        XCTAssertTrue(
+            showBookmarksBarPreferenceToggle.waitForExistence(timeout: UITests.Timeouts.elementExistence),
+            "The toggle for showing the bookmarks bar didn't become available in a reasonable timeframe."
+        )
+
+        let showBookmarksBarIsChecked = try? XCTUnwrap(
+            showBookmarksBarPreferenceToggle.value as? Bool,
+            "It wasn't possible to get the \"Show bookmarks bar\" value as a Bool"
+        )
+        if showBookmarksBarIsChecked == false {
+            showBookmarksBarPreferenceToggle.click()
+        }
+        XCTAssertTrue(
+            showBookmarksBarPopup.waitForExistence(timeout: UITests.Timeouts.elementExistence),
+            "The \"Show Bookmarks Bar\" popup button didn't become available in a reasonable timeframe."
+        )
+        showBookmarksBarPopup.click()
+
+        XCTAssertTrue(
+            showBookmarksBarNewTabOnly.waitForExistence(timeout: UITests.Timeouts.elementExistence),
+            "The \"Show Bookmarks Bar Always\" button didn't become available in a reasonable timeframe."
+        )
+        showBookmarksBarNewTabOnly.click()
+        app.typeKey("w", modifierFlags: [.command, .option, .shift]) // Close windows
+        app.typeKey("n", modifierFlags: [.command]) // open one new window
+
+        XCTAssertTrue(
+            bookmarksBarCollectionView.waitForExistence(timeout: UITests.Timeouts.elementExistence),
+            "The bookmarksBarCollectionView should exist on a new tab into which no site name or location has been typed yet."
+        )
+        XCTAssertTrue(
+            addressBarTextField.waitForExistence(timeout: UITests.Timeouts.elementExistence),
+            "The Address Bar text field did not exist when it was expected."
+        )
+        addressBarTextField.typeURL(urlForBookmarksBar)
+        XCTAssertTrue(
+            bookmarksBarCollectionView.waitForNonExistence(timeout: UITests.Timeouts.elementExistence),
+            "The bookmarksBarCollectionView should not exist on a tab that has been directed to a site, and is no longer new, when we have selected show bookmarks bar \"New Tab Only\" in the settings"
+        )
+    }
+
+    func test_bookmarksBar_whenShowBookmarksBarIsUnchecked_isNeverShownInWindowsAndTabs() throws {
+        // This tests begins in the state that "show bookmarks bar" is unchecked, so that isn't set within the test
+
+        app.typeKey("w", modifierFlags: [.command, .option, .shift]) // Close windows
+        app.typeKey("n", modifierFlags: [.command]) // Open new window
+        XCTAssertTrue(
+            bookmarksBarCollectionView.waitForNonExistence(timeout: UITests.Timeouts.elementExistence),
+            "The bookmarksBarCollectionView should not exist on a new window when we have unchecked \"Show Bookmarks Bar\" in the settings"
+        )
+
+        app.typeKey("t", modifierFlags: [.command]) // Open new tab
+        XCTAssertTrue(
+            bookmarksBarCollectionView.waitForNonExistence(timeout: UITests.Timeouts.elementExistence),
+            "The bookmarksBarCollectionView should not exist on a new tab when we have unchecked \"Show Bookmarks Bar\" in the settings"
+        )
+        app.typeKey("l", modifierFlags: [.command]) // Get address bar focus
+        app.typeURL(urlForBookmarksBar)
+
+        XCTAssertTrue(
+            bookmarksBarCollectionView.waitForNonExistence(timeout: UITests.Timeouts.elementExistence),
+            "The bookmarksBarCollectionView should not exist on a new tab that has been directed to a site when we have unchecked \"Show Bookmarks Bar\" in the settings"
+        )
+    }
+}
+
+private extension BookmarksBarTests {
+    func openSettingsAndSetShowBookmarksBarToUnchecked() {
+        app.typeKey(",", modifierFlags: [.command])
+
+        let settingsAppearanceButton = app.buttons["PreferencesSidebar.appearanceButton"]
+        XCTAssertTrue(
+            settingsAppearanceButton.waitForExistence(timeout: UITests.Timeouts.elementExistence),
+            "The user settings appearance section button didn't become available in a reasonable timeframe."
+        )
+        // This should just be a click(), but there are states for this test where the first few clicks don't register here.
+        settingsAppearanceButton.click(forDuration: UITests.Timeouts.elementExistence, thenDragTo: settingsAppearanceButton)
+
+        XCTAssertTrue(
+            showBookmarksBarPreferenceToggle.waitForExistence(timeout: UITests.Timeouts.elementExistence),
+            "The toggle for showing the bookmarks bar didn't become available in a reasonable timeframe."
+        )
+
+        let showBookmarksBarIsChecked = showBookmarksBarPreferenceToggle.value as? Bool
+        if showBookmarksBarIsChecked == true {
+            showBookmarksBarPreferenceToggle.click()
+        }
+    }
+
+    func openSecondWindowAndVisitSite() {
+        app.typeKey("n", modifierFlags: [.command])
+        app.typeKey("l", modifierFlags: [.command]) // Get address bar focus without addressing multiple address bars by identifier
+        XCTAssertTrue( // Use home page logo as a test to know if a new window is fully ready before we type
+            app.images["HomePageLogo"].waitForExistence(timeout: UITests.Timeouts.elementExistence),
+            "The Home Page Logo did not exist when it was expected."
+        )
+        app.typeURL(urlForBookmarksBar)
+    }
+
+    func resetBookmarksAndAddOneBookmark() {
+        XCTAssertTrue(
+            resetBookMarksMenuItem.waitForExistence(timeout: UITests.Timeouts.elementExistence),
+            "Reset bookmarks menu item didn't become available in a reasonable timeframe."
+        )
+
+        resetBookMarksMenuItem.click()
+        XCTAssertTrue(
+            addressBarTextField.waitForExistence(timeout: UITests.Timeouts.elementExistence),
+            "The Address Bar text field did not exist when it was expected."
+        )
+        addressBarTextField.typeURL(urlForBookmarksBar)
+        XCTAssertTrue(
+            app.windows.webViews[pageTitle].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(
+            defaultBookmarkDialogButton.waitForExistence(timeout: UITests.Timeouts.elementExistence),
+            "Bookmark button didn't appear with the expected title in a reasonable timeframe."
+        )
+
+        defaultBookmarkDialogButton.click()
+    }
+}
diff --git a/UITests/BrowsingHistoryTests.swift b/UITests/BrowsingHistoryTests.swift
index 53aaade7e5..ac26e4ca7a 100644
--- a/UITests/BrowsingHistoryTests.swift
+++ b/UITests/BrowsingHistoryTests.swift
@@ -27,6 +27,10 @@ class BrowsingHistoryTests: XCTestCase {
     private var addressBarTextField: XCUIElement!
     private let lengthForRandomPageTitle = 8
 
+    override class func setUp() {
+        UITests.firstRun()
+    }
+
     override func setUpWithError() throws {
         continueAfterFailure = false
         app = XCUIApplication()
@@ -72,7 +76,7 @@ class BrowsingHistoryTests: XCTestCase {
             "The address bar text field didn't become available in a reasonable timeframe."
         )
 
-        addressBarTextField.typeText("\(url.absoluteString)\r")
+        addressBarTextField.typeURL(url)
         XCTAssertTrue(
             app.windows.webViews[historyPageTitleExpectedToBeFirstInRecentlyVisited]
                 .waitForExistence(timeout: UITests.Timeouts.elementExistence),
@@ -100,7 +104,7 @@ class BrowsingHistoryTests: XCTestCase {
             "The address bar text field didn't become available in a reasonable timeframe."
         )
 
-        addressBarTextField.typeText("\(url.absoluteString)\r")
+        addressBarTextField.typeURL(url)
         XCTAssertTrue(
             app.windows.webViews[historyPageTitleExpectedToBeFirstInTodayHistory].waitForExistence(timeout: UITests.Timeouts.elementExistence),
             "Visited site didn't load with the expected title in a reasonable timeframe."
@@ -129,14 +133,14 @@ class BrowsingHistoryTests: XCTestCase {
             addressBarTextField.waitForExistence(timeout: UITests.Timeouts.elementExistence),
             "The address bar text field didn't become available in a reasonable timeframe."
         )
-        addressBarTextField.typeText("\(urlForFirstTab.absoluteString)\r")
+        addressBarTextField.typeURL(urlForFirstTab)
         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")
+        addressBarTextField.typeURL(urlForSecondTab)
         XCTAssertTrue(
             app.windows.webViews[titleOfSecondTabWhichShouldRestore].waitForExistence(timeout: UITests.Timeouts.elementExistence),
             "Visited site didn't load with the expected title in a reasonable timeframe."
diff --git a/UITests/Common/UITests.swift b/UITests/Common/UITests.swift
index 3d97fb6a96..10ebf5046d 100644
--- a/UITests/Common/UITests.swift
+++ b/UITests/Common/UITests.swift
@@ -17,13 +17,14 @@
 //
 
 import Foundation
+import XCTest
 
 /// 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
+        static let elementExistence: Double = 5.0
         /// 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
     }
@@ -48,4 +49,56 @@ enum UITests {
     static func randomPageTitle(length: Int) -> String {
         return String(UUID().uuidString.prefix(length))
     }
+
+    /// This is intended for setting an autocomplete checkbox state that extends across all test cases and is only run once in the class override
+    /// setup() of the case. Setting the autocomplete checkbox state for an individual test shouldn't start and terminate the app, as this function
+    /// does.
+    /// - Parameter requestedToggleState: How the autocomplete checkbox state should be set
+    static func setAutocompleteToggleBeforeTestcaseRuns(_ requestedToggleState: Bool) {
+        let app = XCUIApplication()
+        app.launch()
+
+        app.typeKey(",", modifierFlags: [.command]) // Open settings
+        let generalPreferencesButton = app.buttons["PreferencesSidebar.generalButton"]
+        let autocompleteToggle = app.checkBoxes["PreferencesGeneralView.showAutocompleteSuggestions"]
+        XCTAssertTrue(
+            generalPreferencesButton.waitForExistence(timeout: UITests.Timeouts.elementExistence),
+            "The user settings appearance section button didn't become available in a reasonable timeframe."
+        )
+        generalPreferencesButton.click(forDuration: 0.5, thenDragTo: generalPreferencesButton)
+
+        let currentToggleState = try? XCTUnwrap(
+            autocompleteToggle.value as? Bool,
+            "It wasn't possible to get the \"Autocomplete\" value as a Bool"
+        )
+
+        switch (requestedToggleState, currentToggleState) { // Click autocomplete toggle if it is different than our request
+        case (false, true), (true, false):
+            autocompleteToggle.click()
+        default:
+            break
+        }
+        app.terminate()
+    }
+
+    /// A debug function that is going to need some other functionality in order to be useful for debugging address bar focus issues
+    static func openVanillaBrowser() {
+        let app = XCUIApplication()
+        let openVanillaBrowser = app.menuItems["MainMenu.openVanillaBrowser"]
+        openVanillaBrowser.clickAfterExistenceTestSucceeds()
+        app.typeKey("w", modifierFlags: [.command, .option])
+    }
+
+    /// Avoid some first-run states that we aren't testing.
+    static func firstRun() {
+        let notificationCenter = XCUIApplication(bundleIdentifier: "com.apple.UserNotificationCenter")
+        if notificationCenter.exists { // If tests-server is asking for network permissions, deny them.
+            notificationCenter.typeKey(.escape, modifierFlags: [])
+        }
+        let app = XCUIApplication()
+        app.launch()
+        app.typeKey("n", modifierFlags: .command)
+        app.typeKey("w", modifierFlags: [.command, .option])
+        app.terminate()
+    }
 }
diff --git a/UITests/Common/XCUIElementExtension.swift b/UITests/Common/XCUIElementExtension.swift
index 8558cd9a7e..e799a94b37 100644
--- a/UITests/Common/XCUIElementExtension.swift
+++ b/UITests/Common/XCUIElementExtension.swift
@@ -19,7 +19,6 @@
 import XCTest
 
 extension XCUIElement {
-
     // https://stackoverflow.com/a/63089781/119717
     // Licensed under https://creativecommons.org/licenses/by-sa/4.0/
     // Credit: Adil Hussain
@@ -39,4 +38,58 @@ extension XCUIElement {
 
         return false
     }
+
+    /// On some individual systems, strings which contain a ":" do not type the ":" when the string is entirely typed with `typeText(...)` into the
+    /// address bar,
+    /// wherever the ":" occurs in the string. This function stops before the ":" character and then types it with `typeKey(...)` as a workaround for
+    /// this bug or unknown system setting.
+    /// - Parameters:
+    ///   - url: The URL to be typed into the address bar
+    ///   - pressingEnter: If the `enter` key should not be pressed after typing this URL in, set this optional parameter to `false`, otherwise it
+    /// will be pressed.
+    func typeURL(_ url: URL, pressingEnter: Bool = true) {
+        let urlString = url.absoluteString
+        let urlParts = urlString.split(separator: ":")
+        var completedURLSections = 0
+        for urlPart in urlParts {
+            self.typeText(String(urlPart))
+            completedURLSections += 1
+            if completedURLSections != urlParts.count {
+                self.typeKey(":", modifierFlags: [])
+            }
+        }
+        if pressingEnter {
+            self.typeText("\r")
+        }
+    }
+
+    /// Check for the existence of the address bar and type a URL into it if it passes. Although it doesn't really make sense to restrict its usage to
+    /// the address bar, it is only foreseen and recommended for use with the address bar.
+    /// - Parameters:
+    ///   - url: The URL to be typed into the address bar (or other element, for which use with this function should be seen as experimental)
+    ///   - pressingEnter: If the `enter` key should not be pressed after typing this URL in, set this optional parameter to `false`, otherwise it
+    /// will be pressed.
+    func typeURLAfterExistenceTestSucceeds(_ url: URL, pressingEnter: Bool = true) {
+        XCTAssertTrue(
+            self.waitForExistence(timeout: UITests.Timeouts.elementExistence),
+            "The element \(self.debugDescription) didn't load with the expected title in a reasonable timeframe."
+        )
+        self.typeURL(url, pressingEnter: pressingEnter)
+    }
+
+    func clickAfterExistenceTestSucceeds() {
+        XCTAssertTrue(
+            self.waitForExistence(timeout: UITests.Timeouts.elementExistence),
+            "\(self.debugDescription) didn't load with the expected title in a reasonable timeframe."
+        )
+        self.click()
+    }
+
+    func hoverAfterExistenceTestSucceeds() {
+        XCTAssertTrue(
+            self.waitForExistence(timeout: UITests.Timeouts.elementExistence),
+            "\(self.debugDescription) didn't load with the expected title in a reasonable timeframe."
+        )
+        self.hover()
+    }
 }
diff --git a/UITests/FindInPageTests.swift b/UITests/FindInPageTests.swift
index f3337f0cc7..0f8de44641 100644
--- a/UITests/FindInPageTests.swift
+++ b/UITests/FindInPageTests.swift
@@ -26,6 +26,7 @@ class FindInPageTests: XCTestCase {
     private let minimumExpectedMatchingPixelsInFindHighlight = 150
 
     override class func setUp() {
+        UITests.firstRun()
         saveLocalHTML()
     }
 
@@ -50,7 +51,7 @@ class FindInPageTests: XCTestCase {
             addressBarTextField.waitForExistence(timeout: UITests.Timeouts.elementExistence),
             "The Address Bar text field did not exist when it was expected."
         )
-        addressBarTextField.typeText("\(Self.loremIpsumFileURL.absoluteString)\r")
+        addressBarTextField.typeURL(Self.loremIpsumFileURL)
         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."
@@ -69,7 +70,7 @@ class FindInPageTests: XCTestCase {
             addressBarTextField.waitForExistence(timeout: UITests.Timeouts.elementExistence),
             "The Address Bar text field did not exist when it was expected."
         )
-        addressBarTextField.typeText("\(Self.loremIpsumFileURL.absoluteString)\r")
+        addressBarTextField.typeURL(Self.loremIpsumFileURL)
         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."
@@ -93,14 +94,13 @@ class FindInPageTests: XCTestCase {
             addressBarTextField.waitForExistence(timeout: UITests.Timeouts.elementExistence),
             "The Address Bar text field did not exist when it was expected."
         )
-        addressBarTextField.typeText("\(Self.loremIpsumFileURL.absoluteString)\r")
+        addressBarTextField.typeURL(Self.loremIpsumFileURL)
         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()
+        optionsButton.clickAfterExistenceTestSucceeds()
 
         let findInPageMoreOptionsMenuItem = app.menuItems["MoreOptionsMenu.findInPage"]
         XCTAssertTrue(
@@ -120,7 +120,7 @@ class FindInPageTests: XCTestCase {
             addressBarTextField.waitForExistence(timeout: UITests.Timeouts.elementExistence),
             "The Address Bar text field did not exist when it was expected."
         )
-        addressBarTextField.typeText("\(Self.loremIpsumFileURL.absoluteString)\r")
+        addressBarTextField.typeURL(Self.loremIpsumFileURL)
         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."
@@ -144,7 +144,7 @@ class FindInPageTests: XCTestCase {
             addressBarTextField.waitForExistence(timeout: UITests.Timeouts.elementExistence),
             "The Address Bar text field did not exist when it was expected."
         )
-        addressBarTextField.typeText("\(Self.loremIpsumFileURL.absoluteString)\r")
+        addressBarTextField.typeURL(Self.loremIpsumFileURL)
         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."
@@ -168,7 +168,7 @@ class FindInPageTests: XCTestCase {
             addressBarTextField.waitForExistence(timeout: UITests.Timeouts.elementExistence),
             "The Address Bar text field did not exist when it was expected."
         )
-        addressBarTextField.typeText("\(Self.loremIpsumFileURL.absoluteString)\r")
+        addressBarTextField.typeURL(Self.loremIpsumFileURL)
         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."
@@ -197,7 +197,7 @@ class FindInPageTests: XCTestCase {
             addressBarTextField.waitForExistence(timeout: UITests.Timeouts.elementExistence),
             "The Address Bar text field did not exist when it was expected."
         )
-        addressBarTextField.typeText("\(Self.loremIpsumFileURL.absoluteString)\r")
+        addressBarTextField.typeURL(Self.loremIpsumFileURL)
         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."
@@ -224,7 +224,7 @@ class FindInPageTests: XCTestCase {
             addressBarTextField.waitForExistence(timeout: UITests.Timeouts.elementExistence),
             "The Address Bar text field did not exist when it was expected."
         )
-        addressBarTextField.typeText("\(Self.loremIpsumFileURL.absoluteString)\r")
+        addressBarTextField.typeURL(Self.loremIpsumFileURL)
         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."
@@ -246,7 +246,7 @@ class FindInPageTests: XCTestCase {
         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)
+        let highlightedPixelsInScreenshot = try XCTUnwrap(webViewWithSelectedWordsScreenshot.image.matchingPixels(of: .findHighlightColor))
         XCTAssertGreaterThan(
             highlightedPixelsInScreenshot.count,
             minimumExpectedMatchingPixelsInFindHighlight,
@@ -259,7 +259,7 @@ class FindInPageTests: XCTestCase {
             addressBarTextField.waitForExistence(timeout: UITests.Timeouts.elementExistence),
             "The Address Bar text field did not exist when it was expected."
         )
-        addressBarTextField.typeText("\(Self.loremIpsumFileURL.absoluteString)\r")
+        addressBarTextField.typeURL(Self.loremIpsumFileURL)
         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."
@@ -279,7 +279,7 @@ class FindInPageTests: XCTestCase {
         // 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 highlightedPixelsInFindScreenshot = try XCTUnwrap(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"]
@@ -296,8 +296,9 @@ class FindInPageTests: XCTestCase {
         )
         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 highlightedPixelsInFindNextScreenshot =
+            try XCTUnwrap(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
@@ -318,7 +319,7 @@ class FindInPageTests: XCTestCase {
             addressBarTextField.waitForExistence(timeout: UITests.Timeouts.elementExistence),
             "The Address Bar text field did not exist when it was expected."
         )
-        addressBarTextField.typeText("\(Self.loremIpsumFileURL.absoluteString)\r")
+        addressBarTextField.typeURL(Self.loremIpsumFileURL)
         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."
@@ -338,7 +339,7 @@ class FindInPageTests: XCTestCase {
         // 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 highlightedPixelsInFindScreenshot = try XCTUnwrap(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(
@@ -355,7 +356,7 @@ class FindInPageTests: XCTestCase {
         )
         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 highlightedPixelsInFindNextScreenshot = try XCTUnwrap(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
@@ -376,7 +377,7 @@ class FindInPageTests: XCTestCase {
             addressBarTextField.waitForExistence(timeout: UITests.Timeouts.elementExistence),
             "The Address Bar text field did not exist when it was expected."
         )
-        addressBarTextField.typeText("\(Self.loremIpsumFileURL.absoluteString)\r")
+        addressBarTextField.typeURL(Self.loremIpsumFileURL)
         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."
@@ -397,7 +398,7 @@ class FindInPageTests: XCTestCase {
         // 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 highlightedPixelsInFindScreenshot = try XCTUnwrap(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"]
@@ -409,7 +410,7 @@ class FindInPageTests: XCTestCase {
 
         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 highlightedPixelsInFindNextScreenshot = try XCTUnwrap(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
@@ -469,25 +470,38 @@ private extension FindInPageTests {
     }
 }
 
+private extension UInt8 {
+    func isCloseTo(_ colorValue: UInt8) -> Bool {
+        // Overflow-safe creation of range +/- 1 around value
+        let lowerBound: UInt8 = self != 0 ? self &- 1 : 0
+        let upperBound: UInt8 = self != 255 ? self &+ 1 : 255
+
+        switch colorValue {
+        case lowerBound ... upperBound:
+            return true
+        default:
+            return false
+        }
+    }
+}
+
 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!)
+    func matchingPixels(of colorToMatch: NSColor) throws -> [Pixel] {
+        let cgImage = try XCTUnwrap(
+            cgImage(forProposedRect: nil, context: nil, hints: nil),
+            "It wasn't possible to obtain the CGImage of the NSImage."
+        )
+        let bitmap = NSBitmapImageRep(cgImage: cgImage)
         let colorSpace = bitmap.colorSpace
-
-        XCTAssertNotNil(
+        let colorToMatchWithColorSpace = try XCTUnwrap(
             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
+        ) // 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 bitmapData: UnsafeMutablePointer<UInt8> = try XCTUnwrap(bitmap.bitmapData, "It wasn't possible to obtain the bitmapData of the bitmap.")
         var redInImage, greenInImage, blueInImage, alphaInImage: UInt8
 
         let redToMatch = UInt8(colorToMatchWithColorSpace.redComponent * 255.999999) // color components in 0-255 values in this colorspace
@@ -506,7 +520,9 @@ private extension NSImage {
                 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
+                if redInImage.isCloseTo(redToMatch), greenInImage.isCloseTo(greenToMatch),
+                   blueInImage.isCloseTo(blueToMatch)
+                { // We aren't matching alpha
                     pixels.append(Pixel(
                         red: redInImage,
                         green: greenInImage,
diff --git a/UITests/PermissionsTests.swift b/UITests/PermissionsTests.swift
new file mode 100644
index 0000000000..86a82b06f5
--- /dev/null
+++ b/UITests/PermissionsTests.swift
@@ -0,0 +1,595 @@
+//
+//  PermissionsTests.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
+
+/// We are apparently in the part of the `XCUIAutomation` life cycle right now in which interruption management using `addUIInterruptionMonitor`
+/// doesn't fire due to an acknowledged bug (https://forums.developer.apple.com/forums/thread/737880), so we can't test these the best way, which is
+/// to create an interruption handler and wait for TCC requests to respond to (https://eclecticlight.co/2023/02/10/privacy-what-tcc-does-and-doesnt/).
+/// Realistically, the best approach (in terms of robust test design) may never be a good fit for these tests, because it is always a possibility that
+/// one of the targeted macOS versions is manifesting this every-few-systems bug. Therefore, these tests simply wait for the relevant
+/// privacy request to click on directly, via a combination of bundle ID targeting and button targeting by number. That means that adjustments could
+/// be needed in the future, in case of significant changes in this system-level interface in future macOS versions (but Apple tries not to change
+/// that too frequently) or its backend (for instance, if the bundle ID for the user notification center changes). Here is a link to how to do this
+/// the best way, in the event that a future macOS version stops supporting this approach, but also solves the bug with `addUIInterruptionMonitor`,
+/// and you want to branch the implementations per macOS version:
+/// https://stackoverflow.com/questions/56559269/adduiinterruptionmonitor-is-not-getting-called-on-macos
+class PermissionsTests: XCTestCase {
+    private var app: XCUIApplication!
+    private var notificationCenter: XCUIApplication!
+    private var addressBarTextField: XCUIElement!
+    private var permissionsSiteURL: URL!
+    private var historyMenuBarItem: XCUIElement!
+    private var clearAllHistoryMenuItem: XCUIElement!
+    private var clearAllHistoryAlertClearButton: XCUIElement!
+    private var fakeFireButton: XCUIElement!
+    override class func setUp() {
+        UITests.firstRun()
+    }
+
+    override func setUpWithError() throws {
+        continueAfterFailure = false
+        app = XCUIApplication()
+        app.launchEnvironment["UITEST_MODE"] = "1"
+
+        permissionsSiteURL = try XCTUnwrap(URL(string: "https://permission.site"), "It wasn't possible to unwrap a URL that the tests depend on.")
+        notificationCenter = XCUIApplication(bundleIdentifier: "com.apple.UserNotificationCenter")
+        addressBarTextField = app.windows.textFields["AddressBarViewController.addressBarTextField"]
+        historyMenuBarItem = app.menuBarItems["History"]
+        clearAllHistoryMenuItem = app.menuItems["HistoryMenu.clearAllHistory"]
+        clearAllHistoryAlertClearButton = app.buttons["ClearAllHistoryAndDataAlert.clearButton"]
+        fakeFireButton = app.buttons["FireViewController.fakeFireButton"]
+
+        app.resetAuthorizationStatus(for: .camera) // These resets work much better before launch.
+        app.resetAuthorizationStatus(for: .microphone)
+
+        app.launch()
+        app.activate()
+        historyMenuBarItem.clickAfterExistenceTestSucceeds()
+        clearAllHistoryMenuItem.clickAfterExistenceTestSucceeds()
+        clearAllHistoryAlertClearButton.clickAfterExistenceTestSucceeds() // 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."
+        )
+
+        app.typeKey("w", modifierFlags: [.command, .option, .shift]) // Enforce a single window
+        app.typeKey("n", modifierFlags: .command)
+        XCTAssertTrue(
+            addressBarTextField.waitForExistence(timeout: UITests.Timeouts.elementExistence),
+            "The address bar text field didn't become available in a reasonable timeframe before starting the test."
+        )
+    }
+
+    func test_cameraPermissions_withAcceptedTCCChallenge_showCorrectStateInBrowser() throws {
+        addressBarTextField.typeURLAfterExistenceTestSucceeds(permissionsSiteURL)
+
+        let cameraButton = app.webViews.buttons["Camera"]
+        cameraButton.clickAfterExistenceTestSucceeds()
+        XCTAssert(
+            notificationCenter.buttons.firstMatch.waitForExistence(timeout: UITests.Timeouts.elementExistence),
+            "The notification center didn't appear. This can happen because the TCC setting at the start of the test wasn't correct – check the app.resetPermissions behavior."
+        )
+        let allowButtonIndex = try XCTUnwrap(notificationCenter.indexOfSystemModelDialogButtonOnElement(
+            titled: "Allow",
+            "OK"
+        )) // You can add any titles you see this permission dialog using on any tested macOS versions, because it is evaluated by a variadic
+        // function.
+        let allowButton = notificationCenter.buttons.element(boundBy: allowButtonIndex)
+        allowButton.clickAfterExistenceTestSucceeds() // Click system camera permissions dialog
+        let permissionsPopoverAllowButton = app.popovers.buttons["PermissionAuthorizationViewController.allowButton"]
+        permissionsPopoverAllowButton.clickAfterExistenceTestSucceeds()
+        var websitePermissionsColorIsGreen = false
+        for _ in 1 ... 4 { // permission.site updates this color a bit slowly and we have no control over it, so we try a few times.
+            websitePermissionsColorIsGreen = try websitePermissionsButtonIsExpectedColor(cameraButton, is: .green)
+            if websitePermissionsColorIsGreen {
+                break
+            }
+            usleep(500_000)
+        }
+        XCTAssertTrue(
+            websitePermissionsColorIsGreen,
+            "After a few attempts to wait for permissions.site to update their button animation after the TCC dialog, their button has to be green."
+        )
+
+        let navigationBarViewControllerPermissionButton = app.buttons["NavigationBarViewController.cameraPermissionButton"]
+        navigationBarViewControllerPermissionButton.clickAfterExistenceTestSucceeds()
+
+        let permissionContextMenuAlwaysAsk = app.menuItems["PermissionContextMenu.alwaysAsk"]
+        XCTAssertTrue(
+            permissionContextMenuAlwaysAsk.waitForExistence(timeout: UITests.Timeouts.elementExistence),
+            "permissionContextMenuAlwaysAsk didn't exist in a reasonable timeframe."
+        )
+        let permissionContextMenuAlwaysAskValue = try XCTUnwrap(permissionContextMenuAlwaysAsk.value as? String)
+        XCTAssertEqual(
+            permissionContextMenuAlwaysAskValue,
+            "selected",
+            "The \"always ask\" menu item of the permission context menu has to be the selected item."
+        )
+    }
+
+    func test_cameraPermissions_withDeniedTCCChallenge_showCorrectStateInBrowser() throws {
+        addressBarTextField.typeURLAfterExistenceTestSucceeds(permissionsSiteURL)
+
+        let cameraButton = app.webViews.buttons["Camera"]
+        cameraButton.clickAfterExistenceTestSucceeds()
+        XCTAssert(
+            notificationCenter.buttons.firstMatch.waitForExistence(timeout: UITests.Timeouts.elementExistence),
+            "The notification center didn't appear. This can happen because the TCC setting at the start of the test wasn't correct – check the app.resetPermissions behavior."
+        )
+        let denyButtonIndex = try XCTUnwrap(notificationCenter.indexOfSystemModelDialogButtonOnElement(
+            titled: "Deny", "No", "Cancel", "Don’t Allow", "Don't Allow"
+        )) // You can add any titles you see this permission dialog using on any tested macOS versions, because it is evaluated by a variadic
+        // function.
+        let denyButton = notificationCenter.buttons.element(boundBy: denyButtonIndex)
+        denyButton.clickAfterExistenceTestSucceeds() // Click system camera permissions dialog
+        let permissionsPopoverAllowButton = app.popovers.buttons["PermissionAuthorizationViewController.allowButton"]
+
+        XCTAssertTrue( // Prove that the browser's permission popover does not appear
+            permissionsPopoverAllowButton.waitForNonExistence(timeout: UITests.Timeouts.elementExistence),
+            "The permissions popover in the browser should not appear when camera permission has been denied."
+        )
+
+        var websitePermissionsColorIsRed = false
+        for _ in 1 ... 4 {
+            websitePermissionsColorIsRed = try websitePermissionsButtonIsExpectedColor(cameraButton, is: .red)
+            if websitePermissionsColorIsRed {
+                break
+            }
+            usleep(500_000)
+        }
+        XCTAssertTrue(
+            websitePermissionsColorIsRed,
+            "After a few attempts to wait for permissions.site to update their button animation after the TCC dialog, their button has to be red."
+        )
+
+        let navigationBarViewControllerPermissionButton = app.buttons["NavigationBarViewController.cameraPermissionButton"]
+        XCTAssertTrue( // Prove that the browser's permission button does not appear
+            navigationBarViewControllerPermissionButton.waitForNonExistence(timeout: UITests.Timeouts.elementExistence),
+            "The permissions button in the browser should not appear when camera permission has been denied."
+        )
+    }
+
+    func test_cameraPermissions_withAcceptedTCCChallenge_whereAlwaysDenyIsSelected_alwaysDenies() throws {
+        addressBarTextField.typeURLAfterExistenceTestSucceeds(permissionsSiteURL)
+
+        let cameraButton = app.webViews.buttons["Camera"]
+        cameraButton.clickAfterExistenceTestSucceeds()
+        XCTAssert(
+            notificationCenter.buttons.firstMatch.waitForExistence(timeout: UITests.Timeouts.elementExistence),
+            "The notification center didn't appear. This can happen because the TCC setting at the start of the test wasn't correct – check the app.resetPermissions behavior."
+        )
+        let allowButtonIndex = try XCTUnwrap(notificationCenter.indexOfSystemModelDialogButtonOnElement(
+            titled: "Allow",
+            "OK"
+        )) // You can add any titles you see this permission dialog using on any tested macOS versions, because it is evaluated by a variadic
+        // function.
+        let allowButton = notificationCenter.buttons.element(boundBy: allowButtonIndex)
+        allowButton.clickAfterExistenceTestSucceeds() // Click system camera permissions dialog
+        let permissionsPopoverAllowButton = app.popovers.buttons["PermissionAuthorizationViewController.allowButton"]
+        permissionsPopoverAllowButton.clickAfterExistenceTestSucceeds()
+        var websitePermissionsColorIsGreen = false
+        for _ in 1 ... 4 { // permission.site updates this color a bit slowly and we have no control over it, so we try a few times.
+            websitePermissionsColorIsGreen = try websitePermissionsButtonIsExpectedColor(cameraButton, is: .green)
+            if websitePermissionsColorIsGreen {
+                break
+            }
+            usleep(500_000)
+        }
+        XCTAssertTrue(
+            websitePermissionsColorIsGreen,
+            "After a few attempts to wait for permissions.site to update their button animation after the TCC dialog, their button has to be green."
+        )
+
+        let navigationBarViewControllerPermissionButton = app.buttons["NavigationBarViewController.cameraPermissionButton"]
+        navigationBarViewControllerPermissionButton.clickAfterExistenceTestSucceeds()
+
+        let permissionContextMenuAlwaysAsk = app.menuItems["PermissionContextMenu.alwaysAsk"]
+
+        XCTAssertTrue(
+            permissionContextMenuAlwaysAsk.waitForExistence(timeout: UITests.Timeouts.elementExistence),
+            "permissionContextMenuAlwaysAsk didn't exist in a reasonable timeframe."
+        )
+        let permissionContextMenuAlwaysAskValue = try XCTUnwrap(permissionContextMenuAlwaysAsk.value as? String)
+        XCTAssertEqual(
+            permissionContextMenuAlwaysAskValue,
+            "selected",
+            "The \"always ask\" menu item of the permission context menu has to be the selected item."
+        )
+        let permissionContextMenuAlwaysDeny = app.menuItems["PermissionContextMenu.alwaysDeny"]
+        permissionContextMenuAlwaysDeny.clickAfterExistenceTestSucceeds()
+        app.typeKey("w", modifierFlags: [.command, .option, .shift]) // Enforce a single window
+        app.typeKey("n", modifierFlags: .command)
+        addressBarTextField.typeURL(permissionsSiteURL)
+        for _ in 1 ... 4 {
+            cameraButton.clickAfterExistenceTestSucceeds()
+        }
+        XCTAssertTrue(
+            try websitePermissionsButtonIsExpectedColor(cameraButton, is: .red),
+            "Even if we click the button for the denied resource many times, when we are on a site where we have set \"always deny\" for the resource, the permission button will remain red"
+        )
+        XCTAssert(
+            notificationCenter.buttons.firstMatch.waitForNonExistence(timeout: UITests.Timeouts.elementExistence),
+            "Even if we click the button for the denied resource many times, when we are on a site where we have set \"always deny\" for the resource, the TCC dialog permission alert will not be on the screen"
+        )
+        XCTAssert(
+            permissionsPopoverAllowButton.waitForNonExistence(timeout: UITests.Timeouts.elementExistence),
+            "Even if we click the button for the denied resource many times, when we are on a site where we have set \"always deny\" for the resource, the permission popover will not be on the screen"
+        )
+    }
+
+    func test_microphonePermissions_withAcceptedTCCChallenge_showCorrectStateInBrowser() throws {
+        addressBarTextField.typeURLAfterExistenceTestSucceeds(permissionsSiteURL)
+
+        let microphoneButton = app.webViews.buttons["Microphone"]
+        microphoneButton.clickAfterExistenceTestSucceeds()
+        XCTAssert(
+            notificationCenter.buttons.firstMatch.waitForExistence(timeout: UITests.Timeouts.elementExistence),
+            "The notification center didn't appear. This can happen because the TCC setting at the start of the test wasn't correct – check the app.resetPermissions behavior."
+        )
+        let allowButtonIndex = try XCTUnwrap(notificationCenter.indexOfSystemModelDialogButtonOnElement(
+            titled: "Allow",
+            "OK"
+        )) // You can add any titles you see this permission dialog using on any tested macOS versions, because it is evaluated by a variadic
+        // function.
+        let allowButton = notificationCenter.buttons.element(boundBy: allowButtonIndex)
+        allowButton.clickAfterExistenceTestSucceeds() // Click system microphone permissions dialog
+        let permissionsPopoverAllowButton = app.popovers.buttons["PermissionAuthorizationViewController.allowButton"]
+        permissionsPopoverAllowButton.clickAfterExistenceTestSucceeds()
+        var websitePermissionsColorIsGreen = false
+        for _ in 1 ... 4 { // permission.site updates this color a bit slowly and we have no control over it, so we try a few times.
+            websitePermissionsColorIsGreen = try websitePermissionsButtonIsExpectedColor(microphoneButton, is: .green)
+            if websitePermissionsColorIsGreen {
+                break
+            }
+            usleep(500_000)
+        }
+        XCTAssertTrue(
+            websitePermissionsColorIsGreen,
+            "After a few attempts to wait for permissions.site to update their button animation after the TCC dialog, their button has to be green."
+        )
+
+        let navigationBarViewControllerPermissionButton = app.buttons["NavigationBarViewController.microphonePermissionButton"]
+        navigationBarViewControllerPermissionButton.clickAfterExistenceTestSucceeds()
+
+        let permissionContextMenuAlwaysAsk = app.menuItems["PermissionContextMenu.alwaysAsk"]
+        XCTAssertTrue(
+            permissionContextMenuAlwaysAsk.waitForExistence(timeout: UITests.Timeouts.elementExistence),
+            "permissionContextMenuAlwaysAsk didn't exist in a reasonable timeframe."
+        )
+        let permissionContextMenuAlwaysAskValue = try XCTUnwrap(permissionContextMenuAlwaysAsk.value as? String)
+        XCTAssertEqual(
+            permissionContextMenuAlwaysAskValue,
+            "selected",
+            "The \"always ask\" menu item of the permission context menu has to be the selected item."
+        )
+    }
+
+    func test_microphonePermissions_withDeniedTCCChallenge_showCorrectStateInBrowser() throws {
+        addressBarTextField.typeURLAfterExistenceTestSucceeds(permissionsSiteURL)
+
+        let microphoneButton = app.webViews.buttons["Microphone"]
+        microphoneButton.clickAfterExistenceTestSucceeds()
+        XCTAssert(
+            notificationCenter.buttons.firstMatch.waitForExistence(timeout: UITests.Timeouts.elementExistence),
+            "The notification center didn't appear. This can happen because the TCC setting at the start of the test wasn't correct – check the app.resetPermissions behavior."
+        )
+        let denyButtonIndex = try XCTUnwrap(notificationCenter.indexOfSystemModelDialogButtonOnElement(
+            titled: "Deny", "No", "Cancel", "Don’t Allow", "Don't Allow"
+        )) // You can add any titles you see this permission dialog using on any tested macOS versions, because it is evaluated by a variadic
+        // function.
+        let denyButton = notificationCenter.buttons.element(boundBy: denyButtonIndex)
+        denyButton.clickAfterExistenceTestSucceeds() // Click system microphone permissions dialog
+        let permissionsPopoverAllowButton = app.popovers.buttons["PermissionAuthorizationViewController.allowButton"]
+
+        XCTAssertTrue( // Prove that the browser's permission popover does not appear
+            permissionsPopoverAllowButton.waitForNonExistence(timeout: UITests.Timeouts.elementExistence),
+            "The permissions popover in the browser should not appear when camera permission has been denied."
+        )
+
+        var websitePermissionsColorIsRed = false
+        for _ in 1 ... 4 {
+            websitePermissionsColorIsRed = try websitePermissionsButtonIsExpectedColor(microphoneButton, is: .red)
+            if websitePermissionsColorIsRed {
+                break
+            }
+            usleep(500_000)
+        }
+        XCTAssertTrue(
+            websitePermissionsColorIsRed,
+            "After between one and four attempts to wait for permissions.site to update their button animation after the TCC dialog, their button has to be red."
+        )
+
+        let navigationBarViewControllerPermissionButton = app.buttons["NavigationBarViewController.microphonePermissionButton"]
+        XCTAssertTrue( // Prove that the browser's permission button does not appear
+            navigationBarViewControllerPermissionButton.waitForNonExistence(timeout: UITests.Timeouts.elementExistence),
+            "The permissions button in the browser should not appear when microphone permission has been denied."
+        )
+    }
+
+    func test_microphonePermissions_withAcceptedTCCChallenge_whereAlwaysDenyIsSelected_alwaysDenies() throws {
+        addressBarTextField.typeURLAfterExistenceTestSucceeds(permissionsSiteURL)
+
+        let microphoneButton = app.webViews.buttons["Microphone"]
+        microphoneButton.clickAfterExistenceTestSucceeds()
+        XCTAssert(
+            notificationCenter.buttons.firstMatch.waitForExistence(timeout: UITests.Timeouts.elementExistence),
+            "The notification center didn't appear. This can happen because the TCC setting at the start of the test wasn't correct – check the app.resetPermissions behavior."
+        )
+        let allowButtonIndex = try XCTUnwrap(notificationCenter.indexOfSystemModelDialogButtonOnElement(
+            titled: "Allow",
+            "OK"
+        )) // You can add any titles you see this permission dialog using on any tested macOS versions, because it is evaluated by a variadic
+        // function.
+        let allowButton = notificationCenter.buttons.element(boundBy: allowButtonIndex)
+        allowButton.clickAfterExistenceTestSucceeds() // Click system microphone permissions dialog
+        let permissionsPopoverAllowButton = app.popovers.buttons["PermissionAuthorizationViewController.allowButton"]
+        permissionsPopoverAllowButton.clickAfterExistenceTestSucceeds()
+        var websitePermissionsColorIsGreen = false
+        for _ in 1 ... 4 { // permission.site updates this color a bit slowly and we have no control over it, so we try a few times.
+            websitePermissionsColorIsGreen = try websitePermissionsButtonIsExpectedColor(microphoneButton, is: .green)
+            if websitePermissionsColorIsGreen {
+                break
+            }
+            usleep(500_000)
+        }
+        XCTAssertTrue(
+            websitePermissionsColorIsGreen,
+            "After a few attempts to wait for permissions.site to update their button animation after the TCC dialog, their button has to be green."
+        )
+
+        let navigationBarViewControllerPermissionButton = app.buttons["NavigationBarViewController.microphonePermissionButton"]
+        navigationBarViewControllerPermissionButton.clickAfterExistenceTestSucceeds()
+
+        let permissionContextMenuAlwaysAsk = app.menuItems["PermissionContextMenu.alwaysAsk"]
+        XCTAssertTrue(
+            permissionContextMenuAlwaysAsk.waitForExistence(timeout: UITests.Timeouts.elementExistence),
+            "permissionContextMenuAlwaysAsk didn't exist in a reasonable timeframe."
+        )
+        let permissionContextMenuAlwaysAskValue = try XCTUnwrap(permissionContextMenuAlwaysAsk.value as? String)
+        XCTAssertEqual(
+            permissionContextMenuAlwaysAskValue,
+            "selected",
+            "The \"always ask\" menu item of the permission context menu has to be the selected item."
+        )
+
+        let permissionContextMenuAlwaysDeny = app.menuItems["PermissionContextMenu.alwaysDeny"]
+        permissionContextMenuAlwaysDeny.clickAfterExistenceTestSucceeds()
+        app.typeKey("w", modifierFlags: [.command, .option, .shift]) // Enforce a single window
+        app.typeKey("n", modifierFlags: .command)
+        addressBarTextField.typeURL(permissionsSiteURL)
+        for _ in 1 ... 4 {
+            microphoneButton.clickAfterExistenceTestSucceeds()
+        }
+        XCTAssertTrue(
+            try websitePermissionsButtonIsExpectedColor(microphoneButton, is: .red),
+            "Even if we click the button for the denied resource many times, when we are on a site where we have set \"always deny\" for the resource, the permission button will remain red"
+        )
+        XCTAssert(
+            notificationCenter.buttons.firstMatch.waitForNonExistence(timeout: UITests.Timeouts.elementExistence),
+            "Even if we click the button for the denied resource many times, when we are on a site where we have set \"always deny\" for the resource, the TCC dialog permission alert will not be on the screen"
+        )
+        XCTAssert(
+            permissionsPopoverAllowButton.waitForNonExistence(timeout: UITests.Timeouts.elementExistence),
+            "Even if we click the button for the denied resource many times, when we are on a site where we have set \"always deny\" for the resource, the permission popover will not be on the screen"
+        )
+    }
+
+    func test_locationPermissions_whenAccepted_showCorrectStateInBrowser() throws {
+        addressBarTextField.typeURLAfterExistenceTestSucceeds(permissionsSiteURL)
+
+        let locationButton = app.webViews.buttons["Location"]
+        locationButton.clickAfterExistenceTestSucceeds()
+        let permissionsPopoverAllowButton = app.popovers.buttons["PermissionAuthorizationViewController.allowButton"]
+        permissionsPopoverAllowButton.clickAfterExistenceTestSucceeds()
+        var websitePermissionsColorIsGreen = false
+        for _ in 1 ... 4 { // permission.site updates this color a bit slowly and we have no control over it, so we try a few times.
+            websitePermissionsColorIsGreen = try websitePermissionsButtonIsExpectedColor(locationButton, is: .green)
+            if websitePermissionsColorIsGreen {
+                break
+            }
+            usleep(500_000)
+        }
+        // We would like to be able to test here that the permission.site "Location" button turns green here, but it frequently doesn't turn green
+        // when location permissions are granted.
+
+        let navigationBarViewControllerPermissionButton = app.buttons["NavigationBarViewController.geolocationPermissionButton"]
+        navigationBarViewControllerPermissionButton.clickAfterExistenceTestSucceeds()
+
+        let permissionContextMenuAlwaysAsk = app.menuItems["PermissionContextMenu.alwaysAsk"]
+        XCTAssertTrue(
+            permissionContextMenuAlwaysAsk.waitForExistence(timeout: UITests.Timeouts.elementExistence),
+            "permissionContextMenuAlwaysAsk didn't exist in a reasonable timeframe."
+        )
+        let permissionContextMenuAlwaysAskValue = try XCTUnwrap(permissionContextMenuAlwaysAsk.value as? String)
+        XCTAssertEqual(
+            permissionContextMenuAlwaysAskValue,
+            "selected",
+            "The \"always ask\" menu item of the permission context menu has to be the selected item."
+        )
+    }
+
+    func test_locationPermissions_whenAlwaysDenyIsSelected_alwaysDenies() throws {
+        addressBarTextField.typeURLAfterExistenceTestSucceeds(permissionsSiteURL)
+
+        let locationButton = app.webViews.buttons["Location"]
+        locationButton.clickAfterExistenceTestSucceeds()
+        let permissionsPopoverAllowButton = app.popovers.buttons["PermissionAuthorizationViewController.allowButton"]
+        permissionsPopoverAllowButton.clickAfterExistenceTestSucceeds()
+        var websitePermissionsColorIsGreen = false
+        for _ in 1 ... 4 { // permission.site updates this color a bit slowly and we have no control over it, so we try a few times.
+            websitePermissionsColorIsGreen = try websitePermissionsButtonIsExpectedColor(locationButton, is: .green)
+            if websitePermissionsColorIsGreen {
+                break
+            }
+            usleep(500_000)
+        }
+
+        // We would like to be able to test here that the permission.site "Location" button turns green here, but it frequently doesn't turn green
+        // when location permissions are granted.
+
+        let navigationBarViewControllerPermissionButton = app.buttons["NavigationBarViewController.geolocationPermissionButton"]
+        navigationBarViewControllerPermissionButton.clickAfterExistenceTestSucceeds()
+
+        let permissionContextMenuAlwaysAsk = app.menuItems["PermissionContextMenu.alwaysAsk"]
+        XCTAssertTrue(
+            permissionContextMenuAlwaysAsk.waitForExistence(timeout: UITests.Timeouts.elementExistence),
+            "permissionContextMenuAlwaysAsk didn't exist in a reasonable timeframe."
+        )
+        let permissionContextMenuAlwaysAskValue = try XCTUnwrap(permissionContextMenuAlwaysAsk.value as? String)
+        XCTAssertEqual(
+            permissionContextMenuAlwaysAskValue,
+            "selected",
+            "The \"always ask\" menu item of the permission context menu has to be the selected item."
+        )
+
+        let permissionContextMenuAlwaysDeny = app.menuItems["PermissionContextMenu.alwaysDeny"]
+        permissionContextMenuAlwaysDeny.clickAfterExistenceTestSucceeds()
+        app.typeKey("w", modifierFlags: [.command, .option, .shift]) // Enforce a single window
+        app.typeKey("n", modifierFlags: .command)
+        addressBarTextField.typeURL(permissionsSiteURL)
+        for _ in 1 ... 4 {
+            locationButton.clickAfterExistenceTestSucceeds()
+        }
+        XCTAssertTrue( // It does turn red when permission is denied.
+            try websitePermissionsButtonIsExpectedColor(locationButton, is: .red),
+            "Even if we click the button for the denied resource many times, when we are on a site where we have set \"always deny\" for the resource, the permission button will remain red"
+        )
+
+        XCTAssert(
+            permissionsPopoverAllowButton.waitForNonExistence(timeout: UITests.Timeouts.elementExistence),
+            "Even if we click the button for the denied resource many times, when we are on a site where we have set \"always deny\" for the resource, the permission popover will not be on the screen"
+        )
+    }
+}
+
+private extension PermissionsTests {
+    func websitePermissionsButtonIsExpectedColor(_ button: XCUIElement, is expectedColor: PredominantColor) throws -> Bool {
+        let buttonScreenshot = button.screenshot().image
+        let trimmedButton = buttonScreenshot.trim(to: CGRect(
+            x: 10,
+            y: 10,
+            width: 20,
+            height: 20
+        )) // A sample of the button that we are going to analyze for its predominant color tone.
+        let predominantColor = try XCTUnwrap(
+            trimmedButton.ciImage(with: nil).predominantColor(),
+            "It wasn't possible to unwrap the predominant color of the website button screenshot sample"
+        )
+        return predominantColor == expectedColor
+    }
+}
+
+private extension XCUIElement {
+    /// We don't have as much control over what is going to appear on a modal dialogue, and it feels fragile to use Apple's accessibility IDs since I
+    /// don't think there is any contract for that, but we can plan some flexibility in title matching for the button names, since the button names
+    /// are in the test description.
+    /// - Parameter titled: The title or titles (if they vary across macOS versions) of a button whose index on the element we'd like to know,
+    /// variadic
+    /// - Returns: An optional Int representing the button index on the element, if a button with this title was found.
+    func indexOfSystemModelDialogButtonOnElement(titled: String...) -> Int? {
+        for buttonIndex in 0 ... 4 { // It feels unlikely that a system modal dialog will have more than five buttons
+            let button = self.buttons.element(boundBy: buttonIndex)
+            if button.exists, titled.contains(button.title) {
+                return buttonIndex
+            }
+        }
+        return nil
+    }
+}
+
+/// Understand whether a webpage button is greenish or reddish when we expect one or the other, or states where we need to retry or fail
+private enum PredominantColor {
+    case red
+    case green
+    case neither
+}
+
+private extension NSImage {
+    /// Trim NSImage to sample
+    /// - Parameter rect: the sample size to trim to
+    /// - Returns: The trimmed NSImage
+    func trim(to rect: CGRect) -> NSImage {
+        let result = NSImage(size: rect.size)
+        result.lockFocus()
+
+        let destRect = CGRect(origin: .zero, size: result.size)
+        self.draw(in: destRect, from: rect, operation: .copy, fraction: 1.0)
+
+        result.unlockFocus()
+        return result
+    }
+}
+
+private extension CIImage {
+    /// Evaluate a sample of a webpage button to see what its predominant color tone is. Assumes it is being run on a button that is expected to be
+    /// either green or red (otherwise we are starting to think into `https://permission.site`'s potential implementation errors or surprise cases,
+    /// which I don't think should be part of this test case scope which tests UIs from three responsible organizations in which the tested UIs, in
+    /// order of importance, should be: this browser, macOS, permission.site)).
+    /// - Returns: .red, .green, .neither if we get a result but it isn't helpful, or nil in the event of an error (but it will always verbosely fail
+    /// the test before returning nil, so in practice, if the test is still in progress, it has returned a case.)
+    func predominantColor() throws -> PredominantColor? {
+        var redValueOfSample = 0.0
+        var greenValueOfSample = 0.0
+
+        for channel in 0 ... 1 { // We are only checking the first two channels
+            let extentVector = CIVector(
+                x: self.extent.origin.x,
+                y: self.extent.origin.y,
+                z: self.extent.size.width,
+                w: self.extent.size.height
+            )
+
+            guard let filter = CIFilter(name: "CIAreaAverage", parameters: [kCIInputImageKey: self, kCIInputExtentKey: extentVector])
+            else { XCTFail("It wasn't possible to set the CIFilter for the predominant color channel check")
+                return nil
+            }
+            guard let outputImage = filter.outputImage
+            else { XCTFail("It wasn't possible to set the output image for the predominant color channel check")
+                return nil
+            }
+
+            var outputBitmap = [UInt8](repeating: 0, count: 4)
+            let nullSingletonInstance = try XCTUnwrap(kCFNull, "Could not unwrap singleton null instance")
+            let outputRenderContext = CIContext(options: [.workingColorSpace: nullSingletonInstance])
+            outputRenderContext.render(
+                outputImage,
+                toBitmap: &outputBitmap,
+                rowBytes: 4,
+                bounds: CGRect(x: 0, y: 0, width: 1, height: 1),
+                format: .RGBA8,
+                colorSpace: nil
+            )
+            if channel == 0 {
+                redValueOfSample = Double(outputBitmap[channel]) / Double(255)
+            } else if channel == 1 {
+                greenValueOfSample = Double(outputBitmap[channel]) / Double(255)
+            }
+        }
+
+        let tooSimilar = abs(redValueOfSample - greenValueOfSample) < 0.05 // This isn't a huge difference because these are both very light colors
+        if tooSimilar {
+            print(
+                "It wasn't possible to get a predominant color of the button because the two channel values of red (\(redValueOfSample)) and green (\(greenValueOfSample)) were \(redValueOfSample == greenValueOfSample ? "the same." : "too close in value.")"
+            )
+            return .neither
+        }
+
+        return max(redValueOfSample, greenValueOfSample) == redValueOfSample ? .red : .green
+    }
+}
diff --git a/UITests/StateRestorationTests.swift b/UITests/StateRestorationTests.swift
new file mode 100644
index 0000000000..4d952c2d49
--- /dev/null
+++ b/UITests/StateRestorationTests.swift
@@ -0,0 +1,138 @@
+//
+//  StateRestorationTests.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 StateRestorationTests: XCTestCase {
+    private var app: XCUIApplication!
+    private var firstPageTitle: String!
+    private var secondPageTitle: String!
+    private var firstURLForBookmarksBar: URL!
+    private var secondURLForBookmarksBar: URL!
+    private let titleStringLength = 12
+    private var addressBarTextField: XCUIElement!
+    private var settingsGeneralButton: XCUIElement!
+    private var openANewWindowPreference: XCUIElement!
+    private var reopenAllWindowsFromLastSessionPreference: XCUIElement!
+
+    override class func setUp() {
+        UITests.firstRun()
+    }
+
+    override func setUpWithError() throws {
+        continueAfterFailure = false
+        app = XCUIApplication()
+        app.launchEnvironment["UITEST_MODE"] = "1"
+        firstPageTitle = UITests.randomPageTitle(length: titleStringLength)
+        secondPageTitle = UITests.randomPageTitle(length: titleStringLength)
+        firstURLForBookmarksBar = UITests.simpleServedPage(titled: firstPageTitle)
+        secondURLForBookmarksBar = UITests.simpleServedPage(titled: secondPageTitle)
+        addressBarTextField = app.windows.textFields["AddressBarViewController.addressBarTextField"]
+        settingsGeneralButton = app.buttons["PreferencesSidebar.generalButton"]
+        openANewWindowPreference = app.radioButtons["PreferencesGeneralView.stateRestorePicker.openANewWindow"]
+        reopenAllWindowsFromLastSessionPreference = app.radioButtons["PreferencesGeneralView.stateRestorePicker.reopenAllWindowsFromLastSession"]
+
+        app.launch()
+        app.typeKey("w", modifierFlags: [.command, .option, .shift]) // Let's enforce a single window
+        app.typeKey("n", modifierFlags: .command)
+    }
+
+    override func tearDownWithError() throws {
+        app.terminate()
+    }
+
+    func test_tabStateAtRelaunch_shouldContainTwoSitesVisitedInPreviousSession_whenReopenAllWindowsFromLastSessionIsSet() {
+        app.typeKey(",", modifierFlags: [.command]) // Open settings
+        settingsGeneralButton.click(forDuration: 0.5, thenDragTo: settingsGeneralButton)
+        reopenAllWindowsFromLastSessionPreference.clickAfterExistenceTestSucceeds()
+        app.typeKey("w", modifierFlags: [.command, .option, .shift]) // Close windows
+        app.typeKey("n", modifierFlags: .command)
+        XCTAssertTrue(
+            addressBarTextField.waitForExistence(timeout: UITests.Timeouts.elementExistence),
+            "The address bar text field didn't become available in a reasonable timeframe."
+        )
+        addressBarTextField.typeURL(firstURLForBookmarksBar)
+        XCTAssertTrue(
+            app.windows.webViews[firstPageTitle].waitForExistence(timeout: UITests.Timeouts.elementExistence),
+            "Site didn't load with the expected title in a reasonable timeframe."
+        )
+        app.typeKey("t", modifierFlags: [.command])
+        app.typeURL(secondURLForBookmarksBar)
+        XCTAssertTrue(
+            app.windows.webViews[secondPageTitle].waitForExistence(timeout: UITests.Timeouts.elementExistence),
+            "Site didn't load with the expected title in a reasonable timeframe."
+        )
+
+        app.terminate()
+        app.launch()
+
+        XCTAssertTrue(
+            app.windows.webViews[secondPageTitle].waitForExistence(timeout: UITests.Timeouts.elementExistence),
+            "Second visited site wasn't found in a webview with the expected title in a reasonable timeframe."
+        )
+        app.typeKey("w", modifierFlags: [.command])
+        XCTAssertTrue(
+            app.windows.webViews[firstPageTitle].waitForExistence(timeout: UITests.Timeouts.elementExistence),
+            "First visited site wasn't found in a webview with the expected title in a reasonable timeframe."
+        )
+    }
+
+    func test_tabStateAtRelaunch_shouldContainNoSitesVisitedInPreviousSession_whenReopenAllWindowsFromLastSessionIsUnset() {
+        app.typeKey(",", modifierFlags: [.command]) // Open settings
+        settingsGeneralButton.click(forDuration: 0.5, thenDragTo: settingsGeneralButton)
+        openANewWindowPreference.clickAfterExistenceTestSucceeds()
+        app.typeKey("w", modifierFlags: [.command, .option, .shift]) // Close windows
+        app.typeKey("n", modifierFlags: .command)
+        XCTAssertTrue(
+            addressBarTextField.waitForExistence(timeout: UITests.Timeouts.elementExistence),
+            "The address bar text field didn't become available in a reasonable timeframe."
+        )
+        addressBarTextField.typeURL(firstURLForBookmarksBar)
+        XCTAssertTrue(
+            app.windows.webViews[firstPageTitle].waitForExistence(timeout: UITests.Timeouts.elementExistence),
+            "Site didn't load with the expected title in a reasonable timeframe."
+        )
+        app.typeKey("t", modifierFlags: [.command])
+        app.typeURL(secondURLForBookmarksBar)
+        XCTAssertTrue(
+            app.windows.webViews[secondPageTitle].waitForExistence(timeout: UITests.Timeouts.elementExistence),
+            "Site didn't load with the expected title in a reasonable timeframe."
+        )
+
+        app.terminate()
+        app.launch()
+
+        XCTAssertTrue(
+            app.windows.webViews[secondPageTitle].waitForNonExistence(timeout: UITests.Timeouts.elementExistence),
+            "Second visited site from previous session should not be in any webview."
+        )
+        XCTAssertTrue(
+            app.windows.webViews[firstPageTitle].waitForNonExistence(timeout: UITests.Timeouts.elementExistence),
+            "First visited site from previous session should not be in any webview."
+        )
+        app.typeKey("w", modifierFlags: [.command])
+        XCTAssertTrue(
+            app.windows.webViews[firstPageTitle].waitForNonExistence(timeout: UITests.Timeouts.elementExistence),
+            "First visited site from previous session should not be in any webview."
+        )
+        XCTAssertTrue(
+            app.windows.webViews[secondPageTitle].waitForNonExistence(timeout: UITests.Timeouts.elementExistence),
+            "Second visited site from previous session should not be in any webview."
+        )
+    }
+}
diff --git a/UITests/TabBarTests.swift b/UITests/TabBarTests.swift
index 2480e2f71f..0c1cc4c3cc 100644
--- a/UITests/TabBarTests.swift
+++ b/UITests/TabBarTests.swift
@@ -28,6 +28,10 @@ class TabBarTests: XCTestCase {
         app.launch()
     }
 
+    override class func setUp() {
+        UITests.firstRun()
+    }
+
     func testWhenClickingAddTab_ThenTabsOpen() throws {
 //        let app = XCUIApplication()
 //
diff --git a/UITests/UI Tests.xctestplan b/UITests/UI Tests.xctestplan
new file mode 100644
index 0000000000..e1394ca735
--- /dev/null
+++ b/UITests/UI Tests.xctestplan	
@@ -0,0 +1,49 @@
+{
+  "configurations" : [
+    {
+      "id" : "3B3274F0-3353-49A0-B607-6F17F519C2E2",
+      "name" : "Test Scheme Action",
+      "options" : {
+
+      }
+    }
+  ],
+  "defaultOptions" : {
+    "commandLineArgumentEntries" : [
+      {
+        "argument" : "-NSConstraintBasedLayoutVisualizeMutuallyExclusiveConstraints YES"
+      },
+      {
+        "argument" : "-com.apple.CoreData.ConcurrencyDebug 1"
+      }
+    ],
+    "environmentVariableEntries" : [
+      {
+        "key" : "OS_ACTIVITY_DT_MODE",
+        "value" : "YES"
+      },
+      {
+        "key" : "OS_ACTIVITY_MODE",
+        "value" : "debug"
+      }
+    ],
+    "targetForVariableExpansion" : {
+      "containerPath" : "container:DuckDuckGo.xcodeproj",
+      "identifier" : "AA585D7D248FD31100E9A3E2",
+      "name" : "DuckDuckGo Privacy Browser"
+    }
+  },
+  "testTargets" : [
+    {
+      "skippedTests" : [
+        "PermissionsTests"
+      ],
+      "target" : {
+        "containerPath" : "container:DuckDuckGo.xcodeproj",
+        "identifier" : "7B4CE8D926F02108009134B1",
+        "name" : "UI Tests"
+      }
+    }
+  ],
+  "version" : 1
+}
diff --git a/UnitTests/AppDelegate/AutoClearHandlerTests.swift b/UnitTests/AppDelegate/AutoClearHandlerTests.swift
new file mode 100644
index 0000000000..192de793f3
--- /dev/null
+++ b/UnitTests/AppDelegate/AutoClearHandlerTests.swift
@@ -0,0 +1,83 @@
+//
+//  AutoClearHandlerTests.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 XCTest
+
+@testable import DuckDuckGo_Privacy_Browser
+
+@MainActor
+class AutoClearHandlerTests: XCTestCase {
+
+    var handler: AutoClearHandler!
+    var preferences: DataClearingPreferences!
+    var fireViewModel: FireViewModel!
+
+    override func setUp() {
+        super.setUp()
+        let persistor = MockFireButtonPreferencesPersistor()
+        preferences = DataClearingPreferences(persistor: persistor)
+        fireViewModel = FireViewModel(fire: Fire(tld: ContentBlocking.shared.tld))
+        let fileName = "AutoClearHandlerTests"
+        let fileStore = FileStoreMock()
+        let service = StatePersistenceService(fileStore: fileStore, fileName: fileName)
+        let appStateRestorationManager = AppStateRestorationManager(fileStore: fileStore,
+                                                                    service: service,
+                                                                    shouldRestorePreviousSession: false)
+        handler = AutoClearHandler(preferences: preferences, fireViewModel: fireViewModel, stateRestorationManager: appStateRestorationManager)
+    }
+
+    override func tearDown() {
+        handler = nil
+        preferences = nil
+        fireViewModel = nil
+        super.tearDown()
+    }
+
+    func testWhenBurningEnabledAndNoWarningRequiredThenTerminateLaterIsReturned() {
+            preferences.isAutoClearEnabled = true
+            preferences.isWarnBeforeClearingEnabled = false
+
+            let response = handler.handleAppTermination()
+
+            XCTAssertEqual(response, .terminateLater)
+        }
+
+        func testWhenBurningDisabledThenNoTerminationResponse() {
+            preferences.isAutoClearEnabled = false
+
+            let response = handler.handleAppTermination()
+
+            XCTAssertNil(response)
+        }
+
+        func testWhenBurningEnabledAndFlagFalseThenBurnOnStartTriggered() {
+            preferences.isAutoClearEnabled = true
+            handler.resetTheCorrectTerminationFlag()
+
+            XCTAssertTrue(handler.burnOnStartIfNeeded())
+        }
+
+        func testWhenBurningDisabledThenBurnOnStartNotTriggered() {
+            preferences.isAutoClearEnabled = false
+            handler.resetTheCorrectTerminationFlag()
+
+            XCTAssertFalse(handler.burnOnStartIfNeeded())
+        }
+
+}
diff --git a/UnitTests/Autofill/Mocks/MockAutofillActionExecutor.swift b/UnitTests/Autofill/Mocks/MockAutofillActionExecutor.swift
index bb7a4ec8bb..d94b13ccb0 100644
--- a/UnitTests/Autofill/Mocks/MockAutofillActionExecutor.swift
+++ b/UnitTests/Autofill/Mocks/MockAutofillActionExecutor.swift
@@ -27,7 +27,7 @@ final class MockAutofillActionBuilder: AutofillActionBuilder {
     var mockPresenter: MockAutofillActionPresenter?
 
     func buildExecutor() -> AutofillActionExecutor? {
-        guard let secureVault = try? MockSecureVaultFactory.makeVault(errorReporter: nil) else { return nil }
+        guard let secureVault = try? MockSecureVaultFactory.makeVault(reporter: nil) else { return nil }
         let syncService = MockDDGSyncing(authState: .inactive, scheduler: CapturingScheduler(), isSyncInProgress: false)
         let executor = MockAutofillActionExecutor(userAuthenticator: UserAuthenticatorMock(), secureVault: secureVault, syncService: syncService)
         self.mockExecutor = executor
diff --git a/UnitTests/Autofill/Tests/AutofillDeleteAllPasswordsExecutorTests.swift b/UnitTests/Autofill/Tests/AutofillDeleteAllPasswordsExecutorTests.swift
index f34960a14f..3b262f145d 100644
--- a/UnitTests/Autofill/Tests/AutofillDeleteAllPasswordsExecutorTests.swift
+++ b/UnitTests/Autofill/Tests/AutofillDeleteAllPasswordsExecutorTests.swift
@@ -30,7 +30,7 @@ final class AutofillDeleteAllPasswordsExecutorTests: XCTestCase {
     private var syncService: DDGSyncing!
 
     override func setUpWithError() throws {
-        secureVault = try MockSecureVaultFactory.makeVault(errorReporter: nil)
+        secureVault = try MockSecureVaultFactory.makeVault(reporter: nil)
         syncService = MockDDGSyncing(authState: .inactive, scheduler: scheduler, isSyncInProgress: false)
         sut = .init(userAuthenticator: mockAuthenticator, secureVault: secureVault, syncService: syncService)
     }
diff --git a/UnitTests/Bookmarks/Helpers/WebsiteInfoHelpers.swift b/UnitTests/Bookmarks/Helpers/WebsiteInfoHelpers.swift
new file mode 100644
index 0000000000..9a87f91090
--- /dev/null
+++ b/UnitTests/Bookmarks/Helpers/WebsiteInfoHelpers.swift
@@ -0,0 +1,35 @@
+//
+//  WebsiteInfoHelpers.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
+@testable import DuckDuckGo_Privacy_Browser
+
+extension WebsiteInfo {
+
+    @MainActor
+    static func makeWebsitesInfo(url: URL, title: String? = nil, occurrences: Int = 1) -> [WebsiteInfo] {
+        (1...occurrences)
+            .map { _ in
+                let tab = Tab(content: .url(url, credential: nil, source: .ui))
+                tab.title = title
+                return tab
+            }
+            .compactMap(WebsiteInfo.init)
+    }
+
+}
diff --git a/UnitTests/Bookmarks/Model/LocalBookmarkManagerTests.swift b/UnitTests/Bookmarks/Model/LocalBookmarkManagerTests.swift
index 97ce23202d..79d3809847 100644
--- a/UnitTests/Bookmarks/Model/LocalBookmarkManagerTests.swift
+++ b/UnitTests/Bookmarks/Model/LocalBookmarkManagerTests.swift
@@ -178,6 +178,87 @@ final class LocalBookmarkManagerTests: XCTestCase {
         XCTAssertNotNil(bookmarkList)
     }
 
+    func testWhenGetBookmarkFolderIsCalledThenAskBookmarkStoreToRetrieveFolder() throws {
+        // GIVEN
+        let (bookmarkManager, bookmarkStoreMock) = LocalBookmarkManager.aManager
+        XCTAssertFalse(bookmarkStoreMock.bookmarkFolderWithIdCalled)
+        XCTAssertNil(bookmarkStoreMock.capturedFolderId)
+
+        // WHEN
+        _ = bookmarkManager.getBookmarkFolder(withId: #function)
+
+        // THEN
+        XCTAssertTrue(bookmarkStoreMock.bookmarkFolderWithIdCalled)
+        XCTAssertEqual(bookmarkStoreMock.capturedFolderId, #function)
+    }
+
+    func testWhenGetBookmarkFolderIsCalledAndFolderExistsInStoreThenBookmarkStoreReturnsFolder() throws {
+        // GIVEN
+        let (bookmarkManager, bookmarkStoreMock) = LocalBookmarkManager.aManager
+        let folder = BookmarkFolder(id: "1", title: "Test")
+        bookmarkStoreMock.bookmarkFolder = folder
+
+        // WHEN
+        let result = bookmarkManager.getBookmarkFolder(withId: #function)
+
+        // THEN
+        XCTAssertEqual(result, folder)
+    }
+
+    func testWhenGetBookmarkFolderIsCalledAndFolderDoesNotExistInStoreThenBookmarkStoreReturnsNil() throws {
+        // GIVEN
+        let (bookmarkManager, bookmarkStoreMock) = LocalBookmarkManager.aManager
+        bookmarkStoreMock.bookmarkFolder = nil
+
+        // WHEN
+        let result = bookmarkManager.getBookmarkFolder(withId: #function)
+
+        // THEN
+        XCTAssertNil(result)
+    }
+
+    // MARK: - Save Multiple Bookmarks at once
+
+    func testWhenMakeBookmarksForWebsitesInfoIsCalledThenBookmarkStoreIsAskedToCreateMultipleBookmarks() {
+        // GIVEN
+        let (sut, bookmarkStoreMock) = LocalBookmarkManager.aManager
+        let newFolderName = #function
+        let websitesInfo = [
+            WebsiteInfo(url: URL.duckDuckGo, title: "Website 1"),
+            WebsiteInfo(url: URL.duckDuckGo, title: "Website 2"),
+            WebsiteInfo(url: URL.duckDuckGo, title: "Website 3"),
+            WebsiteInfo(url: URL.duckDuckGo, title: "Website 4"),
+        ].compactMap { $0 }
+        XCTAssertFalse(bookmarkStoreMock.saveBookmarksInNewFolderNamedCalled)
+        XCTAssertNil(bookmarkStoreMock.capturedWebsitesInfo)
+        XCTAssertNil(bookmarkStoreMock.capturedNewFolderName)
+        XCTAssertNil(bookmarkStoreMock.capturedParentFolderType)
+
+        // WHEN
+        sut.makeBookmarks(for: websitesInfo, inNewFolderNamed: newFolderName, withinParentFolder: .root)
+
+        // THEN
+        XCTAssertTrue(bookmarkStoreMock.saveBookmarksInNewFolderNamedCalled)
+        XCTAssertEqual(bookmarkStoreMock.capturedWebsitesInfo?.count, 4)
+        XCTAssertEqual(bookmarkStoreMock.capturedWebsitesInfo, websitesInfo)
+        XCTAssertEqual(bookmarkStoreMock.capturedNewFolderName, newFolderName)
+        XCTAssertEqual(bookmarkStoreMock.capturedParentFolderType, .root)
+    }
+
+    func testWhenMakeBookmarksForWebsiteInfoIsCalledThenReloadAllBookmarks() {
+        // GIVEN
+        let (sut, bookmarkStoreMock) = LocalBookmarkManager.aManager
+        bookmarkStoreMock.loadAllCalled = false // Reset after load all bookmarks the first time
+        XCTAssertFalse(bookmarkStoreMock.loadAllCalled)
+        let websitesInfo = [WebsiteInfo(url: URL.duckDuckGo, title: "Website 1")].compactMap { $0 }
+
+        // WHEN
+        sut.makeBookmarks(for: websitesInfo, inNewFolderNamed: "Test", withinParentFolder: .root)
+
+        // THEN
+        XCTAssertTrue(bookmarkStoreMock.loadAllCalled)
+    }
+
 }
 
 fileprivate extension LocalBookmarkManager {
@@ -204,3 +285,14 @@ fileprivate extension Bookmark {
                                               isFavorite: false)
 
 }
+
+private extension WebsiteInfo {
+
+    @MainActor
+    init?(url: URL, title: String) {
+        let tab = Tab(content: .url(url, credential: nil, source: .ui))
+        tab.title = title
+        self.init(tab)
+    }
+
+}
diff --git a/UnitTests/Bookmarks/Model/WebsiteInfoTests.swift b/UnitTests/Bookmarks/Model/WebsiteInfoTests.swift
new file mode 100644
index 0000000000..7b1b8e8196
--- /dev/null
+++ b/UnitTests/Bookmarks/Model/WebsiteInfoTests.swift
@@ -0,0 +1,77 @@
+//
+//  WebsiteInfoTests.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 WebsiteInfoTests: XCTestCase {
+
+    // MARK: - URL
+
+    func testWhenInitWithTabThenSetURLWithTabURLValue() throws {
+        // GIVEN
+        let url = URL.duckDuckGo
+        let websiteInfo = try XCTUnwrap(WebsiteInfo.makeWebsitesInfo(url: url).first)
+
+        // WHEN
+        let result = websiteInfo.url
+
+        // THEN
+        XCTAssertEqual(result, url)
+    }
+
+    // MARK: - Title
+
+    func testWhenTitleIsNotNilThenDisplayTitleReturnsTitleValue() throws {
+        // GIVEN
+        let title = #function
+        let websiteInfo = try XCTUnwrap(WebsiteInfo.makeWebsitesInfo(url: .duckDuckGo, title: title).first)
+
+        // WHEN
+        let result = websiteInfo.title
+
+        // THEN
+        XCTAssertEqual(result, title)
+    }
+
+    func testWhenTitleIsNilAndURLConformsToRFC3986ThenDisplayTitleReturnsURLHost() throws {
+        // GIVEN
+        let url = URL.duckDuckGo
+        let websiteInfo = try XCTUnwrap(WebsiteInfo.makeWebsitesInfo(url: .duckDuckGo, title: nil).first)
+
+        // WHEN
+        let result = websiteInfo.title
+
+        // THEN
+        XCTAssertEqual(result, url.host)
+    }
+
+    func testWhenTitleIsNilAndURLDoesNotConformToRFC3986ThenDisplayTitleReturnsURLAbsoluteString() throws {
+        // GIVEN
+        let invalidURL = try XCTUnwrap(URL(string: "duckduckgo.com"))
+        let websiteInfo = try XCTUnwrap(WebsiteInfo.makeWebsitesInfo(url: invalidURL, title: nil).first)
+
+        // WHEN
+        let result = websiteInfo.title
+
+        // THEN
+        XCTAssertEqual(result, invalidURL.absoluteString)
+    }
+
+}
diff --git a/LocalPackages/PixelKit/Sources/PixelKit/Extensions/String+StaticString.swift b/UnitTests/Bookmarks/Services/BookmarkFolderStoreMock.swift
similarity index 70%
rename from LocalPackages/PixelKit/Sources/PixelKit/Extensions/String+StaticString.swift
rename to UnitTests/Bookmarks/Services/BookmarkFolderStoreMock.swift
index 19f9b8b692..014282eff6 100644
--- a/LocalPackages/PixelKit/Sources/PixelKit/Extensions/String+StaticString.swift
+++ b/UnitTests/Bookmarks/Services/BookmarkFolderStoreMock.swift
@@ -1,7 +1,7 @@
 //
-//  String+StaticString.swift
+//  BookmarkFolderStoreMock.swift
 //
-//  Copyright © 2023 DuckDuckGo. All rights reserved.
+//  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.
@@ -17,11 +17,9 @@
 //
 
 import Foundation
+@testable import DuckDuckGo_Privacy_Browser
+
+final class BookmarkFolderStoreMock: BookmarkFoldersStore {
+    var lastBookmarkAllTabsFolderIdUsed: String?
 
-extension String {
-    init(_ staticString: StaticString) {
-        self = staticString.withUTF8Buffer {
-            String(decoding: $0, as: UTF8.self)
-        }
-    }
 }
diff --git a/UnitTests/Bookmarks/Services/LocalBookmarkStoreTests.swift b/UnitTests/Bookmarks/Services/LocalBookmarkStoreTests.swift
index 2ebff62e7d..1619b751fa 100644
--- a/UnitTests/Bookmarks/Services/LocalBookmarkStoreTests.swift
+++ b/UnitTests/Bookmarks/Services/LocalBookmarkStoreTests.swift
@@ -30,6 +30,7 @@ extension LocalBookmarkStore {
     }
 }
 
+@MainActor
 final class LocalBookmarkStoreTests: XCTestCase {
 
     // MARK: Save/Delete
@@ -261,6 +262,134 @@ final class LocalBookmarkStoreTests: XCTestCase {
         waitForExpectations(timeout: 3, handler: nil)
     }
 
+    @MainActor
+    func testWhenSaveMultipleWebsiteInfoToANewFolderInRootFolder_ThenTheNewFolderIsCreated_AndBoomarksAreAddedToTheFolder() async throws {
+        // GIVEN
+        let context = container.viewContext
+        let sut = LocalBookmarkStore(context: context)
+        let newFolderName = "Bookmark All Open Tabs"
+        let websites = WebsiteInfo.makeWebsitesInfo(url: .duckDuckGo, occurrences: 50)
+        var bookmarksEntity = try await sut.loadAll(type: .bookmarks).get()
+        var topLevelEntities = try await sut.loadAll(type: .topLevelEntities).get()
+        XCTAssertEqual(bookmarksEntity.count, 0)
+        XCTAssertEqual(topLevelEntities.count, 0)
+
+        // WHEN
+        sut.saveBookmarks(for: websites, inNewFolderNamed: newFolderName, withinParentFolder: .root)
+
+        // THEN
+        bookmarksEntity = try await sut.loadAll(type: .bookmarks).get()
+        topLevelEntities = try await sut.loadAll(type: .topLevelEntities).get()
+        let bookmarks = try XCTUnwrap(bookmarksEntity as? [Bookmark])
+        let folders = try XCTUnwrap(topLevelEntities as? [BookmarkFolder])
+        let folder = try XCTUnwrap(folders.first)
+        XCTAssertEqual(bookmarksEntity.count, 50)
+        XCTAssertEqual(folders.count, 1)
+        XCTAssertEqual(folder.parentFolderUUID, BookmarkEntity.Constants.rootFolderID)
+        XCTAssertEqual(folder.title, newFolderName)
+        XCTAssertEqual(Set(folder.children), Set(bookmarks))
+        bookmarks.forEach { bookmark in
+            XCTAssertEqual(bookmark.parentFolderUUID, folder.id)
+        }
+    }
+
+    @MainActor
+    func testWhenSaveMultipleWebsiteInfoToANewFolderInSubfolder_ThenTheNewFolderIsCreated_AndBoomarksAreAddedToTheFolder() async throws {
+        // GIVEN
+        let context = container.viewContext
+        let sut = LocalBookmarkStore(context: context)
+        let newFolderName = "Bookmark All Open Tabs"
+        let websites = WebsiteInfo.makeWebsitesInfo(url: .duckDuckGo, occurrences: 50)
+        let parentFolderToInsert = BookmarkFolder(id: "ABCDE", title: "Subfolder")
+        _ = await sut.save(folder: parentFolderToInsert, parent: nil)
+        var bookmarksEntity = try await sut.loadAll(type: .bookmarks).get()
+        var topLevelEntities = try await sut.loadAll(type: .topLevelEntities).get()
+        XCTAssertEqual(bookmarksEntity.count, 0)
+        XCTAssertEqual(topLevelEntities.count, 1)
+        XCTAssertEqual(topLevelEntities.first, parentFolderToInsert)
+        XCTAssertEqual((topLevelEntities.first as? BookmarkFolder)?.parentFolderUUID, BookmarkEntity.Constants.rootFolderID)
+
+        // WHEN
+        sut.saveBookmarks(for: websites, inNewFolderNamed: newFolderName, withinParentFolder: .parent(uuid: parentFolderToInsert.id))
+
+        // THEN
+        bookmarksEntity = try await sut.loadAll(type: .bookmarks).get()
+        topLevelEntities = try await sut.loadAll(type: .topLevelEntities).get()
+        let bookmarks = try XCTUnwrap(bookmarksEntity as? [Bookmark])
+        let folders = try XCTUnwrap(topLevelEntities as? [BookmarkFolder])
+        let parentFolder = try XCTUnwrap(folders.first)
+        let subFolder = try XCTUnwrap(parentFolder.children.first as? BookmarkFolder)
+        XCTAssertEqual(bookmarksEntity.count, 50)
+        XCTAssertEqual(folders.count, 1)
+        XCTAssertEqual(parentFolder.title, parentFolderToInsert.title)
+        XCTAssertEqual(parentFolder.children.count, 1)
+        XCTAssertEqual(subFolder.title, newFolderName)
+        XCTAssertEqual(Set(subFolder.children), Set(bookmarks))
+        bookmarks.forEach { bookmark in
+            XCTAssertEqual(bookmark.parentFolderUUID, subFolder.id)
+        }
+    }
+
+    @MainActor
+    func testWhenSaveMultipleWebsiteInfo_AndTitleIsNotNil_ThenTitleIsUsedAsBookmarkTitle() async throws {
+        // GIVEN
+        let context = container.viewContext
+        let sut = LocalBookmarkStore(context: context)
+        let websiteName = "Test Website"
+        let websites = WebsiteInfo.makeWebsitesInfo(url: .duckDuckGo, title: websiteName, occurrences: 1)
+        var bookmarksEntity = try await sut.loadAll(type: .bookmarks).get()
+        XCTAssertEqual(bookmarksEntity.count, 0)
+
+        // WHEN
+        sut.saveBookmarks(for: websites, inNewFolderNamed: "Saved Tabs", withinParentFolder: .root)
+
+        // THEN
+        bookmarksEntity = try await sut.loadAll(type: .bookmarks).get()
+        let bookmark = try XCTUnwrap((bookmarksEntity as? [Bookmark])?.first)
+        XCTAssertEqual(bookmarksEntity.count, 1)
+        XCTAssertEqual(bookmark.title, websiteName)
+    }
+
+    @MainActor
+    func testWhenSaveMultipleWebsiteInfo_AndTitleIsNil_ThenURLDomainIsUsedAsBookmarkTitle() async throws {
+        // GIVEN
+        let context = container.viewContext
+        let sut = LocalBookmarkStore(context: context)
+        let url = URL.duckDuckGo
+        let websites = WebsiteInfo.makeWebsitesInfo(url: url, title: nil, occurrences: 1)
+        var bookmarksEntity = try await sut.loadAll(type: .bookmarks).get()
+        XCTAssertEqual(bookmarksEntity.count, 0)
+
+        // WHEN
+        sut.saveBookmarks(for: websites, inNewFolderNamed: "Saved Tabs", withinParentFolder: .root)
+
+        // THEN
+        bookmarksEntity = try await sut.loadAll(type: .bookmarks).get()
+        let bookmark = try XCTUnwrap((bookmarksEntity as? [Bookmark])?.first)
+        XCTAssertEqual(bookmarksEntity.count, 1)
+        XCTAssertEqual(bookmark.title, url.host)
+    }
+
+    @MainActor
+    func testWhenSaveMultipleWebsiteInfo_AndTitleIsNil_AndURLDoesNotConformToRFC3986_ThenURLAbsoluteStringIsUsedAsBookmarkTitle() async throws {
+        // GIVEN
+        let context = container.viewContext
+        let sut = LocalBookmarkStore(context: context)
+        let url = try XCTUnwrap(URL(string: "duckduckgo.com"))
+        let websites = WebsiteInfo.makeWebsitesInfo(url: url, title: nil, occurrences: 1)
+        var bookmarksEntity = try await sut.loadAll(type: .bookmarks).get()
+        XCTAssertEqual(bookmarksEntity.count, 0)
+
+        // WHEN
+        sut.saveBookmarks(for: websites, inNewFolderNamed: "Saved Tabs", withinParentFolder: .root)
+
+        // THEN
+        bookmarksEntity = try await sut.loadAll(type: .bookmarks).get()
+        let bookmark = try XCTUnwrap((bookmarksEntity as? [Bookmark])?.first)
+        XCTAssertEqual(bookmarksEntity.count, 1)
+        XCTAssertEqual(bookmark.title, url.absoluteString)
+    }
+
     // MARK: Moving Bookmarks/Folders
 
     func testWhenMovingBookmarkWithinParentCollection_AndIndexIsValid_ThenBookmarkIsMoved() async {
@@ -313,6 +442,122 @@ final class LocalBookmarkStoreTests: XCTestCase {
         XCTAssertEqual(expectedBookmarkUUIDs, updatedFetchedBookmarkUUIDs)
     }
 
+    func testWhenMovingBookmarkWithinParentCollection_AndThereAreStubs_ThenIndexIsCalculatedAndBookmarkIsMoved() async {
+        let context = container.viewContext
+        let bookmarkStore = LocalBookmarkStore(context: context)
+
+        guard let rootMO = BookmarkUtils.fetchRootFolder(context) else {
+            XCTFail("Missing root folder")
+            return
+        }
+
+        let folderMO = BookmarkEntity.makeFolder(title: "Parent", parent: rootMO, context: context)
+
+        let bookmarkStub1MO = BookmarkEntity.makeBookmark(title: "Stub 1", url: "", parent: folderMO,
+                                                          context: context)
+        bookmarkStub1MO.isStub = true
+
+        let bookmark1MO = BookmarkEntity.makeBookmark(title: "Example 1", url: "https://example1.com", parent: folderMO,
+                                                      context: context)
+
+        let bookmarkStub2MO = BookmarkEntity.makeBookmark(title: "Stub 2", url: "", parent: folderMO,
+                                                          context: context)
+        bookmarkStub2MO.isStub = true
+
+        let bookmark2MO = BookmarkEntity.makeBookmark(title: "Example 2", url: "https://example2.com", parent: folderMO,
+                                                      context: context)
+
+        let bookmarkStub3MO = BookmarkEntity.makeBookmark(title: "Stub 3", url: "", parent: folderMO,
+                                                          context: context)
+        bookmarkStub3MO.isStub = true
+        let bookmarkStub4MO = BookmarkEntity.makeBookmark(title: "Stub 4", url: "", parent: folderMO,
+                                                          context: context)
+        bookmarkStub4MO.isStub = true
+
+        let bookmark3MO = BookmarkEntity.makeBookmark(title: "Example 3", url: "https://example3.com", parent: folderMO,
+                                                      context: context)
+
+        let bookmarkStub5MO = BookmarkEntity.makeBookmark(title: "Stub 5", url: "", parent: folderMO,
+                                                          context: context)
+        bookmarkStub5MO.isStub = true
+
+        let bookmark4MO = BookmarkEntity.makeBookmark(title: "Example 4", url: "https://example3.com", parent: folderMO,
+                                                      context: context)
+
+        let bookmarkStub6MO = BookmarkEntity.makeBookmark(title: "Stub 6", url: "", parent: folderMO,
+                                                          context: context)
+        bookmarkStub6MO.isStub = true
+
+        // Save the initial bookmarks state:
+
+        do {
+            try context.save()
+        } catch {
+            XCTFail("Failed to save context")
+        }
+
+        // Fetch persisted bookmarks back from the store:
+
+        guard case let .success(initialTopLevelEntities) = await bookmarkStore.loadAll(type: .topLevelEntities),
+              let initialParentFolder = initialTopLevelEntities.first as? BookmarkFolder else {
+            XCTFail("Couldn't load top level entities")
+            return
+        }
+
+        XCTAssertEqual(initialParentFolder.children.count, 4)
+
+        // Verify initial order of saved bookmarks:
+
+        let initialBookmarkUUIDs = [bookmark1MO.uuid, bookmark2MO.uuid, bookmark3MO.uuid, bookmark4MO.uuid]
+        let initialFetchedBookmarkUUIDs = initialParentFolder.children.map(\.id)
+        XCTAssertEqual(initialBookmarkUUIDs, initialFetchedBookmarkUUIDs)
+
+        func testMoving(bookmarkUUIDs: [String], toIndex: Int) async -> [String] {
+            let moveBookmarksError = await bookmarkStore.move(objectUUIDs: bookmarkUUIDs, toIndex: toIndex, withinParentFolder: .parent(uuid: folderMO.uuid!))
+            XCTAssertNil(moveBookmarksError)
+
+            guard case let .success(updatedTopLevelEntities) = await bookmarkStore.loadAll(type: .topLevelEntities),
+                  let updatedParentFolder = updatedTopLevelEntities.first as? BookmarkFolder else {
+                XCTFail("Couldn't load top level entities")
+                return []
+            }
+
+            return updatedParentFolder.children.map(\.title)
+        }
+
+        // Update the order of the bookmarks:
+        // More than one bookmark
+        // To the end
+        var result = await testMoving(bookmarkUUIDs: [bookmark1MO.uuid!, bookmark2MO.uuid!], toIndex: 4)
+        XCTAssertEqual(result, [bookmark3MO.title, bookmark4MO.title, bookmark1MO.title, bookmark2MO.title])
+        // To the beginning
+        result = await testMoving(bookmarkUUIDs: [bookmark1MO.uuid!, bookmark2MO.uuid!], toIndex: 0)
+        XCTAssertEqual(result, [bookmark1MO.title, bookmark2MO.title, bookmark3MO.title, bookmark4MO.title])
+        // To middle
+        result = await testMoving(bookmarkUUIDs: [bookmark1MO.uuid!, bookmark2MO.uuid!], toIndex: 3)
+        XCTAssertEqual(result, [bookmark3MO.title, bookmark1MO.title, bookmark2MO.title, bookmark4MO.title])
+        // To the beginning
+        result = await testMoving(bookmarkUUIDs: [bookmark1MO.uuid!, bookmark2MO.uuid!], toIndex: 0)
+        XCTAssertEqual(result, [bookmark1MO.title, bookmark2MO.title, bookmark3MO.title, bookmark4MO.title])
+
+        // Single bookmark
+        // Middle to end
+        result = await testMoving(bookmarkUUIDs: [bookmark2MO.uuid!], toIndex: 4)
+        XCTAssertEqual(result, [bookmark1MO.title, bookmark3MO.title, bookmark4MO.title, bookmark2MO.title])
+        // First to Beginning
+        result = await testMoving(bookmarkUUIDs: [bookmark1MO.uuid!], toIndex: 0)
+        XCTAssertEqual(result, [bookmark1MO.title, bookmark3MO.title, bookmark4MO.title, bookmark2MO.title])
+        // First to First
+        result = await testMoving(bookmarkUUIDs: [bookmark1MO.uuid!], toIndex: 1)
+        XCTAssertEqual(result, [bookmark1MO.title, bookmark3MO.title, bookmark4MO.title, bookmark2MO.title])
+        // First to Second
+        result = await testMoving(bookmarkUUIDs: [bookmark1MO.uuid!], toIndex: 2)
+        XCTAssertEqual(result, [bookmark3MO.title, bookmark1MO.title, bookmark4MO.title, bookmark2MO.title])
+        // First to End
+        result = await testMoving(bookmarkUUIDs: [bookmark3MO.uuid!], toIndex: 4)
+        XCTAssertEqual(result, [bookmark1MO.title, bookmark4MO.title, bookmark2MO.title, bookmark3MO.title])
+    }
+
     func testWhenMovingBookmarkWithinParentCollection_AndIndexIsOutOfBounds_ThenBookmarkIsAppended() async {
         let context = container.viewContext
         let bookmarkStore = LocalBookmarkStore(context: context)
@@ -743,6 +988,99 @@ final class LocalBookmarkStoreTests: XCTestCase {
         XCTAssertEqual(expectedBookmarkUUIDs, updatedFetchedBookmarkUUIDs)
     }
 
+    func testWhenMovingFavorite_AndThereAreStubs_ThenIndexIsCalculatedAndBookmarkIsMoved() async {
+        let context = container.viewContext
+        let bookmarkStore = LocalBookmarkStore(context: context)
+        bookmarkStore.applyFavoritesDisplayMode(.displayUnified(native: .desktop))
+
+        guard let rootMO = BookmarkUtils.fetchRootFolder(context) else {
+            XCTFail("Missing root folder")
+            return
+        }
+
+        let folderMO = BookmarkEntity.makeFolder(title: "Parent", parent: rootMO, context: context)
+
+        let bookmark1MO = BookmarkEntity.makeBookmark(title: "Example 1", url: "https://example1.com", parent: folderMO,
+                                                      context: context)
+        let bookmark2MO = BookmarkEntity.makeBookmark(title: "Example 2", url: "https://example2.com", parent: folderMO,
+                                                      context: context)
+        let bookmarkStub1MO = BookmarkEntity.makeBookmark(title: "Stub 1", url: "", parent: folderMO,
+                                                          context: context)
+        bookmarkStub1MO.isStub = true
+        let bookmarkStub2MO = BookmarkEntity.makeBookmark(title: "Stub 2", url: "", parent: folderMO,
+                                                          context: context)
+        bookmarkStub2MO.isStub = true
+        let bookmark3MO = BookmarkEntity.makeBookmark(title: "Example 3", url: "https://example3.com", parent: folderMO,
+                                                      context: context)
+        let bookmarkStub3MO = BookmarkEntity.makeBookmark(title: "Stub 3", url: "", parent: folderMO,
+                                                          context: context)
+        bookmarkStub3MO.isStub = true
+
+        let favoriteRoots = BookmarkUtils.fetchFavoritesFolders(for: .displayUnified(native: .desktop), in: context)
+        guard !favoriteRoots.isEmpty else {
+            XCTFail("No favorite root")
+            return
+        }
+        bookmark1MO.addToFavorites(folders: favoriteRoots)
+        bookmark2MO.addToFavorites(folders: favoriteRoots)
+        bookmarkStub1MO.addToFavorites(folders: favoriteRoots)
+        bookmarkStub2MO.addToFavorites(folders: favoriteRoots)
+        bookmark3MO.addToFavorites(folders: favoriteRoots)
+        bookmarkStub3MO.addToFavorites(folders: favoriteRoots)
+
+        // Save the initial state:
+
+        do {
+            try context.save()
+        } catch {
+            XCTFail("Failed to save context")
+        }
+
+        // Fetch persisted bookmarks back from the store:
+
+        guard case let .success(favorites) = await bookmarkStore.loadAll(type: .favorites) else {
+            XCTFail("Couldn't load top level entities")
+            return
+        }
+
+        XCTAssertEqual(favorites.count, 3)
+
+        // Verify initial order of saved bookmarks:
+
+        let initialBookmarkUUIDs = [bookmark1MO.uuid, bookmark2MO.uuid, bookmark3MO.uuid]
+        let initialFetchedBookmarkUUIDs = favorites.map(\.id)
+        XCTAssertEqual(initialBookmarkUUIDs, initialFetchedBookmarkUUIDs)
+
+        func testMoving(bookmarkUUID: String, toIndex: Int) async -> [String] {
+            let moveBookmarksError = await bookmarkStore.moveFavorites(with: [bookmarkUUID], toIndex: toIndex)
+            XCTAssertNil(moveBookmarksError)
+
+            guard case let .success(updatedFavorites) = await bookmarkStore.loadAll(type: .favorites) else {
+                XCTFail("Couldn't load top level entities")
+                return []
+            }
+
+            return updatedFavorites.map(\.title)
+        }
+
+        // Update the order of the bookmarks:
+        // Middle to end
+        var result = await testMoving(bookmarkUUID: bookmark2MO.uuid!, toIndex: 3)
+        XCTAssertEqual(result, [bookmark1MO.title, bookmark3MO.title, bookmark2MO.title])
+        // First to Beginning
+        result = await testMoving(bookmarkUUID: bookmark1MO.uuid!, toIndex: 0)
+        XCTAssertEqual(result, [bookmark1MO.title, bookmark3MO.title, bookmark2MO.title])
+        // First to First
+        result = await testMoving(bookmarkUUID: bookmark1MO.uuid!, toIndex: 1)
+        XCTAssertEqual(result, [bookmark1MO.title, bookmark3MO.title, bookmark2MO.title])
+        // First to Second
+        result = await testMoving(bookmarkUUID: bookmark1MO.uuid!, toIndex: 2)
+        XCTAssertEqual(result, [bookmark3MO.title, bookmark1MO.title, bookmark2MO.title])
+        // First to End
+        result = await testMoving(bookmarkUUID: bookmark3MO.uuid!, toIndex: 3)
+        XCTAssertEqual(result, [bookmark1MO.title, bookmark2MO.title, bookmark3MO.title])
+    }
+
     func testWhenMovingFavorite_AndIndexIsOutOfBounds_ThenFavoriteIsAppended() async {
         let context = container.viewContext
         let bookmarkStore = LocalBookmarkStore(context: context)
@@ -1071,6 +1409,63 @@ final class LocalBookmarkStoreTests: XCTestCase {
         }
     }
 
+    // MARK: - Retrieve Bookmark Folder
+
+    func testWhenFetchingBookmarkFolderWithId_AndFolderExist_ThenFolderIsReturned() async {
+        // GIVEN
+        let context = container.viewContext
+        let sut = LocalBookmarkStore(context: context)
+        let folderId = "ABCDE"
+        let folder = BookmarkFolder(id: folderId, title: "Test")
+        _ = await sut.save(folder: folder, parent: nil)
+
+        // WHEN
+        let result = sut.bookmarkFolder(withId: folderId)
+
+        // THEN
+        XCTAssertEqual(result, folder)
+    }
+
+    func testWhenFetchingBookmarkFolderWithId_AndFolderDoesNotExist_ThenNilIsReturned() {
+        // GIVEN
+        let context = container.viewContext
+        let sut = LocalBookmarkStore(context: context)
+        let folderId = "ABCDE"
+
+        // WHEN
+        let result = sut.bookmarkFolder(withId: folderId)
+
+        // THEN
+        XCTAssertNil(result)
+    }
+
+    func testWhenFetchingBookmarkFolderWithId_AndFolderHasBeenMoved_ThenFolderIsStillReturned() async {
+        // GIVEN
+        let context = container.viewContext
+        let sut = LocalBookmarkStore(context: context)
+        let folderId = "ABCDE"
+        let folder1 = BookmarkFolder(id: UUID().uuidString, title: "Test")
+        let folder2 = BookmarkFolder(id: folderId, title: "Test")
+        let expectedFolder = BookmarkFolder(id: folderId, title: "Test", parentFolderUUID: folder1.id)
+        _ = await sut.save(folder: folder1, parent: nil)
+        _ = await sut.save(folder: folder2, parent: nil)
+
+        // WHEN
+        let firstFetchResult = sut.bookmarkFolder(withId: folderId)
+
+        // THEN
+        XCTAssertEqual(firstFetchResult, folder2)
+
+        // Move folder
+        _ = await sut.move(objectUUIDs: [folder2.id], toIndex: nil, withinParentFolder: .parent(uuid: folder1.id))
+
+        // WHEN
+        let secondFetchResult = sut.bookmarkFolder(withId: folderId)
+
+        // THEN
+        XCTAssertEqual(secondFetchResult, expectedFolder)
+    }
+
     // MARK: Import
 
     func testWhenBookmarksAreImported_AndNoDuplicatesExist_ThenBookmarksAreImported() {
diff --git a/UnitTests/Bookmarks/Services/UserDefaultsBookmarkFoldersStoreTests.swift b/UnitTests/Bookmarks/Services/UserDefaultsBookmarkFoldersStoreTests.swift
new file mode 100644
index 0000000000..7020d8ec28
--- /dev/null
+++ b/UnitTests/Bookmarks/Services/UserDefaultsBookmarkFoldersStoreTests.swift
@@ -0,0 +1,62 @@
+//
+//  UserDefaultsBookmarkFoldersStoreTests.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 UserDefaultsBookmarkFoldersStoreTests: XCTestCase {
+    private static let suiteName = "testing_bookmark_folders_store"
+    private var userDefaults: UserDefaults!
+    private var sut: UserDefaultsBookmarkFoldersStore!
+
+    override func setUpWithError() throws {
+        try super.setUpWithError()
+        userDefaults = UserDefaults(suiteName: Self.suiteName)
+        sut = UserDefaultsBookmarkFoldersStore(userDefaults: userDefaults)
+    }
+
+    override func tearDownWithError() throws {
+        userDefaults.removePersistentDomain(forName: Self.suiteName)
+        userDefaults = nil
+        sut = nil
+        try super.tearDownWithError()
+    }
+
+    func testReturnBookmarkAllTabsLastFolderIdUsedWhenUserDefaultsContainsValue() {
+        // GIVEN
+        let value = "12345"
+        userDefaults.set(value, forKey: UserDefaultsBookmarkFoldersStore.Keys.bookmarkAllTabsFolderUsedKey)
+
+        // WHEN
+        let result = sut.lastBookmarkAllTabsFolderIdUsed
+
+        // THEN
+        XCTAssertEqual(result, value)
+    }
+
+    func testReturnNilForBookmarkAllTabsLastFolderIdUsedWhenUserDefaultsDoesNotContainValue() {
+        // GIVEN
+        userDefaults.set(nil, forKey: UserDefaultsBookmarkFoldersStore.Keys.bookmarkAllTabsFolderUsedKey)
+
+        // WHEN
+        let result = sut.lastBookmarkAllTabsFolderIdUsed
+
+        // THEN
+        XCTAssertNil(result)
+    }
+}
diff --git a/UnitTests/Bookmarks/ViewModels/AddEditBookmarkDialogCoordinatorViewModelTests.swift b/UnitTests/Bookmarks/ViewModels/AddEditBookmarkDialogCoordinatorViewModelTests.swift
index 53072513c4..c8b101e148 100644
--- a/UnitTests/Bookmarks/ViewModels/AddEditBookmarkDialogCoordinatorViewModelTests.swift
+++ b/UnitTests/Bookmarks/ViewModels/AddEditBookmarkDialogCoordinatorViewModelTests.swift
@@ -125,46 +125,44 @@ final class AddEditBookmarkDialogCoordinatorViewModelTests: XCTestCase {
         XCTAssertEqual(bookmarkViewModelMock.selectedFolder, folder)
     }
 
-}
+    // MARK: - Integration Test
 
-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()
+    func testWhenAddFolderMultipleTimesThenFolderListIsUpdatedAndSelectedFolderIsNil() {
+        // GIVEN
+        let expectation = self.expectation(description: #function)
+        let folder = BookmarkFolder(id: "1", title: "Folder")
+        bookmarkViewModelMock.selectedFolder = folder
+        let bookmarkStoreMock = BookmarkStoreMock()
+        bookmarkStoreMock.bookmarks = [folder]
+        let bookmarkManager = LocalBookmarkManager(bookmarkStore: bookmarkStoreMock, faviconManagement: FaviconManagerMock())
+        bookmarkManager.loadBookmarks()
+        let folderModel = AddEditBookmarkFolderDialogViewModel(mode: .add(parentFolder: nil), bookmarkManager: bookmarkManager)
+        let sut = AddEditBookmarkDialogCoordinatorViewModel(bookmarkModel: bookmarkViewModelMock, folderModel: folderModel)
+        let c = folderModel.$folders
+            .dropFirst(2) // Not interested in the first two events. 1.subscribing to $folders and 2. subscribing to $list.
+            .sink { folders in
+                expectation.fulfill()
         }
-    }
-    var cancelActionTitle: String = ""
-    var isOtherActionDisabled: Bool = false
-    var defaultActionTitle: String = ""
-    var isDefaultActionDisabled: Bool = false
 
-    func cancel(dismiss: () -> Void) {}
-    func addOrSave(dismiss: () -> Void) {}
+        XCTAssertNil(folderModel.selectedFolder)
 
-    var selectedFolderExpectation: XCTestExpectation?
-}
+        // Tap Add Folder
+        sut.addFolderAction()
+        XCTAssertEqual(sut.viewState, .folder)
+        XCTAssertTrue(folderModel.folderName.isEmpty)
+        XCTAssertEqual(folderModel.selectedFolder, folder)
 
-final class AddEditBookmarkFolderDialogViewModelMock: BookmarkFolderDialogEditing {
-    let subject = PassthroughSubject<BookmarkFolder, Never>()
+        // Create a new folder
+        folderModel.folderName = #function
+        folderModel.addOrSave {}
+
+        // Add folder again
+        sut.addFolderAction()
 
-    var addFolderPublisher: AnyPublisher<DuckDuckGo_Privacy_Browser.BookmarkFolder, Never> {
-        subject.eraseToAnyPublisher()
+        // THEN
+        withExtendedLifetime(c) {}
+        waitForExpectations(timeout: 1.0)
+        XCTAssertEqual(sut.viewState, .folder)
+        XCTAssertTrue(folderModel.folderName.isEmpty)
     }
-    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
index b409df5b9c..615777c7d9 100644
--- a/UnitTests/Bookmarks/ViewModels/AddEditBookmarkDialogViewModelTests.swift
+++ b/UnitTests/Bookmarks/ViewModels/AddEditBookmarkDialogViewModelTests.swift
@@ -119,25 +119,61 @@ final class AddEditBookmarkDialogViewModelTests: XCTestCase {
         XCTAssertTrue(result.isEmpty)
     }
 
-    func testShouldSetNameAndURLToValueWhenInitModeIsAddTabInfoIsNotNilAndURLIsNotAlreadyBookmarked() {
+    func testWhenInitModeIsAddAndTabInfoIsNotNilAndURLIsNotAlreadyBookmarkedThenSetURLToValue() {
         // 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 testWhenInitAndModeIsAddAndTabInfoTitleIsNotNilAndURLIsNotAlreadyBookmarkedThenSetBookmarkNameToTitle() {
+        // 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
+
+        // THEN
+        XCTAssertEqual(name, "Test")
+    }
+
+    func testWhenInitAndModeIsAddAndTabInfoTitleIsNilAndURLIsNotAlreadyBookmarkedThenSetBookmarkNameToURLDomain() {
+        // GIVEN
+        let url = URL.duckDuckGo
+        let tab = Tab(content: .url(url, source: .link), title: nil)
+        let sut = AddEditBookmarkDialogViewModel(mode: .add(tabWebsite: WebsiteInfo(tab)), bookmarkManager: bookmarkManager)
+
+        // WHEN
+        let name = sut.bookmarkName
+
+        // THEN
+        XCTAssertEqual(name, url.host)
+    }
+
+    func testWhenInitAndModeIsAddAndTabInfoTitleIsNilAndURLDoesNotConformToRFC3986AndURLIsNotAlreadyBookmarkedThenSetBookmarkNameToURLAbsoluteString() throws {
+        // GIVEN
+        let url = try XCTUnwrap(URL(string: "duckduckgo.com"))
+        let tab = Tab(content: .url(url, source: .link), title: nil)
+        let sut = AddEditBookmarkDialogViewModel(mode: .add(tabWebsite: WebsiteInfo(tab)), bookmarkManager: bookmarkManager)
+
+        // WHEN
+        let name = sut.bookmarkName
+
+        // THEN
+        XCTAssertEqual(name, url.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)
+        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)
diff --git a/UnitTests/Bookmarks/ViewModels/AddEditBookmarkFolderDialogViewModelTests.swift b/UnitTests/Bookmarks/ViewModels/AddEditBookmarkFolderDialogViewModelTests.swift
index a48f18d2ab..6d54257048 100644
--- a/UnitTests/Bookmarks/ViewModels/AddEditBookmarkFolderDialogViewModelTests.swift
+++ b/UnitTests/Bookmarks/ViewModels/AddEditBookmarkFolderDialogViewModelTests.swift
@@ -329,7 +329,7 @@ final class AddEditBookmarkFolderDialogViewModelTests: XCTestCase {
         // THEN
         XCTAssertFalse(bookmarkStoreMock.updateFolderCalled)
         XCTAssertTrue(bookmarkStoreMock.saveFolderCalled)
-        XCTAssertEqual(bookmarkStoreMock.capturedFolder?.title, sut.folderName)
+        XCTAssertEqual(bookmarkStoreMock.capturedFolder?.title, #function)
         XCTAssertEqual(bookmarkStoreMock.capturedParentFolder, folder)
     }
 
@@ -346,7 +346,7 @@ final class AddEditBookmarkFolderDialogViewModelTests: XCTestCase {
 
         // THEN
         XCTAssertTrue(bookmarkStoreMock.updateFolderCalled)
-        XCTAssertEqual(bookmarkStoreMock.capturedFolder?.title, sut.folderName)
+        XCTAssertEqual(bookmarkStoreMock.capturedFolder?.title, "TEST")
     }
 
     func testShouldNotAskBookmarkStoreToUpdateFolderWhenNameIsNotChanged() {
diff --git a/UnitTests/Bookmarks/ViewModels/BookmarkAllTabsDialogCoordinatorViewModelTests.swift b/UnitTests/Bookmarks/ViewModels/BookmarkAllTabsDialogCoordinatorViewModelTests.swift
new file mode 100644
index 0000000000..d766d27f0d
--- /dev/null
+++ b/UnitTests/Bookmarks/ViewModels/BookmarkAllTabsDialogCoordinatorViewModelTests.swift
@@ -0,0 +1,171 @@
+//
+//  BookmarkAllTabsDialogCoordinatorViewModelTests.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 BookmarkAllTabsDialogCoordinatorViewModelTests: XCTestCase {
+    private var sut: BookmarkAllTabsDialogCoordinatorViewModel<BookmarkAllTabsDialogViewModelMock, AddEditBookmarkFolderDialogViewModelMock>!
+    private var bookmarkAllTabsViewModelMock: BookmarkAllTabsDialogViewModelMock!
+    private var bookmarkFolderViewModelMock: AddEditBookmarkFolderDialogViewModelMock!
+    private var cancellables: Set<AnyCancellable>!
+
+    override func setUpWithError() throws {
+        try super.setUpWithError()
+
+        cancellables = []
+        bookmarkAllTabsViewModelMock = .init()
+        bookmarkFolderViewModelMock = .init()
+        sut = .init(bookmarkModel: bookmarkAllTabsViewModelMock, folderModel: bookmarkFolderViewModelMock)
+    }
+
+    override func tearDownWithError() throws {
+        cancellables = nil
+        bookmarkAllTabsViewModelMock = nil
+        bookmarkFolderViewModelMock = nil
+        sut = nil
+        try super.tearDownWithError()
+    }
+
+    func testWhenInitThenViewStateIsBookmarkAllTabs() {
+        XCTAssertEqual(sut.viewState, .bookmarkAllTabs)
+    }
+
+    func testWhenDismissActionIsCalledThenViewStateIsBookmarkAllTabs() {
+        // GIVEN
+        sut.addFolderAction()
+        XCTAssertEqual(sut.viewState, .addFolder)
+
+        // WHEN
+        sut.dismissAction()
+
+        // THEN
+        XCTAssertEqual(sut.viewState, .bookmarkAllTabs)
+
+    }
+
+    func testWhenAddFolderActionIsCalledThenSetSelectedFolderOnFolderViewModelIsCalledAndReturnAddFolderViewState() {
+        // GIVEN
+        let folder = BookmarkFolder(id: "1", title: "Folder")
+        bookmarkAllTabsViewModelMock.selectedFolder = folder
+        XCTAssertNil(bookmarkFolderViewModelMock.selectedFolder)
+        XCTAssertEqual(sut.viewState, .bookmarkAllTabs)
+
+        // WHEN
+        sut.addFolderAction()
+
+        // THEN
+        XCTAssertEqual(bookmarkFolderViewModelMock.selectedFolder, folder)
+        XCTAssertEqual(sut.viewState, .addFolder)
+    }
+
+    func testWhenBookmarkModelChangesThenReceiveEvent() {
+        // 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 testWhenBookmarkFolderModelChangesThenReceiveEvent() {
+        // 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 testWhenAddFolderPublisherSendsEventThenSelectedFolderOnBookmarkAllTabsViewModelIsSet() {
+        // GIVEN
+        let expectation = self.expectation(description: #function)
+        bookmarkAllTabsViewModelMock.selectedFolderExpectation = expectation
+        let folder = BookmarkFolder(id: "ABCDE", title: #function)
+        XCTAssertNil(bookmarkAllTabsViewModelMock.selectedFolder)
+
+        // WHEN
+        sut.folderModel.subject.send(folder)
+
+        // THEN
+        waitForExpectations(timeout: 1.0)
+        XCTAssertEqual(bookmarkAllTabsViewModelMock.selectedFolder, folder)
+    }
+
+    // MARK: - Integration Test
+
+    func testWhenAddFolderMultipleTimesThenFolderListIsUpdatedAndSelectedFolderIsNil() {
+        // GIVEN
+        let expectation = self.expectation(description: #function)
+        let folder = BookmarkFolder(id: "1", title: "Folder")
+        bookmarkAllTabsViewModelMock.selectedFolder = folder
+        let bookmarkStoreMock = BookmarkStoreMock()
+        bookmarkStoreMock.bookmarks = [folder]
+        let bookmarkManager = LocalBookmarkManager(bookmarkStore: bookmarkStoreMock, faviconManagement: FaviconManagerMock())
+        bookmarkManager.loadBookmarks()
+        let folderModel = AddEditBookmarkFolderDialogViewModel(mode: .add(parentFolder: nil), bookmarkManager: bookmarkManager)
+        let sut = BookmarkAllTabsDialogCoordinatorViewModel(bookmarkModel: bookmarkAllTabsViewModelMock, folderModel: folderModel)
+        let c = folderModel.$folders
+            .dropFirst(2) // Not interested in the first two events. 1.subscribing to $folders and 2. subscribing to $list.
+            .sink { folders in
+                expectation.fulfill()
+        }
+
+        XCTAssertNil(folderModel.selectedFolder)
+
+        // Tap Add Folder
+        sut.addFolderAction()
+        XCTAssertEqual(sut.viewState, .addFolder)
+        XCTAssertTrue(folderModel.folderName.isEmpty)
+        XCTAssertEqual(folderModel.selectedFolder, folder)
+
+        // Create a new folder
+        folderModel.folderName = #function
+        folderModel.addOrSave {}
+
+        // Add folder again
+        sut.addFolderAction()
+
+        // THEN
+        withExtendedLifetime(c) {}
+        waitForExpectations(timeout: 1.0)
+        XCTAssertEqual(sut.viewState, .addFolder)
+        XCTAssertTrue(folderModel.folderName.isEmpty)
+    }
+
+}
diff --git a/UnitTests/Bookmarks/ViewModels/BookmarkAllTabsDialogViewModelTests.swift b/UnitTests/Bookmarks/ViewModels/BookmarkAllTabsDialogViewModelTests.swift
new file mode 100644
index 0000000000..dd05e42238
--- /dev/null
+++ b/UnitTests/Bookmarks/ViewModels/BookmarkAllTabsDialogViewModelTests.swift
@@ -0,0 +1,382 @@
+//
+//  BookmarkAllTabsDialogViewModelTests.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 BookmarkAllTabsDialogViewModelTests: XCTestCase {
+    private var bookmarkManager: LocalBookmarkManager!
+    private var bookmarkStoreMock: BookmarkStoreMock!
+    private var foldersStoreMock: BookmarkFolderStoreMock!
+
+    override func setUpWithError() throws {
+        try super.setUpWithError()
+        bookmarkStoreMock = BookmarkStoreMock()
+        bookmarkStoreMock.bookmarks = [BookmarkFolder.mock]
+        bookmarkManager = .init(bookmarkStore: bookmarkStoreMock, faviconManagement: FaviconManagerMock())
+        bookmarkManager.loadBookmarks()
+        foldersStoreMock = .init()
+    }
+
+    override func tearDownWithError() throws {
+        bookmarkStoreMock = nil
+        bookmarkManager = nil
+        foldersStoreMock = nil
+        try super.tearDownWithError()
+    }
+
+    // MARK: - Copy
+
+    func testWhenTitleIsCalledThenItReflectsThenNumberOfWebsites() {
+        // GIVEN
+        let websitesInfo = WebsiteInfo.makeWebsitesInfo(url: .duckDuckGo, occurrences: 10)
+        let sut = BookmarkAllTabsDialogViewModel(websites: websitesInfo, foldersStore: foldersStoreMock, bookmarkManager: bookmarkManager)
+
+        // WHEN
+        let title = sut.title
+
+        // THEN
+        XCTAssertEqual(title, String(format: UserText.Bookmarks.Dialog.Title.bookmarkOpenTabs, websitesInfo.count))
+    }
+
+    func testWhenCancelActionTitleIsCalledThenItReturnsTheRightTitle() {
+        // GIVEN
+        let websitesInfo = WebsiteInfo.makeWebsitesInfo(url: .duckDuckGo)
+        let sut = BookmarkAllTabsDialogViewModel(websites: websitesInfo, foldersStore: foldersStoreMock, bookmarkManager: bookmarkManager)
+
+        // WHEN
+        let title = sut.cancelActionTitle
+
+        // THEN
+        XCTAssertEqual(title, UserText.cancel)
+    }
+
+    func testWhenEducationalMessageIsCalledThenItReturnsTheRightMessage() {
+        // GIVEN
+        let websitesInfo = WebsiteInfo.makeWebsitesInfo(url: .duckDuckGo)
+        let sut = BookmarkAllTabsDialogViewModel(websites: websitesInfo, foldersStore: foldersStoreMock, bookmarkManager: bookmarkManager)
+
+        // WHEN
+        let title = sut.educationalMessage
+
+        // THEN
+        XCTAssertEqual(title, UserText.Bookmarks.Dialog.Message.bookmarkOpenTabsEducational)
+    }
+
+    func testWhenDefaultActionTitleIsCalledThenItReturnsTheRightTitle() {
+        // GIVEN
+        let websitesInfo = WebsiteInfo.makeWebsitesInfo(url: .duckDuckGo)
+        let sut = BookmarkAllTabsDialogViewModel(websites: websitesInfo, foldersStore: foldersStoreMock, bookmarkManager: bookmarkManager)
+
+        // WHEN
+        let title = sut.defaultActionTitle
+
+        // THEN
+        XCTAssertEqual(title, UserText.Bookmarks.Dialog.Action.addAllBookmarks)
+    }
+
+    func testWhenFolderNameFieldTitleIsCalledThenItReturnsTheRightTitle() {
+        // GIVEN
+        let websitesInfo = WebsiteInfo.makeWebsitesInfo(url: .duckDuckGo)
+        let sut = BookmarkAllTabsDialogViewModel(websites: websitesInfo, foldersStore: foldersStoreMock, bookmarkManager: bookmarkManager)
+
+        // WHEN
+        let title = sut.folderNameFieldTitle
+
+        // THEN
+        XCTAssertEqual(title, UserText.Bookmarks.Dialog.Field.folderName)
+    }
+
+    func testWhenLocationFieldTitleIsCalledThenItReturnsTheRightTitle() {
+        // GIVEN
+        let websitesInfo = WebsiteInfo.makeWebsitesInfo(url: .duckDuckGo)
+        let sut = BookmarkAllTabsDialogViewModel(websites: websitesInfo, foldersStore: foldersStoreMock, bookmarkManager: bookmarkManager)
+
+        // WHEN
+        let title = sut.locationFieldTitle
+
+        // THEN
+        XCTAssertEqual(title, UserText.Bookmarks.Dialog.Field.location)
+    }
+
+    // MARK: - State
+
+    func testWhenInitThenFolderNameIsSetToCurrentDateAndNumberOfWebsites() throws {
+        // GIVEN
+        let date = Date(timeIntervalSince1970: 1712902304) // 12th of April 2024
+        let gmtTimeZone = try XCTUnwrap(TimeZone(identifier: "GMT"))
+        let websitesInfo = WebsiteInfo.makeWebsitesInfo(url: .duckDuckGo, occurrences: 5)
+        let sut = BookmarkAllTabsDialogViewModel(
+            websites: websitesInfo,
+            foldersStore: foldersStoreMock,
+            bookmarkManager: bookmarkManager,
+            dateFormatterConfigurationProvider: {
+                BookmarkAllTabsDialogViewModel.DateFormatterConfiguration(date: date, timeZone: gmtTimeZone)
+            }
+        )
+
+        // WHEN
+        let result = sut.folderName
+
+        // THEN
+        XCTAssertEqual(result, String(format: UserText.Bookmarks.Dialog.Value.folderName, "2024-04-12", websitesInfo.count))
+    }
+
+    func testWhenInitAndTimeZoneIsPDTThenFolderNameIsSetToCurrentDateAndNumberOfWebsites() throws {
+        // GIVEN
+        let date = Date(timeIntervalSince1970: 1712902304) // 12th of April 2024 (GMT)
+        let pdtTimeZone = try XCTUnwrap(TimeZone(identifier: "America/Los_Angeles"))
+        let expectedDate = "2024-04-11" // Expected date in PDT TimeZone
+        let websitesInfo = WebsiteInfo.makeWebsitesInfo(url: .duckDuckGo, occurrences: 5)
+        let sut = BookmarkAllTabsDialogViewModel(
+            websites: websitesInfo,
+            foldersStore: foldersStoreMock,
+            bookmarkManager: bookmarkManager,
+            dateFormatterConfigurationProvider: {
+                BookmarkAllTabsDialogViewModel.DateFormatterConfiguration(date: date, timeZone: pdtTimeZone)
+            }
+        )
+
+        // WHEN
+        let result = sut.folderName
+
+        // THEN
+        XCTAssertEqual(result, String(format: UserText.Bookmarks.Dialog.Value.folderName, expectedDate, websitesInfo.count))
+    }
+
+    func testWhenInitThenFoldersAreSetFromBookmarkList() {
+        // GIVEN
+        let folder = BookmarkFolder(id: "1", title: #function)
+        bookmarkStoreMock.bookmarks = [folder]
+        bookmarkManager.loadBookmarks()
+        let websitesInfo = WebsiteInfo.makeWebsitesInfo(url: .duckDuckGo)
+        let sut = BookmarkAllTabsDialogViewModel(websites: websitesInfo, foldersStore: foldersStoreMock, bookmarkManager: bookmarkManager)
+
+        // WHEN
+        let result = sut.folders
+
+        // THEN
+        XCTAssertEqual(result.count, 1)
+        XCTAssertEqual(result.first?.entity, folder)
+    }
+
+    func testWhenInitAndFoldersStoreLastUsedFolderIsNilThenDoNotAskBookmarkStoreForBookmarkFolder() {
+        // GIVEN
+        foldersStoreMock.lastBookmarkAllTabsFolderIdUsed = nil
+        XCTAssertFalse(bookmarkStoreMock.bookmarkFolderWithIdCalled)
+        XCTAssertNil(bookmarkStoreMock.capturedFolderId)
+
+        // WHEN
+        _ = BookmarkAllTabsDialogViewModel(websites: WebsiteInfo.makeWebsitesInfo(url: .duckDuckGo), foldersStore: foldersStoreMock, bookmarkManager: bookmarkManager)
+
+        // THEN
+        XCTAssertFalse(bookmarkStoreMock.bookmarkFolderWithIdCalled)
+        XCTAssertNil(bookmarkStoreMock.capturedFolderId)
+    }
+
+    func testWhenInitAndFoldersStoreLastUsedFolderIsNotNilThenAskBookmarkStoreForBookmarkFolder() {
+        foldersStoreMock.lastBookmarkAllTabsFolderIdUsed = "1ABCDE"
+        XCTAssertFalse(bookmarkStoreMock.bookmarkFolderWithIdCalled)
+        XCTAssertNil(bookmarkStoreMock.capturedFolderId)
+
+        // WHEN
+        _ = BookmarkAllTabsDialogViewModel(websites: WebsiteInfo.makeWebsitesInfo(url: .duckDuckGo), foldersStore: foldersStoreMock, bookmarkManager: bookmarkManager)
+
+        // THEN
+        XCTAssertTrue(bookmarkStoreMock.bookmarkFolderWithIdCalled)
+        XCTAssertEqual(bookmarkStoreMock.capturedFolderId, "1ABCDE")
+    }
+
+    func testWhenFoldersStoreLastUsedFolderIsNotNilAndBookmarkStoreDoesNotContainFolderThenSelectedFolderIsNil() throws {
+        // GIVEN
+        let folder = BookmarkFolder(id: "1", title: #function)
+        foldersStoreMock.lastBookmarkAllTabsFolderIdUsed = "1"
+        bookmarkStoreMock.bookmarkFolder = nil
+        bookmarkStoreMock.bookmarks = [folder]
+        bookmarkManager.loadBookmarks()
+        let websitesInfo = WebsiteInfo.makeWebsitesInfo(url: .duckDuckGo)
+        let sut = BookmarkAllTabsDialogViewModel(websites: websitesInfo, foldersStore: foldersStoreMock, bookmarkManager: bookmarkManager)
+
+        // WHEN
+        let result = sut.selectedFolder
+
+        // THEN
+        XCTAssertNil(result)
+    }
+
+    func testWhenFoldersStoreLastUsedFolderIsNotNilThenSelectedFolderIsNotNil() throws {
+        // GIVEN
+        let folder = BookmarkFolder(id: "1", title: #function)
+        foldersStoreMock.lastBookmarkAllTabsFolderIdUsed = "1"
+        bookmarkStoreMock.bookmarkFolder = folder
+        bookmarkStoreMock.bookmarks = [folder]
+        bookmarkManager.loadBookmarks()
+        let websitesInfo = WebsiteInfo.makeWebsitesInfo(url: .duckDuckGo)
+        let sut = BookmarkAllTabsDialogViewModel(websites: websitesInfo, foldersStore: foldersStoreMock, bookmarkManager: bookmarkManager)
+
+        // WHEN
+        let result = sut.selectedFolder
+
+        // THEN
+        XCTAssertEqual(result, folder)
+    }
+
+    func testWhenFolderIsAddedThenFoldersListIsRefreshed() {
+        // GIVEN
+        let expectation = self.expectation(description: #function)
+        expectation.expectedFulfillmentCount = 2
+        let folder = BookmarkFolder(id: "1", title: #function)
+        let folder2 = BookmarkFolder(id: "2", title: "Test")
+        bookmarkStoreMock.bookmarks = [folder]
+        bookmarkManager.loadBookmarks()
+        let websitesInfo = WebsiteInfo.makeWebsitesInfo(url: .duckDuckGo)
+        let sut = BookmarkAllTabsDialogViewModel(websites: websitesInfo, foldersStore: foldersStoreMock, bookmarkManager: bookmarkManager)
+        XCTAssertEqual(sut.folders.count, 1)
+        XCTAssertEqual(sut.folders.first?.entity, folder)
+
+        // Simulate Bookmark store changing data set
+        bookmarkStoreMock.bookmarks = [folder, folder2]
+        var expectedFolder: [BookmarkFolder] = []
+        let c = sut.$folders
+            .dropFirst()
+            .sink { folders in
+            expectedFolder = folders.map(\.entity)
+            expectation.fulfill()
+        }
+
+        // WHEN
+        bookmarkManager.loadBookmarks()
+
+        // THEN
+        withExtendedLifetime(c) {}
+        waitForExpectations(timeout: 1.0)
+        XCTAssertEqual(expectedFolder.count, 2)
+        XCTAssertEqual(expectedFolder.first, folder)
+        XCTAssertEqual(expectedFolder.last, folder2)
+    }
+
+    // MARK: - Actions
+
+    func testWhenIsOtherActionDisabledCalledThenReturnFalse() {
+        // GIVEN
+        let websitesInfo = WebsiteInfo.makeWebsitesInfo(url: .duckDuckGo)
+        let sut = BookmarkAllTabsDialogViewModel(websites: websitesInfo, foldersStore: foldersStoreMock, bookmarkManager: bookmarkManager)
+
+        // WHEN
+        let result = sut.isOtherActionDisabled
+
+        // THEN
+        XCTAssertFalse(result)
+    }
+
+    func testWhenFolderNameIsEmptyDefaultActionIsDisabled() {
+        // GIVEN
+        let websitesInfo = WebsiteInfo.makeWebsitesInfo(url: .duckDuckGo)
+        let sut = BookmarkAllTabsDialogViewModel(websites: websitesInfo, foldersStore: foldersStoreMock, bookmarkManager: bookmarkManager)
+        sut.folderName = ""
+
+        // WHEN
+        let result = sut.isDefaultActionDisabled
+
+        // THEN
+        XCTAssertTrue(result)
+    }
+
+    func testWhenFolderNameIsNotEmptyDefaultActionIsEnabled() {
+        // GIVEN
+        let websitesInfo = WebsiteInfo.makeWebsitesInfo(url: .duckDuckGo)
+        let sut = BookmarkAllTabsDialogViewModel(websites: websitesInfo, foldersStore: foldersStoreMock, bookmarkManager: bookmarkManager)
+        sut.folderName = "TEST"
+
+        // WHEN
+        let result = sut.isDefaultActionDisabled
+
+        // THEN
+        XCTAssertFalse(result)
+    }
+
+    func testWhenCancelIsCalledThenDismissIsCalled() {
+        // GIVEN
+        let websitesInfo = WebsiteInfo.makeWebsitesInfo(url: .duckDuckGo)
+        let sut = BookmarkAllTabsDialogViewModel(websites: websitesInfo, foldersStore: foldersStoreMock, bookmarkManager: bookmarkManager)
+        var didCallDismiss = false
+
+        // WHEN
+        sut.cancel {
+            didCallDismiss = true
+        }
+
+        // THEN
+        XCTAssertTrue(didCallDismiss)
+    }
+
+    func testWhenAddOrSaveIsCalledAndSelectedFolderIsNilThenBookmarkStoreIsAskedToBookmarkWebsitesInfoInRootFolder() {
+        // GIVEN
+        let websitesInfo = WebsiteInfo.makeWebsitesInfo(url: .duckDuckGo)
+        let sut = BookmarkAllTabsDialogViewModel(websites: websitesInfo, foldersStore: foldersStoreMock, bookmarkManager: bookmarkManager)
+        sut.selectedFolder = nil
+        XCTAssertFalse(bookmarkStoreMock.saveBookmarksInNewFolderNamedCalled)
+        XCTAssertNil(bookmarkStoreMock.capturedWebsitesInfo)
+        XCTAssertNil(bookmarkStoreMock.capturedParentFolderType)
+
+        // WHEN
+        sut.addOrSave(dismiss: {})
+
+        // THEN
+        XCTAssertTrue(bookmarkStoreMock.saveBookmarksInNewFolderNamedCalled)
+        XCTAssertEqual(bookmarkStoreMock.capturedWebsitesInfo, websitesInfo)
+        XCTAssertEqual(bookmarkStoreMock.capturedParentFolderType, .root)
+
+    }
+
+    func testWhenAddOrSaveIsCalledAndSelectedFolderIsNotNilThenBookmarkStoreIsAskedToBookmarkWebsitesInfoNotInRootFolder() {
+        // GIVEN
+        let folder = BookmarkFolder(id: "ABCDE", title: "Saved Tabs")
+        let websitesInfo = WebsiteInfo.makeWebsitesInfo(url: .duckDuckGo)
+        let sut = BookmarkAllTabsDialogViewModel(websites: websitesInfo, foldersStore: foldersStoreMock, bookmarkManager: bookmarkManager)
+        sut.selectedFolder = folder
+        XCTAssertFalse(bookmarkStoreMock.saveBookmarksInNewFolderNamedCalled)
+        XCTAssertNil(bookmarkStoreMock.capturedWebsitesInfo)
+        XCTAssertNil(bookmarkStoreMock.capturedParentFolderType)
+
+        // WHEN
+        sut.addOrSave(dismiss: {})
+
+        // THEN
+        XCTAssertTrue(bookmarkStoreMock.saveBookmarksInNewFolderNamedCalled)
+        XCTAssertEqual(bookmarkStoreMock.capturedWebsitesInfo, websitesInfo)
+        XCTAssertEqual(bookmarkStoreMock.capturedParentFolderType, .parent(uuid: "ABCDE"))
+    }
+
+    func testWhenAddOrSaveIsCalledThenDismissIsCalled() {
+        // GIVEN
+        let websitesInfo = WebsiteInfo.makeWebsitesInfo(url: .duckDuckGo)
+        let sut = BookmarkAllTabsDialogViewModel(websites: websitesInfo, foldersStore: foldersStoreMock, bookmarkManager: bookmarkManager)
+        var didCallDismiss = false
+
+        // WHEN
+        sut.addOrSave {
+            didCallDismiss = true
+        }
+
+        // THEN
+        XCTAssertTrue(didCallDismiss)
+    }
+
+}
diff --git a/UnitTests/Bookmarks/ViewModels/Mocks/AddEditBookmarkDialogViewModelMock.swift b/UnitTests/Bookmarks/ViewModels/Mocks/AddEditBookmarkDialogViewModelMock.swift
new file mode 100644
index 0000000000..6cd4175ac6
--- /dev/null
+++ b/UnitTests/Bookmarks/ViewModels/Mocks/AddEditBookmarkDialogViewModelMock.swift
@@ -0,0 +1,43 @@
+//
+//  AddEditBookmarkDialogViewModelMock.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 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?
+}
diff --git a/UnitTests/Bookmarks/ViewModels/Mocks/AddEditBookmarkFolderDialogViewModelMock.swift b/UnitTests/Bookmarks/ViewModels/Mocks/AddEditBookmarkFolderDialogViewModelMock.swift
new file mode 100644
index 0000000000..99317bf853
--- /dev/null
+++ b/UnitTests/Bookmarks/ViewModels/Mocks/AddEditBookmarkFolderDialogViewModelMock.swift
@@ -0,0 +1,40 @@
+//
+//  AddEditBookmarkFolderDialogViewModelMock.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
+@testable import DuckDuckGo_Privacy_Browser
+
+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/Mocks/BookmarkAllTabsDialogViewModelMock.swift b/UnitTests/Bookmarks/ViewModels/Mocks/BookmarkAllTabsDialogViewModelMock.swift
new file mode 100644
index 0000000000..3d9e9ba3e7
--- /dev/null
+++ b/UnitTests/Bookmarks/ViewModels/Mocks/BookmarkAllTabsDialogViewModelMock.swift
@@ -0,0 +1,43 @@
+//
+//  BookmarkAllTabsDialogViewModelMock.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 BookmarkAllTabsDialogViewModelMock: BookmarkAllTabsDialogEditing {
+    var folderName: String = ""
+    var educationalMessage: String = ""
+    var folderNameFieldTitle: String = ""
+    var locationFieldTitle: String = ""
+    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 = true
+
+    func cancel(dismiss: () -> Void) {}
+    func addOrSave(dismiss: () -> Void) {}
+
+    var selectedFolderExpectation: XCTestExpectation?
+}
diff --git a/UnitTests/BookmarksBar/BookmarksBarVisibilityManagerTests.swift b/UnitTests/BookmarksBar/BookmarksBarVisibilityManagerTests.swift
new file mode 100644
index 0000000000..802a33323c
--- /dev/null
+++ b/UnitTests/BookmarksBar/BookmarksBarVisibilityManagerTests.swift
@@ -0,0 +1,296 @@
+//
+//  BookmarksBarVisibilityManagerTests.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 BookmarksBarVisibilityManagerTests: XCTestCase {
+    private let selectedTabSubject = PassthroughSubject<TabViewModel?, Never>()
+    private var appearance: AppearancePreferences!
+    private var cancellables: Set<AnyCancellable>!
+    let tabContents: [Tab.TabContent] = [
+        .none,
+        .newtab,
+        .url(URL.duckDuckGo, credential: nil, source: .link),
+        .settings(pane: nil),
+        .bookmarks,
+        .onboarding,
+        .dataBrokerProtection,
+        .subscription(URL.duckDuckGo),
+        .identityTheftRestoration(URL.duckDuckGo)
+    ]
+
+    override func setUpWithError() throws {
+        try super.setUpWithError()
+
+        cancellables = []
+        appearance = AppearancePreferences(persistor: AppearancePreferencesPersistorMock())
+    }
+
+    override func tearDownWithError() throws {
+        cancellables = nil
+        appearance = nil
+        try super.tearDownWithError()
+    }
+
+    func makeSUT() -> BookmarksBarVisibilityManager {
+        return BookmarksBarVisibilityManager(
+            selectedTabPublisher: selectedTabSubject.eraseToAnyPublisher(),
+            preferences: appearance
+        )
+    }
+
+    func testWhenSubscribeThenIsBookmarksBarVisibleIsFalse() {
+        // GIVEN
+        let sut = makeSUT()
+
+        // WHEN
+        let result = sut.isBookmarksBarVisible
+
+        // THEN
+        XCTAssertFalse(result)
+    }
+
+    // MARK: - Selecting a Tab
+
+    // Appearance `showBookmarksBars` false
+    func testWhenSelectedTaContentAndShowBookmarksBarIsFalseThenIsBookmarksBarVisibleIsFalse() throws {
+        // GIVEN
+        appearance.showBookmarksBar = false
+
+        for content in tabContents {
+            var capturedValue: Bool?
+            let sut = makeSUT()
+            sut.$isBookmarksBarVisible
+                .dropFirst() // Not interested in the value when subscribing
+                .sink { value in
+                    capturedValue = value
+                }
+                .store(in: &cancellables)
+
+            // WHEN
+            selectedTabSubject.send(TabViewModel(tab: Tab(content: content)))
+
+            // THEN
+            try assertFalse(capturedValue)
+        }
+    }
+
+    // Appearance `showBookmarksBars` true and .newTabOnly
+
+    func testWhenShowBookmarksBarIsTrueAndBookmarkBarAppearanceIsTabOnlyThenIsBookmarksBarVisibleIsTrueForNoneAndNewTab() throws {
+        // GIVEN
+        appearance.showBookmarksBar = true
+        appearance.bookmarksBarAppearance = .newTabOnly
+
+        for content in tabContents {
+            var capturedValue: Bool?
+            let sut = makeSUT()
+            sut.$isBookmarksBarVisible
+                .dropFirst() // Not interested in the value when subscribing
+                .sink { value in
+                    capturedValue = value
+                }
+                .store(in: &cancellables)
+
+            // WHEN
+            selectedTabSubject.send(TabViewModel(tab: Tab(content: content)))
+
+            // THEN
+            switch content {
+            case .none, .newtab:
+                try assertTrue(capturedValue)
+            default:
+                try assertFalse(capturedValue)
+            }
+        }
+    }
+
+    // Appearance `showBookmarksBars` true and .alwaysOn
+
+    func testWhenShowBookmarksBarIsTrueAndBookmarkBarAppearanceIsAlwaysOnThenIsBookmarksBarVisibleIsTrue() throws {
+        // GIVEN
+        appearance.showBookmarksBar = true
+        appearance.bookmarksBarAppearance = .alwaysOn
+
+        for content in tabContents {
+            var capturedValue: Bool?
+            let sut = makeSUT()
+            sut.$isBookmarksBarVisible
+                .dropFirst() // Not interested in the value when subscribing
+                .sink { value in
+                    capturedValue = value
+                }
+                .store(in: &cancellables)
+
+            // WHEN
+            selectedTabSubject.send(TabViewModel(tab: Tab(content: content)))
+
+            // THEN
+            try assertTrue(capturedValue)
+        }
+    }
+
+    // MARK: - Settings Change
+
+    func testWhenChangingShowBookmarksBarToTrueThenIsBookmarksBarVisibleIsTrue() throws {
+        // GIVEN
+        appearance.showBookmarksBar = false
+        appearance.bookmarksBarAppearance = .alwaysOn
+
+        for content in tabContents {
+            var capturedValue: Bool?
+            let sut = makeSUT()
+            XCTAssertFalse(sut.isBookmarksBarVisible)
+            sut.$isBookmarksBarVisible
+                .dropFirst() // Not interested in the value when subscribing
+                .sink { value in
+                    capturedValue = value
+                }
+                .store(in: &cancellables)
+            selectedTabSubject.send(TabViewModel(tab: Tab(content: content)))
+
+            // WHEN
+            appearance.showBookmarksBar = true
+
+            // THEN
+            try assertTrue(capturedValue)
+        }
+    }
+
+    func testWhenChangingShowBookmarksBarToFalseThenIsBookmarksBarVisibleIsFalse() throws {
+        // GIVEN
+        appearance.showBookmarksBar = true
+        appearance.bookmarksBarAppearance = .alwaysOn
+
+        for content in tabContents {
+            var capturedValue: Bool?
+            let sut = makeSUT()
+            sut.$isBookmarksBarVisible
+                .dropFirst() // Not interested in the value when subscribing
+                .sink { value in
+                    capturedValue = value
+                }
+                .store(in: &cancellables)
+            selectedTabSubject.send(TabViewModel(tab: Tab(content: content)))
+
+            // WHEN
+            appearance.showBookmarksBar = false
+
+            // THEN
+            try assertFalse(capturedValue)
+        }
+    }
+
+    func testWhenBookmarksBarAppearanceChangesToAlwaysVisibleThenIsBookmarkBarVisibleIsTrue() throws {
+        // GIVEN
+        appearance.showBookmarksBar = true
+        appearance.bookmarksBarAppearance = .newTabOnly
+
+        for content in tabContents {
+            var capturedValue: Bool?
+            let sut = makeSUT()
+            XCTAssertFalse(sut.isBookmarksBarVisible)
+            sut.$isBookmarksBarVisible
+                .dropFirst() // Not interested in the value when subscribing
+                .sink { value in
+                    capturedValue = value
+                }
+                .store(in: &cancellables)
+            selectedTabSubject.send(TabViewModel(tab: Tab(content: content)))
+
+            // WHEN
+            appearance.bookmarksBarAppearance = .alwaysOn
+
+            // THEN
+            try assertTrue(capturedValue)
+        }
+    }
+
+    func testWhenBookmarksBarAppearanceChangesToOnlyOnNewTabThenIsBookmarkBarVisibleIsTrueForNoneAndNewTab() throws {
+        // GIVEN
+        appearance.showBookmarksBar = true
+        appearance.bookmarksBarAppearance = .alwaysOn
+
+        for content in tabContents {
+            var capturedValue: Bool?
+            let sut = makeSUT()
+            XCTAssertFalse(sut.isBookmarksBarVisible)
+            sut.$isBookmarksBarVisible
+                .dropFirst() // Not interested in the value when subscribing
+                .sink { value in
+                    capturedValue = value
+                }
+                .store(in: &cancellables)
+            selectedTabSubject.send(TabViewModel(tab: Tab(content: content)))
+
+            // WHEN
+            appearance.bookmarksBarAppearance = .newTabOnly
+
+            // THEN
+            switch content {
+            case .none, .newtab:
+                try assertTrue(capturedValue)
+            default:
+                try assertFalse(capturedValue)
+            }
+        }
+    }
+
+    // MARK: - New Tab becoming URL
+
+    func testWhenBookmarksBarAppeareanceIsNewTabOnlyAndTabContentBecomesURLThenIsBookmarkBarVisibleIsFalse() throws {
+        // GIVEN
+        appearance.showBookmarksBar = true
+        appearance.bookmarksBarAppearance = .newTabOnly
+        let sut = makeSUT()
+        let tab = Tab(content: .newtab)
+        selectedTabSubject.send(TabViewModel(tab: tab))
+
+        var capturedValue: Bool?
+        sut.$isBookmarksBarVisible
+            .sink { value in
+                capturedValue = value
+            }
+            .store(in: &cancellables)
+        try assertTrue(capturedValue)
+
+        // WHEN
+        tab.setContent(.url(URL.duckDuckGo, credential: nil, source: .link))
+
+        // THEN
+        try assertFalse(capturedValue)
+    }
+
+}
+
+private extension BookmarksBarVisibilityManagerTests {
+
+    func assertFalse(_ value: Bool?) throws {
+        let value = try XCTUnwrap(value)
+        XCTAssertFalse(value)
+    }
+
+    func assertTrue(_ value: Bool?) throws {
+        let value = try XCTUnwrap(value)
+        XCTAssertTrue(value)
+    }
+
+}
diff --git a/UnitTests/Common/Extensions/URLExtensionTests.swift b/UnitTests/Common/Extensions/URLExtensionTests.swift
index 00ed9d6f24..7f3444649b 100644
--- a/UnitTests/Common/Extensions/URLExtensionTests.swift
+++ b/UnitTests/Common/Extensions/URLExtensionTests.swift
@@ -136,4 +136,99 @@ final class URLExtensionTests: XCTestCase {
         }
     }
 
+    func testWhenGetHostAndPort_WithPort_ThenHostAndPortIsReturned() throws {
+        // Given
+        let expected = "duckduckgo.com:1234"
+        let sut = URL(string: "https://duckduckgo.com:1234")
+
+        // When
+        let result = sut?.hostAndPort()
+
+        // Then
+        XCTAssertEqual(expected, result)
+    }
+
+    func testWhenGetHostAndPort_WithoutPort_ThenHostReturned() throws {
+        // Given
+        let expected = "duckduckgo.com"
+        let sut = URL(string: "https://duckduckgo.com")
+
+        // When
+        let result = sut?.hostAndPort()
+
+        // Then
+        XCTAssertEqual(expected, result)
+    }
+
+    func testIsChildWhenURLsSame() throws {
+        let parentURL = URL(string: "https://duckduckgo.com/subscriptions")!
+        let testedURL = URL(string: "https://duckduckgo.com/subscriptions")!
+        XCTAssertTrue(testedURL.isChild(of: parentURL))
+    }
+
+    func testIsChildWhenTestedURLHasSubpath() throws {
+        let parentURL = URL(string: "https://duckduckgo.com/subscriptions")!
+        let testedURL = URL(string: "https://dax.duckduckgo.com/subscriptions/test")!
+        XCTAssertTrue(testedURL.isChild(of: parentURL))
+    }
+
+    func testIsChildWhenTestedURLHasSubdomain() throws {
+        let parentURL = URL(string: "https://duckduckgo.com/subscriptions")!
+        let testedURL = URL(string: "https://dax.duckduckgo.com/subscriptions")!
+        XCTAssertTrue(testedURL.isChild(of: parentURL))
+    }
+
+    func testIsChildWhenTestedURLHasSubdomainAndSubpath() throws {
+        let parentURL = URL(string: "https://duckduckgo.com/subscriptions")!
+        let testedURL = URL(string: "https://dax.duckduckgo.com/subscriptions/test")!
+        XCTAssertTrue(testedURL.isChild(of: parentURL))
+    }
+
+    func testIsChildWhenTestedURLHasWWW() throws {
+        let parentURL = URL(string: "https://duckduckgo.com/subscriptions")!
+        let testedURL = URL(string: "https://www.duckduckgo.com/subscriptions/test/t")!
+        XCTAssertTrue(testedURL.isChild(of: parentURL))
+    }
+
+    func testIsChildWhenParentHasParamThatShouldBeIgnored() throws {
+        let parentURL = URL(string: "https://duckduckgo.com/subscriptions?environment=staging")!
+        let testedURL = URL(string: "https://www.duckduckgo.com/subscriptions/test/t")!
+        XCTAssertTrue(testedURL.isChild(of: parentURL))
+    }
+
+    func testIsChildWhenChildHasParamThatShouldBeIgnored() throws {
+        let parentURL = URL(string: "https://duckduckgo.com/subscriptions")!
+        let testedURL = URL(string: "https://duckduckgo.com/subscriptions?environment=staging")!
+        XCTAssertTrue(testedURL.isChild(of: parentURL))
+    }
+
+    func testIsChildWhenChildHasPathAndParamThatShouldBeIgnored() throws {
+        let parentURL = URL(string: "https://duckduckgo.com/subscriptions")!
+        let testedURL = URL(string: "https://www.duckduckgo.com/subscriptions/test/t?environment=staging")!
+        XCTAssertTrue(testedURL.isChild(of: parentURL))
+    }
+
+    func testIsChildWhenBothHaveParamThatShouldBeIgnored() throws {
+        let parentURL = URL(string: "https://duckduckgo.com/subscriptions?environment=production")!
+        let testedURL = URL(string: "https://www.duckduckgo.com/subscriptions/test/t?environment=staging")!
+        XCTAssertTrue(testedURL.isChild(of: parentURL))
+    }
+
+    func testIsChildFailsWhenPathIsShorterSubstring() throws {
+        let parentURL = URL(string: "https://duckduckgo.com/subscriptions")!
+        let testedURL = URL(string: "https://duckduckgo.com/subscription")!
+        XCTAssertFalse(testedURL.isChild(of: parentURL))
+    }
+
+    func testIsChildFailsWhenPathIsLonger() throws {
+        let parentURL = URL(string: "https://duckduckgo.com/subscriptions")!
+        let testedURL = URL(string: "https://duckduckgo.com/subscriptionszzz")!
+        XCTAssertFalse(testedURL.isChild(of: parentURL))
+    }
+
+    func testIsChildFailsWhenPathIsNotComplete() throws {
+        let parentURL = URL(string: "https://duckduckgo.com/subscriptions/welcome")!
+        let testedURL = URL(string: "https://duckduckgo.com/subscriptions")!
+        XCTAssertFalse(testedURL.isChild(of: parentURL))
+    }
 }
diff --git a/UnitTests/DBP/DataBrokerPrerequisitesStatusVerifierTests.swift b/UnitTests/DBP/DataBrokerPrerequisitesStatusVerifierTests.swift
new file mode 100644
index 0000000000..02c94e7feb
--- /dev/null
+++ b/UnitTests/DBP/DataBrokerPrerequisitesStatusVerifierTests.swift
@@ -0,0 +1,73 @@
+//
+//  DataBrokerPrerequisitesStatusVerifierTests.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
+import DataBrokerProtection
+
+final class DataBrokerPrerequisitesStatusVerifierTests: XCTestCase {
+    private let statusChecker = MockDBPLoginItemStatusChecker()
+
+    override func setUpWithError() throws {
+    }
+
+    override func tearDownWithError() throws {
+        statusChecker.reset()
+    }
+
+    func testIncorrectDirectory_thenReturnIncorrectDirectoryStatus() {
+        statusChecker.isInCorrectDirectoryValue = false
+        let result = DefaultDataBrokerPrerequisitesStatusVerifier(statusChecker: statusChecker).checkStatus()
+        XCTAssertEqual(result, DataBrokerPrerequisitesStatus.invalidDirectory)
+    }
+
+    func testIncorrectPermission_thenReturnIncorrectPermissionStatus() {
+        statusChecker.doesHavePermissionValue = false
+        let result = DefaultDataBrokerPrerequisitesStatusVerifier(statusChecker: statusChecker).checkStatus()
+        XCTAssertEqual(result, DataBrokerPrerequisitesStatus.invalidSystemPermission)
+    }
+
+    func testIncorrectDirectoryAndIncorrectPermission_thenReturnIncorrectPermissionStatus() {
+        statusChecker.isInCorrectDirectoryValue = false
+        statusChecker.doesHavePermissionValue = false
+        let result = DefaultDataBrokerPrerequisitesStatusVerifier(statusChecker: statusChecker).checkStatus()
+        XCTAssertEqual(result, DataBrokerPrerequisitesStatus.invalidSystemPermission)
+    }
+
+    func testCorrectStatus_thenReturnValidStatus() {
+        let result = DefaultDataBrokerPrerequisitesStatusVerifier(statusChecker: statusChecker).checkStatus()
+        XCTAssertEqual(result, DataBrokerPrerequisitesStatus.valid)
+    }
+}
+
+private final class MockDBPLoginItemStatusChecker: DBPLoginItemStatusChecker {
+    var doesHavePermissionValue = true
+    var isInCorrectDirectoryValue = true
+
+    func doesHaveNecessaryPermissions() -> Bool {
+        return doesHavePermissionValue
+    }
+    func isInCorrectDirectory() -> Bool {
+        return isInCorrectDirectoryValue
+    }
+
+    func reset() {
+        doesHavePermissionValue = true
+        isInCorrectDirectoryValue = true
+    }
+}
diff --git a/UnitTests/DataExport/CSVLoginExporterTests.swift b/UnitTests/DataExport/CSVLoginExporterTests.swift
index 20d244968e..bd3c079383 100644
--- a/UnitTests/DataExport/CSVLoginExporterTests.swift
+++ b/UnitTests/DataExport/CSVLoginExporterTests.swift
@@ -25,7 +25,7 @@ class CSVLoginExporterTests: XCTestCase {
 
     func testWhenExportingLogins_ThenLoginsArePersistedToDisk() throws {
         let mockFileStore = FileStoreMock()
-        let vault = try MockSecureVaultFactory.makeVault(errorReporter: nil)
+        let vault = try MockSecureVaultFactory.makeVault(reporter: nil)
 
         vault.addWebsiteCredentials(identifiers: [1])
 
diff --git a/UnitTests/DataExport/MockSecureVault.swift b/UnitTests/DataExport/MockSecureVault.swift
index c92a6f6189..d9d55a92fa 100644
--- a/UnitTests/DataExport/MockSecureVault.swift
+++ b/UnitTests/DataExport/MockSecureVault.swift
@@ -26,7 +26,7 @@ typealias MockVaultFactory = SecureVaultFactory<MockSecureVault<MockDatabaseProv
 let MockSecureVaultFactory = SecureVaultFactory<MockSecureVault>(
     makeCryptoProvider: {
         return MockCryptoProvider()
-    }, makeKeyStoreProvider: {
+    }, makeKeyStoreProvider: { _ in
         let provider = MockKeyStoreProvider()
         provider._l1Key = "key".data(using: .utf8)
         return provider
diff --git a/UnitTests/DataImport/DataImportViewModelTests.swift b/UnitTests/DataImport/DataImportViewModelTests.swift
index 6d698185e4..81f5fca4a7 100644
--- a/UnitTests/DataImport/DataImportViewModelTests.swift
+++ b/UnitTests/DataImport/DataImportViewModelTests.swift
@@ -1067,9 +1067,9 @@ import XCTest
     // MARK: - File Import after failure (or nil result for a data type)
 
     // all possible import summaries for combining
-    let bookmarksSummaries: [DataImportViewModel.DataTypeImportResult?] = [
+    var bookmarksSummaries: [DataImportViewModel.DataTypeImportResult?] {
         // bookmarks import didn‘t happen (or skipped)
-        nil,
+        [nil,
         // bookmarks import succeeded
         .init(.bookmarks, .success(.init(successful: 42, duplicate: 3, failed: 1))),
         // bookmarks import succeeded with no bookmarks imported
@@ -1077,8 +1077,10 @@ import XCTest
         // bookmarks import failed with error
         .init(.bookmarks, .failure(Failure(.bookmarks, .dataCorrupted))),
         // bookmarks import failed with file not found
-        .init(.bookmarks, .failure(Failure(.bookmarks, .noData))),
-    ]
+        bookmarkSummaryNoData]
+    }
+
+    private let bookmarkSummaryNoData: DataImportViewModel.DataTypeImportResult? = .init(.bookmarks, .failure(Failure(.bookmarks, .noData)))
 
     let bookmarksResults: [DataImportResult<DataTypeSummary>?] = [
         .failure(Failure(.bookmarks, .dataCorrupted)),
@@ -1087,9 +1089,9 @@ import XCTest
         nil, // skip
     ]
 
-    let passwordsSummaries: [DataImportViewModel.DataTypeImportResult?] = [
+    var passwordsSummaries: [DataImportViewModel.DataTypeImportResult?] {
         // passwords import didn‘t happen (or skipped)
-        nil,
+        [nil,
         // passwords import succeeded
         .init(.passwords, .success(.init(successful: 99, duplicate: 4, failed: 2))),
         // passwords import succeeded with no passwords imported
@@ -1097,8 +1099,10 @@ import XCTest
         // passwords import failed with error
         .init(.passwords, .failure(Failure(.passwords, .keychainError))),
         // passwords import failed with file not found
-        .init(.passwords, .failure(Failure(.passwords, .noData))),
-    ]
+        passwordSummaryNoData]
+    }
+
+    private let passwordSummaryNoData: DataImportViewModel.DataTypeImportResult? = .init(.passwords, .failure(Failure(.passwords, .noData)))
 
     let passwordsResults: [DataImportResult<DataTypeSummary>?] = [
         .failure(Failure(.passwords, .dataCorrupted)),
@@ -1128,24 +1132,19 @@ import XCTest
                                    summary: [bookmarksSummary, passwordsSummary].compactMap { $0 })
                         var xctDescr = "bookmarksSummary: \(bookmarksSummary?.description ?? "<nil>") passwordsSummary: \(passwordsSummary?.description ?? "<nil>") result: \(result?.description ?? ".skip")"
 
-                        // run File Import (or skip)
+                        // run File Import
                         let expectation: DataImportViewModel
                         if let result {
                             try await initiateImport(of: [.bookmarks], fromFile: .testHTML, resultingWith: [.bookmarks: result], xctDescr)
                             // expect Final Summary
                             expectation = DataImportViewModel(importSource: source, screen: .summary([.bookmarks], isFileImport: true), summary: [bookmarksSummary, passwordsSummary, .init(.bookmarks, result)].compactMap { $0 })
-                        } else {
-                            XCTAssertEqual(model.actionButton, .skip)
-                            model.performAction(.skip)
-                            // expect Final Summary
-                            expectation = DataImportViewModel(importSource: source, screen: .summary([.bookmarks, .passwords]), summary: [bookmarksSummary, passwordsSummary].compactMap { $0 })
-                        }
 
-                        xctDescr = "\(source): " + xctDescr
+                            xctDescr = "\(source): " + xctDescr
 
-                        XCTAssertEqual(model.description, expectation.description, xctDescr)
-                        XCTAssertEqual(model.actionButton, .done, xctDescr)
-                        XCTAssertNil(model.secondaryButton, xctDescr)
+                            XCTAssertEqual(model.description, expectation.description, xctDescr)
+                            XCTAssertEqual(model.actionButton, .done, xctDescr)
+                            XCTAssertNil(model.secondaryButton, xctDescr)
+                        }
                     }
                 }
             }
@@ -1192,8 +1191,9 @@ import XCTest
     func testWhenBrowsersBookmarksFileImportFailsAndNoPasswordsFileImportNeeded_feedbackShown() async throws {
         for source in Source.allCases where source.initialScreen == .profileAndDataTypesPicker && source.supportedDataTypes.contains(.passwords) {
             for bookmarksSummary in bookmarksSummaries
-            // initial bookmark import failed or ended with empty result
-            where bookmarksSummary?.result.isSuccess == false || (try? bookmarksSummary?.result.get())?.isEmpty == true {
+            // initial bookmark import failed and is not a `noData` error, or empty
+            where (bookmarksSummary?.result.isSuccess == false && bookmarkSummaryNoData != bookmarksSummary)
+            || (try? bookmarksSummary?.result.get())?.isEmpty == true {
 
                 for passwordsSummary in passwordsSummaries
                 // passwords successfully imported
@@ -1231,6 +1231,31 @@ import XCTest
         }
     }
 
+    func testWhenBrowsersBookmarksImportFailsNoDataAndFileImportSkippedAndNoPasswordsFileImportNeeded_dialogDismissed() throws {
+        for source in Source.allCases where source.initialScreen == .profileAndDataTypesPicker && source.supportedDataTypes.contains(.passwords) {
+
+            let bookmarksSummary = bookmarkSummaryNoData
+
+            for passwordsSummary in passwordsSummaries
+            // passwords successfully imported
+            where (try? passwordsSummary?.result.get().isEmpty) == false {
+
+                // setup model with pre-failed bookmarks import
+                setupModel(with: source,
+                           profiles: [BrowserProfile.test, BrowserProfile.default, BrowserProfile.test2],
+                           screen: .fileImport(dataType: .bookmarks, summary: []),
+                           summary: [bookmarksSummary, passwordsSummary].compactMap { $0 })
+
+                let expectation = expectation(description: "dismissed")
+                model.performAction(for: .skip) {
+                    expectation.fulfill()
+                }
+
+                waitForExpectations(timeout: 0)
+            }
+        }
+    }
+
     func testWhenBrowsersOnlySelectedBookmarksFileImportFails_feedbackShown() async throws {
         for source in Source.allCases where source.initialScreen == .profileAndDataTypesPicker {
             for bookmarksSummary in bookmarksSummaries
@@ -1434,8 +1459,9 @@ import XCTest
             for bookmarksSummary in bookmarksSummaries {
 
                 for passwordsSummary in passwordsSummaries
-                // passwords import failed or empty
-                where passwordsSummary?.result.isSuccess == false || (try? passwordsSummary?.result.get().isEmpty) == false {
+                // passwords import failed and is not a `noData` error, or empty
+                where (passwordsSummary?.result.isSuccess == false && passwordSummaryNoData != passwordsSummary)
+                || (try? passwordsSummary?.result.get().isEmpty) == false {
 
                     for bookmarksFileImportSummary in bookmarksSummaries
                     // if bookmarks result was failure - append successful bookmarks file import result
@@ -1477,6 +1503,36 @@ import XCTest
         }
     }
 
+    func testWhenBrowsersPasswordsImportFailNoDataAndFileImportSkipped_dialogDismissed() throws {
+        for source in Source.allCases where source.initialScreen == .profileAndDataTypesPicker && source.supportedDataTypes.contains(.passwords) {
+            for bookmarksSummary in bookmarksSummaries {
+
+                let passwordsSummary = passwordSummaryNoData
+
+                for bookmarksFileImportSummary in bookmarksSummaries
+                // if bookmarks result was failure - append successful bookmarks file import result
+                where (bookmarksSummary?.result.isSuccess == false && bookmarksFileImportSummary?.result.isSuccess == true)
+                // if bookmarks file import summary was successful and non empty - don‘t append bookmarks file import result
+                // or if bookmarks file import was empty - and bookmarks file import skipped
+                || (bookmarksSummary?.result.isSuccess == true && bookmarksFileImportSummary == nil) {
+
+                    // setup model with pre-failed passwords import
+                    setupModel(with: source,
+                               profiles: [BrowserProfile.test, BrowserProfile.default, BrowserProfile.test2],
+                               screen: .fileImport(dataType: .passwords, summary: []),
+                               summary: [bookmarksSummary, passwordsSummary, bookmarksFileImportSummary].compactMap { $0 })
+
+                    let expectation = expectation(description: "dismissed")
+                    model.performAction(for: .skip) {
+                        expectation.fulfill()
+                    }
+
+                    waitForExpectations(timeout: 0)
+                }
+            }
+        }
+    }
+
     func testWhenBrowsersOnlySelectedPasswordsFileImportFails_feedbackShown() async throws {
         for source in Source.allCases where source.initialScreen == .profileAndDataTypesPicker && source.supportedDataTypes.contains(.passwords) {
             for passwordsSummary in passwordsSummaries
diff --git a/UnitTests/DataImport/FirefoxBookmarksReaderTests.swift b/UnitTests/DataImport/FirefoxBookmarksReaderTests.swift
index 0a4ffdc2ee..f175f59f1b 100644
--- a/UnitTests/DataImport/FirefoxBookmarksReaderTests.swift
+++ b/UnitTests/DataImport/FirefoxBookmarksReaderTests.swift
@@ -39,9 +39,26 @@ class FirefoxBookmarksReaderTests: XCTestCase {
         }), true)
     }
 
+    func testFileNotFoundReturnsFailureWithDbOpenError() {
+        // Given
+        let bookmarksReader = FirefoxBookmarksReader(firefoxDataDirectoryURL: invalidResourceURL())
+        let expected: DataImportResult<ImportedBookmarks> = .failure(FirefoxBookmarksReader.ImportError(type: .couldNotFindBookmarksFile, underlyingError: nil))
+
+        // When
+        let result = bookmarksReader.readBookmarks()
+
+        // Then
+        XCTAssertEqual(expected, result)
+    }
+
     private func resourceURL() -> URL {
         let bundle = Bundle(for: FirefoxBookmarksReaderTests.self)
         return bundle.resourceURL!.appendingPathComponent("DataImportResources/TestFirefoxData")
     }
 
+    private func invalidResourceURL() -> URL {
+        let bundle = Bundle(for: FirefoxBookmarksReaderTests.self)
+        return bundle.resourceURL!.appendingPathComponent("Nothing/Here")
+    }
+
 }
diff --git a/UnitTests/DataImport/FirefoxLoginReaderTests.swift b/UnitTests/DataImport/FirefoxLoginReaderTests.swift
index 83abe67b66..cdbaa31662 100644
--- a/UnitTests/DataImport/FirefoxLoginReaderTests.swift
+++ b/UnitTests/DataImport/FirefoxLoginReaderTests.swift
@@ -132,7 +132,7 @@ class FirefoxLoginReaderTests: XCTestCase {
 
         switch result {
         case .failure(let error as FirefoxLoginReader.ImportError):
-            XCTAssertEqual(error.type, .couldNotDetermineFormat)
+            XCTAssertEqual(error.type, .couldNotFindKeyDB)
         default:
             XCTFail("Received unexpected \(result)")
         }
@@ -274,6 +274,26 @@ class FirefoxLoginReaderTests: XCTestCase {
         }
     }
 
+    func testWhenImportingLogins_AndNoKeysDBExists_ThenImportFailsWithNoDBError() throws {
+        // Given
+        let logins = resourcesURLWithoutPassword().appendingPathComponent("logins.json")
+
+        let structure = FileSystem(rootDirectoryName: rootDirectoryName) {
+            File("logins.json", contents: .copy(logins))
+        }
+
+        try structure.writeToTemporaryDirectory()
+        let profileDirectoryURL = FileManager.default.temporaryDirectory.appendingPathComponent(rootDirectoryName)
+
+        let firefoxLoginReader = FirefoxLoginReader(firefoxProfileURL: profileDirectoryURL)
+
+        // When
+        let result = firefoxLoginReader.readLogins(dataFormat: nil)
+
+        // Then
+        XCTAssertEqual(result, .failure(FirefoxLoginReader.ImportError(type: .couldNotFindKeyDB, underlyingError: nil)))
+    }
+
     private func resourcesURLWithPassword() -> URL {
         let bundle = Bundle(for: FirefoxLoginReaderTests.self)
         return bundle.resourceURL!.appendingPathComponent("DataImportResources/TestFirefoxData/Primary Password")
diff --git a/UnitTests/FileDownload/DownloadListCoordinatorTests.swift b/UnitTests/FileDownload/DownloadListCoordinatorTests.swift
index 1092aac187..8446b932b2 100644
--- a/UnitTests/FileDownload/DownloadListCoordinatorTests.swift
+++ b/UnitTests/FileDownload/DownloadListCoordinatorTests.swift
@@ -75,7 +75,7 @@ final class DownloadListCoordinatorTests: XCTestCase {
         let e = expectation(description: "download added")
         var id: UUID!
         let c = coordinator.updates.sink { kind, item in
-            if kind == .added {
+            if case .added = kind {
                 e.fulfill()
                 id = item.identifier
             }
@@ -153,9 +153,10 @@ final class DownloadListCoordinatorTests: XCTestCase {
         }
 
         let c = coordinator.updates.sink { (kind, item) in
-            if kind == .added {
+            if case .added = kind {
                 expectations[item.identifier]!.fulfill()
-            } else if kind != .updated {
+            } else if case .updated = kind {
+            } else {
                 XCTFail("unexpected \(kind) \(item.fileName)")
             }
         }
@@ -217,7 +218,7 @@ final class DownloadListCoordinatorTests: XCTestCase {
         let taskCompleted = expectation(description: "item updated")
         var c: AnyCancellable!
         c = coordinator.updates.sink { (kind, item) in
-            guard kind == .updated, item.progress == nil else { return }
+            guard case .updated = kind, item.progress == nil else { return }
 
             taskCompleted.fulfill()
 
@@ -267,7 +268,9 @@ final class DownloadListCoordinatorTests: XCTestCase {
         let taskCompleted = expectation(description: "location updated")
         var c: AnyCancellable!
         c = coordinator.updates.sink { (kind, item) in
-            XCTAssertEqual(kind, .updated)
+            if case .updated = kind { } else {
+                XCTFail("\(kind) is not .updated")
+            }
             guard item.destinationURL != nil, item.tempURL != nil else { return }
 
             XCTAssertEqual(item.destinationURL, self.destURL)
@@ -328,7 +331,9 @@ final class DownloadListCoordinatorTests: XCTestCase {
 
         let itemUpdated = expectation(description: "item updated")
         let c = coordinator.updates.sink { (kind, item) in
-            XCTAssertEqual(kind, .updated)
+            if case .updated = kind { } else {
+                XCTFail("\(kind) is not .updated")
+            }
             itemUpdated.fulfill()
 
             XCTAssertEqual(item.destinationURL, item.destinationURL)
@@ -386,7 +391,9 @@ final class DownloadListCoordinatorTests: XCTestCase {
 
         let itemUpdated = expectation(description: "item updated")
         let c = coordinator.updates.sink { (kind, item) in
-            XCTAssertEqual(kind, .updated)
+            if case .updated = kind { } else {
+                XCTFail("\(kind) is not .updated")
+            }
             itemUpdated.fulfill()
 
             XCTAssertEqual(item.destinationURL, item.destinationURL)
@@ -444,7 +451,9 @@ final class DownloadListCoordinatorTests: XCTestCase {
 
         let itemUpdated = expectation(description: "item updated")
         let c = coordinator.updates.sink { (kind, item) in
-            XCTAssertEqual(kind, .updated)
+            if case .updated = kind { } else {
+                XCTFail("\(kind) is not .updated")
+            }
             itemUpdated.fulfill()
 
             XCTAssertEqual(item.destinationURL, item.destinationURL)
@@ -467,7 +476,9 @@ final class DownloadListCoordinatorTests: XCTestCase {
 
         let itemRemoved = expectation(description: "item removed")
         let c = coordinator.updates.sink { (kind, item) in
-            XCTAssertEqual(kind, .removed)
+            if case .removed = kind { } else {
+                XCTFail("\(kind) is not .updated")
+            }
             itemRemoved.fulfill()
 
             XCTAssertEqual(item.identifier, id)
@@ -499,7 +510,7 @@ final class DownloadListCoordinatorTests: XCTestCase {
         let e1 = expectation(description: "download stopped")
         e1.expectedFulfillmentCount = 2
         var c = coordinator.updates.sink { (kind, item) in
-            guard kind == .updated, item.progress == nil else { return }
+            guard case .updated = kind, item.progress == nil else { return }
             e1.fulfill()
             XCTAssertNotEqual(item.identifier, keptId)
         }
@@ -509,7 +520,7 @@ final class DownloadListCoordinatorTests: XCTestCase {
         let e2 = expectation(description: "item removed")
         e2.expectedFulfillmentCount = 2
         c = coordinator.updates.sink { (kind, item) in
-            guard kind == .removed else { return }
+            guard case .removed = kind else { return }
             e2.fulfill()
             XCTAssertNotEqual(item.identifier, keptId)
         }
diff --git a/UnitTests/FileDownload/FilePresenterTests.swift b/UnitTests/FileDownload/FilePresenterTests.swift
index fb0390c09d..52a36f568e 100644
--- a/UnitTests/FileDownload/FilePresenterTests.swift
+++ b/UnitTests/FileDownload/FilePresenterTests.swift
@@ -64,7 +64,6 @@ final class FilePresenterTests: XCTestCase {
         cancellables.removeAll()
         onError = nil
         onFileRead = nil
-        NSURL.swizzleStopAccessingSecurityScopedResource(with: nil)
     }
 
     private func makeNonSandboxFile() throws -> URL {
@@ -95,15 +94,17 @@ final class FilePresenterTests: XCTestCase {
         return app
     }
 
-    private func terminateApp(timeout: TimeInterval = 1) async {
-        let eTerminated = runningApp != nil ? expectation(description: "terminated") : nil
+    private func terminateApp(timeout: TimeInterval = 5, expectation: XCTestExpectation = XCTestExpectation(description: "terminated")) async {
+        if runningApp == nil {
+            expectation.fulfill()
+        }
         let c = runningApp?.publisher(for: \.isTerminated).filter { $0 }.sink { _ in
-            eTerminated?.fulfill()
+            expectation.fulfill()
         }
         post(.terminate)
         runningApp?.forceTerminate()
 
-        await fulfillment(of: eTerminated.map { [$0] } ?? [], timeout: timeout)
+        await fulfillment(of: [expectation], timeout: timeout)
         withExtendedLifetime(c) {}
     }
 
@@ -111,7 +112,7 @@ final class FilePresenterTests: XCTestCase {
         DistributedNotificationCenter.default().post(name: .init(name.rawValue), object: object)
     }
 
-    private func fileReadPromise(timeout: TimeInterval = 5) -> Future<FileReadResult, Error> {
+    private func fileReadPromise(timeout: TimeInterval = 5, file: StaticString = #file, line: UInt = #line) -> Future<FileReadResult, Error> {
         Future<FileReadResult, Error> { [unowned self] fulfill in
             onFileRead = { result in
                 fulfill(.success(result))
@@ -124,13 +125,14 @@ final class FilePresenterTests: XCTestCase {
                 self.onError = nil
             }
         }
-        .timeout(timeout)
+        .timeout(timeout, file: file, line: line)
         .first()
         .promise()
     }
 
     // MARK: - Test sandboxed file access
 #if APPSTORE && !CI
+
     func testTool_run() async throws {
         // 1. make non-sandbox file
         let nonSandboxUrl = try makeNonSandboxFile()
@@ -177,7 +179,7 @@ final class FilePresenterTests: XCTestCase {
         await terminateApp()
         runningApp = try await runHelperApp()
 
-        // 3. open the bookmark with SandboxFilePresenter
+        // 3. open the bookmark with BookmarkFilePresenter
         post(.openBookmarkWithFilePresenter, with: bookmark.base64EncodedString())
 
         // 4. read the file
@@ -188,7 +190,7 @@ final class FilePresenterTests: XCTestCase {
         XCTAssertEqual(result.data, testData.utf8String())
         XCTAssertEqual(result.bookmark, bookmark)
 
-        // 5. close SandboxFilePresenter
+        // 5. close BookmarkFilePresenter
         let e = expectation(description: "access stopped")
         let c = DistributedNotificationCenter.default().publisher(for: SandboxTestNotification.stopAccessingSecurityScopedResourceCalled.name).sink { _ in
             e.fulfill()
@@ -220,7 +222,7 @@ final class FilePresenterTests: XCTestCase {
         await terminateApp()
         runningApp = try await runHelperApp()
 
-        // 3. open the bookmark with SandboxFilePresenter
+        // 3. open the bookmark with BookmarkFilePresenter
         post(.openBookmarkWithFilePresenter, with: bookmark.base64EncodedString())
         fileReadPromise = self.fileReadPromise()
         post(.openFile, with: nonSandboxUrl.path)
@@ -290,7 +292,7 @@ final class FilePresenterTests: XCTestCase {
         await terminateApp()
         runningApp = try await runHelperApp()
 
-        // 3. open the bookmark with SandboxFilePresenter
+        // 3. open the bookmark with BookmarkFilePresenter
         post(.openBookmarkWithFilePresenter, with: bookmark.base64EncodedString())
         fileReadPromise = self.fileReadPromise()
 
@@ -316,7 +318,7 @@ final class FilePresenterTests: XCTestCase {
         await terminateApp()
         runningApp = try await runHelperApp()
 
-        // 3. open the bookmark with SandboxFilePresenter
+        // 3. open the bookmark with BookmarkFilePresenter
         post(.openBookmarkWithFilePresenter, with: bookmark.base64EncodedString())
         fileReadPromise = self.fileReadPromise()
         post(.openFile, with: nonSandboxUrl.path)
@@ -355,7 +357,7 @@ final class FilePresenterTests: XCTestCase {
         await terminateApp()
         runningApp = try await runHelperApp()
 
-        // 3. open the bookmark with SandboxFilePresenter
+        // 3. open the bookmark with BookmarkFilePresenter
         post(.openBookmarkWithFilePresenter, with: bookmark.base64EncodedString())
         fileReadPromise = self.fileReadPromise()
         post(.openFile, with: nonSandboxUrl.path)
@@ -374,7 +376,7 @@ final class FilePresenterTests: XCTestCase {
         }
         await fulfillment(of: [e], timeout: 5)
 
-        // 5. close SandboxFilePresenter
+        // 5. close BookmarkFilePresenter
         let eStopped = expectation(description: "access stopped")
         let c2 = DistributedNotificationCenter.default().publisher(for: SandboxTestNotification.stopAccessingSecurityScopedResourceCalled.name).sink { _ in
             eStopped.fulfill()
@@ -406,13 +408,13 @@ final class FilePresenterTests: XCTestCase {
         await terminateApp()
         runningApp = try await runHelperApp()
 
-        // 3. open the bookmark with SandboxFilePresenter
+        // 3. open the bookmark with BookmarkFilePresenter
         post(.openBookmarkWithFilePresenter, with: bookmark.base64EncodedString())
         fileReadPromise = self.fileReadPromise()
         post(.openFile, with: nonSandboxUrl.path)
         _=try await fileReadPromise.value
 
-        // 4. close SandboxFilePresenter
+        // 4. close BookmarkFilePresenter
         let eStopped = expectation(description: "access stopped")
         let c2 = DistributedNotificationCenter.default().publisher(for: SandboxTestNotification.stopAccessingSecurityScopedResourceCalled.name).sink { _ in
             eStopped.fulfill()
@@ -456,7 +458,7 @@ final class FilePresenterTests: XCTestCase {
         await terminateApp()
         runningApp = try await runHelperApp()
 
-        // 3. open the bookmark with SandboxFilePresenter
+        // 3. open the bookmark with BookmarkFilePresenter
         post(.openBookmarkWithFilePresenter, with: bookmark.base64EncodedString())
         fileReadPromise = self.fileReadPromise()
         post(.openFile, with: nonSandboxUrl.path)
@@ -503,7 +505,7 @@ final class FilePresenterTests: XCTestCase {
         await terminateApp()
         runningApp = try await runHelperApp()
 
-        // 3. open the bookmark with SandboxFilePresenter
+        // 3. open the bookmark with BookmarkFilePresenter
         post(.openBookmarkWithFilePresenter, with: bookmark.base64EncodedString())
         fileReadPromise = self.fileReadPromise()
         post(.openFile, with: nonSandboxUrl.path)
@@ -543,7 +545,7 @@ final class FilePresenterTests: XCTestCase {
         await terminateApp()
         runningApp = try await runHelperApp()
 
-        // 3. open the bookmark with SandboxFilePresenter
+        // 3. open the bookmark with BookmarkFilePresenter
         post(.openBookmarkWithFilePresenter, with: bookmark1.base64EncodedString())
         post(.openBookmarkWithFilePresenter, with: bookmark2.base64EncodedString())
         fileReadPromise = self.fileReadPromise()
@@ -571,7 +573,6 @@ final class FilePresenterTests: XCTestCase {
         // 5. close FilePresenter 1 (at the original URL)
         let e3 = expectation(description: "access stopped")
         let c2 = DistributedNotificationCenter.default().publisher(for: SandboxTestNotification.stopAccessingSecurityScopedResourceCalled.name).sink { n in
-            XCTAssertEqual(n.object as? String, nonSandboxUrl1.path)
             e3.fulfill()
         }
         post(.closeFilePresenter, with: nonSandboxUrl1.path)
@@ -600,32 +601,6 @@ final class FilePresenterTests: XCTestCase {
         }
     }
 
-    func testWhenFilePresenterClosesFileOpenedByOS_fileAccessIsPreserved() async throws {
-        // 1. make non-sandbox file and open the file with the helper app
-        let nonSandboxUrl = try makeNonSandboxFile()
-        var fileReadPromise = self.fileReadPromise()
-        runningApp = try await runHelperApp(opening: nonSandboxUrl)
-        guard let bookmark = try await fileReadPromise.value.bookmark else { XCTFail("No bookmark"); return }
-
-        // 2. open file presenter
-        post(.openBookmarkWithFilePresenter, with: bookmark.base64EncodedString())
-
-        // 3. close the file presenter
-        let e = expectation(description: "access stopped")
-        let c = DistributedNotificationCenter.default().publisher(for: SandboxTestNotification.stopAccessingSecurityScopedResourceCalled.name).sink { n in
-            XCTAssertEqual(n.object as? String, nonSandboxUrl.path)
-            e.fulfill()
-        }
-        post(.closeFilePresenter, with: nonSandboxUrl.path)
-        await fulfillment(of: [e], timeout: 1)
-        withExtendedLifetime(c) {}
-
-        // 4. validate file can still be read
-        fileReadPromise = self.fileReadPromise()
-        post(.openFile, with: nonSandboxUrl.path)
-        let result = try await fileReadPromise.value
-        XCTAssertEqual(result.path, nonSandboxUrl.path)
-    }
 #endif
 
     // MARK: - Test non-sandboxed file access
@@ -633,10 +608,10 @@ final class FilePresenterTests: XCTestCase {
     func testWhenSandboxFilePresenterIsOpen_itCanReadFile_accessIsNotStoppedWhenClosed_noSandbox() async throws {
         // 1. make non-sandbox file; create bookmark
         let nonSandboxUrl = try makeNonSandboxFile()
-        guard let bookmarkData = try SandboxFilePresenter(url: nonSandboxUrl).fileBookmarkData else { XCTFail("No bookmark"); return }
+        guard let bookmarkData = try BookmarkFilePresenter(url: nonSandboxUrl).fileBookmarkData else { XCTFail("No bookmark"); return }
 
-        // 2. open the bookmark with SandboxFilePresenter
-        var filePresenter: SandboxFilePresenter! = try SandboxFilePresenter(fileBookmarkData: bookmarkData)
+        // 2. open the bookmark with BookmarkFilePresenter
+        var filePresenter: BookmarkFilePresenter! = try BookmarkFilePresenter(fileBookmarkData: bookmarkData)
 
         // 3. validate
         var publishedUrl: URL?
@@ -656,7 +631,7 @@ final class FilePresenterTests: XCTestCase {
     func testWhenFileIsRenamed_urlIsUpdated_noSandbox() async throws {
         // 1. make non-sandbox file
         let nonSandboxUrl = try makeNonSandboxFile()
-        let filePresenter = try SandboxFilePresenter(url: nonSandboxUrl)
+        let filePresenter = try BookmarkFilePresenter(url: nonSandboxUrl)
 
         // 4. rename the file
         let newUrl = nonSandboxUrl.deletingPathExtension().appendingPathExtension("1.txt")
@@ -689,7 +664,7 @@ final class FilePresenterTests: XCTestCase {
     func testWhenFileIsRemoved_removalIsDetected_noSandbox() async throws {
         // 1. make non-sandbox file
         let nonSandboxUrl = try makeNonSandboxFile()
-        let filePresenter = try SandboxFilePresenter(url: nonSandboxUrl)
+        let filePresenter = try BookmarkFilePresenter(url: nonSandboxUrl)
 
         // 2. remove the file
         let e1 = expectation(description: "file presenter: file removed")
@@ -716,8 +691,8 @@ final class FilePresenterTests: XCTestCase {
         let bookmarkData1 = try nonSandboxUrl1.bookmarkData(options: .withSecurityScope)
         let nonSandboxUrl2 = try makeNonSandboxFile()
         let bookmarkData2 = try nonSandboxUrl2.bookmarkData(options: .withSecurityScope)
-        let filePresenter1 = try SandboxFilePresenter(fileBookmarkData: bookmarkData1)
-        let filePresenter2 = try SandboxFilePresenter(fileBookmarkData: bookmarkData2)
+        let filePresenter1 = try BookmarkFilePresenter(fileBookmarkData: bookmarkData1)
+        let filePresenter2 = try BookmarkFilePresenter(fileBookmarkData: bookmarkData2)
 
         // 2. cross-rename the files
         let tempUrl = nonSandboxUrl1.appendingPathExtension("tmp")
diff --git a/UnitTests/Fire/Model/FireTests.swift b/UnitTests/Fire/Model/FireTests.swift
index 25c3645949..36e81cc3fa 100644
--- a/UnitTests/Fire/Model/FireTests.swift
+++ b/UnitTests/Fire/Model/FireTests.swift
@@ -94,7 +94,7 @@ final class FireTests: XCTestCase {
         waitForExpectations(timeout: 5, handler: nil)
 
         XCTAssertEqual(tabCollectionViewModel.tabCollection.tabs.count, 0)
-        XCTAssertEqual(pinnedTabsManager.tabCollection.tabs.map(\.content.url), pinnedTabs.map(\.content.url))
+        XCTAssertEqual(pinnedTabsManager.tabCollection.tabs.map(\.content.userEditableUrl), pinnedTabs.map(\.content.userEditableUrl))
     }
 
     func testWhenBurnAll_ThenAllWebsiteDataAreRemoved() {
diff --git a/UnitTests/HomePage/ContinueSetUpModelTests.swift b/UnitTests/HomePage/ContinueSetUpModelTests.swift
index 08f034af48..f7c2060ffc 100644
--- a/UnitTests/HomePage/ContinueSetUpModelTests.swift
+++ b/UnitTests/HomePage/ContinueSetUpModelTests.swift
@@ -18,10 +18,9 @@
 
 import XCTest
 import BrowserServicesKit
+import Common
 @testable import DuckDuckGo_Privacy_Browser
 
-#if NETWORK_PROTECTION
-
 final class MockNetworkProtectionRemoteMessaging: NetworkProtectionRemoteMessaging {
 
     var messages: [NetworkProtectionRemoteMessage] = []
@@ -38,8 +37,6 @@ final class MockNetworkProtectionRemoteMessaging: NetworkProtectionRemoteMessagi
 
 }
 
-#endif
-
 #if DBP
 
 final class MockDataBrokerProtectionRemoteMessaging: DataBrokerProtectionRemoteMessaging {
@@ -77,10 +74,8 @@ final class ContinueSetUpModelTests: XCTestCase {
     @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)
+        userDefaults.set(false, forKey: UserDefaultsWrapper<Date>.Key.homePageUserInSurveyShare.rawValue)
+        userDefaults.set(nil, forKey: UserDefaultsWrapper<Bool?>.Key.homePageShowPermanentSurvey.rawValue)
         capturingDefaultBrowserProvider = CapturingDefaultBrowserProvider()
         capturingDataImportProvider = CapturingDataImportProvider()
         tabCollectionVM = TabCollectionViewModel()
@@ -89,32 +84,21 @@ final class ContinueSetUpModelTests: XCTestCase {
         duckPlayerPreferences = DuckPlayerPreferencesPersistorMock()
         privacyConfigManager = MockPrivacyConfigurationManager()
         let config = MockPrivacyConfiguration()
-        config.featureSettings = [
-            "surveyCardDay0": "enabled",
-            "surveyCardDay14": "enabled"
-        ] as! [String: String]
         privacyConfigManager.privacyConfig = config
         randomNumberGenerator = MockRandomNumberGenerator()
 
-#if NETWORK_PROTECTION && DBP
+#if DBP
         let messaging = HomePageRemoteMessaging(
             networkProtectionRemoteMessaging: MockNetworkProtectionRemoteMessaging(),
             networkProtectionUserDefaults: userDefaults,
             dataBrokerProtectionRemoteMessaging: MockDataBrokerProtectionRemoteMessaging(),
             dataBrokerProtectionUserDefaults: userDefaults
         )
-#elseif NETWORK_PROTECTION
+#else
         let messaging = HomePageRemoteMessaging(
             networkProtectionRemoteMessaging: MockNetworkProtectionRemoteMessaging(),
             networkProtectionUserDefaults: userDefaults
         )
-#elseif DBP
-        let messaging =  HomePageRemoteMessaging(
-            dataBrokerProtectionRemoteMessaging: MockDataBrokerProtectionRemoteMessaging(),
-            dataBrokerProtectionUserDefaults: userDefaults
-        )
-#else
-        let messaging =  HomePageRemoteMessaging.defaultMessaging()
 #endif
 
         vm = HomePage.Models.ContinueSetUpModel(
@@ -125,7 +109,7 @@ final class ContinueSetUpModelTests: XCTestCase {
             duckPlayerPreferences: duckPlayerPreferences,
             homePageRemoteMessaging: messaging,
             privacyConfigurationManager: privacyConfigManager,
-            randomNumberGenerator: randomNumberGenerator
+            permanentSurveyManager: MockPermanentSurveyManager()
         )
     }
 
@@ -166,7 +150,8 @@ final class ContinueSetUpModelTests: XCTestCase {
             tabCollectionViewModel: tabCollectionVM,
             emailManager: emailManager,
             duckPlayerPreferences: duckPlayerPreferences,
-            homePageRemoteMessaging: createMessaging()
+            homePageRemoteMessaging: createMessaging(),
+            permanentSurveyManager: MockPermanentSurveyManager()
         )
 
         XCTAssertFalse(vm.isMoreOrLessButtonNeeded)
@@ -179,123 +164,11 @@ final class ContinueSetUpModelTests: XCTestCase {
 
         vm.shouldShowAllFeatures = true
 
-        expectedMatrix = expectedFeatureMatrixWithout(types: [.surveyDay14])
+        expectedMatrix = expectedFeatureMatrixWithout(types: [.permanentSurvey])
 
         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)
-        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))
-
-        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)
-        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.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 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))
-        XCTAssertFalse(vm.visibleFeaturesMatrix.reduce([], +).contains(HomePage.Models.FeatureType.surveyDay14))
-    }
-
-    @MainActor func testWhenInstallDateIsMoreThan14daysAgoAndUserInteractedWithDay0SurveyDay14SurveyCardIsNotShown() {
-        let statisticStore = MockStatisticsStore()
-        vm.statisticsStore = statisticStore
-        vm.performAction(for: .surveyDay0)
-        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.surveyDay14))
-    }
-
-    @MainActor func testWhenInstallDateIsMoreThanAWeekAgoAndUserDismissedDay0SurveyDay14SurveyCardIsNotShown() {
-        let statisticStore = MockStatisticsStore()
-        vm.statisticsStore = statisticStore
-        vm.removeItem(for: .surveyDay0)
-        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.surveyDay14))
-    }
-
     @MainActor func testWhenInitializedNotForTheFirstTimeTheMatrixHasAllElementsInTheRightOrder() {
         let homePageIsFirstSession = UserDefaultsWrapper<Bool>(key: .homePageIsFirstSession, defaultValue: true)
         homePageIsFirstSession.wrappedValue = false
@@ -308,7 +181,7 @@ final class ContinueSetUpModelTests: XCTestCase {
     }
 
     func testWhenTogglingShowAllFeatureThenCorrectElementsAreVisible() {
-        let expectedMatrix = expectedFeatureMatrixWithout(types: [.surveyDay14])
+        let expectedMatrix = expectedFeatureMatrixWithout(types: [.permanentSurvey])
 
         vm.shouldShowAllFeatures = true
 
@@ -336,7 +209,7 @@ final class ContinueSetUpModelTests: XCTestCase {
     }
 
     @MainActor func testWhenIsDefaultBrowserAndTogglingShowAllFeatureThenCorrectElementsAreVisible() {
-        let expectedMatrix = expectedFeatureMatrixWithout(types: [.defaultBrowser, .surveyDay14])
+        let expectedMatrix = expectedFeatureMatrixWithout(types: [.defaultBrowser, .permanentSurvey])
 
         capturingDefaultBrowserProvider.isDefault = true
         vm = HomePage.Models.ContinueSetUpModel.fixture(defaultBrowserProvider: capturingDefaultBrowserProvider, appGroupUserDefaults: userDefaults)
@@ -364,7 +237,7 @@ final class ContinueSetUpModelTests: XCTestCase {
     }
 
     @MainActor func testWhenUserHasUsedImportAndTogglingShowAllFeatureThenCorrectElementsAreVisible() {
-        let expectedMatrix = expectedFeatureMatrixWithout(types: [.surveyDay14, .importBookmarksAndPasswords])
+        let expectedMatrix = expectedFeatureMatrixWithout(types: [.permanentSurvey, .importBookmarksAndPasswords])
 
         capturingDataImportProvider.didImport = true
         vm = HomePage.Models.ContinueSetUpModel.fixture(dataImportProvider: capturingDataImportProvider, appGroupUserDefaults: userDefaults)
@@ -386,7 +259,7 @@ final class ContinueSetUpModelTests: XCTestCase {
     }
 
     @MainActor func testWhenUserHasEmailProtectionEnabledThenCorrectElementsAreVisible() {
-        let expectedMatrix = expectedFeatureMatrixWithout(types: [.surveyDay14, .emailProtection])
+        let expectedMatrix = expectedFeatureMatrixWithout(types: [.permanentSurvey, .emailProtection])
 
         emailStorage.isEmailProtectionEnabled = true
         vm = HomePage.Models.ContinueSetUpModel.fixture(emailManager: emailManager, appGroupUserDefaults: userDefaults)
@@ -408,7 +281,7 @@ final class ContinueSetUpModelTests: XCTestCase {
     }
 
     @MainActor func testWhenUserHasDuckPlayerEnabledAndOverlayButtonNotPressedThenCorrectElementsAreVisible() {
-        let expectedMatrix = expectedFeatureMatrixWithout(types: [.surveyDay14, .duckplayer])
+        let expectedMatrix = expectedFeatureMatrixWithout(types: [.permanentSurvey, .duckplayer])
 
         duckPlayerPreferences.youtubeOverlayAnyButtonPressed = false
         duckPlayerPreferences.duckPlayerModeBool = true
@@ -425,7 +298,7 @@ final class ContinueSetUpModelTests: XCTestCase {
     }
 
     @MainActor func testWhenUserHasDuckPlayerDisabledAndOverlayButtonNotPressedThenCorrectElementsAreVisible() {
-        let expectedMatrix = expectedFeatureMatrixWithout(types: [.surveyDay14, .duckplayer])
+        let expectedMatrix = expectedFeatureMatrixWithout(types: [.permanentSurvey, .duckplayer])
 
         duckPlayerPreferences.youtubeOverlayAnyButtonPressed = false
         duckPlayerPreferences.duckPlayerModeBool = false
@@ -442,7 +315,7 @@ final class ContinueSetUpModelTests: XCTestCase {
     }
 
     @MainActor func testWhenUserHasDuckPlayerOnAlwaysAskAndOverlayButtonNotPressedThenCorrectElementsAreVisible() {
-        let expectedMatrix = expectedFeatureMatrixWithout(types: [.surveyDay14])
+        let expectedMatrix = expectedFeatureMatrixWithout(types: [.permanentSurvey])
 
         duckPlayerPreferences.youtubeOverlayAnyButtonPressed = false
         duckPlayerPreferences.duckPlayerModeBool = nil
@@ -459,7 +332,7 @@ final class ContinueSetUpModelTests: XCTestCase {
     }
 
     @MainActor func testWhenUserHasDuckPlayerOnAlwaysAskAndOverlayButtonIsPressedThenCorrectElementsAreVisible() {
-        let expectedMatrix = expectedFeatureMatrixWithout(types: [.surveyDay14, .duckplayer])
+        let expectedMatrix = expectedFeatureMatrixWithout(types: [.permanentSurvey, .duckplayer])
 
         duckPlayerPreferences.youtubeOverlayAnyButtonPressed = true
         duckPlayerPreferences.duckPlayerModeBool = nil
@@ -475,33 +348,12 @@ final class ContinueSetUpModelTests: XCTestCase {
         XCTAssertTrue(vm.visibleFeaturesMatrix[0].count <= HomePage.featuresPerRow)
     }
 
-    @MainActor func testWhenAskedToPerformActionForSurveyDay1ShowsTheSurveySite() {
-        let atb = "someAtb"
-        let statisticStore = MockStatisticsStore()
-        statisticStore.atb = atb
-        vm.statisticsStore = statisticStore
-
-        vm.performAction(for: .surveyDay0)
-        XCTAssertEqual(tabCollectionVM.tabs[1].url, URL(string: vm.day0SurveyURL))
-    }
-
-    @MainActor func testWhenAskedToPerformActionForSurveyDay14ShowsTheSurveySite() {
-        let atb = "someAtb"
-        let statisticStore = MockStatisticsStore()
-        statisticStore.atb = atb
-        vm.statisticsStore = statisticStore
-
-        vm.performAction(for: .surveyDay14)
-        XCTAssertEqual(tabCollectionVM.tabs[1].url, URL(string: vm.day14SurveyURL))
-    }
-
-    @MainActor func testThatWhenIfAllFeatureActiveThenVisibleMatrixIsEmpty() {
+    @MainActor func testThatWhenAllFeatureInactiveThenVisibleMatrixIsEmpty() {
         capturingDefaultBrowserProvider.isDefault = true
         emailStorage.isEmailProtectionEnabled = true
         duckPlayerPreferences.youtubeOverlayAnyButtonPressed = true
         capturingDataImportProvider.didImport = true
-        userDefaults.set(false, forKey: UserDefaultsWrapper<Date>.Key.homePageShowSurveyDay0.rawValue)
-        userDefaults.set(false, forKey: UserDefaultsWrapper<Date>.Key.homePageShowSurveyDay14.rawValue)
+        userDefaults.set(false, forKey: UserDefaultsWrapper<Date>.Key.homePageShowPermanentSurvey.rawValue)
 
         vm = HomePage.Models.ContinueSetUpModel(
             defaultBrowserProvider: capturingDefaultBrowserProvider,
@@ -509,7 +361,8 @@ final class ContinueSetUpModelTests: XCTestCase {
             tabCollectionViewModel: tabCollectionVM,
             emailManager: emailManager,
             duckPlayerPreferences: duckPlayerPreferences,
-            homePageRemoteMessaging: createMessaging()
+            homePageRemoteMessaging: createMessaging(),
+            permanentSurveyManager: MockPermanentSurveyManager()
         )
 
         XCTAssertEqual(vm.visibleFeaturesMatrix, [[]])
@@ -517,18 +370,9 @@ final class ContinueSetUpModelTests: XCTestCase {
 
     @MainActor func testDismissedItemsAreRemovedFromVisibleMatrixAndChoicesArePersisted() {
         vm.shouldShowAllFeatures = true
-        let expectedMatrix = expectedFeatureMatrixWithout(types: [.surveyDay14])
+        let expectedMatrix = expectedFeatureMatrixWithout(types: [.permanentSurvey])
         XCTAssertEqual(expectedMatrix, vm.visibleFeaturesMatrix)
 
-        vm.removeItem(for: .surveyDay0)
-        XCTAssertFalse(vm.visibleFeaturesMatrix.flatMap { $0 }.contains(.surveyDay0))
-
-        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: .surveyDay14)
-        XCTAssertFalse(vm.visibleFeaturesMatrix.flatMap { $0 }.contains(.surveyDay14))
-
         vm.removeItem(for: .defaultBrowser)
         XCTAssertFalse(vm.visibleFeaturesMatrix.flatMap { $0 }.contains(.defaultBrowser))
 
@@ -553,6 +397,88 @@ final class ContinueSetUpModelTests: XCTestCase {
         XCTAssertFalse(vm2.shouldShowAllFeatures)
     }
 
+    @MainActor func test_PermanentSurveyHasExpectedStrings() {
+        let surveyCardType = HomePage.Models.FeatureType.permanentSurvey
+
+        XCTAssertEqual(surveyCardType.title, PermanentSurveyManager.title)
+        XCTAssertEqual(surveyCardType.summary, PermanentSurveyManager.body)
+        XCTAssertEqual(surveyCardType.action, PermanentSurveyManager.actionTitle)
+    }
+
+    @MainActor func test_whenSurveyIsAvailable_AndUserHasNotInteractedWithTheCard_ThenPermanentSureveyDisplayed() {
+        let expectedURL = URL(string: "someurl.com")
+        let surveyManager = MockPermanentSurveyManager(isSurveyAvailable: true, url: expectedURL)
+        userDefaults.set(true, forKey: UserDefaultsWrapper<Bool>.Key.homePageShowPermanentSurvey.rawValue)
+
+        let vm = HomePage.Models.ContinueSetUpModel.fixture(appGroupUserDefaults: userDefaults, permanentSurveyManager: surveyManager)
+        vm.shouldShowAllFeatures = true
+
+        XCTAssertTrue(vm.visibleFeaturesMatrix.reduce([], +).contains(HomePage.Models.FeatureType.permanentSurvey))
+    }
+
+    @MainActor func test_whenSurveyIsNotAvailable_AndUserHasNotInteractedWithTheCard_ThenPermanentSureveyIsNotDisplayed() {
+        let expectedURL = URL(string: "someurl.com")
+        let surveyManager = MockPermanentSurveyManager(isSurveyAvailable: false, url: expectedURL)
+        userDefaults.set(true, forKey: UserDefaultsWrapper<Bool>.Key.homePageShowPermanentSurvey.rawValue)
+
+        let vm = HomePage.Models.ContinueSetUpModel.fixture(appGroupUserDefaults: userDefaults, permanentSurveyManager: surveyManager)
+        vm.shouldShowAllFeatures = true
+
+        XCTAssertFalse(vm.visibleFeaturesMatrix.reduce([], +).contains(HomePage.Models.FeatureType.permanentSurvey))
+    }
+
+    @MainActor func test_whenSurveyIsAvailable_AndUserHasInteractedWithTheCard_ThenPermanentSureveyIsNotDisplayed() {
+        let expectedURL = URL(string: "someurl.com")
+        let surveyManager = MockPermanentSurveyManager(isSurveyAvailable: false, url: expectedURL)
+        userDefaults.set(false, forKey: UserDefaultsWrapper<Bool>.Key.homePageShowPermanentSurvey.rawValue)
+
+        let vm = HomePage.Models.ContinueSetUpModel.fixture(appGroupUserDefaults: userDefaults, permanentSurveyManager: surveyManager)
+        vm.shouldShowAllFeatures = true
+
+        XCTAssertFalse(vm.visibleFeaturesMatrix.reduce([], +).contains(HomePage.Models.FeatureType.permanentSurvey))
+    }
+
+    @MainActor func test_whenUserDismissPermanentSurvey_ThenPermoanentSurveyIsRemovedFromVisibleMatrixAndChoicesArePersisted() {
+        let expectedURL = URL(string: "someurl.com")
+        let surveyManager = MockPermanentSurveyManager(isSurveyAvailable: false, url: expectedURL)
+        userDefaults.set(false, forKey: UserDefaultsWrapper<Bool>.Key.homePageShowPermanentSurvey.rawValue)
+        let vm = HomePage.Models.ContinueSetUpModel.fixture(appGroupUserDefaults: userDefaults, permanentSurveyManager: surveyManager)
+        vm.shouldShowAllFeatures = true
+
+        vm.removeItem(for: .permanentSurvey)
+
+        XCTAssertFalse(vm.visibleFeaturesMatrix.flatMap { $0 }.contains(.permanentSurvey))
+
+        let vm2 = HomePage.Models.ContinueSetUpModel.fixture(appGroupUserDefaults: userDefaults, permanentSurveyManager: surveyManager)
+        vm2.shouldShowAllFeatures = true
+
+        XCTAssertFalse(vm2.visibleFeaturesMatrix.reduce([], +).contains(HomePage.Models.FeatureType.permanentSurvey))
+    }
+
+    @MainActor func testWhenAskedToPerformActionForPermanetShowsTheSurveySite() async {
+        let expectedURL = URL(string: "someurl.com")
+        let surveyManager = MockPermanentSurveyManager(isSurveyAvailable: true, url: expectedURL)
+        userDefaults.set(true, forKey: UserDefaultsWrapper<Bool>.Key.homePageShowPermanentSurvey.rawValue)
+        let vm = HomePage.Models.ContinueSetUpModel(
+            defaultBrowserProvider: capturingDefaultBrowserProvider,
+            dataImportProvider: capturingDataImportProvider,
+            tabCollectionViewModel: tabCollectionVM,
+            emailManager: emailManager,
+            duckPlayerPreferences: duckPlayerPreferences,
+            homePageRemoteMessaging: createMessaging(),
+            privacyConfigurationManager: privacyConfigManager,
+            permanentSurveyManager: surveyManager
+        )
+
+        vm.performAction(for: .permanentSurvey)
+
+        XCTAssertEqual(tabCollectionVM.tabs[1].url, expectedURL)
+
+        let vm2 = HomePage.Models.ContinueSetUpModel.fixture(appGroupUserDefaults: userDefaults, permanentSurveyManager: surveyManager)
+        vm2.shouldShowAllFeatures = true
+        XCTAssertFalse(vm2.visibleFeaturesMatrix.reduce([], +).contains(HomePage.Models.FeatureType.permanentSurvey))
+    }
+
     private func doTheyContainTheSameElements(matrix1: [[HomePage.Models.FeatureType]], matrix2: [[HomePage.Models.FeatureType]]) -> Bool {
         Set(matrix1.flatMap { $0 }) == Set(matrix2.flatMap { $0 })
     }
@@ -571,32 +497,21 @@ final class ContinueSetUpModelTests: XCTestCase {
     }
 
     private func createMessaging() -> HomePageRemoteMessaging {
-#if NETWORK_PROTECTION && DBP
+#if DBP
         return HomePageRemoteMessaging(
             networkProtectionRemoteMessaging: MockNetworkProtectionRemoteMessaging(),
             networkProtectionUserDefaults: userDefaults,
             dataBrokerProtectionRemoteMessaging: MockDataBrokerProtectionRemoteMessaging(),
             dataBrokerProtectionUserDefaults: userDefaults
         )
-#elseif NETWORK_PROTECTION
+#else
         return HomePageRemoteMessaging(
             networkProtectionRemoteMessaging: MockNetworkProtectionRemoteMessaging(),
             networkProtectionUserDefaults: userDefaults
         )
-#elseif DBP
-        return HomePageRemoteMessaging(
-            dataBrokerProtectionRemoteMessaging: MockDataBrokerProtectionRemoteMessaging(),
-            dataBrokerProtectionUserDefaults: userDefaults
-        )
-#else
-        return HomePageRemoteMessaging.defaultMessaging()
 #endif
     }
 
-    enum SurveyDay {
-        case day0
-        case day7
-    }
 }
 
 extension HomePage.Models.ContinueSetUpModel {
@@ -607,35 +522,27 @@ extension HomePage.Models.ContinueSetUpModel {
         duckPlayerPreferences: DuckPlayerPreferencesPersistor = DuckPlayerPreferencesPersistorMock(),
         privacyConfig: MockPrivacyConfiguration = MockPrivacyConfiguration(),
         appGroupUserDefaults: UserDefaults,
+        permanentSurveyManager: MockPermanentSurveyManager = MockPermanentSurveyManager(),
         randomNumberGenerator: RandomNumberGenerating = MockRandomNumberGenerator()
     ) -> HomePage.Models.ContinueSetUpModel {
         privacyConfig.featureSettings = [
-            "surveyCardDay0": "enabled",
-            "surveyCardDay14": "enabled",
             "networkProtection": "disabled"
         ] as! [String: String]
         let manager = MockPrivacyConfigurationManager()
         manager.privacyConfig = privacyConfig
 
-#if NETWORK_PROTECTION && DBP
+#if DBP
         let messaging = HomePageRemoteMessaging(
             networkProtectionRemoteMessaging: MockNetworkProtectionRemoteMessaging(),
             networkProtectionUserDefaults: appGroupUserDefaults,
             dataBrokerProtectionRemoteMessaging: MockDataBrokerProtectionRemoteMessaging(),
             dataBrokerProtectionUserDefaults: appGroupUserDefaults
         )
-#elseif NETWORK_PROTECTION
+#else
         let messaging = HomePageRemoteMessaging(
             networkProtectionRemoteMessaging: MockNetworkProtectionRemoteMessaging(),
             networkProtectionUserDefaults: appGroupUserDefaults
         )
-#elseif DBP
-        let messaging = HomePageRemoteMessaging(
-            dataBrokerProtectionRemoteMessaging: MockDataBrokerProtectionRemoteMessaging(),
-            dataBrokerProtectionUserDefaults: appGroupUserDefaults
-        )
-#else
-        let messaging =  HomePageRemoteMessaging.defaultMessaging()
 #endif
 
         return HomePage.Models.ContinueSetUpModel(
@@ -646,15 +553,17 @@ extension HomePage.Models.ContinueSetUpModel {
             duckPlayerPreferences: duckPlayerPreferences,
             homePageRemoteMessaging: messaging,
             privacyConfigurationManager: manager,
-            randomNumberGenerator: randomNumberGenerator)
+            permanentSurveyManager: permanentSurveyManager)
     }
 }
 
-class MockRandomNumberGenerator: RandomNumberGenerating {
-    var numberToReturn = 0
-    var capturedRange: Range<Int>?
-    func random(in range: Range<Int>) -> Int {
-        capturedRange = range
-        return numberToReturn
-    }
+struct MockPermanentSurveyManager: SurveyManager {
+    var isSurveyAvailable: Bool = false
+    var url: URL?
+
+    static var title: String = "some title"
+
+    static var body: String = "some body"
+
+    static var actionTitle: String = "some action"
 }
diff --git a/UnitTests/HomePage/DataImportProviderTests.swift b/UnitTests/HomePage/DataImportProviderTests.swift
index 325f97e461..a67468dd72 100644
--- a/UnitTests/HomePage/DataImportProviderTests.swift
+++ b/UnitTests/HomePage/DataImportProviderTests.swift
@@ -55,7 +55,7 @@ final class DataImportProviderTests: XCTestCase {
     override func setUp() {
         UserDefaultsWrapper<Any>.clearAll()
 
-        vault = try! MockSecureVaultFactory.makeVault(errorReporter: nil)
+        vault = try! MockSecureVaultFactory.makeVault(reporter: nil)
         vault.storedAccounts = notImportedAccounts
         vault.storedIdentities = []
         vault.storedCards = []
diff --git a/UnitTests/HomePage/Mocks/MockBookmarkManager.swift b/UnitTests/HomePage/Mocks/MockBookmarkManager.swift
index 28f65fdf59..d1fafb18be 100644
--- a/UnitTests/HomePage/Mocks/MockBookmarkManager.swift
+++ b/UnitTests/HomePage/Mocks/MockBookmarkManager.swift
@@ -41,6 +41,10 @@ class MockBookmarkManager: BookmarkManager {
         return nil
     }
 
+    func getBookmarkFolder(withId id: String) -> DuckDuckGo_Privacy_Browser.BookmarkFolder? {
+        return nil
+    }
+
     func makeBookmark(for url: URL, title: String, isFavorite: Bool) -> DuckDuckGo_Privacy_Browser.Bookmark? {
         return nil
     }
@@ -49,6 +53,8 @@ class MockBookmarkManager: BookmarkManager {
         return nil
     }
 
+    func makeBookmarks(for websitesInfo: [DuckDuckGo_Privacy_Browser.WebsiteInfo], inNewFolderNamed folderName: String, withinParentFolder parent: DuckDuckGo_Privacy_Browser.ParentFolderType) {}
+
     func makeFolder(for title: String, parent: DuckDuckGo_Privacy_Browser.BookmarkFolder?, completion: (DuckDuckGo_Privacy_Browser.BookmarkFolder) -> Void) {}
 
     func remove(bookmark: DuckDuckGo_Privacy_Browser.Bookmark) {}
diff --git a/UnitTests/HomePage/PermanentSurveyManagerTests.swift b/UnitTests/HomePage/PermanentSurveyManagerTests.swift
new file mode 100644
index 0000000000..de71ff2fa8
--- /dev/null
+++ b/UnitTests/HomePage/PermanentSurveyManagerTests.swift
@@ -0,0 +1,231 @@
+//
+//  PermanentSurveyManagerTests.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 Common
+@testable import DuckDuckGo_Privacy_Browser
+
+final class PermanentSurveyManagerTests: XCTestCase {
+
+    var privacyConfigManager: MockPrivacyConfigurationManager!
+    var privacyConfig: MockPrivacyConfiguration!
+    var statisticsStore: MockStatisticsStore!
+    let userDefaults = UserDefaults(suiteName: "\(Bundle.main.bundleIdentifier!).\(NSApplication.runType)")!
+
+    override func setUp() {
+        privacyConfigManager = MockPrivacyConfigurationManager()
+        privacyConfig = MockPrivacyConfiguration()
+        statisticsStore = MockStatisticsStore()
+    }
+
+    override func tearDown() {
+        privacyConfigManager = nil
+        privacyConfig = nil
+        statisticsStore = nil
+    }
+
+    func test_surveyManagerReturnsExpectedStrings() {
+        let expectedTitle = "Help Us Improve"
+        let expectedBody = "Take our short survey and help us build the best browser."
+        let expectedAction = "Share Your Thoughts"
+
+        XCTAssertEqual(PermanentSurveyManager.title, expectedTitle)
+        XCTAssertEqual(PermanentSurveyManager.body, expectedBody)
+        XCTAssertEqual(PermanentSurveyManager.actionTitle, expectedAction)
+    }
+
+    @MainActor func test_surveyManagerReturnsExpectedURL() {
+        let urlString = "https://someUrl.com"
+        let atb = "someAtb"
+        let someVariant = "someVariant"
+        statisticsStore.atb = atb
+        statisticsStore.variant = someVariant
+        let expectedURL = URL(string: "\(urlString)?atb=\(atb)&v=\(someVariant)&ddg=\(AppVersion.shared.versionNumber)&macos=\(AppVersion.shared.majorAndMinorOSVersion)")
+        let newTabContinueSetUpSettings = createNewTabContinueSetUpSettings(state: "enabled", url: urlString, firstDay: 0, lastDay: 0, sharePercentage: 0)
+        privacyConfig.featureSettings = newTabContinueSetUpSettings
+        privacyConfigManager.privacyConfig = privacyConfig
+        let manager = PermanentSurveyManager(privacyConfigurationManager: privacyConfigManager)
+        manager.statisticsStore = statisticsStore
+
+        let actualURL = manager.url
+
+        XCTAssertEqual(actualURL, expectedURL)
+    }
+
+    @MainActor func test_wheninvalidURLInConfig_ThenSurveyManagerReturnsExpectedURL() {
+        let urlString = "ht tps://someUrl.com"
+        let newTabContinueSetUpSettings = createNewTabContinueSetUpSettings(state: "enabled", url: urlString, firstDay: 0, lastDay: 0, sharePercentage: 0)
+        privacyConfig.featureSettings = newTabContinueSetUpSettings
+        privacyConfigManager.privacyConfig = privacyConfig
+        let manager = PermanentSurveyManager(privacyConfigurationManager: privacyConfigManager)
+
+        let actualURL = manager.url
+
+        XCTAssertNil(actualURL)
+    }
+
+    @MainActor func test_surveyIsEnabled_andFirstInstallInTargetRange_andIsRightLocale_andInSureveyShare_ThenPermanentSureveyIsAvalable() {
+        let sixDaysAgo = Calendar.current.date(byAdding: .day, value: -6, to: Date())!
+        userDefaults.set(sixDaysAgo, forKey: UserDefaultsWrapper<Date>.Key.firstLaunchDate.rawValue)
+        userDefaults.set(nil, forKey: UserDefaultsWrapper<Bool?>.Key.homePageUserInSurveyShare.rawValue)
+        let urlString = "https://someUrl.com"
+        let randomGenerator = MockRandomNumberGenerator()
+        randomGenerator.numberToReturn = 59
+        let newTabContinueSetUpSettings = createNewTabContinueSetUpSettings(state: "enabled", url: urlString, firstDay: 5, lastDay: 8, sharePercentage: 60)
+        privacyConfig.featureSettings = newTabContinueSetUpSettings
+        privacyConfigManager.privacyConfig = privacyConfig
+        let manager = PermanentSurveyManager(privacyConfigurationManager: privacyConfigManager, randomNumberGenerator: randomGenerator)
+        let isSurveyAvailable = manager.isSurveyAvailable
+
+        XCTAssertTrue(isSurveyAvailable)
+        XCTAssertEqual(randomGenerator.capturedRange, 0..<100)
+
+        let manager2 = PermanentSurveyManager(privacyConfigurationManager: privacyConfigManager, randomNumberGenerator: randomGenerator)
+        manager2.statisticsStore = statisticsStore
+
+        let isSurveyAvailable2 = manager2.isSurveyAvailable
+
+        XCTAssertTrue(isSurveyAvailable2)
+    }
+
+    @MainActor func test_surveyIsDisabled_andFirstInstallInTargetRange_andIsRightLocale_andInSureveyShare_ThenPermanentSureveyIsNotAvalable() {
+        let sixDaysAgo = Calendar.current.date(byAdding: .day, value: -6, to: Date())!
+        userDefaults.set(sixDaysAgo, forKey: UserDefaultsWrapper<Date>.Key.firstLaunchDate.rawValue)
+        userDefaults.set(nil, forKey: UserDefaultsWrapper<Bool?>.Key.homePageUserInSurveyShare.rawValue)
+        let urlString = "https://someUrl.com"
+        let randomGenerator = MockRandomNumberGenerator()
+        randomGenerator.numberToReturn = 59
+        let newTabContinueSetUpSettings = createNewTabContinueSetUpSettings(state: "disabled", url: urlString, firstDay: 5, lastDay: 8, sharePercentage: 60)
+        privacyConfig.featureSettings = newTabContinueSetUpSettings
+        privacyConfigManager.privacyConfig = privacyConfig
+        let manager = PermanentSurveyManager(privacyConfigurationManager: privacyConfigManager, randomNumberGenerator: randomGenerator)
+
+        let isSurveyAvailable = manager.isSurveyAvailable
+
+        XCTAssertFalse(isSurveyAvailable)
+    }
+
+    @MainActor func test_surveyIsEnabled_andFirstInstallBeforeTargetRange_andIsRightLocale_andInSureveyShare_ThenPermanentSureveyIsNotAvalable() {
+        let oneDayAgo = Calendar.current.date(byAdding: .day, value: -1, to: Date())!
+        userDefaults.set(oneDayAgo, forKey: UserDefaultsWrapper<Date>.Key.firstLaunchDate.rawValue)
+        userDefaults.set(nil, forKey: UserDefaultsWrapper<Bool?>.Key.homePageUserInSurveyShare.rawValue)
+        let urlString = "https://someUrl.com"
+        let randomGenerator = MockRandomNumberGenerator()
+        randomGenerator.numberToReturn = 59
+        let newTabContinueSetUpSettings = createNewTabContinueSetUpSettings(state: "enabled", url: urlString, firstDay: 5, lastDay: 8, sharePercentage: 60)
+        privacyConfig.featureSettings = newTabContinueSetUpSettings
+        privacyConfigManager.privacyConfig = privacyConfig
+        let manager = PermanentSurveyManager(privacyConfigurationManager: privacyConfigManager, randomNumberGenerator: randomGenerator)
+
+        let isSurveyAvailable = manager.isSurveyAvailable
+
+        XCTAssertFalse(isSurveyAvailable)
+    }
+
+    @MainActor func test_surveyIsEnabled_andInstallAfterTargetRange_andIsRightLocale_andInSureveyShare_ThenPermanentSureveyIsNotAvalable() {
+        let nineDaysAgo = Calendar.current.date(byAdding: .day, value: -9, to: Date())!
+        userDefaults.set(nineDaysAgo, forKey: UserDefaultsWrapper<Date>.Key.firstLaunchDate.rawValue)
+        userDefaults.set(nil, forKey: UserDefaultsWrapper<Bool?>.Key.homePageUserInSurveyShare.rawValue)
+        let urlString = "https://someUrl.com"
+        let randomGenerator = MockRandomNumberGenerator()
+        randomGenerator.numberToReturn = 59
+        let newTabContinueSetUpSettings = createNewTabContinueSetUpSettings(state: "enabled", url: urlString, firstDay: 5, lastDay: 8, sharePercentage: 60)
+        privacyConfig.featureSettings = newTabContinueSetUpSettings
+        privacyConfigManager.privacyConfig = privacyConfig
+        let manager = PermanentSurveyManager(privacyConfigurationManager: privacyConfigManager, randomNumberGenerator: randomGenerator)
+
+        let isSurveyAvailable = manager.isSurveyAvailable
+
+        XCTAssertFalse(isSurveyAvailable)
+    }
+
+    @MainActor func test_surveyIsEnabled_andInstallInTargetRange_andIsRightLocale_andBucketedOutsideInSureveyShare_ThenPermanentSureveyIsNotAvalable() {
+        let nineDaysAgo = Calendar.current.date(byAdding: .day, value: -9, to: Date())!
+        userDefaults.set(nineDaysAgo, forKey: UserDefaultsWrapper<Date>.Key.firstLaunchDate.rawValue)
+        userDefaults.set(nil, forKey: UserDefaultsWrapper<Bool?>.Key.homePageUserInSurveyShare.rawValue)
+        let urlString = "https://someUrl.com"
+        let randomGenerator = MockRandomNumberGenerator()
+        randomGenerator.numberToReturn = 61
+        let newTabContinueSetUpSettings = createNewTabContinueSetUpSettings(state: "enabled", url: urlString, firstDay: 5, lastDay: 8, sharePercentage: 60)
+        privacyConfig.featureSettings = newTabContinueSetUpSettings
+        privacyConfigManager.privacyConfig = privacyConfig
+        let manager = PermanentSurveyManager(privacyConfigurationManager: privacyConfigManager, randomNumberGenerator: randomGenerator)
+
+        let isSurveyAvailable = manager.isSurveyAvailable
+
+        XCTAssertFalse(isSurveyAvailable)
+    }
+
+    @MainActor func test_surveyIsEnabled_andInstallInTargetRange_andIsRightLocale_andRegisteredOutsideInSureveyShare_ThenPermanentSureveyIsNotAvalable() {
+        let nineDaysAgo = Calendar.current.date(byAdding: .day, value: -9, to: Date())!
+        userDefaults.set(nineDaysAgo, forKey: UserDefaultsWrapper<Date>.Key.firstLaunchDate.rawValue)
+        userDefaults.set(false, forKey: UserDefaultsWrapper<Bool?>.Key.homePageUserInSurveyShare.rawValue)
+        let urlString = "https://someUrl.com"
+        let randomGenerator = MockRandomNumberGenerator()
+        randomGenerator.numberToReturn = 9
+        let newTabContinueSetUpSettings = createNewTabContinueSetUpSettings(state: "enabled", url: urlString, firstDay: 5, lastDay: 8, sharePercentage: 60)
+        privacyConfig.featureSettings = newTabContinueSetUpSettings
+        privacyConfigManager.privacyConfig = privacyConfig
+        let manager = PermanentSurveyManager(privacyConfigurationManager: privacyConfigManager, randomNumberGenerator: randomGenerator)
+
+        let isSurveyAvailable = manager.isSurveyAvailable
+
+        XCTAssertFalse(isSurveyAvailable)
+    }
+
+    @MainActor func test_surveyIsEnabled_andInstallInTargetRange_andIsNotInRightLocale_andInSureveyShare_ThenPermanentSureveyIsNotAvalable() {
+        let nineDaysAgo = Calendar.current.date(byAdding: .day, value: -9, to: Date())!
+        userDefaults.set(nineDaysAgo, forKey: UserDefaultsWrapper<Date>.Key.firstLaunchDate.rawValue)
+        userDefaults.set(false, forKey: UserDefaultsWrapper<Bool?>.Key.homePageUserInSurveyShare.rawValue)
+        let urlString = "https://someUrl.com"
+        let randomGenerator = MockRandomNumberGenerator()
+        randomGenerator.numberToReturn = 9
+        let newTabContinueSetUpSettings = createNewTabContinueSetUpSettings(state: "enabled", url: urlString, localization: "disabled", firstDay: 5, lastDay: 8, sharePercentage: 60)
+        privacyConfig.featureSettings = newTabContinueSetUpSettings
+        privacyConfigManager.privacyConfig = privacyConfig
+        let manager = PermanentSurveyManager(privacyConfigurationManager: privacyConfigManager, randomNumberGenerator: randomGenerator)
+
+        let isSurveyAvailable = manager.isSurveyAvailable
+
+        XCTAssertFalse(isSurveyAvailable)
+    }
+
+    private func createNewTabContinueSetUpSettings(state: String, url: String, localization: String = "enabled", firstDay: Int, lastDay: Int, sharePercentage: Int) -> [String: Any] {
+        let newTabContinueSetUpSettings: [String: Any] = [
+            "permanentSurvey": [
+                "firstDay": firstDay,
+                "lastDay": lastDay,
+                "localization": localization,
+                "sharePercentage": sharePercentage,
+                "state": state,
+                "url": url
+            ]
+        ]
+        return newTabContinueSetUpSettings
+    }
+
+}
+
+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/Menus/MainMenuTests.swift b/UnitTests/Menus/MainMenuTests.swift
index 44ec9cdb11..b3b5f4275e 100644
--- a/UnitTests/Menus/MainMenuTests.swift
+++ b/UnitTests/Menus/MainMenuTests.swift
@@ -18,6 +18,7 @@
 
 import XCTest
 import Combine
+import BrowserServicesKit
 @testable import DuckDuckGo_Privacy_Browser
 
 class MainMenuTests: XCTestCase {
@@ -87,4 +88,26 @@ class MainMenuTests: XCTestCase {
         XCTAssertEqual(manager.reopenLastClosedMenuItem?.keyEquivalent, ReopenMenuItemKeyEquivalentManager.Const.keyEquivalent)
         XCTAssertEqual(manager.reopenLastClosedMenuItem?.keyEquivalentModifierMask, ReopenMenuItemKeyEquivalentManager.Const.modifierMask)
     }
+
+    // MARK: - Bookmarks
+
+    @MainActor
+    func testWhenBookmarksMenuIsInitialized_ThenSecondItemIsBookmarkAllTabs() throws {
+        // GIVEN
+        let sut = MainMenu(featureFlagger: DummyFeatureFlagger(), bookmarkManager: MockBookmarkManager(), faviconManager: FaviconManagerMock(), copyHandler: CopyHandler())
+        let bookmarksMenu = try XCTUnwrap(sut.item(withTitle: UserText.bookmarks))
+
+        // WHEN
+        let result = try XCTUnwrap(bookmarksMenu.submenu?.item(withTitle: UserText.bookmarkAllTabs))
+
+        // THEN
+        XCTAssertEqual(result.keyEquivalent, "d")
+        XCTAssertEqual(result.keyEquivalentModifierMask, [.command, .shift])
+    }
+}
+
+private class DummyFeatureFlagger: FeatureFlagger {
+    func isFeatureOn<F: BrowserServicesKit.FeatureFlagSourceProviding>(forProvider: F) -> Bool {
+        false
+    }
 }
diff --git a/UnitTests/Menus/Mocks/CapturingOptionsButtonMenuDelegate.swift b/UnitTests/Menus/Mocks/CapturingOptionsButtonMenuDelegate.swift
index e37582c4fa..05e9c206e7 100644
--- a/UnitTests/Menus/Mocks/CapturingOptionsButtonMenuDelegate.swift
+++ b/UnitTests/Menus/Mocks/CapturingOptionsButtonMenuDelegate.swift
@@ -23,6 +23,7 @@ class CapturingOptionsButtonMenuDelegate: OptionsButtonMenuDelegate {
 
     var optionsButtonMenuRequestedPreferencesCalled = false
     var optionsButtonMenuRequestedAppearancePreferencesCalled = false
+    var optionsButtonMenuRequestedBookmarkAllOpenTabsCalled = false
 
     func optionsButtonMenuRequestedDataBrokerProtection(_ menu: NSMenu) {
 
@@ -36,6 +37,10 @@ class CapturingOptionsButtonMenuDelegate: OptionsButtonMenuDelegate {
 
     }
 
+    func optionsButtonMenuRequestedBookmarkAllOpenTabs(_ sender: NSMenuItem) {
+        optionsButtonMenuRequestedBookmarkAllOpenTabsCalled = true
+    }
+
     func optionsButtonMenuRequestedBookmarkPopover(_ menu: NSMenu) {
 
     }
diff --git a/UnitTests/Menus/MoreOptionsMenu+BookmarksTests.swift b/UnitTests/Menus/MoreOptionsMenu+BookmarksTests.swift
new file mode 100644
index 0000000000..3888c658a1
--- /dev/null
+++ b/UnitTests/Menus/MoreOptionsMenu+BookmarksTests.swift
@@ -0,0 +1,61 @@
+//
+//  MoreOptionsMenu+BookmarksTests.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 MoreOptionsMenu_BookmarksTests: XCTestCase {
+
+    func testWhenBookmarkSubmenuIsInitThenBookmarkAllTabsKeyIsCmdShiftD() throws {
+        // GIVEN
+        let sut = BookmarksSubMenu(targetting: self, tabCollectionViewModel: .init())
+
+        // WHEN
+        let result = try XCTUnwrap(sut.item(withTitle: UserText.bookmarkAllTabs))
+
+        // THEN
+        XCTAssertEqual(result.keyEquivalent, "d")
+        XCTAssertEqual(result.keyEquivalentModifierMask, [.command, .shift])
+    }
+
+    func testWhenTabCollectionCanBookmarkAllTabsThenBookmarkAllTabsMenuItemIsEnabled() throws {
+        // GIVEN
+        let tab1 = Tab(content: .url(.duckDuckGo, credential: nil, source: .ui))
+        let tab2 = Tab(content: .url(.duckDuckGoEmail, credential: nil, source: .ui))
+        let sut = BookmarksSubMenu(targetting: self, tabCollectionViewModel: .init(tabCollection: .init(tabs: [tab1, tab2])))
+
+        // WHEN
+        let result = try XCTUnwrap(sut.item(withTitle: UserText.bookmarkAllTabs))
+
+        // THEN
+        XCTAssertTrue(result.isEnabled)
+    }
+
+    func testWhenTabCollectionCannotBookmarkAllTabsThenBookmarkAllTabsMenuItemIsDisabled() throws {
+        // GIVEN
+        let sut = BookmarksSubMenu(targetting: self, tabCollectionViewModel: .init(tabCollection: .init(tabs: [])))
+
+        // WHEN
+        let result = try XCTUnwrap(sut.item(withTitle: UserText.bookmarkAllTabs))
+
+        // THEN
+        XCTAssertFalse(result.isEnabled)
+    }
+
+}
diff --git a/UnitTests/Menus/MoreOptionsMenuTests.swift b/UnitTests/Menus/MoreOptionsMenuTests.swift
index 95fe1e0739..6bda1607b7 100644
--- a/UnitTests/Menus/MoreOptionsMenuTests.swift
+++ b/UnitTests/Menus/MoreOptionsMenuTests.swift
@@ -16,15 +16,11 @@
 //  limitations under the License.
 //
 
+import Combine
+import NetworkProtection
+import NetworkProtectionUI
 import XCTest
-
-#if SUBSCRIPTION
 import Subscription
-#endif
-
-#if NETWORK_PROTECTION
-import NetworkProtection
-#endif
 
 @testable import DuckDuckGo_Privacy_Browser
 
@@ -35,27 +31,18 @@ final class MoreOptionsMenuTests: XCTestCase {
     var capturingActionDelegate: CapturingOptionsButtonMenuDelegate!
     @MainActor
     lazy var moreOptionMenu: MoreOptionsMenu! = {
-#if NETWORK_PROTECTION
         let menu = MoreOptionsMenu(tabCollectionViewModel: tabCollectionViewModel,
                                    passwordManagerCoordinator: passwordManagerCoordinator,
                                    networkProtectionFeatureVisibility: networkProtectionVisibilityMock,
                                    sharingMenu: NSMenu(),
                                    internalUserDecider: internalUserDecider)
-#else
-        let menu = MoreOptionsMenu(tabCollectionViewModel: tabCollectionViewModel,
-                                   passwordManagerCoordinator: passwordManagerCoordinator,
-                                   sharingMenu: NSMenu(),
-                                   internalUserDecider: internalUserDecider)
-#endif
         menu.actionDelegate = capturingActionDelegate
         return menu
     }()
 
     var internalUserDecider: InternalUserDeciderMock!
 
-#if NETWORK_PROTECTION
     var networkProtectionVisibilityMock: NetworkProtectionVisibilityMock!
-#endif
 
     @MainActor
     override func setUp() {
@@ -65,9 +52,7 @@ final class MoreOptionsMenuTests: XCTestCase {
         capturingActionDelegate = CapturingOptionsButtonMenuDelegate()
         internalUserDecider = InternalUserDeciderMock()
 
-#if NETWORK_PROTECTION
         networkProtectionVisibilityMock = NetworkProtectionVisibilityMock(isInstalled: false, visible: false)
-#endif
     }
 
     @MainActor
@@ -80,19 +65,12 @@ final class MoreOptionsMenuTests: XCTestCase {
     }
 
     @MainActor
-    func testThatMoreOptionMenuHasTheExpectedItems_WhenNetworkProtectionIsEnabled() {
-#if NETWORK_PROTECTION
+    func testThatMoreOptionMenuHasTheExpectedItems() {
         moreOptionMenu = MoreOptionsMenu(tabCollectionViewModel: tabCollectionViewModel,
                                          passwordManagerCoordinator: passwordManagerCoordinator,
                                          networkProtectionFeatureVisibility: NetworkProtectionVisibilityMock(isInstalled: false, visible: true),
                                          sharingMenu: NSMenu(),
                                          internalUserDecider: internalUserDecider)
-#else
-        moreOptionMenu = MoreOptionsMenu(tabCollectionViewModel: tabCollectionViewModel,
-                                         passwordManagerCoordinator: passwordManagerCoordinator,
-                                         sharingMenu: NSMenu(),
-                                         internalUserDecider: internalUserDecider)
-#endif
 
         XCTAssertEqual(moreOptionMenu.items[0].title, UserText.sendFeedback)
         XCTAssertTrue(moreOptionMenu.items[1].isSeparatorItem)
@@ -108,7 +86,6 @@ final class MoreOptionsMenuTests: XCTestCase {
         XCTAssertTrue(moreOptionMenu.items[11].isSeparatorItem)
         XCTAssertEqual(moreOptionMenu.items[12].title, UserText.emailOptionsMenuItem)
 
-#if NETWORK_PROTECTION
         if AccountManager(subscriptionAppGroup: Bundle.main.appGroup(bundle: .subs)).isUserAuthenticated {
             XCTAssertTrue(moreOptionMenu.items[13].isSeparatorItem)
             XCTAssertTrue(moreOptionMenu.items[14].title.hasPrefix(UserText.networkProtection))
@@ -121,54 +98,6 @@ final class MoreOptionsMenuTests: XCTestCase {
             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)
-#endif
-    }
-
-    @MainActor
-    func testThatMoreOptionMenuHasTheExpectedItems_WhenNetworkProtectionIsDisabled() {
-#if NETWORK_PROTECTION
-        moreOptionMenu = MoreOptionsMenu(tabCollectionViewModel: tabCollectionViewModel,
-                                         passwordManagerCoordinator: passwordManagerCoordinator,
-                                         networkProtectionFeatureVisibility: NetworkProtectionVisibilityMock(isInstalled: false, visible: false),
-                                         sharingMenu: NSMenu(),
-                                         internalUserDecider: internalUserDecider)
-#else
-        moreOptionMenu = MoreOptionsMenu(tabCollectionViewModel: tabCollectionViewModel,
-                                         passwordManagerCoordinator: passwordManagerCoordinator,
-                                         sharingMenu: NSMenu(),
-                                         internalUserDecider: internalUserDecider)
-#endif
-
-        XCTAssertEqual(moreOptionMenu.items[0].title, UserText.sendFeedback)
-        XCTAssertTrue(moreOptionMenu.items[1].isSeparatorItem)
-        XCTAssertEqual(moreOptionMenu.items[2].title, UserText.plusButtonNewTabMenuItem)
-        XCTAssertEqual(moreOptionMenu.items[3].title, UserText.newWindowMenuItem)
-        XCTAssertEqual(moreOptionMenu.items[4].title, UserText.newBurnerWindowMenuItem)
-        XCTAssertTrue(moreOptionMenu.items[5].isSeparatorItem)
-        XCTAssertEqual(moreOptionMenu.items[6].title, UserText.zoom)
-        XCTAssertTrue(moreOptionMenu.items[7].isSeparatorItem)
-        XCTAssertEqual(moreOptionMenu.items[8].title, UserText.bookmarks)
-        XCTAssertEqual(moreOptionMenu.items[9].title, UserText.downloads)
-        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
@@ -194,10 +123,29 @@ final class MoreOptionsMenuTests: XCTestCase {
         XCTAssertTrue(capturingActionDelegate.optionsButtonMenuRequestedPreferencesCalled)
     }
 
+    // MARK: - Bookmarks
+
+    @MainActor
+    func testWhenClickingOnBookmarkAllTabsMenuItemThenTheActionDelegateIsAlerted() throws {
+        // GIVEN
+        let bookmarksMenu = try XCTUnwrap(moreOptionMenu.item(at: 8)?.submenu)
+        let bookmarkAllTabsIndex = try XCTUnwrap(bookmarksMenu.indexOfItem(withTitle: UserText.bookmarkAllTabs))
+        let bookmarkAllTabsMenuItem = try XCTUnwrap(bookmarksMenu.items[bookmarkAllTabsIndex])
+        bookmarkAllTabsMenuItem.isEnabled = true
+
+        // WHEN
+        bookmarksMenu.performActionForItem(at: bookmarkAllTabsIndex)
+
+        // THEN
+        XCTAssertTrue(capturingActionDelegate.optionsButtonMenuRequestedBookmarkAllOpenTabsCalled)
+    }
+
 }
 
-#if NETWORK_PROTECTION
 final class NetworkProtectionVisibilityMock: NetworkProtectionFeatureVisibility {
+    var onboardStatusPublisher: AnyPublisher<NetworkProtectionUI.OnboardingStatus, Never> {
+        Just(.default).eraseToAnyPublisher()
+    }
 
     var isInstalled: Bool
     var visible: Bool
@@ -215,10 +163,6 @@ final class NetworkProtectionVisibilityMock: NetworkProtectionFeatureVisibility
         return !visible
     }
 
-    func isNetworkProtectionBetaVisible() -> Bool {
-        return visible
-    }
-
     func canStartVPN() async throws -> Bool {
         return false
     }
@@ -227,10 +171,6 @@ final class NetworkProtectionVisibilityMock: NetworkProtectionFeatureVisibility
         // intentional no-op
     }
 
-    func disableForWaitlistUsers() {
-        // intentional no-op
-    }
-
     var isEligibleForThankYouMessage: Bool {
         false
     }
@@ -239,4 +179,3 @@ final class NetworkProtectionVisibilityMock: NetworkProtectionFeatureVisibility
         return false
     }
 }
-#endif
diff --git a/UnitTests/NavigationBar/LocalPinningManagerTests.swift b/UnitTests/NavigationBar/LocalPinningManagerTests.swift
index 9c57966d62..5cf5cf7962 100644
--- a/UnitTests/NavigationBar/LocalPinningManagerTests.swift
+++ b/UnitTests/NavigationBar/LocalPinningManagerTests.swift
@@ -17,14 +17,10 @@
 //
 
 import XCTest
-
-#if NETWORK_PROTECTION
 import NetworkProtection
-#endif
 
 @testable import DuckDuckGo_Privacy_Browser
 
-#if NETWORK_PROTECTION
 private struct NetworkProtectionFeatureActivationMock: NetworkProtectionFeatureActivation {
 
     let activated: Bool = true
@@ -33,7 +29,6 @@ private struct NetworkProtectionFeatureActivationMock: NetworkProtectionFeatureA
         activated
     }
 }
-#endif
 
 final class LocalPinningManagerTests: XCTestCase {
 
@@ -48,11 +43,7 @@ final class LocalPinningManagerTests: XCTestCase {
     }
 
     private func createManager() -> LocalPinningManager {
-#if NETWORK_PROTECTION
         return LocalPinningManager(networkProtectionFeatureActivation: NetworkProtectionFeatureActivationMock())
-#else
-        return LocalPinningManager()
-#endif
     }
 
     func testWhenTogglingPinningForAView_AndViewIsNotPinned_ThenViewBecomesPinned() {
diff --git a/UnitTests/NavigationBar/View/NavigationBarPopoversTests.swift b/UnitTests/NavigationBar/View/NavigationBarPopoversTests.swift
index 461c0109be..091f73f4d9 100644
--- a/UnitTests/NavigationBar/View/NavigationBarPopoversTests.swift
+++ b/UnitTests/NavigationBar/View/NavigationBarPopoversTests.swift
@@ -29,12 +29,7 @@ final class NavigationBarPopoversTests: XCTestCase {
 
     override func setUpWithError() throws {
         autofillPopoverPresenter = MockAutofillPopoverPresenter()
-
-        #if NETWORK_PROTECTION
             sut = NavigationBarPopovers(networkProtectionPopoverManager: NetPPopoverManagerMock(), autofillPopoverPresenter: autofillPopoverPresenter)
-        #else
-            sut = NavigationBarPopovers(passwordPopoverPresenter: popoverPresenter)
-        #endif
     }
 
     func testSetsPasswordPopoverDomainOnPopover() throws {
diff --git a/UnitTests/NetworkProtection/DefaultVPNLocationFormatterTests.swift b/UnitTests/NetworkProtection/DefaultVPNLocationFormatterTests.swift
new file mode 100644
index 0000000000..e9abed7230
--- /dev/null
+++ b/UnitTests/NetworkProtection/DefaultVPNLocationFormatterTests.swift
@@ -0,0 +1,90 @@
+//
+//  DefaultVPNLocationFormatterTests.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 XCTest
+@testable import DuckDuckGo_Privacy_Browser
+@testable import NetworkProtection
+
+final class DefaultVPNLocationFormatterTests: XCTestCase {
+    private var formatter: DefaultVPNLocationFormatter!
+
+    override func setUp() {
+        formatter = DefaultVPNLocationFormatter()
+    }
+
+    func testUSLocation() {
+        let server = NetworkProtectionServerInfo.ServerAttributes(city: "Lafayette", country: "us", state: "la")
+        let preferredLocation = VPNSettings.SelectedLocation.location(.init(country: "us"))
+        let otherPreferredLocation = VPNSettings.SelectedLocation.location(.init(country: "gb"))
+
+        XCTAssertNil(formatter.emoji(for: nil, preferredLocation: .nearest))
+        XCTAssertEqual(formatter.emoji(for: nil, preferredLocation: preferredLocation), "🇺🇸")
+        XCTAssertEqual(formatter.emoji(for: nil, preferredLocation: otherPreferredLocation), "🇬🇧")
+        XCTAssertEqual(formatter.emoji(for: server.country, preferredLocation: preferredLocation), "🇺🇸")
+        XCTAssertEqual(formatter.emoji(for: server.country, preferredLocation: otherPreferredLocation), "🇺🇸")
+
+        XCTAssertEqual(formatter.string(from: nil, preferredLocation: .nearest), "Nearest Location")
+        XCTAssertEqual(formatter.string(from: nil, preferredLocation: preferredLocation), "United States")
+        XCTAssertEqual(formatter.string(from: nil, preferredLocation: otherPreferredLocation), "United Kingdom")
+        XCTAssertEqual(formatter.string(from: server.serverLocation, preferredLocation: .nearest), "Lafayette, United States (Nearest)")
+        XCTAssertEqual(formatter.string(from: server.serverLocation, preferredLocation: preferredLocation), "Lafayette, United States")
+        XCTAssertEqual(formatter.string(from: server.serverLocation, preferredLocation: otherPreferredLocation), "Lafayette, United States")
+
+        if #available(macOS 12, *) {
+            XCTAssertEqual(NSAttributedString(formatter.string(from: server.serverLocation,
+                                                               preferredLocation: .nearest,
+                                                               locationTextColor: .black,
+                                                               preferredLocationTextColor: .black)).string, "Lafayette, United States (Nearest)")
+            XCTAssertEqual(NSAttributedString(formatter.string(from: server.serverLocation,
+                                                               preferredLocation: preferredLocation,
+                                                               locationTextColor: .black,
+                                                               preferredLocationTextColor: .black)).string, "Lafayette, United States")
+        }
+    }
+
+    func testCALocation() {
+        let server = NetworkProtectionServerInfo.ServerAttributes(city: "Toronto", country: "ca", state: "on")
+        let preferredLocation = VPNSettings.SelectedLocation.location(.init(country: "ca"))
+        let otherPreferredLocation = VPNSettings.SelectedLocation.location(.init(country: "gb"))
+
+        XCTAssertNil(formatter.emoji(for: nil, preferredLocation: .nearest))
+        XCTAssertEqual(formatter.emoji(for: nil, preferredLocation: preferredLocation), "🇨🇦")
+        XCTAssertEqual(formatter.emoji(for: nil, preferredLocation: otherPreferredLocation), "🇬🇧")
+        XCTAssertEqual(formatter.emoji(for: server.country, preferredLocation: preferredLocation), "🇨🇦")
+        XCTAssertEqual(formatter.emoji(for: server.country, preferredLocation: otherPreferredLocation), "🇨🇦")
+
+        XCTAssertEqual(formatter.string(from: nil, preferredLocation: .nearest), "Nearest Location")
+        XCTAssertEqual(formatter.string(from: nil, preferredLocation: preferredLocation), "Canada")
+        XCTAssertEqual(formatter.string(from: nil, preferredLocation: otherPreferredLocation), "United Kingdom")
+        XCTAssertEqual(formatter.string(from: server.serverLocation, preferredLocation: .nearest), "Toronto, Canada (Nearest)")
+        XCTAssertEqual(formatter.string(from: server.serverLocation, preferredLocation: preferredLocation), "Toronto, Canada")
+        XCTAssertEqual(formatter.string(from: server.serverLocation, preferredLocation: otherPreferredLocation), "Toronto, Canada")
+
+        if #available(macOS 12, *) {
+            XCTAssertEqual(NSAttributedString(formatter.string(from: server.serverLocation,
+                                                               preferredLocation: .nearest,
+                                                               locationTextColor: .black,
+                                                               preferredLocationTextColor: .black)).string, "Toronto, Canada (Nearest)")
+            XCTAssertEqual(NSAttributedString(formatter.string(from: server.serverLocation,
+                                                               preferredLocation: preferredLocation,
+                                                               locationTextColor: .black,
+                                                               preferredLocationTextColor: .black)).string, "Toronto, Canada")
+        }
+    }
+}
diff --git a/UnitTests/NetworkProtection/Mocks/MockVPNLocationFormatter.swift b/UnitTests/NetworkProtection/Mocks/MockVPNLocationFormatter.swift
new file mode 100644
index 0000000000..579ba6e4ff
--- /dev/null
+++ b/UnitTests/NetworkProtection/Mocks/MockVPNLocationFormatter.swift
@@ -0,0 +1,37 @@
+//
+//  MockVPNLocationFormatter.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 NetworkProtection
+@testable import DuckDuckGo_Privacy_Browser
+
+struct MockVPNLocationFormatter: VPNLocationFormatting {
+    func emoji(for country: String?, preferredLocation someLocation: VPNSettings.SelectedLocation) -> String? {
+        nil
+    }
+
+    func string(from location: String?, preferredLocation: NetworkProtection.VPNSettings.SelectedLocation) -> String {
+        ""
+    }
+
+    @available(macOS 12, *)
+    func string(from location: String?, preferredLocation: NetworkProtection.VPNSettings.SelectedLocation, locationTextColor: Color, preferredLocationTextColor: Color) -> AttributedString {
+        ""
+    }
+}
diff --git a/UnitTests/NetworkProtection/NetworkProtectionIPCTunnelControllerTests.swift b/UnitTests/NetworkProtection/NetworkProtectionIPCTunnelControllerTests.swift
new file mode 100644
index 0000000000..b2376ee397
--- /dev/null
+++ b/UnitTests/NetworkProtection/NetworkProtectionIPCTunnelControllerTests.swift
@@ -0,0 +1,138 @@
+//
+//  NetworkProtectionIPCTunnelControllerTests.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 Combine
+import Foundation
+import NetworkProtection
+import PixelKit
+import PixelKitTestingUtilities
+import XCTest
+@testable import DuckDuckGo_Privacy_Browser
+
+final class NetworkProtectionIPCTunnelControllerTests: XCTestCase {
+
+    // MARK: - Tunnel Start Tests
+
+    func testStartTunnelSuccess() async {
+        let pixelKit = PixelKitMock(expecting: [
+            .init(pixel: NetworkProtectionIPCTunnelController.StartAttempt.begin, frequency: .standard),
+            .init(pixel: NetworkProtectionIPCTunnelController.StartAttempt.success, frequency: .dailyAndCount)
+        ])
+        let controller = NetworkProtectionIPCTunnelController(
+            featureVisibility: MockFeatureVisibility(),
+            loginItemsManager: MockLoginItemsManager(mockResult: .success),
+            ipcClient: MockIPCClient(),
+            pixelKit: pixelKit)
+
+        await controller.start()
+
+        pixelKit.verifyExpectations(file: #file, line: #line)
+    }
+
+    func testStartTunnelLoginItemFailure() async {
+        let error = NSError(domain: "test", code: 1)
+        let expectedError = NetworkProtectionIPCTunnelController.RequestError.internalLoginItemError(error)
+
+        let pixelKit = PixelKitMock(expecting: [
+            .init(pixel: NetworkProtectionIPCTunnelController.StartAttempt.begin, frequency: .standard),
+            .init(pixel: NetworkProtectionIPCTunnelController.StartAttempt.failure(expectedError), frequency: .dailyAndCount)
+        ])
+
+        let controller = NetworkProtectionIPCTunnelController(
+            featureVisibility: MockFeatureVisibility(),
+            loginItemsManager: MockLoginItemsManager(mockResult: .failure(error)),
+            ipcClient: MockIPCClient(),
+            pixelKit: pixelKit)
+
+        await controller.start()
+
+        pixelKit.verifyExpectations(file: #file, line: #line)
+    }
+
+    func testStartTunnelIPCFailure() async {
+        let error = NSError(domain: "test", code: 1)
+        let pixelKit = PixelKitMock(expecting: [
+            .init(pixel: NetworkProtectionIPCTunnelController.StartAttempt.begin, frequency: .standard),
+            .init(pixel: NetworkProtectionIPCTunnelController.StartAttempt.failure(error), frequency: .dailyAndCount)
+        ])
+        let controller = NetworkProtectionIPCTunnelController(
+            featureVisibility: MockFeatureVisibility(),
+            loginItemsManager: MockLoginItemsManager(mockResult: .success),
+            ipcClient: MockIPCClient(error: error),
+            pixelKit: pixelKit)
+
+        await controller.start()
+
+        pixelKit.verifyExpectations(file: #file, line: #line)
+    }
+
+    // MARK: - Tunnel Stop Tests
+
+    func testStopTunnelSuccess() async {
+        let pixelKit = PixelKitMock(expecting: [
+            .init(pixel: NetworkProtectionIPCTunnelController.StopAttempt.begin, frequency: .standard),
+            .init(pixel: NetworkProtectionIPCTunnelController.StopAttempt.success, frequency: .dailyAndCount)
+        ])
+        let controller = NetworkProtectionIPCTunnelController(
+            featureVisibility: MockFeatureVisibility(),
+            loginItemsManager: MockLoginItemsManager(mockResult: .success),
+            ipcClient: MockIPCClient(),
+            pixelKit: pixelKit)
+
+        await controller.stop()
+
+        pixelKit.verifyExpectations(file: #file, line: #line)
+    }
+
+    func testStopTunnelLoginItemFailure() async {
+        let error = NSError(domain: "test", code: 1)
+        let expectedError = NetworkProtectionIPCTunnelController.RequestError.internalLoginItemError(error)
+
+        let pixelKit = PixelKitMock(expecting: [
+            .init(pixel: NetworkProtectionIPCTunnelController.StopAttempt.begin, frequency: .standard),
+            .init(pixel: NetworkProtectionIPCTunnelController.StopAttempt.failure(expectedError), frequency: .dailyAndCount)
+        ])
+
+        let controller = NetworkProtectionIPCTunnelController(
+            featureVisibility: MockFeatureVisibility(),
+            loginItemsManager: MockLoginItemsManager(mockResult: .failure(error)),
+            ipcClient: MockIPCClient(),
+            pixelKit: pixelKit)
+
+        await controller.stop()
+
+        pixelKit.verifyExpectations(file: #file, line: #line)
+    }
+
+    func testStopTunnelIPCFailure() async {
+        let error = NSError(domain: "test", code: 1)
+        let pixelKit = PixelKitMock(expecting: [
+            .init(pixel: NetworkProtectionIPCTunnelController.StopAttempt.begin, frequency: .standard),
+            .init(pixel: NetworkProtectionIPCTunnelController.StopAttempt.failure(error), frequency: .dailyAndCount)
+        ])
+        let controller = NetworkProtectionIPCTunnelController(
+            featureVisibility: MockFeatureVisibility(),
+            loginItemsManager: MockLoginItemsManager(mockResult: .success),
+            ipcClient: MockIPCClient(error: error),
+            pixelKit: pixelKit)
+
+        await controller.stop()
+
+        pixelKit.verifyExpectations(file: #file, line: #line)
+    }
+}
diff --git a/UnitTests/NetworkProtection/NetworkProtectionPixelEventTests.swift b/UnitTests/NetworkProtection/NetworkProtectionPixelEventTests.swift
index 225fc36fcd..cd60e9adf7 100644
--- a/UnitTests/NetworkProtection/NetworkProtectionPixelEventTests.swift
+++ b/UnitTests/NetworkProtection/NetworkProtectionPixelEventTests.swift
@@ -16,8 +16,6 @@
 //  limitations under the License.
 //
 
-#if NETWORK_PROTECTION
-
 import NetworkProtection
 import PixelKit
 import PixelKitTestingUtilities
@@ -64,164 +62,200 @@ final class NetworkProtectionPixelEventTests: XCTestCase {
     ///
     func testVPNPixelFireExpectations() {
         fire(NetworkProtectionPixelEvent.networkProtectionActiveUser,
+             frequency: .legacyDaily,
              and: .expect(pixelName: "m_mac_netp_daily_active"),
              file: #filePath,
              line: #line)
         fire(NetworkProtectionPixelEvent.networkProtectionNewUser,
+             frequency: .unique,
              and: .expect(pixelName: "m_mac_netp_daily_active_u"),
              file: #filePath,
              line: #line)
         fire(NetworkProtectionPixelEvent.networkProtectionControllerStartAttempt,
+             frequency: .dailyAndCount,
              and: .expect(pixelName: "m_mac_netp_controller_start_attempt"),
              file: #filePath,
              line: #line)
         fire(NetworkProtectionPixelEvent.networkProtectionControllerStartFailure(TestError.testError),
+             frequency: .dailyAndCount,
              and: .expect(pixelName: "m_mac_netp_controller_start_failure",
                           error: TestError.testError,
-                          underlyingError: TestError.underlyingError),
+                          underlyingErrors: [TestError.underlyingError]),
              file: #filePath,
              line: #line)
         fire(NetworkProtectionPixelEvent.networkProtectionControllerStartSuccess,
+             frequency: .dailyAndCount,
              and: .expect(pixelName: "m_mac_netp_controller_start_success"),
              file: #filePath,
              line: #line)
         fire(NetworkProtectionPixelEvent.networkProtectionTunnelStartAttempt,
+             frequency: .dailyAndCount,
              and: .expect(pixelName: "m_mac_netp_tunnel_start_attempt"),
              file: #filePath,
              line: #line)
         fire(NetworkProtectionPixelEvent.networkProtectionTunnelStartFailure(TestError.testError),
+             frequency: .dailyAndCount,
              and: .expect(pixelName: "m_mac_netp_tunnel_start_failure",
                           error: TestError.testError,
-                          underlyingError: TestError.underlyingError),
+                          underlyingErrors: [TestError.underlyingError]),
              file: #filePath,
              line: #line)
         fire(NetworkProtectionPixelEvent.networkProtectionTunnelStartSuccess,
+             frequency: .dailyAndCount,
              and: .expect(pixelName: "m_mac_netp_tunnel_start_success"),
              file: #filePath,
              line: #line)
         fire(NetworkProtectionPixelEvent.networkProtectionTunnelUpdateAttempt,
+             frequency: .dailyAndCount,
              and: .expect(pixelName: "m_mac_netp_tunnel_update_attempt"),
              file: #filePath,
              line: #line)
         fire(NetworkProtectionPixelEvent.networkProtectionTunnelUpdateFailure(TestError.testError),
+             frequency: .dailyAndCount,
              and: .expect(pixelName: "m_mac_netp_tunnel_update_failure",
                           error: TestError.testError,
-                          underlyingError: TestError.underlyingError),
+                          underlyingErrors: [TestError.underlyingError]),
              file: #filePath,
              line: #line)
         fire(NetworkProtectionPixelEvent.networkProtectionTunnelUpdateSuccess,
+             frequency: .dailyAndCount,
              and: .expect(pixelName: "m_mac_netp_tunnel_update_success"),
              file: #filePath,
              line: #line)
         fire(NetworkProtectionPixelEvent.networkProtectionEnableAttemptConnecting,
+             frequency: .dailyAndCount,
              and: .expect(pixelName: "m_mac_netp_ev_enable_attempt"),
              file: #filePath,
              line: #line)
         fire(NetworkProtectionPixelEvent.networkProtectionEnableAttemptSuccess,
+             frequency: .dailyAndCount,
              and: .expect(pixelName: "m_mac_netp_ev_enable_attempt_success"),
              file: #filePath,
              line: #line)
         fire(NetworkProtectionPixelEvent.networkProtectionEnableAttemptFailure,
+             frequency: .dailyAndCount,
              and: .expect(pixelName: "m_mac_netp_ev_enable_attempt_failure"),
              file: #filePath,
              line: #line)
         fire(NetworkProtectionPixelEvent.networkProtectionTunnelFailureDetected,
+             frequency: .dailyAndCount,
              and: .expect(pixelName: "m_mac_netp_ev_tunnel_failure"),
              file: #filePath,
              line: #line)
         fire(NetworkProtectionPixelEvent.networkProtectionTunnelFailureRecovered,
+             frequency: .dailyAndCount,
              and: .expect(pixelName: "m_mac_netp_ev_tunnel_failure_recovered"),
              file: #filePath,
              line: #line)
         fire(NetworkProtectionPixelEvent.networkProtectionLatency(quality: .excellent),
+             frequency: .dailyAndCount,
              and: .expect(pixelName: "m_mac_netp_ev_\(NetworkProtectionLatencyMonitor.ConnectionQuality.excellent.rawValue)_latency"),
              file: #filePath,
              line: #line)
         fire(NetworkProtectionPixelEvent.networkProtectionLatencyError,
+             frequency: .legacyDaily,
              and: .expect(pixelName: "m_mac_netp_ev_latency_error"),
              file: #filePath,
              line: #line)
         fire(NetworkProtectionPixelEvent.networkProtectionTunnelConfigurationNoServerRegistrationInfo,
+             frequency: .dailyAndCount,
              and: .expect(pixelName: "m_mac_netp_tunnel_config_error_no_server_registration_info"),
              file: #filePath,
              line: #line)
         fire(NetworkProtectionPixelEvent.networkProtectionTunnelConfigurationCouldNotSelectClosestServer,
+             frequency: .dailyAndCount,
              and: .expect(pixelName: "m_mac_netp_tunnel_config_error_could_not_select_closest_server"),
              file: #filePath,
              line: #line)
         fire(NetworkProtectionPixelEvent.networkProtectionTunnelConfigurationCouldNotGetPeerPublicKey,
+             frequency: .dailyAndCount,
              and: .expect(pixelName: "m_mac_netp_tunnel_config_error_could_not_get_peer_public_key"),
              file: #filePath,
              line: #line)
         fire(NetworkProtectionPixelEvent.networkProtectionTunnelConfigurationCouldNotGetPeerHostName,
+             frequency: .dailyAndCount,
              and: .expect(pixelName: "m_mac_netp_tunnel_config_error_could_not_get_peer_host_name"),
              file: #filePath,
              line: #line)
         fire(NetworkProtectionPixelEvent.networkProtectionTunnelConfigurationCouldNotGetInterfaceAddressRange,
+             frequency: .dailyAndCount,
              and: .expect(pixelName: "m_mac_netp_tunnel_config_error_could_not_get_interface_address_range"),
              file: #filePath,
              line: #line)
         fire(NetworkProtectionPixelEvent.networkProtectionClientFailedToFetchServerList(TestError.testError),
+             frequency: .dailyAndCount,
              and: .expect(pixelName: "m_mac_netp_backend_api_error_failed_to_fetch_server_list",
                           error: TestError.testError,
-                          underlyingError: TestError.underlyingError),
+                          underlyingErrors: [TestError.underlyingError]),
              file: #filePath,
              line: #line)
         fire(NetworkProtectionPixelEvent.networkProtectionClientFailedToParseServerListResponse,
+             frequency: .dailyAndCount,
              and: .expect(pixelName: "m_mac_netp_backend_api_error_parsing_server_list_response_failed"),
              file: #filePath,
              line: #line)
         fire(NetworkProtectionPixelEvent.networkProtectionClientFailedToEncodeRegisterKeyRequest,
+             frequency: .dailyAndCount,
              and: .expect(pixelName: "m_mac_netp_backend_api_error_encoding_register_request_body_failed"),
              file: #filePath,
              line: #line)
         fire(NetworkProtectionPixelEvent.networkProtectionClientFailedToFetchRegisteredServers(TestError.testError),
+             frequency: .dailyAndCount,
              and: .expect(pixelName: "m_mac_netp_backend_api_error_failed_to_fetch_registered_servers",
                           error: TestError.testError,
-                          underlyingError: TestError.underlyingError),
+                          underlyingErrors: [TestError.underlyingError]),
              file: #filePath,
              line: #line)
         fire(NetworkProtectionPixelEvent.networkProtectionClientFailedToParseRegisteredServersResponse,
+             frequency: .dailyAndCount,
              and: .expect(pixelName: "m_mac_netp_backend_api_error_parsing_device_registration_response_failed"),
              file: #filePath,
              line: #line)
         fire(NetworkProtectionPixelEvent.networkProtectionClientFailedToEncodeRedeemRequest,
+             frequency: .dailyAndCount,
              and: .expect(pixelName: "m_mac_netp_backend_api_error_encoding_redeem_request_body_failed"),
              file: #filePath,
              line: #line)
         fire(NetworkProtectionPixelEvent.networkProtectionClientInvalidInviteCode,
+             frequency: .dailyAndCount,
              and: .expect(pixelName: "m_mac_netp_backend_api_error_invalid_invite_code"),
              file: #filePath,
              line: #line)
         fire(NetworkProtectionPixelEvent.networkProtectionClientFailedToRedeemInviteCode(TestError.testError),
+             frequency: .dailyAndCount,
              and: .expect(pixelName: "m_mac_netp_backend_api_error_failed_to_redeem_invite_code",
                           error: TestError.testError,
-                          underlyingError: TestError.underlyingError),
+                          underlyingErrors: [TestError.underlyingError]),
              file: #filePath,
              line: #line)
         fire(NetworkProtectionPixelEvent.networkProtectionClientFailedToParseRedeemResponse(TestError.testError),
+             frequency: .dailyAndCount,
              and: .expect(pixelName: "m_mac_netp_backend_api_error_parsing_redeem_response_failed",
                           error: TestError.testError,
-                          underlyingError: TestError.underlyingError),
+                          underlyingErrors: [TestError.underlyingError]),
              file: #filePath,
              line: #line)
         fire(NetworkProtectionPixelEvent.networkProtectionClientFailedToFetchLocations(TestError.testError),
+             frequency: .dailyAndCount,
              and: .expect(pixelName: "m_mac_netp_backend_api_error_failed_to_fetch_location_list",
                           error: TestError.testError,
-                          underlyingError: TestError.underlyingError),
+                          underlyingErrors: [TestError.underlyingError]),
              file: #filePath,
              line: #line)
         fire(NetworkProtectionPixelEvent.networkProtectionClientFailedToParseLocationsResponse(TestError.testError),
+             frequency: .dailyAndCount,
              and: .expect(pixelName: "m_mac_netp_backend_api_error_parsing_location_list_response_failed",
                           error: TestError.testError,
-                          underlyingError: TestError.underlyingError),
+                          underlyingErrors: [TestError.underlyingError]),
              file: #filePath,
              line: #line)
         fire(NetworkProtectionPixelEvent.networkProtectionClientInvalidAuthToken,
+             frequency: .dailyAndCount,
              and: .expect(pixelName: "m_mac_netp_backend_api_error_invalid_auth_token"),
              file: #filePath,
              line: #line)
         fire(NetworkProtectionPixelEvent.networkProtectionKeychainErrorFailedToCastKeychainValueToData(field: "field"),
+             frequency: .dailyAndCount,
              and: .expect(pixelName: "m_mac_netp_keychain_error_failed_to_cast_keychain_value_to_data",
                           customFields: [
                             PixelKit.Parameters.keychainFieldName: "field",
@@ -229,6 +263,7 @@ final class NetworkProtectionPixelEventTests: XCTestCase {
              file: #filePath,
              line: #line)
         fire(NetworkProtectionPixelEvent.networkProtectionKeychainReadError(field: "field", status: 1),
+             frequency: .dailyAndCount,
              and: .expect(pixelName: "m_mac_netp_keychain_error_read_failed",
                           customFields: [
                             PixelKit.Parameters.keychainFieldName: "field",
@@ -237,6 +272,7 @@ final class NetworkProtectionPixelEventTests: XCTestCase {
              file: #filePath,
              line: #line)
         fire(NetworkProtectionPixelEvent.networkProtectionKeychainWriteError(field: "field", status: 1),
+             frequency: .dailyAndCount,
              and: .expect(pixelName: "m_mac_netp_keychain_error_write_failed",
                           customFields: [
                             PixelKit.Parameters.keychainFieldName: "field",
@@ -245,6 +281,7 @@ final class NetworkProtectionPixelEventTests: XCTestCase {
              file: #filePath,
              line: #line)
         fire(NetworkProtectionPixelEvent.networkProtectionKeychainUpdateError(field: "field", status: 1),
+             frequency: .dailyAndCount,
              and: .expect(pixelName: "m_mac_netp_keychain_error_update_failed",
                           customFields: [
                             PixelKit.Parameters.keychainFieldName: "field",
@@ -253,6 +290,7 @@ final class NetworkProtectionPixelEventTests: XCTestCase {
              file: #filePath,
              line: #line)
         fire(NetworkProtectionPixelEvent.networkProtectionKeychainDeleteError(status: 1),
+             frequency: .dailyAndCount,
              and: .expect(pixelName: "m_mac_netp_keychain_error_delete_failed",
                           customFields: [
                             PixelKit.Parameters.errorCode: "1"
@@ -260,10 +298,12 @@ final class NetworkProtectionPixelEventTests: XCTestCase {
              file: #filePath,
              line: #line)
         fire(NetworkProtectionPixelEvent.networkProtectionWireguardErrorCannotLocateTunnelFileDescriptor,
+             frequency: .dailyAndCount,
              and: .expect(pixelName: "m_mac_netp_wireguard_error_cannot_locate_tunnel_file_descriptor"),
              file: #filePath,
              line: #line)
         fire(NetworkProtectionPixelEvent.networkProtectionWireguardErrorInvalidState(reason: "reason"),
+             frequency: .dailyAndCount,
              and: .expect(pixelName: "m_mac_netp_wireguard_error_invalid_state",
                           customFields: [
                             PixelKit.Parameters.reason: "reason"
@@ -271,16 +311,19 @@ final class NetworkProtectionPixelEventTests: XCTestCase {
              file: #filePath,
              line: #line)
         fire(NetworkProtectionPixelEvent.networkProtectionWireguardErrorFailedDNSResolution,
+             frequency: .dailyAndCount,
              and: .expect(pixelName: "m_mac_netp_wireguard_error_failed_dns_resolution"),
              file: #filePath,
              line: #line)
         fire(NetworkProtectionPixelEvent.networkProtectionWireguardErrorCannotSetNetworkSettings(TestError.testError),
+             frequency: .dailyAndCount,
              and: .expect(pixelName: "m_mac_netp_wireguard_error_cannot_set_network_settings",
                                  error: TestError.testError,
-                                 underlyingError: TestError.underlyingError),
+                                 underlyingErrors: [TestError.underlyingError]),
              file: #filePath,
              line: #line)
         fire(NetworkProtectionPixelEvent.networkProtectionWireguardErrorCannotStartWireguardBackend(code: 1),
+             frequency: .dailyAndCount,
              and: .expect(pixelName: "m_mac_netp_wireguard_error_cannot_start_wireguard_backend",
                           customFields: [
                             PixelKit.Parameters.errorCode: "1"
@@ -288,31 +331,39 @@ final class NetworkProtectionPixelEventTests: XCTestCase {
              file: #filePath,
              line: #line)
         fire(NetworkProtectionPixelEvent.networkProtectionNoAuthTokenFoundError,
+             frequency: .standard,
              and: .expect(pixelName: "m_mac_netp_no_auth_token_found_error"),
              file: #filePath,
              line: #line)
         fire(NetworkProtectionPixelEvent.networkProtectionRekeyAttempt,
+             frequency: .dailyAndCount,
              and: .expect(pixelName: "m_mac_netp_rekey_attempt"),
              file: #filePath,
              line: #line)
         fire(NetworkProtectionPixelEvent.networkProtectionRekeyCompleted,
+             frequency: .dailyAndCount,
              and: .expect(pixelName: "m_mac_netp_rekey_completed"),
              file: #filePath,
              line: #line)
         fire(NetworkProtectionPixelEvent.networkProtectionRekeyFailure(TestError.testError),
+             frequency: .dailyAndCount,
              and: .expect(pixelName: "m_mac_netp_rekey_failure",
                           error: TestError.testError,
-                          underlyingError: TestError.underlyingError),
+                          underlyingErrors: [TestError.underlyingError]),
              file: #filePath,
              line: #line)
-        fire(NetworkProtectionPixelEvent.networkProtectionSystemExtensionActivationFailure,
-             and: .expect(pixelName: "m_mac_netp_system_extension_activation_failure"),
+        fire(NetworkProtectionPixelEvent.networkProtectionSystemExtensionActivationFailure(TestError.testError),
+             frequency: .dailyAndCount,
+             and: .expect(pixelName: "m_mac_netp_system_extension_activation_failure",
+                          error: TestError.testError,
+                          underlyingErrors: [TestError.underlyingError]),
              file: #filePath,
              line: #line)
         fire(NetworkProtectionPixelEvent.networkProtectionUnhandledError(function: "function", line: 1, error: TestError.testError),
+             frequency: .standard,
              and: .expect(pixelName: "m_mac_netp_unhandled_error",
                           error: TestError.testError,
-                          underlyingError: TestError.underlyingError,
+                          underlyingErrors: [TestError.underlyingError],
                           customFields: [
                             PixelKit.Parameters.function: "function",
                             PixelKit.Parameters.line: "1",
@@ -321,5 +372,3 @@ final class NetworkProtectionPixelEventTests: XCTestCase {
              line: #line)
     }
 }
-
-#endif
diff --git a/UnitTests/NetworkProtection/NetworkProtectionRemoteMessagingTests.swift b/UnitTests/NetworkProtection/NetworkProtectionRemoteMessagingTests.swift
index 761f184335..3f96a7d0ea 100644
--- a/UnitTests/NetworkProtection/NetworkProtectionRemoteMessagingTests.swift
+++ b/UnitTests/NetworkProtection/NetworkProtectionRemoteMessagingTests.swift
@@ -16,8 +16,6 @@
 //  limitations under the License.
 //
 
-#if NETWORK_PROTECTION
-
 import XCTest
 @testable import DuckDuckGo_Privacy_Browser
 
@@ -376,5 +374,3 @@ final class MockWaitlistActivationDateStore: WaitlistActivationDateStore {
     }
 
 }
-
-#endif
diff --git a/UnitTests/NetworkProtection/Support/NetworkProtectionTestingSupport.swift b/UnitTests/NetworkProtection/Support/NetworkProtectionTestingSupport.swift
new file mode 100644
index 0000000000..4e6de202e7
--- /dev/null
+++ b/UnitTests/NetworkProtection/Support/NetworkProtectionTestingSupport.swift
@@ -0,0 +1,152 @@
+//
+//  NetworkProtectionTestingSupport.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 Combine
+import Common
+import Foundation
+import LoginItems
+import NetworkProtection
+import NetworkProtectionUI
+@testable import DuckDuckGo_Privacy_Browser
+
+struct MockFeatureVisibility: NetworkProtectionFeatureVisibility {
+    let isEligibleForThankYouMessage: Bool
+    let isInstalled: Bool
+    let canStartVPNValue: Bool
+    let isVPNVisibleValue: Bool
+    let isNetworkProtectionBetaVisibleValue: Bool
+    let shouldUninstallAutomaticallyValue: Bool
+    let disableIfUserHasNoAccessValue: Bool
+
+    func canStartVPN() async throws -> Bool {
+        canStartVPNValue
+    }
+
+    func isVPNVisible() -> Bool {
+        isVPNVisibleValue
+    }
+
+    func isNetworkProtectionBetaVisible() -> Bool {
+        isNetworkProtectionBetaVisibleValue
+    }
+
+    func shouldUninstallAutomatically() -> Bool {
+        shouldUninstallAutomaticallyValue
+    }
+
+    func disableForAllUsers() async {
+        // Intentional no-op
+    }
+
+    func disableForWaitlistUsers() {
+        // Intentional no-op
+    }
+
+    func disableIfUserHasNoAccess() async -> Bool {
+        disableIfUserHasNoAccessValue
+    }
+
+    let onboardStatusPublisher: AnyPublisher<NetworkProtectionUI.OnboardingStatus, Never>
+
+    init(isEligibleForThankYouMessage: Bool = false,
+         isInstalled: Bool = false,
+         canStartVPNValue: Bool = true,
+         isVPNVisibleValue: Bool = true,
+         isNetworkProtectionBetaVisibleValue: Bool = false,
+         shouldUninstallAutomaticallyValue: Bool = false,
+         disableIfUserHasNoAccessValue: Bool = false,
+         onboardStatusPublisher: AnyPublisher<NetworkProtectionUI.OnboardingStatus, Never> = Just(.default).eraseToAnyPublisher()) {
+
+        self.isEligibleForThankYouMessage = isEligibleForThankYouMessage
+        self.isInstalled = isInstalled
+        self.canStartVPNValue = canStartVPNValue
+        self.isVPNVisibleValue = isVPNVisibleValue
+        self.isNetworkProtectionBetaVisibleValue = isNetworkProtectionBetaVisibleValue
+        self.shouldUninstallAutomaticallyValue = shouldUninstallAutomaticallyValue
+        self.disableIfUserHasNoAccessValue = disableIfUserHasNoAccessValue
+        self.onboardStatusPublisher = onboardStatusPublisher
+    }
+}
+
+struct MockConnectionStatusObserver: ConnectionStatusObserver {
+    var publisher: AnyPublisher<NetworkProtection.ConnectionStatus, Never> = Just(.disconnected).eraseToAnyPublisher()
+
+    var recentValue: NetworkProtection.ConnectionStatus = .disconnected
+}
+
+struct MockServerInfoObserver: ConnectionServerInfoObserver {
+    var publisher: AnyPublisher<NetworkProtection.NetworkProtectionStatusServerInfo, Never> = Just(.unknown).eraseToAnyPublisher()
+
+    var recentValue: NetworkProtection.NetworkProtectionStatusServerInfo = .unknown
+}
+
+struct MockConnectionErrorObserver: ConnectionErrorObserver {
+    var publisher: AnyPublisher<String?, Never> = Just(nil).eraseToAnyPublisher()
+
+    var recentValue: String?
+}
+
+struct MockDataVolumeObserver: DataVolumeObserver {
+    var publisher: AnyPublisher<DataVolume, Never> = Just(.init()).eraseToAnyPublisher()
+
+    var recentValue: DataVolume = .init()
+}
+
+struct MockIPCClient: NetworkProtectionIPCClient {
+    private let error: Error?
+
+    var ipcStatusObserver: NetworkProtection.ConnectionStatusObserver = MockConnectionStatusObserver()
+    var ipcServerInfoObserver: NetworkProtection.ConnectionServerInfoObserver = MockServerInfoObserver()
+    var ipcConnectionErrorObserver: NetworkProtection.ConnectionErrorObserver = MockConnectionErrorObserver()
+    var ipcDataVolumeObserver: any NetworkProtection.DataVolumeObserver = MockDataVolumeObserver()
+
+    init(error: Error? = nil) {
+        self.error = error
+    }
+
+    func start(completion: @escaping (Error?) -> Void) {
+        completion(error)
+    }
+
+    func stop(completion: @escaping (Error?) -> Void) {
+        completion(error)
+    }
+}
+
+struct MockLoginItemsManager: LoginItemsManaging {
+
+    enum MockResult {
+        case success
+        case failure(_ error: Error)
+    }
+
+    private let mockResult: MockResult
+
+    init(mockResult: MockResult) {
+        self.mockResult = mockResult
+    }
+
+    func throwingEnableLoginItems(_ items: Set<LoginItems.LoginItem>, log: Common.OSLog) throws {
+        switch mockResult {
+        case .success:
+            return
+        case .failure(let error):
+            throw error
+        }
+    }
+}
diff --git a/UnitTests/Permissions/PermissionModelTests.swift b/UnitTests/Permissions/PermissionModelTests.swift
index 1357aec53a..1a31091936 100644
--- a/UnitTests/Permissions/PermissionModelTests.swift
+++ b/UnitTests/Permissions/PermissionModelTests.swift
@@ -21,6 +21,7 @@ import Combine
 import Foundation
 import WebKit
 import XCTest
+@testable import PixelKit
 
 @testable import DuckDuckGo_Privacy_Browser
 
@@ -31,6 +32,11 @@ final class PermissionModelTests: XCTestCase {
     var geolocationProviderMock: GeolocationProviderMock!
     let webView = WebViewMock()
     var model: PermissionModel!
+    let pixelKit = PixelKit(dryRun: true,
+                            appVersion: "1.0.0",
+                            defaultHeaders: [:],
+                            defaults: UserDefaults(),
+                            fireRequest: { _, _, _, _, _, _ in })
 
     var securityOrigin: WKSecurityOrigin {
         WKSecurityOriginMock.new(url: .duckDuckGo)
@@ -42,6 +48,8 @@ final class PermissionModelTests: XCTestCase {
     }
 
     override func setUp() {
+        PixelKit.setSharedForTesting(pixelKit: pixelKit)
+
         webView.uiDelegate = self
 
         geolocationProviderMock = GeolocationProviderMock(geolocationService: geolocationServiceMock)
diff --git a/UnitTests/Permissions/PermissionStoreTests.swift b/UnitTests/Permissions/PermissionStoreTests.swift
index 4566288bf5..f95ff7f2ed 100644
--- a/UnitTests/Permissions/PermissionStoreTests.swift
+++ b/UnitTests/Permissions/PermissionStoreTests.swift
@@ -19,11 +19,21 @@
 import Foundation
 import XCTest
 @testable import DuckDuckGo_Privacy_Browser
+@testable import PixelKit
 
 final class PermissionStoreTests: XCTestCase {
 
     let container = CoreData.permissionContainer()
     lazy var store = LocalPermissionStore(context: container.viewContext)
+    let pixelKit = PixelKit(dryRun: true,
+                            appVersion: "1.0.0",
+                            defaultHeaders: [:],
+                            defaults: UserDefaults(),
+                            fireRequest: { _, _, _, _, _, _ in })
+
+    override func setUp() {
+        PixelKit.setSharedForTesting(pixelKit: pixelKit)
+    }
 
     func testWhenPermissionIsAddedThenItMustBeLoadedFromStore() throws {
         let stored1 = try store.add(domain: "duckduckgo.com", permissionType: .camera, decision: .allow)
diff --git a/UnitTests/Permissions/WebViewMock.swift b/UnitTests/Permissions/WebViewMock.swift
index d8b0dd4ae5..8899c7f88f 100644
--- a/UnitTests/Permissions/WebViewMock.swift
+++ b/UnitTests/Permissions/WebViewMock.swift
@@ -107,15 +107,16 @@ final class WebViewMock: WKWebView {
         stopMediaCaptureHandler?()
     }
 
-    var mediaMutedStateValue = _WKMediaMutedState()
-    override func _mediaMutedState() -> _WKMediaMutedState {
-        mediaMutedStateValue
-    }
-
+    var mediaMutedStateValue: _WKMediaMutedState = []
     var setPageMutedHandler: ((_WKMediaMutedState) -> Void)?
-    override func _setPageMuted(_ mutedState: _WKMediaMutedState) {
-        mediaMutedStateValue = mutedState
-        setPageMutedHandler?(mutedState)
+    override var mediaMutedState: _WKMediaMutedState {
+        get {
+            mediaMutedStateValue
+        }
+        set {
+            mediaMutedStateValue = newValue
+            setPageMutedHandler?(newValue)
+        }
     }
 
     var setCameraCaptureStateHandler: ((Bool?) -> Void)?
diff --git a/UnitTests/Preferences/AutofillPreferencesModelTests.swift b/UnitTests/Preferences/AutofillPreferencesModelTests.swift
index 79341abe79..9851f65f72 100644
--- a/UnitTests/Preferences/AutofillPreferencesModelTests.swift
+++ b/UnitTests/Preferences/AutofillPreferencesModelTests.swift
@@ -49,7 +49,7 @@ final class UserAuthenticatorMock: UserAuthenticating {
 final class AutofillPreferencesModelTests: XCTestCase {
 
     func neverPromptWebsitesManager() throws -> AutofillNeverPromptWebsitesManager {
-        try AutofillNeverPromptWebsitesManager(secureVault: MockSecureVaultFactory.makeVault(errorReporter: nil))
+        try AutofillNeverPromptWebsitesManager(secureVault: MockSecureVaultFactory.makeVault(reporter: nil))
     }
 
     @MainActor
diff --git a/UnitTests/Preferences/DataClearingPreferencesTests.swift b/UnitTests/Preferences/DataClearingPreferencesTests.swift
index 5563fb6e90..1c0b6675e4 100644
--- a/UnitTests/Preferences/DataClearingPreferencesTests.swift
+++ b/UnitTests/Preferences/DataClearingPreferencesTests.swift
@@ -20,7 +20,11 @@ import XCTest
 @testable import DuckDuckGo_Privacy_Browser
 
 class MockFireButtonPreferencesPersistor: FireButtonPreferencesPersistor {
+
+    var autoClearEnabled: Bool = false
+    var warnBeforeClearingEnabled: Bool = false
     var loginDetectionEnabled: Bool = false
+
 }
 
 class DataClearingPreferencesTests: XCTestCase {
diff --git a/UnitTests/Preferences/DownloadsPreferencesTests.swift b/UnitTests/Preferences/DownloadsPreferencesTests.swift
index 3213d7c0af..7c50d88ff5 100644
--- a/UnitTests/Preferences/DownloadsPreferencesTests.swift
+++ b/UnitTests/Preferences/DownloadsPreferencesTests.swift
@@ -142,7 +142,7 @@ class DownloadsPreferencesTests: XCTestCase {
 
         preferences.selectedDownloadLocation = invalidDownloadLocationURL
 
-        XCTAssertEqual(preferences.effectiveDownloadLocation, testDirectory)
+        XCTAssertEqual(preferences.effectiveDownloadLocation, DownloadsPreferences.defaultDownloadLocation())
     }
 
     func testWhenGettingSelectedDownloadLocationAndSelectedLocationIsInaccessibleThenDefaultDownloadLocationIsReturned() {
@@ -213,18 +213,15 @@ class DownloadsPreferencesTests: XCTestCase {
         XCTAssertNil(preferences.lastUsedCustomDownloadLocation)
     }
 
-    func testWhenInvalidLastUsedCustomDownloadLocationIsSet_oldValueIsPreserved() {
+    func testWhenInvalidLastUsedCustomDownloadLocationIsSet_lastUsedCustomLocationIsNil() {
         let testDirectory = createTemporaryTestDirectory()
         let persistor = DownloadsPreferencesPersistorMock(selectedDownloadLocation: nil)
         let preferences = DownloadsPreferences(persistor: persistor)
 
-        let valuesBeforeChange = persistor.values()
         preferences.lastUsedCustomDownloadLocation = testDirectory
         preferences.lastUsedCustomDownloadLocation = testDirectory.appendingPathComponent("non-existent-dir")
 
-        let valuesAfterChange = persistor.values()
-        XCTAssertEqual(valuesBeforeChange.difference(from: valuesAfterChange), ["\(\DownloadsPreferencesPersistorMock.lastUsedCustomDownloadLocation)".pathExtension])
-        XCTAssertEqual(preferences.lastUsedCustomDownloadLocation, testDirectory)
+        XCTAssertNil(preferences.lastUsedCustomDownloadLocation)
     }
 
     func testWhenLastUsedCustomDownloadLocationIsReset_nilIsReturned() {
diff --git a/UnitTests/Preferences/TabsPreferencesTests.swift b/UnitTests/Preferences/TabsPreferencesTests.swift
new file mode 100644
index 0000000000..4faab128cc
--- /dev/null
+++ b/UnitTests/Preferences/TabsPreferencesTests.swift
@@ -0,0 +1,53 @@
+//
+//  TabsPreferencesTests.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
+
+class MockTabsPreferencesPersistor: TabsPreferencesPersistor {
+    var preferNewTabsToWindows: Bool = false
+    var switchToNewTabWhenOpened: Bool = false
+    var newTabPosition: NewTabPosition = .atEnd
+}
+
+final class TabsPreferencesTests: XCTestCase {
+
+    func testWhenInitializedThenItLoadsPersistedValues() {
+        let mockPersistor = MockTabsPreferencesPersistor()
+        mockPersistor.preferNewTabsToWindows = true
+        mockPersistor.switchToNewTabWhenOpened = true
+        mockPersistor.newTabPosition = .nextToCurrent
+        let tabsPreferences = TabsPreferences(persistor: mockPersistor)
+
+        XCTAssertTrue(tabsPreferences.preferNewTabsToWindows)
+        XCTAssertTrue(tabsPreferences.switchToNewTabWhenOpened)
+        XCTAssertEqual(tabsPreferences.newTabPosition, .nextToCurrent)
+    }
+
+    func testWhenPreferencesUpdatedThenPersistorUpdates() {
+        let mockPersistor = MockTabsPreferencesPersistor()
+        let tabsPreferences = TabsPreferences(persistor: mockPersistor)
+        tabsPreferences.preferNewTabsToWindows = true
+        tabsPreferences.switchToNewTabWhenOpened = true
+        tabsPreferences.newTabPosition = .nextToCurrent
+
+        XCTAssertTrue(mockPersistor.preferNewTabsToWindows)
+        XCTAssertTrue(mockPersistor.switchToNewTabWhenOpened)
+        XCTAssertEqual(mockPersistor.newTabPosition, .nextToCurrent)
+    }
+}
diff --git a/UnitTests/PrivacyReferenceTests/BrokenSiteReportingReferenceTests.swift b/UnitTests/PrivacyReferenceTests/BrokenSiteReportingReferenceTests.swift
index bc52a33041..1d38801f44 100644
--- a/UnitTests/PrivacyReferenceTests/BrokenSiteReportingReferenceTests.swift
+++ b/UnitTests/PrivacyReferenceTests/BrokenSiteReportingReferenceTests.swift
@@ -51,7 +51,7 @@ final class BrokenSiteReportingReferenceTests: XCTestCase {
         APIRequest.Headers.setUserAgent("")
         var params = parameters
         params["test"] = "1"
-        let configuration = APIRequest.Configuration(url: URL.pixelUrl(forPixelNamed: Pixel.Event.brokenSiteReport.name),
+        let configuration = APIRequest.Configuration(url: URL.pixelUrl(forPixelNamed: GeneralPixel.brokenSiteReport.name),
                                                      queryParameters: params,
                                                      allowedQueryReservedCharacters: BrokenSiteReport.allowedQueryReservedCharacters)
         return configuration.request
diff --git a/UnitTests/Statistics/ATB/AttributionOriginFileProviderTests.swift b/UnitTests/Statistics/ATB/AttributionOriginFileProviderTests.swift
new file mode 100644
index 0000000000..e90408c532
--- /dev/null
+++ b/UnitTests/Statistics/ATB/AttributionOriginFileProviderTests.swift
@@ -0,0 +1,61 @@
+//
+//  AttributionOriginFileProviderTests.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 AttributionOriginFileProviderTests: XCTestCase {
+    private var sut: AttributionOriginFileProvider!
+
+    func testWhenFileAndValueExistThenReturnOriginValue() {
+        // GIVEN
+        sut = AttributionOriginFileProvider(bundle: .test)
+
+        // WHEN
+        let result = sut.origin
+
+        // THEN
+        XCTAssertEqual(result, "app_search")
+    }
+
+    func testWhenFileDoesNotExistThenReturnNil() {
+        // GIVEN
+        sut = AttributionOriginFileProvider(resourceName: #function, bundle: .test)
+
+        // WHEN
+        let result = sut.origin
+
+        // THEN
+        XCTAssertNil(result)
+    }
+
+    func testWhenFileExistAndIsEmptyThenReturnNil() {
+        // GIVEN
+        sut = AttributionOriginFileProvider(resourceName: "Origin-empty", bundle: .test)
+
+        // WHEN
+        let result = sut.origin
+
+        // THEN
+        XCTAssertNil(result)
+    }
+}
+
+private extension Bundle {
+    static let test = Bundle(for: AttributionOriginFileProviderTests.self)
+}
diff --git a/UnitTests/Statistics/ATB/InstallationAttributionPixelHandlerTests.swift b/UnitTests/Statistics/ATB/InstallationAttributionPixelHandlerTests.swift
new file mode 100644
index 0000000000..0d217cf769
--- /dev/null
+++ b/UnitTests/Statistics/ATB/InstallationAttributionPixelHandlerTests.swift
@@ -0,0 +1,129 @@
+//
+//  InstallationAttributionPixelHandlerTests.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 PixelKit
+@testable import DuckDuckGo_Privacy_Browser
+
+final class InstallationAttributionPixelHandlerTests: XCTestCase {
+    private var sut: InstallationAttributionPixelHandler!
+    private var capturedParams: CapturedParameters!
+    private var fireRequest: InstallationAttributionPixelHandler.FireRequest!
+
+    override func setUpWithError() throws {
+        try super.setUpWithError()
+        capturedParams = CapturedParameters()
+        fireRequest = { event, frequency, headers, parameters, error, reservedCharacters, includeAppVersion, onComplete in
+            self.capturedParams.event = event
+            self.capturedParams.frequency = frequency
+            self.capturedParams.headers = headers
+            self.capturedParams.parameters = parameters
+            self.capturedParams.error = error
+            self.capturedParams.reservedCharacters = reservedCharacters
+            self.capturedParams.includeAppVersion = includeAppVersion
+            self.capturedParams.onComplete = onComplete
+        }
+    }
+
+    override func tearDownWithError() throws {
+        capturedParams = nil
+        fireRequest = nil
+        sut = nil
+        try super.tearDownWithError()
+    }
+
+    func testWhenPixelFiresThenNameIsSetToM_Mac_Install() {
+        // GIVEN
+        sut = .init(fireRequest: fireRequest, originProvider: MockAttributionOriginProvider(), locale: .current)
+
+        // WHEN
+        sut.fireInstallationAttributionPixel()
+
+        // THEN
+        XCTAssertEqual(capturedParams.event?.name, "m_mac_install")
+    }
+
+    func testWhenPixelFiresThenLanguageCodeIsSet() {
+        // GIVEN
+        let locale = Locale(identifier: "hu-HU")
+        sut = .init(fireRequest: fireRequest, originProvider: MockAttributionOriginProvider(), locale: locale)
+
+        // WHEN
+        sut.fireInstallationAttributionPixel()
+
+        // THEN
+        XCTAssertEqual(capturedParams?.parameters?[InstallationAttributionPixelHandler.Parameters.locale], "hu-HU")
+    }
+
+    func testWhenPixelFiresAndOriginIsNotNilThenOriginIsSet() {
+        // GIVEN
+        let origin = "app_search"
+        let locale = Locale(identifier: "en-US")
+        let originProvider = MockAttributionOriginProvider(origin: origin)
+        sut = .init(fireRequest: fireRequest, originProvider: originProvider, locale: locale)
+
+        // WHEN
+        sut.fireInstallationAttributionPixel()
+
+        // THEN
+        XCTAssertEqual(capturedParams?.parameters?[InstallationAttributionPixelHandler.Parameters.origin], origin)
+        XCTAssertEqual(capturedParams?.parameters?[InstallationAttributionPixelHandler.Parameters.locale], "en-US")
+    }
+
+    func testWhenPixelFiresAndOriginIsNilThenOnlyLocaleIsSet() {
+        // GIVEN
+        let origin: String? = nil
+        let locale = Locale(identifier: "en-US")
+        let originProvider = MockAttributionOriginProvider(origin: origin)
+        sut = .init(fireRequest: fireRequest, originProvider: originProvider, locale: locale)
+
+        // WHEN
+        sut.fireInstallationAttributionPixel()
+
+        // THEN
+        XCTAssertNil(capturedParams?.parameters?[InstallationAttributionPixelHandler.Parameters.origin])
+        XCTAssertEqual(capturedParams?.parameters?[InstallationAttributionPixelHandler.Parameters.locale], "en-US")
+    }
+
+    func testWhenPixelFiresThenAddAppVersionIsTrueAndFrequencyIsLegacyInitial() {
+        // GIVEN
+        sut = .init(fireRequest: fireRequest, originProvider: MockAttributionOriginProvider(), locale: .current)
+
+        // WHEN
+        sut.fireInstallationAttributionPixel()
+
+        // THEN
+        XCTAssertEqual(capturedParams.includeAppVersion, true)
+        XCTAssertEqual(capturedParams.frequency, .legacyInitial)
+    }
+}
+
+extension InstallationAttributionPixelHandlerTests {
+
+    struct CapturedParameters {
+        var event: PixelKit.Event?
+        var frequency: PixelKit.Frequency = .standard
+        var headers: [String: String] = [:]
+        var parameters: [String: String]?
+        var error: Error?
+        var reservedCharacters: CharacterSet?
+        var includeAppVersion: Bool?
+        var onComplete: (Bool, Error?) -> Void = { _, _ in }
+    }
+
+}
diff --git a/DuckDuckGo/Common/Extensions/NSStoryboardExtension.swift b/UnitTests/Statistics/ATB/Mock/MockAttributionOriginProvider.swift
similarity index 64%
rename from DuckDuckGo/Common/Extensions/NSStoryboardExtension.swift
rename to UnitTests/Statistics/ATB/Mock/MockAttributionOriginProvider.swift
index 9e50fa79ce..05e91bff49 100644
--- a/DuckDuckGo/Common/Extensions/NSStoryboardExtension.swift
+++ b/UnitTests/Statistics/ATB/Mock/MockAttributionOriginProvider.swift
@@ -1,7 +1,7 @@
 //
-//  NSStoryboardExtension.swift
+//  MockAttributionOriginProvider.swift
 //
-//  Copyright © 2021 DuckDuckGo. All rights reserved.
+//  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.
@@ -16,10 +16,13 @@
 //  limitations under the License.
 //
 
-import AppKit
+import Foundation
+@testable import DuckDuckGo_Privacy_Browser
 
-extension NSStoryboard {
-
-    static var bookmarks = NSStoryboard(name: "Bookmarks", bundle: .main)
+final class MockAttributionOriginProvider: AttributionOriginProvider {
+    let origin: String?
 
+    init(origin: String? = nil) {
+        self.origin = origin
+    }
 }
diff --git a/UnitTests/Statistics/ATB/Mock/MockAttributionsPixelHandler.swift b/UnitTests/Statistics/ATB/Mock/MockAttributionsPixelHandler.swift
new file mode 100644
index 0000000000..a32ee60a30
--- /dev/null
+++ b/UnitTests/Statistics/ATB/Mock/MockAttributionsPixelHandler.swift
@@ -0,0 +1,30 @@
+//
+//  MockAttributionsPixelHandler.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
+@testable import DuckDuckGo_Privacy_Browser
+
+final class MockAttributionsPixelHandler: AttributionsPixelHandler {
+    private(set) var fireInstallationAttributionPixelCount = 0
+    private(set) var didCallFireInstallationAttributionPixel = false
+
+    func fireInstallationAttributionPixel() {
+        fireInstallationAttributionPixelCount += 1
+        didCallFireInstallationAttributionPixel = true
+    }
+}
diff --git a/UnitTests/Statistics/ATB/Mock/Origin-empty.txt b/UnitTests/Statistics/ATB/Mock/Origin-empty.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/UnitTests/Statistics/ATB/Mock/Origin.txt b/UnitTests/Statistics/ATB/Mock/Origin.txt
new file mode 100644
index 0000000000..2598289de9
--- /dev/null
+++ b/UnitTests/Statistics/ATB/Mock/Origin.txt
@@ -0,0 +1 @@
+app_search
diff --git a/UnitTests/Statistics/ATB/StatisticsLoaderTests.swift b/UnitTests/Statistics/ATB/StatisticsLoaderTests.swift
index bb572ecdf8..eb6bbfaa2c 100644
--- a/UnitTests/Statistics/ATB/StatisticsLoaderTests.swift
+++ b/UnitTests/Statistics/ATB/StatisticsLoaderTests.swift
@@ -19,20 +19,34 @@
 import XCTest
 import OHHTTPStubs
 import OHHTTPStubsSwift
+@testable import PixelKit
 @testable import DuckDuckGo_Privacy_Browser
 
 class StatisticsLoaderTests: XCTestCase {
 
-    var mockStatisticsStore: StatisticsStore!
-    var testee: StatisticsLoader!
+    private var mockAttributionsPixelHandler: MockAttributionsPixelHandler!
+    private var mockStatisticsStore: StatisticsStore!
+    private var testee: StatisticsLoader!
+    let pixelKit = PixelKit(dryRun: true,
+                            appVersion: "1.0.0",
+                            defaultHeaders: [:],
+                            defaults: UserDefaults(),
+                            fireRequest: { _, _, _, _, _, _ in })
 
     override func setUp() {
+        PixelKit.setSharedForTesting(pixelKit: pixelKit)
+
+        mockAttributionsPixelHandler = MockAttributionsPixelHandler()
         mockStatisticsStore = MockStatisticsStore()
-        testee = StatisticsLoader(statisticsStore: mockStatisticsStore)
+        testee = StatisticsLoader(statisticsStore: mockStatisticsStore, attributionPixelHandler: mockAttributionsPixelHandler)
     }
 
     override func tearDown() {
+        PixelKit.tearDown()
         HTTPStubs.removeAllStubs()
+        mockStatisticsStore = nil
+        mockAttributionsPixelHandler = nil
+        testee = nil
         super.tearDown()
     }
 
@@ -296,6 +310,55 @@ class StatisticsLoaderTests: XCTestCase {
         waitForExpectations(timeout: 1, handler: nil)
     }
 
+    func testWhenLoadHasSuccessfulAtbThenAttributionPixelShouldFire() {
+        // GIVEN
+        loadSuccessfulAtbStub()
+        let expect = expectation(description: #function)
+        XCTAssertFalse(mockAttributionsPixelHandler.didCallFireInstallationAttributionPixel)
+
+        // WHEN
+        testee.load {
+            expect.fulfill()
+        }
+
+        // THEN
+        waitForExpectations(timeout: 1, handler: nil)
+        XCTAssertTrue(mockAttributionsPixelHandler.didCallFireInstallationAttributionPixel)
+    }
+
+    func testWhenLoadHasUnsuccessfulAtbThenAttributionPixelShouldNotFire() {
+        // GIVEN
+        loadUnsuccessfulAtbStub()
+        let expect = expectation(description: #function)
+        XCTAssertFalse(mockAttributionsPixelHandler.didCallFireInstallationAttributionPixel)
+
+        testee.load {
+            expect.fulfill()
+        }
+
+        // THEN
+        waitForExpectations(timeout: 1, handler: nil)
+        XCTAssertFalse(mockAttributionsPixelHandler.didCallFireInstallationAttributionPixel)
+    }
+
+    func testWhenLoadHasSuccessfulAtbSubsequentlyThenAttributionPixelShouldNotFire() {
+        // GIVEN
+        loadSuccessfulAtbStub()
+        let firstATBCallExpectation = XCTestExpectation(description: "First ATB call")
+        let secondATBCallExpectation = XCTestExpectation(description: "Second ATB call")
+        testee.load { firstATBCallExpectation.fulfill() }
+        wait(for: [firstATBCallExpectation], timeout: 1.0)
+        XCTAssertTrue(mockAttributionsPixelHandler.didCallFireInstallationAttributionPixel)
+        XCTAssertEqual(mockAttributionsPixelHandler.fireInstallationAttributionPixelCount, 1)
+
+        // WHEN
+        testee.load { secondATBCallExpectation.fulfill() }
+
+        // THEN
+        wait(for: [secondATBCallExpectation], timeout: 1.0)
+        XCTAssertEqual(mockAttributionsPixelHandler.fireInstallationAttributionPixelCount, 1)
+    }
+
     func loadSuccessfulAtbStub() {
         stub(condition: isHost(URL.initialAtb.host!)) { _ in
             let path = OHPathForFile("atb.json", type(of: self))!
diff --git a/UnitTests/Statistics/CBRCompileTimeReporterTests.swift b/UnitTests/Statistics/CBRCompileTimeReporterTests.swift
index 95187b5346..f6e7aef1d2 100644
--- a/UnitTests/Statistics/CBRCompileTimeReporterTests.swift
+++ b/UnitTests/Statistics/CBRCompileTimeReporterTests.swift
@@ -19,6 +19,7 @@
 import XCTest
 import OHHTTPStubs
 import OHHTTPStubsSwift
+@testable import PixelKit
 @testable import DuckDuckGo_Privacy_Browser
 
 class CBRCompileTimeReporterTests: XCTestCase {
@@ -27,15 +28,20 @@ class CBRCompileTimeReporterTests: XCTestCase {
     let host = "improving.duckduckgo.com"
     var tab: NSObject! = NSObject()
     var time = CACurrentMediaTime()
+    let pixelKit = PixelKit(dryRun: true,
+                            appVersion: "1.0.0",
+                            defaultHeaders: [:],
+                            defaults: UserDefaults(),
+                            fireRequest: { _, _, _, _, _, _ in })
 
     override func setUp() {
-        Pixel.setUp()
+        PixelKit.setSharedForTesting(pixelKit: pixelKit)
         UserDefaultsWrapper<Any>.clearAll()
     }
 
     override func tearDown() {
         HTTPStubs.removeAllStubs()
-        Pixel.tearDown()
+        PixelKit.tearDown()
         super.tearDown()
     }
 
@@ -51,8 +57,8 @@ class CBRCompileTimeReporterTests: XCTestCase {
     @discardableResult
     func performTest(withOnboardingFinished onboardingFinished: Bool,
                      waitTime: TimeInterval,
-                     expectedWaitTime: Pixel.Event.CompileRulesWaitTime,
-                     result: Pixel.Event.WaitResult,
+                     expectedWaitTime: GeneralPixel.CompileRulesWaitTime,
+                     result: GeneralPixel.WaitResult,
                      runBeforeFinishing: ((Reporter) throws -> Void)? = nil) rethrows -> Reporter {
 
         HTTPStubs.removeAllStubs()
@@ -60,7 +66,7 @@ class CBRCompileTimeReporterTests: XCTestCase {
             HTTPStubs.removeAllStubs()
         }
         let reporter = initReporter(onboardingFinished: onboardingFinished)
-        let pixel = Pixel.Event.compileRulesWait(onboardingShown: onboardingFinished ? .regularNavigation : .onboardingShown,
+        let pixel = GeneralPixel.compileRulesWait(onboardingShown: onboardingFinished ? .regularNavigation : .onboardingShown,
                                                  waitTime: expectedWaitTime,
                                                  result: result)
 
@@ -98,7 +104,7 @@ class CBRCompileTimeReporterTests: XCTestCase {
         return reporter
     }
 
-    typealias Pair = (TimeInterval, Pixel.Event.CompileRulesWaitTime)
+    typealias Pair = (TimeInterval, GeneralPixel.CompileRulesWaitTime)
     let waitExpectationSeq: [Pair] = [(0, .noWait),
                                       (0.5, .lessThan1s),
                                       (1, .lessThan1s),
diff --git a/UnitTests/Statistics/PixelArgumentsTests.swift b/UnitTests/Statistics/Legacy/PixelArgumentsTests.swift
similarity index 79%
rename from UnitTests/Statistics/PixelArgumentsTests.swift
rename to UnitTests/Statistics/Legacy/PixelArgumentsTests.swift
index 8347a25732..f5e812e079 100644
--- a/UnitTests/Statistics/PixelArgumentsTests.swift
+++ b/UnitTests/Statistics/Legacy/PixelArgumentsTests.swift
@@ -50,7 +50,7 @@ class PixelArgumentsTests: XCTestCase {
     // MARK: AccessPoint
 
     func testWhenInitWithButtonThenAccessPointIsButton() {
-        let ap = Pixel.Event.AccessPoint(sender: NSButton(), default: .tabMenu)
+        let ap = GeneralPixel.AccessPoint(sender: NSButton(), default: .tabMenu)
         XCTAssertEqual(ap, .button)
     }
 
@@ -68,7 +68,7 @@ class PixelArgumentsTests: XCTestCase {
 
     func testWhenInitWithMainMenuItemThenAccessPointIsMenu() {
         let mainMenu = makeMenu()
-        let ap = Pixel.Event.AccessPoint(sender: mainMenu.item, default: .tabMenu) { $0 === mainMenu.menu }
+        let ap = GeneralPixel.AccessPoint(sender: mainMenu.item, default: .tabMenu) { $0 === mainMenu.menu }
         XCTAssertEqual(ap, .mainMenu)
     }
 
@@ -79,7 +79,7 @@ class PixelArgumentsTests: XCTestCase {
                                      context: nil, characters: "x", charactersIgnoringModifiers: "",
                                      isARepeat: false, keyCode: UInt16(kVK_ANSI_X))!
         NSApp.setValue(event, forKey: "currentEvent")
-        let ap = Pixel.Event.AccessPoint(sender: mainMenu.item, default: .tabMenu) { $0 === mainMenu.menu }
+        let ap = GeneralPixel.AccessPoint(sender: mainMenu.item, default: .tabMenu) { $0 === mainMenu.menu }
         XCTAssertEqual(ap, .hotKey)
     }
 
@@ -90,7 +90,7 @@ class PixelArgumentsTests: XCTestCase {
                                      context: nil, characters: "\n", charactersIgnoringModifiers: "",
                                      isARepeat: false, keyCode: UInt16(kVK_Return))!
         NSApp.setValue(event, forKey: "currentEvent")
-        let ap = Pixel.Event.AccessPoint(sender: mainMenu.item, default: .tabMenu) { $0 === mainMenu.menu }
+        let ap = GeneralPixel.AccessPoint(sender: mainMenu.item, default: .tabMenu) { $0 === mainMenu.menu }
         XCTAssertEqual(ap, .mainMenu)
     }
 
@@ -101,30 +101,30 @@ class PixelArgumentsTests: XCTestCase {
                                      context: nil, characters: " ", charactersIgnoringModifiers: "",
                                      isARepeat: false, keyCode: UInt16(kVK_Space))!
         NSApp.setValue(event, forKey: "currentEvent")
-        let ap = Pixel.Event.AccessPoint(sender: mainMenu.item, default: .tabMenu) { $0 === mainMenu.menu }
+        let ap = GeneralPixel.AccessPoint(sender: mainMenu.item, default: .tabMenu) { $0 === mainMenu.menu }
         XCTAssertEqual(ap, .mainMenu)
     }
 
     func testWhenInitWithTabMenuItemThenAccessPointIsMenu() {
         let mainMenu = makeMenu()
         let tabMenu = makeMenu()
-        let ap = Pixel.Event.AccessPoint(sender: tabMenu.item, default: .tabMenu) { $0 === mainMenu.menu }
+        let ap = GeneralPixel.AccessPoint(sender: tabMenu.item, default: .tabMenu) { $0 === mainMenu.menu }
         XCTAssertEqual(ap, .tabMenu)
     }
 
     // MARK: Repetition
 
     func testWhenInitFirstTimeThenRepetitionIsInitial() {
-        let rep1 = Pixel.Event.Repetition(key: "test", store: pixelDataStore)
-        let rep2 = Pixel.Event.Repetition(key: "test2", store: pixelDataStore)
+        let rep1 = GeneralPixel.Repetition(key: "test", store: pixelDataStore)
+        let rep2 = GeneralPixel.Repetition(key: "test2", store: pixelDataStore)
         XCTAssertEqual(rep1, .initial)
         XCTAssertEqual(rep2, .initial)
     }
 
     func testWhenInitSecondTimeThenRepetitionIsRepetitive() {
-        _=Pixel.Event.Repetition(key: "test", store: pixelDataStore)
-        let rep1 = Pixel.Event.Repetition(key: "test", store: pixelDataStore)
-        let rep2 = Pixel.Event.Repetition(key: "test2", store: pixelDataStore)
+        _=GeneralPixel.Repetition(key: "test", store: pixelDataStore)
+        let rep1 = GeneralPixel.Repetition(key: "test", store: pixelDataStore)
+        let rep2 = GeneralPixel.Repetition(key: "test2", store: pixelDataStore)
         XCTAssertEqual(rep1, .repetitive)
         XCTAssertEqual(rep2, .initial)
     }
@@ -135,10 +135,10 @@ class PixelArgumentsTests: XCTestCase {
         let tomorrow2 = now.addingTimeInterval(3600 * 24 + 1)
         let afterTomorrow = tomorrow.addingTimeInterval(3600 * 24)
 
-        _=Pixel.Event.Repetition(key: "test", store: pixelDataStore, now: now)
-        let rep1 = Pixel.Event.Repetition(key: "test", store: pixelDataStore, now: tomorrow)
-        let rep2 = Pixel.Event.Repetition(key: "test", store: pixelDataStore, now: tomorrow2)
-        let rep3 = Pixel.Event.Repetition(key: "test", store: pixelDataStore, now: afterTomorrow)
+        _=GeneralPixel.Repetition(key: "test", store: pixelDataStore, now: now)
+        let rep1 = GeneralPixel.Repetition(key: "test", store: pixelDataStore, now: tomorrow)
+        let rep2 = GeneralPixel.Repetition(key: "test", store: pixelDataStore, now: tomorrow2)
+        let rep3 = GeneralPixel.Repetition(key: "test", store: pixelDataStore, now: afterTomorrow)
 
         XCTAssertEqual(rep1, .dailyFirst)
         XCTAssertEqual(rep2, .repetitive)
diff --git a/UnitTests/Statistics/PixelEventTests.swift b/UnitTests/Statistics/Legacy/PixelEventTests.swift
similarity index 100%
rename from UnitTests/Statistics/PixelEventTests.swift
rename to UnitTests/Statistics/Legacy/PixelEventTests.swift
diff --git a/UnitTests/Statistics/PixelStoreTests.swift b/UnitTests/Statistics/Legacy/PixelStoreTests.swift
similarity index 100%
rename from UnitTests/Statistics/PixelStoreTests.swift
rename to UnitTests/Statistics/Legacy/PixelStoreTests.swift
diff --git a/UnitTests/Statistics/PixelTests.swift b/UnitTests/Statistics/Legacy/PixelTests.swift
similarity index 94%
rename from UnitTests/Statistics/PixelTests.swift
rename to UnitTests/Statistics/Legacy/PixelTests.swift
index 1e580a0652..25b9de1126 100644
--- a/UnitTests/Statistics/PixelTests.swift
+++ b/UnitTests/Statistics/Legacy/PixelTests.swift
@@ -66,7 +66,7 @@ class PixelTests: XCTestCase {
             return HTTPStubsResponse(data: Data(), statusCode: 200, headers: nil)
         }
 
-        Pixel.fire(.crash, withAdditionalParameters: params)
+        PixelKit.fire(GeneralPixel.crash, withAdditionalParameters: params)
 
         waitForExpectations(timeout: 1.0)
     }
@@ -82,7 +82,7 @@ class PixelTests: XCTestCase {
             return HTTPStubsResponse(data: Data(), statusCode: 200, headers: nil)
         }
 
-        Pixel.fire(.debug(event: Pixel.Event.Debug.appOpenURLFailed, error: error))
+        PixelKit.fire(DebugEvent( GeneralPixel.appOpenURLFailed, error: error))
 
         waitForExpectations(timeout: 1.0)
     }
@@ -107,7 +107,7 @@ class PixelTests: XCTestCase {
             return HTTPStubsResponse(data: Data(), statusCode: 200, headers: nil)
         }
 
-        Pixel.fire(.debug(event: Pixel.Event.Debug.appOpenURLFailed, error: error), withAdditionalParameters: params)
+        PixelKit.fire(DebugEvent( GeneralPixel.appOpenURLFailed, error: error), withAdditionalParameters: params)
 
         waitForExpectations(timeout: 1.0)
     }
diff --git a/UnitTests/Statistics/PixelExperiment/PixelExperimentTests.swift b/UnitTests/Statistics/PixelExperiment/PixelExperimentTests.swift
index cb3953e760..6215677a64 100644
--- a/UnitTests/Statistics/PixelExperiment/PixelExperimentTests.swift
+++ b/UnitTests/Statistics/PixelExperiment/PixelExperimentTests.swift
@@ -17,8 +17,15 @@
 //
 
 import XCTest
+import PixelKit
+import os.log
 @testable import DuckDuckGo_Privacy_Browser
 
+/*
+ WARNING: This component doesn't work anymore, re-implementation needed
+ https://app.asana.com/0/0/1207002879349166/f
+ */
+
 class PixelExperimentTests: XCTestCase {
 
     var now = Date()
@@ -55,13 +62,16 @@ class PixelExperimentTests: XCTestCase {
 
     override func tearDown() {
         logic.cleanup()
-        Pixel.tearDown()
+        PixelKit.tearDown()
         _store = nil
     }
 
     func testWhenNotInstalledThenCohortIsNill() {
         XCTAssertNil(logic.cohort)
-        Pixel.setUp { _ in
+
+        PixelKit.setUp(appVersion: "",
+                       defaultHeaders: [:],
+                       defaults: UserDefaults()) { _, _, _, _, _, _ in
             XCTFail("shouldn‘t fire pixels")
         }
 
@@ -71,14 +81,18 @@ class PixelExperimentTests: XCTestCase {
     }
 
     func testWhenNoCohort_NoEnrollmentPixelFired() {
-        Pixel.firstLaunchDate = now
-        PixelExperiment.install()
+        DispatchQueue.main.async {
+            AppDelegate.firstLaunchDate = self.now
+            PixelExperiment.install()
 
-        Pixel.setUp(store: self.store) { _ in
-            XCTFail("shouldn‘t fire pixels")
-        }
+            PixelKit.setUp(appVersion: "",
+                           defaultHeaders: [:],
+                           defaults: UserDefaults()) { _, _, _, _, _, _ in
+                XCTFail("shouldn‘t fire pixels")
+            }
 
-        PixelExperiment.fireEnrollmentPixel()
+            PixelExperiment.fireEnrollmentPixel()
+        }
     }
 
     // See git history for fireFirstSerpPixel and fireDay21To27SerpPixel tests
diff --git a/UnitTests/Suggestions/Model/SuggestionContainerTests.swift b/UnitTests/Suggestions/Model/SuggestionContainerTests.swift
index db15131a1c..fbd8316ade 100644
--- a/UnitTests/Suggestions/Model/SuggestionContainerTests.swift
+++ b/UnitTests/Suggestions/Model/SuggestionContainerTests.swift
@@ -44,7 +44,7 @@ final class SuggestionContainerTests: XCTestCase {
         withExtendedLifetime(cancellable) {
             waitForExpectations(timeout: 1)
         }
-        XCTAssertEqual(suggestionContainer.result?.all, result.topHits + result.duckduckgoSuggestions + result.historyAndBookmarks)
+        XCTAssertEqual(suggestionContainer.result?.all, result.topHits + result.duckduckgoSuggestions + result.localSuggestions)
     }
 
     func testWhenStopGettingSuggestionsIsCalled_ThenNoSuggestionsArePublished() {
diff --git a/UnitTests/Suggestions/ViewModel/SuggestionContainerViewModelTests.swift b/UnitTests/Suggestions/ViewModel/SuggestionContainerViewModelTests.swift
index cee0f7bec3..42beab1350 100644
--- a/UnitTests/Suggestions/ViewModel/SuggestionContainerViewModelTests.swift
+++ b/UnitTests/Suggestions/ViewModel/SuggestionContainerViewModelTests.swift
@@ -154,7 +154,7 @@ extension SuggestionResult {
         ]
         return SuggestionResult(topHits: topHits,
                                 duckduckgoSuggestions: [],
-                                historyAndBookmarks: [])
+                                localSuggestions: [])
     }
 
 }
diff --git a/UnitTests/Tab/Model/TabTests.swift b/UnitTests/Tab/Model/TabTests.swift
index 5f44e88e02..5bbea5bee8 100644
--- a/UnitTests/Tab/Model/TabTests.swift
+++ b/UnitTests/Tab/Model/TabTests.swift
@@ -368,7 +368,7 @@ final class TabTests: XCTestCase {
 extension Tab {
     var url: URL? {
         get {
-            content.url
+            content.userEditableUrl
         }
         set {
             setContent(newValue.map { TabContent.url($0, source: .link) } ?? .newtab)
diff --git a/UnitTests/Tab/ViewModel/TabViewModelTests.swift b/UnitTests/Tab/ViewModel/TabViewModelTests.swift
index b60b6de00f..a410e689d2 100644
--- a/UnitTests/Tab/ViewModel/TabViewModelTests.swift
+++ b/UnitTests/Tab/ViewModel/TabViewModelTests.swift
@@ -74,10 +74,32 @@ final class TabViewModelTests: XCTestCase {
     }
 
     @MainActor
-    func testWhenURLIsFileURLThenAddressBarIsFilePath() {
+    func testWhenURLIsFileURLAndShowFullUrlIsDisabledThenAddressBarIsFileName() {
         let urlString = "file:///Users/Dax/file.txt"
         let url = URL.makeURL(from: urlString)!
-        let tabViewModel = TabViewModel.forTabWithURL(url)
+        let tab = Tab(content: .url(url, source: .link))
+        let appearancePreferences = AppearancePreferences(persistor: AppearancePreferencesPersistorMock(showFullURL: false))
+        let tabViewModel = TabViewModel(tab: tab, appearancePreferences: appearancePreferences)
+
+        let addressBarStringExpectation = expectation(description: "Address bar string")
+
+        tabViewModel.simulateLoadingCompletion(url, in: tabViewModel.tab.webView)
+
+        tabViewModel.$addressBarString.debounce(for: 0.1, scheduler: RunLoop.main).sink { _ in
+            XCTAssertEqual(tabViewModel.addressBarString, urlString)
+            XCTAssertEqual(tabViewModel.passiveAddressBarAttributedString.string, url.lastPathComponent)
+            addressBarStringExpectation.fulfill()
+        } .store(in: &cancellables)
+        waitForExpectations(timeout: 1, handler: nil)
+    }
+
+    @MainActor
+    func testWhenURLIsFileURLAndShowFullUrlIsEnabledThenAddressBarIsFilePath() {
+        let urlString = "file:///Users/Dax/file.txt"
+        let url = URL.makeURL(from: urlString)!
+        let tab = Tab(content: .url(url, source: .link))
+        let appearancePreferences = AppearancePreferences(persistor: AppearancePreferencesPersistorMock(showFullURL: true))
+        let tabViewModel = TabViewModel(tab: tab, appearancePreferences: appearancePreferences)
 
         let addressBarStringExpectation = expectation(description: "Address bar string")
 
@@ -85,7 +107,7 @@ final class TabViewModelTests: XCTestCase {
 
         tabViewModel.$addressBarString.debounce(for: 0.1, scheduler: RunLoop.main).sink { _ in
             XCTAssertEqual(tabViewModel.addressBarString, urlString)
-            XCTAssertEqual(tabViewModel.passiveAddressBarString, urlString)
+            XCTAssertEqual(tabViewModel.passiveAddressBarAttributedString.string, urlString)
             addressBarStringExpectation.fulfill()
         } .store(in: &cancellables)
         waitForExpectations(timeout: 1, handler: nil)
@@ -103,7 +125,7 @@ final class TabViewModelTests: XCTestCase {
 
         tabViewModel.$addressBarString.debounce(for: 0.1, scheduler: RunLoop.main).sink { _ in
             XCTAssertEqual(tabViewModel.addressBarString, urlString)
-            XCTAssertEqual(tabViewModel.passiveAddressBarString, "data:")
+            XCTAssertEqual(tabViewModel.passiveAddressBarAttributedString.string, "data:")
             addressBarStringExpectation.fulfill()
         } .store(in: &cancellables)
         waitForExpectations(timeout: 1, handler: nil)
diff --git a/UnitTests/Tab/WKWebViewPrivateMethodsAvailabilityTests.swift b/UnitTests/Tab/WKWebViewPrivateMethodsAvailabilityTests.swift
index b569bdb58d..d62bf1f85a 100644
--- a/UnitTests/Tab/WKWebViewPrivateMethodsAvailabilityTests.swift
+++ b/UnitTests/Tab/WKWebViewPrivateMethodsAvailabilityTests.swift
@@ -39,6 +39,11 @@ final class WKWebViewPrivateMethodsAvailabilityTests: XCTestCase {
         XCTAssertTrue(WKBackForwardList.instancesRespond(to: WKBackForwardList.removeAllItemsSelector))
     }
 
+    func testWebViewRespondsTo_pageMutedState() {
+        XCTAssertTrue(WKWebView.instancesRespond(to: WKWebView.Selector.setPageMuted))
+        XCTAssertTrue(WKWebView.instancesRespond(to: WKWebView.Selector.mediaMutedState))
+    }
+
     func testWKWebpagePreferencesCustomHeaderFieldsSupported() {
         XCTAssertTrue(NavigationPreferences.customHeadersSupported)
         let testHeaders = ["X-CUSTOM-HEADER": "TEST"]
diff --git a/UnitTests/TabBar/Model/TabIndexTests.swift b/UnitTests/TabBar/Model/TabIndexTests.swift
index 662eb70f99..2402d42eed 100644
--- a/UnitTests/TabBar/Model/TabIndexTests.swift
+++ b/UnitTests/TabBar/Model/TabIndexTests.swift
@@ -51,6 +51,13 @@ final class TabIndexTests: XCTestCase {
         XCTAssertEqual(TabIndex.pinned(16).makeNext(), TabIndex.pinned(17))
     }
 
+    func testMakeNextUnpinned() {
+        XCTAssertEqual(TabIndex.unpinned(0).makeNextUnpinned(), TabIndex.unpinned(1))
+        XCTAssertEqual(TabIndex.unpinned(41).makeNextUnpinned(), TabIndex.unpinned(42))
+        XCTAssertEqual(TabIndex.pinned(0).makeNextUnpinned(), TabIndex.unpinned(0))
+        XCTAssertEqual(TabIndex.pinned(2).makeNextUnpinned(), TabIndex.unpinned(0))
+    }
+
     func testWhenViewModelHasNoPinnedTabsThenFirstTabIsUnpinned() {
         let tabCollectionViewModel = TabCollectionViewModel(
             tabCollection: tabCollection(tabsCount: 1),
diff --git a/UnitTests/TabBar/View/MockTabViewItemDelegate.swift b/UnitTests/TabBar/View/MockTabViewItemDelegate.swift
index c09b956f23..63b4a7fc97 100644
--- a/UnitTests/TabBar/View/MockTabViewItemDelegate.swift
+++ b/UnitTests/TabBar/View/MockTabViewItemDelegate.swift
@@ -23,8 +23,12 @@ class MockTabViewItemDelegate: TabBarViewItemDelegate {
 
     var mockedCurrentTab: Tab?
 
+    var canBookmarkAllOpenTabs = false
+    var hasItemsToTheLeft = false
     var hasItemsToTheRight = false
-    var audioState: WKWebView.AudioState = .notSupported
+    var audioState: WKWebView.AudioState?
+
+    private(set) var tabBarViewItemBookmarkAllOpenTabsActionCalled = false
 
     func tabBarViewItem(_ tabBarViewItem: DuckDuckGo_Privacy_Browser.TabBarViewItem, isMouseOver: Bool) {
 
@@ -42,6 +46,10 @@ class MockTabViewItemDelegate: TabBarViewItemDelegate {
 
     }
 
+    func tabBarViewItemCloseToTheLeftAction(_ tabBarViewItem: DuckDuckGo_Privacy_Browser.TabBarViewItem) {
+
+    }
+
     func tabBarViewItemCloseToTheRightAction(_ tabBarViewItem: DuckDuckGo_Privacy_Browser.TabBarViewItem) {
 
     }
@@ -70,6 +78,14 @@ class MockTabViewItemDelegate: TabBarViewItemDelegate {
 
     }
 
+    func tabBarViewAllItemsCanBeBookmarked(_ tabBarViewItem: DuckDuckGo_Privacy_Browser.TabBarViewItem) -> Bool {
+        canBookmarkAllOpenTabs
+    }
+
+    func tabBarViewItemBookmarkAllOpenTabsAction(_ tabBarViewItem: DuckDuckGo_Privacy_Browser.TabBarViewItem) {
+        tabBarViewItemBookmarkAllOpenTabsActionCalled = true
+    }
+
     func tabBarViewItemMoveToNewWindowAction(_ tabBarViewItem: DuckDuckGo_Privacy_Browser.TabBarViewItem) {
 
     }
@@ -86,7 +102,7 @@ class MockTabViewItemDelegate: TabBarViewItemDelegate {
 
     }
 
-    func tabBarViewItemAudioState(_ tabBarViewItem: TabBarViewItem) -> WKWebView.AudioState {
+    func tabBarViewItemAudioState(_ tabBarViewItem: TabBarViewItem) -> WKWebView.AudioState? {
         return audioState
     }
 
@@ -95,11 +111,11 @@ class MockTabViewItemDelegate: TabBarViewItemDelegate {
     }
 
     func otherTabBarViewItemsState(for tabBarViewItem: DuckDuckGo_Privacy_Browser.TabBarViewItem) -> DuckDuckGo_Privacy_Browser.OtherTabBarViewItemsState {
-        OtherTabBarViewItemsState(hasItemsToTheLeft: false, hasItemsToTheRight: hasItemsToTheRight)
+        OtherTabBarViewItemsState(hasItemsToTheLeft: hasItemsToTheLeft, hasItemsToTheRight: hasItemsToTheRight)
     }
 
     func clear() {
-        self.audioState = .notSupported
+        self.audioState = nil
     }
 
 }
diff --git a/UnitTests/TabBar/View/TabBarViewItemTests.swift b/UnitTests/TabBar/View/TabBarViewItemTests.swift
index 77afcb715f..19505467d6 100644
--- a/UnitTests/TabBar/View/TabBarViewItemTests.swift
+++ b/UnitTests/TabBar/View/TabBarViewItemTests.swift
@@ -17,10 +17,7 @@
 //
 
 import XCTest
-
-#if SUBSCRIPTION
 import Subscription
-#endif
 
 @testable import DuckDuckGo_Privacy_Browser
 
@@ -48,37 +45,48 @@ final class TabBarViewItemTests: XCTestCase {
         XCTAssertEqual(menu.item(at: 0)?.title, UserText.duplicateTab)
         XCTAssertEqual(menu.item(at: 1)?.title, UserText.pinTab)
         XCTAssertTrue(menu.item(at: 2)?.isSeparatorItem ?? false)
-        XCTAssertEqual(menu.item(at: 3)?.title, UserText.bookmarkThisPage)
-        XCTAssertEqual(menu.item(at: 4)?.title, UserText.fireproofSite)
+        XCTAssertEqual(menu.item(at: 3)?.title, UserText.fireproofSite)
+        XCTAssertEqual(menu.item(at: 4)?.title, UserText.bookmarkThisPage)
         XCTAssertTrue(menu.item(at: 5)?.isSeparatorItem ?? false)
-        XCTAssertEqual(menu.item(at: 6)?.title, UserText.closeTab)
-        XCTAssertEqual(menu.item(at: 7)?.title, UserText.closeOtherTabs)
-        XCTAssertEqual(menu.item(at: 8)?.title, UserText.closeTabsToTheRight)
-        XCTAssertEqual(menu.item(at: 9)?.title, UserText.moveTabToNewWindow)
+        XCTAssertEqual(menu.item(at: 6)?.title, UserText.bookmarkAllTabs)
+        XCTAssertTrue(menu.item(at: 7)?.isSeparatorItem ?? false)
+        XCTAssertEqual(menu.item(at: 8)?.title, UserText.closeTab)
+        XCTAssertEqual(menu.item(at: 9)?.title, UserText.closeOtherTabs)
+        XCTAssertEqual(menu.item(at: 10)?.title, UserText.moveTabToNewWindow)
+
+        // Check "Close Other Tabs" submenu
+        guard let submenu = menu.item(at: 9)?.submenu else {
+            XCTFail("\"Close Other Tabs\" menu item should have a submenu")
+            return
+        }
+        XCTAssertEqual(submenu.item(at: 0)?.title, UserText.closeTabsToTheLeft)
+        XCTAssertEqual(submenu.item(at: 1)?.title, UserText.closeTabsToTheRight)
+        XCTAssertEqual(submenu.item(at: 2)?.title, UserText.closeAllOtherTabs)
     }
 
     func testThatMuteIsShownWhenCurrentAudioStateIsUnmuted() {
         delegate.audioState = .unmuted
         tabBarViewItem.menuNeedsUpdate(menu)
 
-        XCTAssertTrue(menu.item(at: 5)?.isSeparatorItem ?? false)
-        XCTAssertEqual(menu.item(at: 6)?.title, UserText.muteTab)
-        XCTAssertTrue(menu.item(at: 7)?.isSeparatorItem ?? false)
+        XCTAssertFalse(menu.item(at: 1)?.isSeparatorItem ?? true)
+        XCTAssertEqual(menu.item(at: 2)?.title, UserText.muteTab)
+        XCTAssertTrue(menu.item(at: 3)?.isSeparatorItem ?? false)
     }
 
     func testThatUnmuteIsShownWhenCurrentAudioStateIsMuted() {
         delegate.audioState = .muted
         tabBarViewItem.menuNeedsUpdate(menu)
 
-        XCTAssertTrue(menu.item(at: 5)?.isSeparatorItem ?? false)
-        XCTAssertEqual(menu.item(at: 6)?.title, UserText.unmuteTab)
-        XCTAssertTrue(menu.item(at: 7)?.isSeparatorItem ?? false)
+        XCTAssertFalse(menu.item(at: 1)?.isSeparatorItem ?? true)
+        XCTAssertEqual(menu.item(at: 2)?.title, UserText.unmuteTab)
+        XCTAssertTrue(menu.item(at: 3)?.isSeparatorItem ?? false)
     }
 
     func testWhenOneTabCloseThenOtherTabsItemIsDisabled() {
         tabBarViewItem.menuNeedsUpdate(menu)
 
-        let item = menu.items .first { $0.title == UserText.closeOtherTabs }
+        let submenu = menu.items .first { $0.title == UserText.closeOtherTabs }
+        let item = submenu?.submenu?.items .first { $0.title == UserText.closeAllOtherTabs }
         XCTAssertFalse(item?.isEnabled ?? true)
     }
 
@@ -86,7 +94,8 @@ final class TabBarViewItemTests: XCTestCase {
         delegate.hasItemsToTheRight = true
         tabBarViewItem.menuNeedsUpdate(menu)
 
-        let item = menu.items .first { $0.title == UserText.closeOtherTabs }
+        let submenu = menu.items .first { $0.title == UserText.closeOtherTabs }
+        let item = submenu?.submenu?.items .first { $0.title == UserText.closeAllOtherTabs }
         XCTAssertTrue(item?.isEnabled ?? false)
     }
 
@@ -105,10 +114,28 @@ final class TabBarViewItemTests: XCTestCase {
         XCTAssertTrue(item?.isEnabled ?? false)
     }
 
+    func testWhenNoTabsToTheLeftThenCloseTabsToTheLeftIsDisabled() {
+        tabBarViewItem.menuNeedsUpdate(menu)
+
+        let submenu = menu.items .first { $0.title == UserText.closeOtherTabs }
+        let item = submenu?.submenu?.items .first { $0.title == UserText.closeTabsToTheLeft }
+        XCTAssertFalse(item?.isEnabled ?? true)
+    }
+
+    func testWhenTabsToTheLeftThenCloseTabsToTheLeftIsEnabled() {
+        delegate.hasItemsToTheLeft = true
+        tabBarViewItem.menuNeedsUpdate(menu)
+
+        let submenu = menu.items .first { $0.title == UserText.closeOtherTabs }
+        let item = submenu?.submenu?.items .first { $0.title == UserText.closeTabsToTheLeft }
+        XCTAssertTrue(item?.isEnabled ?? false)
+    }
+
     func testWhenNoTabsToTheRightThenCloseTabsToTheRightIsDisabled() {
         tabBarViewItem.menuNeedsUpdate(menu)
 
-        let item = menu.items .first { $0.title == UserText.closeTabsToTheRight }
+        let submenu = menu.items .first { $0.title == UserText.closeOtherTabs }
+        let item = submenu?.submenu?.items .first { $0.title == UserText.closeTabsToTheRight }
         XCTAssertFalse(item?.isEnabled ?? true)
     }
 
@@ -116,7 +143,8 @@ final class TabBarViewItemTests: XCTestCase {
         delegate.hasItemsToTheRight = true
         tabBarViewItem.menuNeedsUpdate(menu)
 
-        let item = menu.items .first { $0.title == UserText.closeTabsToTheRight }
+        let submenu = menu.items .first { $0.title == UserText.closeOtherTabs }
+        let item = submenu?.submenu?.items .first { $0.title == UserText.closeTabsToTheRight }
         XCTAssertTrue(item?.isEnabled ?? false)
     }
 
@@ -163,7 +191,6 @@ final class TabBarViewItemTests: XCTestCase {
         XCTAssertTrue(bookmarkItem?.isEnabled ?? false)
     }
 
-#if SUBSCRIPTION
     func testSubscriptionTabDisabledItems() {
         // Set up fake views for the TabBarViewItems
         let textField = NSTextField()
@@ -192,10 +219,44 @@ final class TabBarViewItemTests: XCTestCase {
 
         let pinItem = menu.items.first { $0.title == UserText.pinTab }
         XCTAssertFalse(pinItem?.isEnabled ?? true)
+    }
 
-        let bookmarkItem = menu.items.first { $0.title == UserText.bookmarkThisPage }
-        XCTAssertFalse(bookmarkItem?.isEnabled ?? true)
+    func testWhenCanBookmarkAllOpenTabsThenBookmarkAllOpenTabsItemIsEnabled() throws {
+        // GIVEN
+        delegate.canBookmarkAllOpenTabs = true
+        tabBarViewItem.menuNeedsUpdate(menu)
+
+        // WHEN
+        let item = try XCTUnwrap(menu.item(withTitle: UserText.bookmarkAllTabs))
+
+        // THEN
+        XCTAssertTrue(item.isEnabled)
+    }
+
+    func testWhenCannotBookmarkAllOpenTabsThenBookmarkAllOpenTabsItemIsDisabled() throws {
+        // GIVEN
+        delegate.canBookmarkAllOpenTabs = false
+        tabBarViewItem.menuNeedsUpdate(menu)
+
+        // WHEN
+        let item = try XCTUnwrap(menu.item(withTitle: UserText.bookmarkAllTabs))
+
+        // THEN
+        XCTAssertFalse(item.isEnabled)
+    }
+
+    func testWhenClickingOnBookmarkAllTabsThenTheActionDelegateIsNotified() throws {
+        // GIVEN
+        delegate.canBookmarkAllOpenTabs = true
+        tabBarViewItem.menuNeedsUpdate(menu)
+        let index = try XCTUnwrap(menu.indexOfItem(withTitle: UserText.bookmarkAllTabs))
+        XCTAssertFalse(delegate.tabBarViewItemBookmarkAllOpenTabsActionCalled)
+
+        // WHEN
+        menu.performActionForItem(at: index)
+
+        // THEN
+        XCTAssertTrue(delegate.tabBarViewItemBookmarkAllOpenTabsActionCalled)
     }
-#endif
 
 }
diff --git a/UnitTests/TabBar/ViewModel/TabCollectionViewModelTests+PinnedTabs.swift b/UnitTests/TabBar/ViewModel/TabCollectionViewModelTests+PinnedTabs.swift
index 7a8394baef..07932afb14 100644
--- a/UnitTests/TabBar/ViewModel/TabCollectionViewModelTests+PinnedTabs.swift
+++ b/UnitTests/TabBar/ViewModel/TabCollectionViewModelTests+PinnedTabs.swift
@@ -110,6 +110,16 @@ extension TabCollectionViewModelTests {
 
     // MARK: - Insert
 
+    func test_WithPinnedTabsManager_WhenInsertNewTabIsCalledThenNewTabIsAlsoSelected() {
+        let tabCollectionViewModel = TabCollectionViewModel.aTabCollectionViewModelWithPinnedTab()
+
+        tabCollectionViewModel.appendNewTab()
+        tabCollectionViewModel.select(at: .unpinned(0))
+        XCTAssertNotNil(tabCollectionViewModel.selectedTabViewModel)
+        tabCollectionViewModel.insertNewTab(after: tabCollectionViewModel.selectedTabViewModel!.tab)
+        XCTAssert(tabCollectionViewModel.selectedTabViewModel === tabCollectionViewModel.tabViewModel(at: 1))
+    }
+
     func test_WithPinnedTabs_WhenInsertChildOfPinnedTabAndNoOtherChildTabIsNearParent_ThenTabIsInsertedAsFirstUnpinnedTab() {
         let tabCollectionViewModel = TabCollectionViewModel.aTabCollectionViewModelWithPinnedTab()
 
@@ -138,6 +148,34 @@ extension TabCollectionViewModelTests {
         XCTAssertIdentical(tab, tabCollectionViewModel.tabViewModel(at: 3)?.tab)
     }
 
+    // MARK: - Insert or Append
+
+    func test_WithPinnedTabs_WhenInsertOrAppendCalledPreferencesAreRespected() {
+        let persistor = MockTabsPreferencesPersistor()
+        var tabCollectionViewModel = TabCollectionViewModel(tabCollection: TabCollection(), pinnedTabsManager: PinnedTabsManager(),
+                                                            tabsPreferences: TabsPreferences(persistor: persistor))
+        tabCollectionViewModel.appendPinnedTab()
+
+        let index = tabCollectionViewModel.tabCollection.tabs.count
+        tabCollectionViewModel.insertOrAppendNewTab()
+        XCTAssert(tabCollectionViewModel.selectedTabViewModel === tabCollectionViewModel.tabViewModel(at: index))
+
+        persistor.newTabPosition = .nextToCurrent
+        tabCollectionViewModel = TabCollectionViewModel(tabCollection: TabCollection(), pinnedTabsManager: PinnedTabsManager(),
+                                                            tabsPreferences: TabsPreferences(persistor: persistor))
+        tabCollectionViewModel.appendPinnedTab()
+
+        tabCollectionViewModel.appendNewTab()
+        tabCollectionViewModel.select(at: .unpinned(0))
+        XCTAssertNotNil(tabCollectionViewModel.selectedTabViewModel)
+        tabCollectionViewModel.insertOrAppendNewTab()
+        XCTAssert(tabCollectionViewModel.selectedTabViewModel === tabCollectionViewModel.tabViewModel(at: 1))
+
+        tabCollectionViewModel.select(at: .pinned(0))
+        tabCollectionViewModel.insertOrAppendNewTab()
+        XCTAssert(tabCollectionViewModel.selectedTabViewModel === tabCollectionViewModel.tabViewModel(at: 0))
+    }
+
     // MARK: - Remove
 
     func test_WithPinnedTabs_WhenRemoveIsCalledWithIndexOutOfBoundsThenNoTabIsRemoved() {
diff --git a/UnitTests/TabBar/ViewModel/TabCollectionViewModelTests+WithoutPinnedTabsManager.swift b/UnitTests/TabBar/ViewModel/TabCollectionViewModelTests+WithoutPinnedTabsManager.swift
index 875c7746a4..2319fbaf17 100644
--- a/UnitTests/TabBar/ViewModel/TabCollectionViewModelTests+WithoutPinnedTabsManager.swift
+++ b/UnitTests/TabBar/ViewModel/TabCollectionViewModelTests+WithoutPinnedTabsManager.swift
@@ -231,6 +231,16 @@ extension TabCollectionViewModelTests {
 
     // MARK: - Insert
 
+    func test_WithoutPinnedTabsManager_WhenInsertNewTabIsCalledThenNewTabIsAlsoSelected() {
+        let tabCollectionViewModel = TabCollectionViewModel.aTabCollectionViewModel()
+
+        tabCollectionViewModel.appendNewTab()
+        tabCollectionViewModel.select(at: .unpinned(0))
+        XCTAssertNotNil(tabCollectionViewModel.selectedTabViewModel)
+        tabCollectionViewModel.insertNewTab(after: tabCollectionViewModel.selectedTabViewModel!.tab)
+        XCTAssert(tabCollectionViewModel.selectedTabViewModel === tabCollectionViewModel.tabViewModel(at: 1))
+    }
+
     func test_WithoutPinnedTabsManager_WhenInsertChildAndParentIsntPartOfTheTabCollection_ThenNoChildIsInserted() {
         let tabCollectionViewModel = TabCollectionViewModel.aTabCollectionViewModel()
 
@@ -284,6 +294,28 @@ extension TabCollectionViewModelTests {
         XCTAssert(tab === tabCollectionViewModel.tabViewModel(at: 2)?.tab)
     }
 
+    // MARK: - Insert or Append
+
+    func test_WithoutPinnedTabsManager_WhenInsertOrAppendCalledPreferencesAreRespected() {
+        let persistor = MockTabsPreferencesPersistor()
+        var tabCollectionViewModel = TabCollectionViewModel(tabCollection: TabCollection(), pinnedTabsManager: nil,
+                                                            tabsPreferences: TabsPreferences(persistor: persistor))
+
+        let index = tabCollectionViewModel.tabCollection.tabs.count
+        tabCollectionViewModel.insertOrAppendNewTab()
+        XCTAssert(tabCollectionViewModel.selectedTabViewModel === tabCollectionViewModel.tabViewModel(at: index))
+
+        persistor.newTabPosition = .nextToCurrent
+        tabCollectionViewModel = TabCollectionViewModel(tabCollection: TabCollection(), pinnedTabsManager: nil,
+                                                            tabsPreferences: TabsPreferences(persistor: persistor))
+
+        tabCollectionViewModel.appendNewTab()
+        tabCollectionViewModel.select(at: .unpinned(0))
+        XCTAssertNotNil(tabCollectionViewModel.selectedTabViewModel)
+        tabCollectionViewModel.insertOrAppendNewTab()
+        XCTAssert(tabCollectionViewModel.selectedTabViewModel === tabCollectionViewModel.tabViewModel(at: 1))
+    }
+
     // MARK: - Remove
 
     func test_WithoutPinnedTabsManager_WhenRemoveIsCalledWithIndexOutOfBoundsThenNoTabIsRemoved() {
diff --git a/UnitTests/TabBar/ViewModel/TabCollectionViewModelTests.swift b/UnitTests/TabBar/ViewModel/TabCollectionViewModelTests.swift
index efc39feac0..5401520d36 100644
--- a/UnitTests/TabBar/ViewModel/TabCollectionViewModelTests.swift
+++ b/UnitTests/TabBar/ViewModel/TabCollectionViewModelTests.swift
@@ -222,6 +222,16 @@ final class TabCollectionViewModelTests: XCTestCase {
 
     // MARK: - Insert
 
+    func testWhenInsertNewTabIsCalledThenNewTabIsAlsoSelected() {
+        let tabCollectionViewModel = TabCollectionViewModel.aTabCollectionViewModel()
+
+        tabCollectionViewModel.appendNewTab()
+        tabCollectionViewModel.select(at: .unpinned(0))
+        XCTAssertNotNil(tabCollectionViewModel.selectedTabViewModel)
+        tabCollectionViewModel.insertNewTab(after: tabCollectionViewModel.selectedTabViewModel!.tab)
+        XCTAssert(tabCollectionViewModel.selectedTabViewModel === tabCollectionViewModel.tabViewModel(at: 1))
+    }
+
     func testWhenInsertChildAndParentIsntPartOfTheTabCollection_ThenNoChildIsInserted() {
         let tabCollectionViewModel = TabCollectionViewModel.aTabCollectionViewModel()
 
@@ -275,6 +285,28 @@ final class TabCollectionViewModelTests: XCTestCase {
         XCTAssert(tab === tabCollectionViewModel.tabViewModel(at: 2)?.tab)
     }
 
+    // MARK: - Insert or Append
+
+    func testWhenInsertOrAppendCalledPreferencesAreRespected() {
+        let persistor = MockTabsPreferencesPersistor()
+        var tabCollectionViewModel = TabCollectionViewModel(tabCollection: TabCollection(), pinnedTabsManager: PinnedTabsManager(),
+                                                            tabsPreferences: TabsPreferences(persistor: persistor))
+
+        let index = tabCollectionViewModel.tabCollection.tabs.count
+        tabCollectionViewModel.insertOrAppendNewTab()
+        XCTAssert(tabCollectionViewModel.selectedTabViewModel === tabCollectionViewModel.tabViewModel(at: index))
+
+        persistor.newTabPosition = .nextToCurrent
+        tabCollectionViewModel = TabCollectionViewModel(tabCollection: TabCollection(), pinnedTabsManager: PinnedTabsManager(),
+                                                        tabsPreferences: TabsPreferences(persistor: persistor))
+
+        tabCollectionViewModel.appendNewTab()
+        tabCollectionViewModel.select(at: .unpinned(0))
+        XCTAssertNotNil(tabCollectionViewModel.selectedTabViewModel)
+        tabCollectionViewModel.insertOrAppendNewTab()
+        XCTAssert(tabCollectionViewModel.selectedTabViewModel === tabCollectionViewModel.tabViewModel(at: 1))
+    }
+
     // MARK: - Remove
 
     func testWhenRemoveIsCalledWithIndexOutOfBoundsThenNoTabIsRemoved() {
@@ -318,6 +350,71 @@ final class TabCollectionViewModelTests: XCTestCase {
         XCTAssertEqual(firstTab, tabCollectionViewModel.selectedTabViewModel?.tab)
     }
 
+    func testWhenTabsToTheLeftAreRemovedAndSelectionIsRemoved_ThenSelectionIsCorrectlyUpdated() {
+        let tabCollectionViewModel = TabCollectionViewModel.aTabCollectionViewModel()
+
+        tabCollectionViewModel.appendNewTab()
+        tabCollectionViewModel.appendNewTab()
+        tabCollectionViewModel.appendNewTab()
+
+        tabCollectionViewModel.select(at: .unpinned(1))
+        tabCollectionViewModel.removeTabs(before: 2)
+
+        XCTAssertEqual(tabCollectionViewModel.selectionIndex?.item, 0)
+    }
+
+    func testWhenTabsToTheLeftAreRemovedAndSelectionRemains_ThenSelectionIsCorrectlyUpdated() {
+        let tabCollectionViewModel = TabCollectionViewModel.aTabCollectionViewModel()
+
+        tabCollectionViewModel.appendNewTab()
+        tabCollectionViewModel.appendNewTab()
+        tabCollectionViewModel.appendNewTab()
+        tabCollectionViewModel.appendNewTab()
+        tabCollectionViewModel.appendNewTab()
+        tabCollectionViewModel.select(at: .unpinned(3))
+        tabCollectionViewModel.removeTabs(before: 3)
+
+        XCTAssertEqual(tabCollectionViewModel.selectionIndex?.item, 0)
+    }
+
+    func testWhenTabsToTheLeftAreRemovedAndSelectionRemainsAndIsToTheRight_ThenSelectionIsCorrectlyUpdated() {
+        let tabCollectionViewModel = TabCollectionViewModel.aTabCollectionViewModel()
+
+        tabCollectionViewModel.appendNewTab()
+        tabCollectionViewModel.appendNewTab()
+        tabCollectionViewModel.appendNewTab()
+        tabCollectionViewModel.appendNewTab()
+        tabCollectionViewModel.appendNewTab()
+        tabCollectionViewModel.select(at: .unpinned(4))
+        tabCollectionViewModel.removeTabs(before: 2)
+
+        XCTAssertEqual(tabCollectionViewModel.selectionIndex?.item, 2)
+    }
+
+    func testWhenTabsToTheRightAreRemovedAndSelectionIsRemoved_ThenSelectionIsCorrectlyUpdated() {
+        let tabCollectionViewModel = TabCollectionViewModel.aTabCollectionViewModel()
+
+        tabCollectionViewModel.appendNewTab()
+        tabCollectionViewModel.appendNewTab()
+        tabCollectionViewModel.appendNewTab()
+
+        tabCollectionViewModel.select(at: .unpinned(1))
+        tabCollectionViewModel.removeTabs(after: 0)
+
+        XCTAssertEqual(tabCollectionViewModel.selectionIndex?.item, 0)
+    }
+
+    func testWhenTabsToTheRightAreRemovedAndSelectionRemains_ThenSelectionIsCorrectlyUpdated() {
+        let tabCollectionViewModel = TabCollectionViewModel.aTabCollectionViewModel()
+
+        tabCollectionViewModel.appendNewTab()
+        tabCollectionViewModel.appendNewTab()
+        tabCollectionViewModel.select(at: .unpinned(1))
+        tabCollectionViewModel.removeTabs(after: 1)
+
+        XCTAssertEqual(tabCollectionViewModel.selectionIndex?.item, 1)
+    }
+
     func testWhenLastTabIsRemoved_ThenSelectionIsNil() {
         let tabCollectionViewModel = TabCollectionViewModel.aTabCollectionViewModel()
 
@@ -425,6 +522,79 @@ final class TabCollectionViewModelTests: XCTestCase {
         XCTAssertEqual(events.count, 1)
         XCTAssertIdentical(events[0], tabCollectionViewModel.selectedTabViewModel)
     }
+
+    // MARK: - Bookmark All Open Tabs
+
+    func testWhenOneEmptyTabOpenThenCanBookmarkAllOpenTabsIsFalse() throws {
+        // GIVEN
+        let sut = TabCollectionViewModel.aTabCollectionViewModel()
+        let firstTabViewModel = try XCTUnwrap(sut.tabViewModel(at: 0))
+        XCTAssertEqual(sut.tabViewModels.count, 1)
+        XCTAssertEqual(firstTabViewModel.tabContent, .newtab)
+
+        // WHEN
+        let result = sut.canBookmarkAllOpenTabs()
+
+        // THEN
+        XCTAssertFalse(result)
+    }
+
+    func testWhenOneURLTabOpenThenCanBookmarkAllOpenTabsIsFalse() throws {
+        // GIVEN
+        let sut = TabCollectionViewModel.aTabCollectionViewModel()
+        sut.replaceTab(at: .unpinned(0), with: .init(content: .url(.duckDuckGo, credential: nil, source: .ui)))
+        let firstTabViewModel = try XCTUnwrap(sut.tabViewModel(at: 0))
+        XCTAssertEqual(sut.tabViewModels.count, 1)
+        XCTAssertEqual(firstTabViewModel.tabContent, .url(.duckDuckGo, credential: nil, source: .ui))
+
+        // WHEN
+        let result = sut.canBookmarkAllOpenTabs()
+
+        // THEN
+        XCTAssertFalse(result)
+    }
+
+    func testWhenOneURLTabAndOnePinnedTabOpenThenCanBookmarkAllOpenTabsIsFalse() {
+        // GIVEN
+        let sut = TabCollectionViewModel.aTabCollectionViewModel()
+        sut.replaceTab(at: .unpinned(0), with: .init(content: .url(.duckDuckGo, credential: nil, source: .ui)))
+        sut.append(tab: .init(content: .url(.duckDuckGoEmail, credential: nil, source: .ui)))
+        sut.pinTab(at: 0)
+        XCTAssertEqual(sut.pinnedTabs.count, 1)
+        XCTAssertEqual(sut.tabViewModels.count, 1)
+
+        // WHEN
+        let result = sut.canBookmarkAllOpenTabs()
+
+        // THEN
+        XCTAssertFalse(result)
+    }
+
+    func testWhenAtLeastTwoURLTabsOpenThenCanBookmarkAllOpenTabsIsTrue() {
+        // GIVEN
+        let sut = TabCollectionViewModel.aTabCollectionViewModel()
+        let pinnedTab = Tab(content: .url(.aboutDuckDuckGo, credential: nil, source: .ui))
+        sut.append(tabs: [
+            pinnedTab,
+            .init(content: .url(.duckDuckGo, credential: nil, source: .ui)),
+            .init(content: .newtab),
+            .init(content: .bookmarks),
+            .init(content: .anySettingsPane),
+            .init(content: .url(.duckDuckGoEmail, credential: nil, source: .ui)),
+        ])
+        sut.pinTab(at: 1)
+        XCTAssertEqual(sut.pinnedTabs.count, 1)
+        XCTAssertEqual(sut.tabViewModels.count, 6)
+        XCTAssertEqual(sut.pinnedTabs.first, pinnedTab)
+        XCTAssertNil(sut.tabViewModels[pinnedTab])
+
+        // WHEN
+        let result = sut.canBookmarkAllOpenTabs()
+
+        // THEN
+        XCTAssertTrue(result)
+    }
+
 }
 
 fileprivate extension TabCollectionViewModel {
diff --git a/UnitTests/TabExtensionsTests/ErrorPageTabExtensionTest.swift b/UnitTests/TabExtensionsTests/ErrorPageTabExtensionTest.swift
new file mode 100644
index 0000000000..51cfbfff44
--- /dev/null
+++ b/UnitTests/TabExtensionsTests/ErrorPageTabExtensionTest.swift
@@ -0,0 +1,411 @@
+//
+//  ErrorPageTabExtensionTest.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 Combine
+import Navigation
+import Common
+import WebKit
+import XCTest
+
+@testable import DuckDuckGo_Privacy_Browser
+
+final class ErrorPageTabExtensionTest: XCTestCase {
+
+    var mockWebViewPublisher: PassthroughSubject<WKWebView, Never>!
+    var scriptPublisher: PassthroughSubject<MockSSLErrorPageScriptProvider, Never>!
+    var errorPageExtention: SSLErrorPageTabExtension!
+    var credentialCreator: MockCredentialCreator!
+    let errorURLString = "com.example.error"
+
+    override func setUpWithError() throws {
+        mockWebViewPublisher = PassthroughSubject<WKWebView, Never>()
+        scriptPublisher = PassthroughSubject<MockSSLErrorPageScriptProvider, Never>()
+        credentialCreator = MockCredentialCreator()
+        let featureFlagger = MockFeatureFlagger()
+        errorPageExtention = SSLErrorPageTabExtension(webViewPublisher: mockWebViewPublisher, scriptsPublisher: scriptPublisher, urlCredentialCreator: credentialCreator, featureFlagger: featureFlagger)
+    }
+
+    override func tearDownWithError() throws {
+        mockWebViewPublisher = nil
+        scriptPublisher = nil
+        errorPageExtention = nil
+        credentialCreator = nil
+    }
+
+    func testWhenWebViewPublisherPublishWebViewThenErrorPageExtensionHasCorrectWebView() throws {
+        // GIVEN
+        let aWebView = WKWebView()
+
+        // WHEN
+        mockWebViewPublisher.send(aWebView)
+
+        // THEN
+        XCTAssertTrue(errorPageExtention.webView === aWebView)
+    }
+
+    @MainActor func testWhenCertificateExpired_ThenExpectedErrorPageIsShown() {
+        // GIVEN
+        let mockWebView = MockWKWebView(url: URL(string: errorURLString)!)
+        errorPageExtention.webView = mockWebView
+        let error = WKError(_nsError: NSError(domain: "com.example.error", code: NSURLErrorServerCertificateUntrusted, userInfo: ["_kCFStreamErrorCodeKey": -9814, "NSErrorFailingURLKey": URL(string: errorURLString)!]))
+        let navigation = Navigation(identity: .init(nil), responders: .init(), state: .started, redirectHistory: [], isCurrent: true, isCommitted: true)
+        let eTldPlus1 = TLD().eTLDplus1(errorURLString) ?? errorURLString
+
+        // WHEN
+        errorPageExtention.navigation(navigation, didFailWith: error)
+
+        // THEN
+        let expectedSpecificMessage = SSLErrorType.expired.specificMessage(for: errorURLString, eTldPlus1: eTldPlus1).replacingOccurrences(of: "</b>", with: "<\\/b>").escapedUnicodeHtmlString()
+        XCTAssertTrue(mockWebView.capturedHTML.contains(expectedSpecificMessage))
+    }
+
+    @MainActor func testWhenCertificateSelfSigned_ThenExpectedErrorPageIsShown() {
+        // GIVEN
+        let mockWebView = MockWKWebView(url: URL(string: errorURLString)!)
+        errorPageExtention.webView = mockWebView
+        let error = WKError(_nsError: NSError(domain: "com.example.error", code: NSURLErrorServerCertificateUntrusted, userInfo: ["_kCFStreamErrorCodeKey": -9807, "NSErrorFailingURLKey": URL(string: errorURLString)!]))
+        let navigation = Navigation(identity: .init(nil), responders: .init(), state: .started, redirectHistory: [], isCurrent: true, isCommitted: true)
+        let eTldPlus1 = TLD().eTLDplus1(errorURLString) ?? errorURLString
+
+        // WHEN
+        errorPageExtention.navigation(navigation, didFailWith: error)
+
+        // THEN
+        let expectedSpecificMessage = SSLErrorType.selfSigned.specificMessage(for: errorURLString, eTldPlus1: eTldPlus1).replacingOccurrences(of: "</b>", with: "<\\/b>").escapedUnicodeHtmlString()
+        XCTAssertTrue(mockWebView.capturedHTML.contains(expectedSpecificMessage))
+    }
+
+    @MainActor func testWhenCertificateWrongHost_ThenExpectedErrorPageIsShown() {
+        // GIVEN
+        let mockWebView = MockWKWebView(url: URL(string: errorURLString)!)
+        errorPageExtention.webView = mockWebView
+        let error = WKError(_nsError: NSError(domain: "com.example.error", code: NSURLErrorServerCertificateUntrusted, userInfo: ["_kCFStreamErrorCodeKey": -9843, "NSErrorFailingURLKey": URL(string: errorURLString)!]))
+        let navigation = Navigation(identity: .init(nil), responders: .init(), state: .started, redirectHistory: [], isCurrent: true, isCommitted: true)
+        let eTldPlus1 = TLD().eTLDplus1(errorURLString) ?? errorURLString
+
+        // WHEN
+        errorPageExtention.navigation(navigation, didFailWith: error)
+
+        // THEN
+        let expectedSpecificMessage = SSLErrorType.wrongHost.specificMessage(for: errorURLString, eTldPlus1: eTldPlus1).replacingOccurrences(of: "</b>", with: "<\\/b>").escapedUnicodeHtmlString()
+        XCTAssertTrue(mockWebView.capturedHTML.contains(expectedSpecificMessage))
+
+    }
+
+    @MainActor func test_WhenUserScriptsPublisherPublishSSLErrorPageScript_ThenErrorPageExtensionIsSetAsUserScriptDelegate() {
+        // GIVEN
+        let aSSLErrorUserScript = SSLErrorPageUserScript()
+        let mockScriptProvider = MockSSLErrorPageScriptProvider(script: aSSLErrorUserScript)
+
+        // WHEN
+        scriptPublisher.send(mockScriptProvider)
+
+        // THEN
+        XCTAssertNotNil(aSSLErrorUserScript.delegate)
+    }
+
+    @MainActor func testWhenNavigationEnded_IfNoFailure_SSLUserScriptIsNotEnabled() {
+        // GIVEN
+        let userScript = SSLErrorPageUserScript()
+        let mockScriptProvider = MockSSLErrorPageScriptProvider(script: userScript)
+        let mockWebView = MockWKWebView(url: URL(string: errorURLString)!)
+        let action = NavigationAction(request: URLRequest(url: URL(string: "com.example.error")!), navigationType: .custom(.userEnteredUrl), currentHistoryItemIdentity: nil, redirectHistory: nil, isUserInitiated: true, sourceFrame: FrameInfo(frame: WKFrameInfo()), targetFrame: nil, shouldDownload: false, mainFrameNavigation: nil)
+        let navigation = Navigation(identity: .init(nil), responders: .init(), state: .started, redirectHistory: [action], isCurrent: true, isCommitted: true)
+        errorPageExtention.webView = mockWebView
+        scriptPublisher.send(mockScriptProvider)
+
+        // WHEN
+        errorPageExtention.navigationDidFinish(navigation)
+
+        // THEN
+        XCTAssertFalse(userScript.isEnabled)
+        XCTAssertNil(userScript.failingURL)
+    }
+
+    @MainActor func testWhenNavigationEnded_IfNonSSLFailure_SSLUserScriptIsNotEnabled() {
+        // GIVEN
+        let userScript = SSLErrorPageUserScript()
+        let mockScriptProvider = MockSSLErrorPageScriptProvider(script: userScript)
+        let mockWebView = MockWKWebView(url: URL(string: errorURLString)!)
+        let action = NavigationAction(request: URLRequest(url: URL(string: "com.example.error")!), navigationType: .custom(.userEnteredUrl), currentHistoryItemIdentity: nil, redirectHistory: nil, isUserInitiated: true, sourceFrame: FrameInfo(frame: WKFrameInfo()), targetFrame: nil, shouldDownload: false, mainFrameNavigation: nil)
+        let navigation = Navigation(identity: .init(nil), responders: .init(), state: .started, redirectHistory: [action], isCurrent: true, isCommitted: true)
+        let errorDescription = "some error"
+        let error = WKError(_nsError: NSError(domain: "com.example.error", code: NSURLErrorUnknown, userInfo: ["_kCFStreamErrorCodeKey": -9843, "NSErrorFailingURLKey": URL(string: errorURLString)!, NSLocalizedDescriptionKey: errorDescription]))
+        errorPageExtention.webView = mockWebView
+        scriptPublisher.send(mockScriptProvider)
+        errorPageExtention.navigation(navigation, didFailWith: error)
+
+        // WHEN
+        errorPageExtention.navigationDidFinish(navigation)
+
+        // THEN
+        XCTAssertFalse(userScript.isEnabled)
+        XCTAssertNil(userScript.failingURL)
+    }
+
+    @MainActor func testWhenNavigationEnded_IfSSLFailure_AndErrorURLIsDifferentFromNavigationURL_SSLUserScriptIsNotEnabled() {
+        // GIVEN
+        let userScript = SSLErrorPageUserScript()
+        let mockScriptProvider = MockSSLErrorPageScriptProvider(script: userScript)
+        let mockWebView = MockWKWebView(url: URL(string: errorURLString)!)
+        let action = NavigationAction(request: URLRequest(url: URL(string: "com.different.error")!), navigationType: .custom(.userEnteredUrl), currentHistoryItemIdentity: nil, redirectHistory: nil, isUserInitiated: true, sourceFrame: FrameInfo(frame: WKFrameInfo()), targetFrame: nil, shouldDownload: false, mainFrameNavigation: nil)
+        let navigation = Navigation(identity: .init(nil), responders: .init(), state: .started, redirectHistory: [action], isCurrent: true, isCommitted: true)
+        let error = WKError(_nsError: NSError(domain: "com.example.error", code: NSURLErrorServerCertificateUntrusted, userInfo: ["_kCFStreamErrorCodeKey": -9843, "NSErrorFailingURLKey": URL(string: errorURLString)!]))
+        errorPageExtention.webView = mockWebView
+        scriptPublisher.send(mockScriptProvider)
+        errorPageExtention.navigation(navigation, didFailWith: error)
+
+        // WHEN
+        errorPageExtention.navigationDidFinish(navigation)
+
+        // THEN
+        XCTAssertFalse(userScript.isEnabled)
+        XCTAssertEqual(userScript.failingURL?.absoluteString, errorURLString)
+    }
+
+    @MainActor func testWhenNavigationEnded_IfSSLFailure_AndErrorURLIsTheSameAsNavigationURL_SSLUserScriptIsEnabled() {
+        // GIVEN
+        let userScript = SSLErrorPageUserScript()
+        let mockScriptProvider = MockSSLErrorPageScriptProvider(script: userScript)
+        let mockWebView = MockWKWebView(url: URL(string: errorURLString)!)
+        let action = NavigationAction(request: URLRequest(url: URL(string: "com.example.error")!), navigationType: .custom(.userEnteredUrl), currentHistoryItemIdentity: nil, redirectHistory: nil, isUserInitiated: true, sourceFrame: FrameInfo(frame: WKFrameInfo()), targetFrame: nil, shouldDownload: false, mainFrameNavigation: nil)
+        let navigation = Navigation(identity: .init(nil), responders: .init(), state: .started, redirectHistory: [action], isCurrent: true, isCommitted: true)
+        let error = WKError(_nsError: NSError(domain: "com.example.error", code: NSURLErrorServerCertificateUntrusted, userInfo: ["_kCFStreamErrorCodeKey": -9843, "NSErrorFailingURLKey": URL(string: errorURLString)!]))
+        errorPageExtention.webView = mockWebView
+        scriptPublisher.send(mockScriptProvider)
+        errorPageExtention.navigation(navigation, didFailWith: error)
+
+        // WHEN
+        errorPageExtention.navigationDidFinish(navigation)
+
+        // THEN
+        XCTAssertTrue(userScript.isEnabled)
+        XCTAssertEqual(userScript.failingURL?.absoluteString, errorURLString)
+    }
+
+    func testWhenLeaveSiteCalled_AndCanGoBackTrue_ThenWebViewGoesBack() {
+        // GIVEN
+        let mockWebView = MockWKWebView(url: URL(string: errorURLString)!)
+        errorPageExtention.webView = mockWebView
+
+        // WHEN
+        errorPageExtention.leaveSite()
+
+        // THEN
+        XCTAssertTrue(mockWebView.goBackCalled)
+    }
+
+    func testWhenLeaveSiteCalled_AndCanGoBackFalse_ThenWebViewCloses() {
+        // GIVEN
+        let mockWebView = MockWKWebView(url: URL(string: errorURLString)!)
+        mockWebView.canGoBack = false
+        errorPageExtention.webView = mockWebView
+
+        // WHEN
+        errorPageExtention.leaveSite()
+
+        // THEN
+        XCTAssertTrue(mockWebView.closedCalled)
+    }
+
+    func testWhenVisitSiteCalled_ThenWebViewReloads() {
+        // GIVEN
+        let mockWebView = MockWKWebView(url: URL(string: errorURLString)!)
+        errorPageExtention.webView = mockWebView
+
+        // WHEN
+        errorPageExtention.visitSite()
+
+        // THEN
+        XCTAssertTrue(mockWebView.reloadCalled)
+    }
+
+    @MainActor
+    func testWhenDidReceiveChallange_IfChallangeForCertificateValidation_AndUserRequestBypass_AndNavigationURLIsTheSameAsWevViewURL_ThenReturnsCredentials() async {
+        // GIVEN
+        let protectionSpace = URLProtectionSpace(host: "", port: 4, protocol: nil, realm: nil, authenticationMethod: NSURLAuthenticationMethodServerTrust)
+        let action = NavigationAction(request: URLRequest(url: URL(string: "com.example.error")!), navigationType: .custom(.userEnteredUrl), currentHistoryItemIdentity: nil, redirectHistory: nil, isUserInitiated: true, sourceFrame: FrameInfo(frame: WKFrameInfo()), targetFrame: nil, shouldDownload: false, mainFrameNavigation: nil)
+        let navigation = Navigation(identity: .init(nil), responders: .init(), state: .started, redirectHistory: [action], isCurrent: true, isCommitted: true)
+        let mockWebView = MockWKWebView(url: URL(string: errorURLString)!)
+        errorPageExtention.webView = mockWebView
+        errorPageExtention.visitSite()
+
+        // WHEN
+        var disposition = await errorPageExtention.didReceive(URLAuthenticationChallenge(protectionSpace: protectionSpace, proposedCredential: nil, previousFailureCount: 0, failureResponse: nil, error: nil, sender: ChallangeSender()), for: navigation)
+
+        // THEN
+        if case .credential(let credential) = disposition {
+            XCTAssertNotNil(credential)
+        } else {
+            XCTFail("No credentials found")
+        }
+
+        // WHEN
+        disposition = await errorPageExtention.didReceive(URLAuthenticationChallenge(protectionSpace: protectionSpace, proposedCredential: nil, previousFailureCount: 0, failureResponse: nil, error: nil, sender: ChallangeSender()), for: navigation)
+
+        // THEN
+        XCTAssertNil(disposition)
+    }
+
+    @MainActor
+    func testWhenDidReceiveChallange_IfChallangeNotForCertificateValidation_AndUserRequestBypass_AndNavigationURLIsTheSameAsWevViewURL_ThenReturnsNoCredentials() async {
+        // GIVEN
+        let protectionSpace = URLProtectionSpace(host: "", port: 4, protocol: nil, realm: nil, authenticationMethod: NSURLAuthenticationMethodClientCertificate)
+        let action = NavigationAction(request: URLRequest(url: URL(string: "com.example.error")!), navigationType: .custom(.userEnteredUrl), currentHistoryItemIdentity: nil, redirectHistory: nil, isUserInitiated: true, sourceFrame: FrameInfo(frame: WKFrameInfo()), targetFrame: nil, shouldDownload: false, mainFrameNavigation: nil)
+        let navigation = Navigation(identity: .init(nil), responders: .init(), state: .started, redirectHistory: [action], isCurrent: true, isCommitted: true)
+        let mockWebView = MockWKWebView(url: URL(string: errorURLString)!)
+        errorPageExtention.webView = mockWebView
+        errorPageExtention.visitSite()
+
+        // WHEN
+        let disposition = await errorPageExtention.didReceive(URLAuthenticationChallenge(protectionSpace: protectionSpace, proposedCredential: nil, previousFailureCount: 0, failureResponse: nil, error: nil, sender: ChallangeSender()), for: navigation)
+
+        // THEN
+        XCTAssertNil(disposition)
+    }
+
+    @MainActor
+    func testWhenDidReceiveChallange_IfChallangeForCertificateValidation_AndUserDoesNotRequestBypass_AndNavigationURLIsTheSameAsWevViewURL_ThenReturnsNoCredentials() async {
+        // GIVEN
+        let protectionSpace = URLProtectionSpace(host: "", port: 4, protocol: nil, realm: nil, authenticationMethod: NSURLAuthenticationMethodServerTrust)
+        let action = NavigationAction(request: URLRequest(url: URL(string: "com.example.error")!), navigationType: .custom(.userEnteredUrl), currentHistoryItemIdentity: nil, redirectHistory: nil, isUserInitiated: true, sourceFrame: FrameInfo(frame: WKFrameInfo()), targetFrame: nil, shouldDownload: false, mainFrameNavigation: nil)
+        let navigation = Navigation(identity: .init(nil), responders: .init(), state: .started, redirectHistory: [action], isCurrent: true, isCommitted: true)
+        let mockWebView = MockWKWebView(url: URL(string: errorURLString)!)
+        errorPageExtention.webView = mockWebView
+        errorPageExtention.leaveSite()
+
+        // WHEN
+        let disposition = await errorPageExtention.didReceive(URLAuthenticationChallenge(protectionSpace: protectionSpace, proposedCredential: nil, previousFailureCount: 0, failureResponse: nil, error: nil, sender: ChallangeSender()), for: navigation)
+
+        // THEN
+        XCTAssertNil(disposition)
+    }
+
+    @MainActor
+    func testWhenDidReceiveChallange_IfChallangeNotForCertificateValidation_AndUserDoesNotRequestBypass_AndNavigationURLIsNotTheSameAsWevViewURL_ThenReturnsNoCredentials() async {
+        // GIVEN
+        let protectionSpace = URLProtectionSpace(host: "", port: 4, protocol: nil, realm: nil, authenticationMethod: NSURLAuthenticationMethodServerTrust)
+        let action = NavigationAction(request: URLRequest(url: URL(string: "com.different.error")!), navigationType: .custom(.userEnteredUrl), currentHistoryItemIdentity: nil, redirectHistory: nil, isUserInitiated: true, sourceFrame: FrameInfo(frame: WKFrameInfo()), targetFrame: nil, shouldDownload: false, mainFrameNavigation: nil)
+        let navigation = Navigation(identity: .init(nil), responders: .init(), state: .started, redirectHistory: [action], isCurrent: true, isCommitted: true)
+        let mockWebView = MockWKWebView(url: URL(string: errorURLString)!)
+        errorPageExtention.webView = mockWebView
+        errorPageExtention.visitSite()
+
+        // WHEN
+        let disposition = await errorPageExtention.didReceive(URLAuthenticationChallenge(protectionSpace: protectionSpace, proposedCredential: nil, previousFailureCount: 0, failureResponse: nil, error: nil, sender: ChallangeSender()), for: navigation)
+
+        // THEN
+        XCTAssertNil(disposition)
+    }
+
+}
+
+class MockWKWebView: NSObject, ErrorPageTabExtensionNavigationDelegate {
+    var canGoBack: Bool = true
+    var url: URL?
+    var capturedHTML: String = ""
+    var goBackCalled = false
+    var reloadCalled = false
+    var closedCalled = false
+
+    init(url: URL) {
+        self.url = url
+    }
+
+    func loadAlternateHTML(_ html: String, baseURL: URL, forUnreachableURL failingURL: URL) {
+        capturedHTML = html
+    }
+
+    func setDocumentHtml(_ html: String) {
+        capturedHTML = html
+    }
+
+    func goBack() -> WKNavigation? {
+        goBackCalled = true
+        return nil
+    }
+
+    func reloadPage() -> WKNavigation? {
+        reloadCalled = true
+        return nil
+    }
+
+    func close() {
+        closedCalled = true
+    }
+}
+
+class MockSSLErrorPageScriptProvider: SSLErrorPageScriptProvider {
+    var sslErrorPageUserScript: SSLErrorPageUserScript?
+
+    init(script: SSLErrorPageUserScript?) {
+        self.sslErrorPageUserScript = script
+    }
+}
+
+class MockCredentialCreator: URLCredentialCreating {
+    func urlCredentialFrom(trust: SecTrust?) -> URLCredential? {
+        return URLCredential(user: "", password: "", persistence: .forSession)
+    }
+}
+
+class ChallangeSender: URLAuthenticationChallengeSender {
+    func use(_ credential: URLCredential, for challenge: URLAuthenticationChallenge) {}
+    func continueWithoutCredential(for challenge: URLAuthenticationChallenge) {}
+    func cancel(_ challenge: URLAuthenticationChallenge) {}
+    func isEqual(_ object: Any?) -> Bool {
+        return false
+    }
+    var hash: Int = 0
+    var superclass: AnyClass?
+    func `self`() -> Self {
+        self
+    }
+    func perform(_ aSelector: Selector!) -> Unmanaged<AnyObject>! {
+        return nil
+    }
+    func perform(_ aSelector: Selector!, with object: Any!) -> Unmanaged<AnyObject>! {
+        return nil
+    }
+    func perform(_ aSelector: Selector!, with object1: Any!, with object2: Any!) -> Unmanaged<AnyObject>! {
+        return nil
+    }
+    func isProxy() -> Bool {
+        return false
+    }
+    func isKind(of aClass: AnyClass) -> Bool {
+        return false
+    }
+    func isMember(of aClass: AnyClass) -> Bool {
+        return false
+    }
+    func conforms(to aProtocol: Protocol) -> Bool {
+        return false
+    }
+    func responds(to aSelector: Selector!) -> Bool {
+        return false
+    }
+    var description: String = ""
+}
+
+class MockFeatureFlagger: FeatureFlagger {
+    func isFeatureOn<F>(forProvider: F) -> Bool where F: BrowserServicesKit.FeatureFlagSourceProviding {
+        return true
+    }
+}
diff --git a/UnitTests/UserAgent/Model/UserAgentTests.swift b/UnitTests/UserAgent/Model/UserAgentTests.swift
index 2aebd6a2d5..d5366a3ec2 100644
--- a/UnitTests/UserAgent/Model/UserAgentTests.swift
+++ b/UnitTests/UserAgent/Model/UserAgentTests.swift
@@ -72,6 +72,15 @@ final class UserAgentTests: XCTestCase {
         XCTAssertNotEqual(UserAgent.for("https://duckduckgo.com".url, privacyConfig: config), UserAgent.webViewDefault)
     }
 
+    func testWhenDefaultPolicyIsBrandThenBrandedUserAgentIsUsed() {
+        let config = MockPrivacyConfiguration()
+        config.featureSettings = [
+            "defaultPolicy": "brand"
+        ] as! [String: Any]
+
+        XCTAssertEqual(UserAgent.for("http://wikipedia.org".url, privacyConfig: config), UserAgent.brandedDefault)
+    }
+
     func testThatRemoteConfigurationTakesPrecedenceOverLocalConfiguration() {
         let config = MockPrivacyConfiguration()
 
diff --git a/UnitTests/UserScripts/SSLErrorPageUserScriptTests.swift b/UnitTests/UserScripts/SSLErrorPageUserScriptTests.swift
new file mode 100644
index 0000000000..f94b23f889
--- /dev/null
+++ b/UnitTests/UserScripts/SSLErrorPageUserScriptTests.swift
@@ -0,0 +1,122 @@
+//
+//  SSLErrorPageUserScriptTests.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 UserScript
+
+@testable import DuckDuckGo_Privacy_Browser
+
+final class SSLErrorPageUserScriptTests: XCTestCase {
+
+    var delegate: CapturingSSLErrorPageUserScriptDelegate!
+    var userScript: SSLErrorPageUserScript!
+
+    override func setUpWithError() throws {
+        delegate = CapturingSSLErrorPageUserScriptDelegate()
+        userScript = SSLErrorPageUserScript()
+        userScript.delegate = delegate
+    }
+
+    override func tearDownWithError() throws {
+        delegate = nil
+        userScript = nil
+    }
+
+    func test_FeatureHasCorrectName() throws {
+        XCTAssertEqual(userScript.featureName, "sslErrorPage")
+    }
+
+    func test_BrokerIsCorrectlyAdded() throws {
+        // WHEN
+        let broker = UserScriptMessageBroker(context: "some contect")
+        userScript.with(broker: broker)
+
+        // THEN
+        XCTAssertEqual(userScript.broker, broker)
+    }
+
+    @MainActor
+    func test_WhenHandlerForLeaveSiteCalled_AndIsEnabledFalse_ThenNoHandlerIsReturned() {
+        // WHEN
+        let handler = userScript.handler(forMethodNamed: "leaveSite")
+
+        // THEN
+        XCTAssertNil(handler)
+    }
+
+    @MainActor
+    func test_WhenHandlerForVisitSiteCalled_AndIsEnabledFalse_ThenNoHandlerIsReturned() {
+        // WHEN
+        let handler = userScript.handler(forMethodNamed: "visitSite")
+
+        // THEN
+        XCTAssertNil(handler)
+    }
+
+    @MainActor
+    func test_WhenHandlerForLeaveSiteCalled_AndIsEnabledTrue_ThenLeaveSiteCalled() async {
+        // GIVEN
+        var encodable: Encodable?
+        userScript.isEnabled = true
+
+        // WHEN
+        let handler = userScript.handler(forMethodNamed: "leaveSite")
+        if let handler {
+            encodable = try? await handler(Data(), WKScriptMessage())
+        }
+
+        // THEN
+        XCTAssertNotNil(handler)
+        XCTAssertNil(encodable)
+        XCTAssertTrue(delegate.leaveSiteCalled)
+        XCTAssertFalse(delegate.visitSiteCalled)
+    }
+
+    @MainActor
+    func test_WhenHandlerForVisitSiteCalled_AndIsEnabledTrue_ThenVisitSiteCalled() async {
+        // GIVEN
+        var encodable: Encodable?
+        userScript.isEnabled = true
+
+        // WHEN
+        let handler = userScript.handler(forMethodNamed: "visitSite")
+        if let handler {
+            encodable = try? await handler(Data(), WKScriptMessage())
+        }
+
+        // THEN
+        XCTAssertNotNil(handler)
+        XCTAssertNil(encodable)
+        XCTAssertTrue(delegate.visitSiteCalled)
+        XCTAssertFalse(delegate.leaveSiteCalled)
+    }
+
+}
+
+class CapturingSSLErrorPageUserScriptDelegate: SSLErrorPageUserScriptDelegate {
+    var leaveSiteCalled = false
+    var visitSiteCalled = false
+
+    func leaveSite() {
+        leaveSiteCalled = true
+    }
+
+    func visitSite() {
+        visitSiteCalled = true
+    }
+}
diff --git a/UnitTests/VPNFeedbackForm/VPNFeedbackFormViewModelTests.swift b/UnitTests/VPNFeedbackForm/VPNFeedbackFormViewModelTests.swift
index 5ad28ed209..d9a45fda0c 100644
--- a/UnitTests/VPNFeedbackForm/VPNFeedbackFormViewModelTests.swift
+++ b/UnitTests/VPNFeedbackForm/VPNFeedbackFormViewModelTests.swift
@@ -19,8 +19,6 @@
 import XCTest
 @testable import DuckDuckGo_Privacy_Browser
 
-#if NETWORK_PROTECTION
-
 final class VPNFeedbackFormViewModelTests: XCTestCase {
 
     func testWhenCreatingViewModel_ThenInitialStateIsFeedbackPending() throws {
@@ -105,7 +103,8 @@ private class MockVPNMetadataCollector: VPNMetadataCollector {
         let vpnState = VPNMetadata.VPNState(
             onboardingState: "onboarded",
             connectionState: "connected",
-            lastErrorMessage: "none",
+            lastStartErrorDescription: "none",
+            lastTunnelErrorDescription: "none",
             connectedServer: "Paoli, PA",
             connectedServerIP: "123.123.123.123"
         )
@@ -128,13 +127,19 @@ private class MockVPNMetadataCollector: VPNMetadataCollector {
             notificationsAgentIsRunning: true
         )
 
+        let privacyProInfo = VPNMetadata.PrivacyProInfo(
+            hasPrivacyProAccount: true,
+            hasVPNEntitlement: true
+        )
+
         return VPNMetadata(
             appInfo: appInfo,
             deviceInfo: deviceInfo,
             networkInfo: networkInfo,
             vpnState: vpnState,
             vpnSettingsState: vpnSettingsState,
-            loginItemState: loginItemState
+            loginItemState: loginItemState,
+            privacyProInfo: privacyProInfo
         )
     }
 
@@ -171,5 +176,3 @@ private class MockVPNFeedbackFormViewModelDelegate: VPNFeedbackFormViewModelDele
     }
 
 }
-
-#endif
diff --git a/UnitTests/Waitlist/Mocks/MockNetworkProtectionCodeRedeemer.swift b/UnitTests/Waitlist/Mocks/MockNetworkProtectionCodeRedeemer.swift
deleted file mode 100644
index 629639fd4b..0000000000
--- a/UnitTests/Waitlist/Mocks/MockNetworkProtectionCodeRedeemer.swift
+++ /dev/null
@@ -1,52 +0,0 @@
-//
-//  MockNetworkProtectionCodeRedeemer.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.
-//
-
-#if NETWORK_PROTECTION
-
-import Foundation
-import NetworkProtection
-
-final class MockNetworkProtectionCodeRedeemer: NetworkProtectionCodeRedeeming {
-
-    enum MockNetworkProtectionCodeRedeemerError: Error {
-        case error
-    }
-
-    var throwError: Bool = false
-
-    var redeemedCode: String?
-    func redeem(_ code: String) async throws {
-        if throwError {
-            throw MockNetworkProtectionCodeRedeemerError.error
-        } else {
-            redeemedCode = code
-        }
-    }
-
-    var redeemedAccessToken: String?
-    func exchange(accessToken: String) async throws {
-        if throwError {
-            throw MockNetworkProtectionCodeRedeemerError.error
-        } else {
-            redeemedAccessToken = accessToken
-        }
-    }
-
-}
-
-#endif
diff --git a/UnitTests/Waitlist/Mocks/MockWaitlistFeatureSetupHandler.swift b/UnitTests/Waitlist/Mocks/MockWaitlistFeatureSetupHandler.swift
index 87c2e903f0..5e20b69faa 100644
--- a/UnitTests/Waitlist/Mocks/MockWaitlistFeatureSetupHandler.swift
+++ b/UnitTests/Waitlist/Mocks/MockWaitlistFeatureSetupHandler.swift
@@ -16,8 +16,6 @@
 //  limitations under the License.
 //
 
-#if NETWORK_PROTECTION
-
 import Foundation
 @testable import DuckDuckGo_Privacy_Browser
 
@@ -26,5 +24,3 @@ struct MockWaitlistFeatureSetupHandler: WaitlistFeatureSetupHandler {
 
     }
 }
-
-#endif
diff --git a/UnitTests/Waitlist/Mocks/MockWaitlistTermsAndConditionsActionHandler.swift b/UnitTests/Waitlist/Mocks/MockWaitlistTermsAndConditionsActionHandler.swift
index e661f9a3de..5f0623646a 100644
--- a/UnitTests/Waitlist/Mocks/MockWaitlistTermsAndConditionsActionHandler.swift
+++ b/UnitTests/Waitlist/Mocks/MockWaitlistTermsAndConditionsActionHandler.swift
@@ -16,8 +16,6 @@
 //  limitations under the License.
 //
 
-#if NETWORK_PROTECTION
-
 import Foundation
 @testable import DuckDuckGo_Privacy_Browser
 
@@ -32,5 +30,3 @@ struct MockWaitlistTermsAndConditionsActionHandler: WaitlistTermsAndConditionsAc
 
     }
 }
-
-#endif
diff --git a/UnitTests/Waitlist/WaitlistViewModelTests.swift b/UnitTests/Waitlist/WaitlistViewModelTests.swift
index 8c1319d92b..cfa6224650 100644
--- a/UnitTests/Waitlist/WaitlistViewModelTests.swift
+++ b/UnitTests/Waitlist/WaitlistViewModelTests.swift
@@ -16,8 +16,6 @@
 //  limitations under the License.
 //
 
-#if NETWORK_PROTECTION
-
 import XCTest
 @testable import DuckDuckGo_Privacy_Browser
 
@@ -129,5 +127,3 @@ final class WaitlistViewModelTests: XCTestCase {
     }
 
 }
-
-#endif
diff --git a/UnitTests/WebsiteBreakageReport/WebsiteBreakageReportTests.swift b/UnitTests/WebsiteBreakageReport/WebsiteBreakageReportTests.swift
index c5c389feac..1103a8f2eb 100644
--- a/UnitTests/WebsiteBreakageReport/WebsiteBreakageReportTests.swift
+++ b/UnitTests/WebsiteBreakageReport/WebsiteBreakageReportTests.swift
@@ -129,7 +129,7 @@ class WebsiteBreakageReportTests: XCTestCase {
         APIRequest.Headers.setUserAgent("")
         var params = parameters
         params["test"] = "1"
-        let configuration = APIRequest.Configuration(url: URL.pixelUrl(forPixelNamed: Pixel.Event.brokenSiteReport.name),
+        let configuration = APIRequest.Configuration(url: URL.pixelUrl(forPixelNamed: GeneralPixel.brokenSiteReport.name),
                                                      queryParameters: params,
                                                      allowedQueryReservedCharacters: BrokenSiteReport.allowedQueryReservedCharacters)
         return configuration.request
diff --git a/fastlane/metadata/en-US/description.txt b/fastlane/metadata/en-US/description.txt
index d97590ce20..b2f7b6c6d6 100644
--- a/fastlane/metadata/en-US/description.txt
+++ b/fastlane/metadata/en-US/description.txt
@@ -26,6 +26,15 @@ EVERYDAY PRIVACY CONTROLS 
 • 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 
+Subscribe to Privacy Pro for: 
+ 
+• Our VPN: Secure your connection on up to 5 devices. 
+
+• Personal Information Removal: Find and remove personal info from sites that store and sell it.
+
+• Identity Theft Restoration: If your identity is stolen, we’ll help restore it. 
  
 Privacy Pro Pricing & Terms
 
diff --git a/package-lock.json b/package-lock.json
index a506b40d5d..353201dd2a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -8,7 +8,7 @@
       "name": "macos-browser",
       "version": "1.0.0",
       "dependencies": {
-        "@duckduckgo/autoconsent": "^10.3.0"
+        "@duckduckgo/autoconsent": "^10.6.1"
       },
       "devDependencies": {
         "@rollup/plugin-json": "^4.1.0",
@@ -53,9 +53,9 @@
       }
     },
     "node_modules/@duckduckgo/autoconsent": {
-      "version": "10.3.0",
-      "resolved": "https://registry.npmjs.org/@duckduckgo/autoconsent/-/autoconsent-10.3.0.tgz",
-      "integrity": "sha512-dUf37qkaYDuXEytU9mNNLGw28S1t1M1dFnvMHZDV9BpINVJeAl1ye7CmlABuGlDs6URrp2ZLZ5IxcKQhQglYcw=="
+      "version": "10.6.1",
+      "resolved": "https://registry.npmjs.org/@duckduckgo/autoconsent/-/autoconsent-10.6.1.tgz",
+      "integrity": "sha512-ptgT0sp4zmQTZHAyGR9TN/WJT9W7kTb/yvaF20FwwSIcLKd2xLe2jCDwbGTaLVSqAixWDKqzZ1Dg3l7HE159Sw=="
     },
     "node_modules/@jridgewell/gen-mapping": {
       "version": "0.3.2",
diff --git a/package.json b/package.json
index ee09d66203..78eb438846 100644
--- a/package.json
+++ b/package.json
@@ -12,6 +12,6 @@
     "rollup-plugin-terser": "^7.0.2"
   },
   "dependencies": {
-    "@duckduckgo/autoconsent": "^10.3.0"
+    "@duckduckgo/autoconsent": "^10.6.1"
   }
 }
diff --git a/sandbox-test-tool/SandboxTestTool.swift b/sandbox-test-tool/SandboxTestTool.swift
index 2a800cfa18..1234426615 100644
--- a/sandbox-test-tool/SandboxTestTool.swift
+++ b/sandbox-test-tool/SandboxTestTool.swift
@@ -55,7 +55,11 @@ extension FileLogger: FilePresenterLogger {
 final class FileLogger {
     static let shared = FileLogger()
 
-    private init() {}
+    private init() {
+        if !FileManager.default.fileExists(atPath: fileURL.path) {
+            FileManager.default.createFile(atPath: fileURL.path, contents: nil)
+        }
+    }
 
     private let pid = ProcessInfo().processIdentifier
 
@@ -176,7 +180,7 @@ final class SandboxTestToolAppDelegate: NSObject, NSApplicationDelegate {
             return
         }
         do {
-            let filePresenter = try SandboxFilePresenter(fileBookmarkData: bookmark, logger: logger)
+            let filePresenter = try BookmarkFilePresenter(fileBookmarkData: bookmark, logger: logger)
             guard let url = filePresenter.url else { throw NSError(domain: "SandboxTestTool", code: -1, userInfo: [NSLocalizedDescriptionKey: "FilePresenter URL is nil"]) }
 
             filePresenter.urlPublisher.dropFirst().sink { [unowned self] url in
@@ -188,7 +192,7 @@ final class SandboxTestToolAppDelegate: NSObject, NSApplicationDelegate {
             self.filePresenters[url] = filePresenter
             logger.log("📗 openBookmarkWithFilePresenter done: \"\(filePresenter.url?.path ?? "<nil>")\"")
         } catch {
-            post(.error, with: error.encoded("could not open SandboxFilePresenter"))
+            post(.error, with: error.encoded("could not open BookmarkFilePresenter"))
         }
     }
 
@@ -198,7 +202,6 @@ final class SandboxTestToolAppDelegate: NSObject, NSApplicationDelegate {
             return
         }
         logger.log("🌂 closeFilePresenter for \(path)")
-
         let url = URL(fileURLWithPath: path)
         filePresenterCancellables[url] = nil
         filePresenters[url] = nil
@@ -230,3 +233,31 @@ private extension Error {
         return String(data: json!, encoding: .utf8)!
     }
 }
+
+extension NSURL {
+
+    private static var stopAccessingSecurityScopedResourceCallback: ((URL) -> Void)?
+
+    private static let originalStopAccessingSecurityScopedResource = {
+        class_getInstanceMethod(NSURL.self, #selector(NSURL.stopAccessingSecurityScopedResource))!
+    }()
+    private static let swizzledStopAccessingSecurityScopedResource = {
+        class_getInstanceMethod(NSURL.self, #selector(NSURL.test_tool_stopAccessingSecurityScopedResource))!
+    }()
+    private static let swizzleStopAccessingSecurityScopedResourceOnce: Void = {
+        method_exchangeImplementations(originalStopAccessingSecurityScopedResource, swizzledStopAccessingSecurityScopedResource)
+    }()
+
+    static func swizzleStopAccessingSecurityScopedResource(with stopAccessingSecurityScopedResourceCallback: ((URL) -> Void)?) {
+        _=swizzleStopAccessingSecurityScopedResourceOnce
+        self.stopAccessingSecurityScopedResourceCallback = stopAccessingSecurityScopedResourceCallback
+    }
+
+    @objc private dynamic func test_tool_stopAccessingSecurityScopedResource() {
+        if let stopAccessingSecurityScopedResourceCallback = Self.stopAccessingSecurityScopedResourceCallback {
+            stopAccessingSecurityScopedResourceCallback(self as URL)
+        }
+        self.test_tool_stopAccessingSecurityScopedResource() // call original
+    }
+
+}
diff --git a/scripts/appcast_manager/appcastManager.swift b/scripts/appcast_manager/appcastManager.swift
index c3906a3cae..e7d28209e5 100755
--- a/scripts/appcast_manager/appcastManager.swift
+++ b/scripts/appcast_manager/appcastManager.swift
@@ -80,6 +80,9 @@ SYNOPSIS
     appcastManager --release-to-internal-channel --dmg <path_to_dmg_file> --release-notes <path_to_release_notes> [--key <path_to_private_key>]
     appcastManager --release-to-public-channel --version <version_identifier> [--release-notes <path_to_release_notes>] [--key <path_to_private_key>]
     appcastManager --release-hotfix-to-public-channel --dmg <path_to_dmg_file> --release-notes <path_to_release_notes> [--key <path_to_private_key>]
+    appcastManager --release-to-internal-channel --dmg <path_to_dmg_file> --release-notes-html <path_to_release_notes_html> [--key <path_to_private_key>]
+    appcastManager --release-to-public-channel --version <version_identifier> [--release-notes-html <path_to_release_notes_html>] [--key <path_to_private_key>]
+    appcastManager --release-hotfix-to-public-channel --dmg <path_to_dmg_file> --release-notes-html <path_to_release_notes_html> [--key <path_to_private_key>]
     appcastManager --help
 
 DESCRIPTION
@@ -109,7 +112,13 @@ DESCRIPTION
     exit(0)
 
 case .releaseToInternalChannel, .releaseHotfixToPublicChannel:
-    guard let dmgPath = arguments.parameters["--dmg"], let releaseNotesPath = arguments.parameters["--release-notes"] else {
+    guard let dmgPath = arguments.parameters["--dmg"] else {
+        print("Missing required parameters")
+        exit(1)
+    }
+    let releaseNotesPath = arguments.parameters["--release-notes"]
+    let releaseNotesHTMLPath = arguments.parameters["--release-notes-html"]
+    guard releaseNotesPath != nil || releaseNotesHTMLPath != nil else {
         print("Missing required parameters")
         exit(1)
     }
@@ -117,7 +126,11 @@ case .releaseToInternalChannel, .releaseHotfixToPublicChannel:
 
     print("➡️  Action: Add to internal channel")
     print("➡️  DMG Path: \(dmgPath)")
-    print("➡️  Release Notes Path: \(releaseNotesPath)")
+    if let releaseNotesPath {
+        print("➡️  Release Notes Path: \(releaseNotesPath)")
+    } else if let releaseNotesHTMLPath {
+        print("➡️  Release Notes HTML Path: \(releaseNotesHTMLPath)")
+    }
     if isCI, let keyFile {
         print("➡️  Key file: \(keyFile)")
     }
@@ -130,7 +143,11 @@ case .releaseToInternalChannel, .releaseHotfixToPublicChannel:
     }
 
     // Handle release notes file
-    handleReleaseNotesFile(path: releaseNotesPath, updatesDirectoryURL: specificDir, dmgURL: dmgURL)
+    if let releaseNotesPath {
+        handleReleaseNotesFile(path: releaseNotesPath, updatesDirectoryURL: specificDir, dmgURL: dmgURL)
+    } else if let releaseNotesHTMLPath {
+        handleReleaseNotesHTML(path: releaseNotesHTMLPath, updatesDirectoryURL: specificDir, dmgURL: dmgURL)
+    }
 
     // Extract version number from DMG file name
     let versionNumber = getVersionNumberFromDMGFileName(dmgURL: dmgURL)
@@ -170,6 +187,10 @@ case .releaseToPublicChannel:
         print("Release Notes Path: \(releaseNotesPath)")
         let dmgURLForPublic = specificDir.appendingPathComponent(dmgFileName)
         handleReleaseNotesFile(path: releaseNotesPath, updatesDirectoryURL: specificDir, dmgURL: dmgURLForPublic)
+    } else if let releaseNotesHTMLPath = arguments.parameters["--release-notes-html"] {
+        print("Release Notes Path: \(releaseNotesHTMLPath)")
+        let dmgURLForPublic = specificDir.appendingPathComponent(dmgFileName)
+        handleReleaseNotesHTML(path: releaseNotesHTMLPath, updatesDirectoryURL: specificDir, dmgURL: dmgURLForPublic)
     } else {
         print("👀 No new release notes provided. Keeping existing release notes.")
     }
@@ -605,6 +626,27 @@ final class AppcastDownloader {
 
 // MARK: - Handling of Release Notes
 
+func handleReleaseNotesHTML(path: String, updatesDirectoryURL: URL, dmgURL: URL) {
+    // Copy release notes file and rename it to match the dmg filename
+    let releaseNotesURL = URL(fileURLWithPath: path)
+    let destinationReleaseNotesURL = updatesDirectoryURL.appendingPathComponent(dmgURL.deletingPathExtension().lastPathComponent + ".html")
+
+    do {
+        if FileManager.default.fileExists(atPath: destinationReleaseNotesURL.path) {
+            try FileManager.default.removeItem(at: destinationReleaseNotesURL)
+            print("Old release notes file removed.")
+        }
+
+        // Save the converted release notes to the destination file
+        try FileManager.default.copyItem(at: releaseNotesURL, to: destinationReleaseNotesURL)
+        print("✅ New release notes HTML file copied to the updates directory.")
+
+    } catch {
+        print("❌ Failed to copy and convert release notes HTML file: \(error).")
+        exit(1)
+    }
+}
+
 func handleReleaseNotesFile(path: String, updatesDirectoryURL: URL, dmgURL: URL) {
     // Copy release notes file and rename it to match the dmg filename
     let releaseNotesURL = URL(fileURLWithPath: path)
diff --git a/scripts/archive.sh b/scripts/archive.sh
index 679bd54885..c00f5570b1 100755
--- a/scripts/archive.sh
+++ b/scripts/archive.sh
@@ -15,7 +15,7 @@ print_usage_and_exit() {
 
 	cat <<- EOF
 	Usage:
-	  $ $(basename "$0") <review|release|dbp|subscription> [-a <asana_task_url>] [-d] [-s] [-r] [-v <version>]
+	  $ $(basename "$0") <review|release|dbp> [-a <asana_task_url>] [-d] [-s] [-r] [-v <version>]
 
 	Options:
 	 -a <asana_task_url>  Update Asana task after building the app (implies -d)
@@ -56,11 +56,6 @@ read_command_line_arguments() {
 			scheme="DuckDuckGo DBP"
 			configuration="Release"
 			;;
-		subscription)
-			app_name="DuckDuckGo Privacy Pro"
-			scheme="DuckDuckGo Privacy Pro"
-			configuration="Review"
-			;;
 		clear-keychain)
 			clear_keychain
 			;;
diff --git a/scripts/assets/loc/en.xliff b/scripts/assets/loc/en.xliff
new file mode 100644
index 0000000000..36c00babfc
--- /dev/null
+++ b/scripts/assets/loc/en.xliff
@@ -0,0 +1,5106 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 http://docs.oasis-open.org/xliff/v1.2/os/xliff-core-1.2-strict.xsd">
+  <file original="DuckDuckGo/InfoPlist.xcstrings" source-language="en" target-language="en" datatype="plaintext">
+    <header>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.2" build-num="15C500b"/>
+    </header>
+    <body>
+      <trans-unit id="CFBundleName" xml:space="preserve">
+        <source>DuckDuckGo</source>
+        <target state="new">DuckDuckGo</target>
+        <note>Bundle name</note>
+      </trans-unit>
+      <trans-unit id="NSCameraUsageDescription" xml:space="preserve">
+        <source>Allows you to upload photographs and videos</source>
+        <target state="new">Allows you to upload photographs and videos</target>
+        <note>Privacy - Camera Usage Description</note>
+      </trans-unit>
+      <trans-unit id="NSHumanReadableCopyright" xml:space="preserve">
+        <source>Copyright © 2024 DuckDuckGo. All rights reserved.</source>
+        <target state="new">Copyright © 2024 DuckDuckGo. All rights reserved.</target>
+        <note>Copyright (human-readable)</note>
+      </trans-unit>
+      <trans-unit id="NSLocationUsageDescription" xml:space="preserve">
+        <source>Allows you to share your geolocation</source>
+        <target state="new">Allows you to share your geolocation</target>
+        <note>Privacy - Location Usage Description</note>
+      </trans-unit>
+      <trans-unit id="NSLocationWhenInUseUsageDescription" xml:space="preserve">
+        <source>Allows you to share your location</source>
+        <target state="new">Allows you to share your location</target>
+        <note>Privacy - Location When In Use Usage Description</note>
+      </trans-unit>
+      <trans-unit id="NSMicrophoneUsageDescription" xml:space="preserve">
+        <source>Allows you to share recordings</source>
+        <target state="new">Allows you to share recordings</target>
+        <note>Privacy - Microphone Usage Description</note>
+      </trans-unit>
+    </body>
+  </file>
+  <file original="DuckDuckGo/Localizable.xcstrings" source-language="en" target-language="en" datatype="plaintext">
+    <header>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.2" build-num="15C500b"/>
+    </header>
+    <body>
+      <trans-unit id="" xml:space="preserve">
+        <source/>
+        <target state="new"/>
+        <note/>
+      </trans-unit>
+      <trans-unit id="%@ does not support storing passwords" xml:space="preserve">
+        <source>%@ does not support storing passwords</source>
+        <target state="new">%@ does not support storing passwords</target>
+        <note>Data Import disabled checkbox message about a browser (%@) not supporting storing passwords</note>
+      </trans-unit>
+      <trans-unit id="%lld" xml:space="preserve">
+        <source>%lld</source>
+        <target state="new">%lld</target>
+        <note/>
+      </trans-unit>
+      <trans-unit id="%lld tracking attempts blocked" xml:space="preserve">
+        <source>%lld tracking attempts blocked</source>
+        <target state="new">%lld tracking attempts blocked</target>
+        <note>The number of tracking attempts blocked in the last 7 days, shown on a new tab, translate as: Tracking attempts blocked: %@</note>
+      </trans-unit>
+      <trans-unit id="**%lld** tracking attempts blocked" xml:space="preserve">
+        <source>**%lld** tracking attempts blocked</source>
+        <target state="new">**%lld** tracking attempts blocked</target>
+        <note>The number of tracking attempts blocked in the last 7 days, shown on a new tab, translate as: Tracking attempts blocked: %@</note>
+      </trans-unit>
+      <trans-unit id="Actual Size" xml:space="preserve">
+        <source>Actual Size</source>
+        <target state="new">Actual Size</target>
+        <note>Main Menu View item</note>
+      </trans-unit>
+      <trans-unit id="Add Folder" xml:space="preserve">
+        <source>Add Folder</source>
+        <target state="new">Add Folder</target>
+        <note>Add Folder popover: Create folder button</note>
+      </trans-unit>
+      <trans-unit id="Add any details that you think may help us fix the problem" xml:space="preserve">
+        <source>Add any details that you think may help us fix the problem</source>
+        <target state="new">Add any details that you think may help us fix the problem</target>
+        <note>Data import failure Report dialog suggestion to provide a comments with extra details helping to identify the data import problem.</note>
+      </trans-unit>
+      <trans-unit id="Address" xml:space="preserve">
+        <source>Address</source>
+        <target state="new">Address</target>
+        <note>Title of the section of the Identities manager where the user can add/modify an address (street city etc,)</note>
+      </trans-unit>
+      <trans-unit id="Address:" xml:space="preserve">
+        <source>Address:</source>
+        <target state="new">Address:</target>
+        <note>Add Bookmark dialog bookmark url field heading</note>
+      </trans-unit>
+      <trans-unit id="Always Show" xml:space="preserve">
+        <source>Always Show</source>
+        <target state="new">Always Show</target>
+        <note>Preference for always showing the bookmarks bar</note>
+      </trans-unit>
+      <trans-unit id="Birthday" xml:space="preserve">
+        <source>Birthday</source>
+        <target state="new">Birthday</target>
+        <note>Title of the section of the Identities manager where the user can add/modify a date of birth</note>
+      </trans-unit>
+      <trans-unit id="Bookmark Added" xml:space="preserve">
+        <source>Bookmark Added</source>
+        <target state="new">Bookmark Added</target>
+        <note>Bookmark Added popover title</note>
+      </trans-unit>
+      <trans-unit id="Bookmark import failed." xml:space="preserve">
+        <source>Bookmark import failed.</source>
+        <target state="new">Bookmark import failed.</target>
+        <note>Data import summary message of failed bookmarks import.</note>
+      </trans-unit>
+      <trans-unit id="Bookmark import failed:" xml:space="preserve">
+        <source>Bookmark import failed:</source>
+        <target state="new">Bookmark import failed:</target>
+        <note>Data import summary format of how many bookmarks (%lld) failed to import.</note>
+      </trans-unit>
+      <trans-unit id="Bookmarks Import Complete:" xml:space="preserve">
+        <source>Bookmarks Import Complete:</source>
+        <target state="new">Bookmarks Import Complete:</target>
+        <note>Bookmarks Data Import result summary headline</note>
+      </trans-unit>
+      <trans-unit id="Bookmarks:" xml:space="preserve">
+        <source>Bookmarks:</source>
+        <target state="new">Bookmarks:</target>
+        <note>Data import summary format of how many bookmarks (%lld) were successfully imported.</note>
+      </trans-unit>
+      <trans-unit id="Bring All to Front" xml:space="preserve">
+        <source>Bring All to Front</source>
+        <target state="new">Bring All to Front</target>
+        <note>Main Menu Window item</note>
+      </trans-unit>
+      <trans-unit id="Capitalize" xml:space="preserve">
+        <source>Capitalize</source>
+        <target state="new">Capitalize</target>
+        <note>Main Menu Edit-Transformations item</note>
+      </trans-unit>
+      <trans-unit id="Clear All History…" xml:space="preserve">
+        <source>Clear All History…</source>
+        <target state="new">Clear All History…</target>
+        <note>Main Menu History item</note>
+      </trans-unit>
+      <trans-unit id="Contact Info" xml:space="preserve">
+        <source>Contact Info</source>
+        <target state="new">Contact Info</target>
+        <note>Title of the section of the Identities manager where the user can add/modify contact info (phone, email address)</note>
+      </trans-unit>
+      <trans-unit id="Copy" xml:space="preserve">
+        <source>Copy</source>
+        <target state="new">Copy</target>
+        <note>Command</note>
+      </trans-unit>
+      <trans-unit id="Country" xml:space="preserve">
+        <source>Country</source>
+        <target state="new">Country</target>
+        <note>Title of the section of the Identities manager where the user can add/modify a country (US,UK, Italy etc...)</note>
+      </trans-unit>
+      <trans-unit id="Data Detectors" xml:space="preserve">
+        <source>Data Detectors</source>
+        <target state="new">Data Detectors</target>
+        <note>Main Menu Edit-Substitutions item</note>
+      </trans-unit>
+      <trans-unit id="Delete" xml:space="preserve">
+        <source>Delete</source>
+        <target state="new">Delete</target>
+        <note>Command</note>
+      </trans-unit>
+      <trans-unit id="Developer" xml:space="preserve">
+        <source>Developer</source>
+        <target state="new">Developer</target>
+        <note>Main Menu </note>
+      </trans-unit>
+      <trans-unit id="Display progress" xml:space="preserve">
+        <source>Display progress</source>
+        <target state="new">Display progress</target>
+        <note/>
+      </trans-unit>
+      <trans-unit id="DuckDuckGo Help" xml:space="preserve">
+        <source>DuckDuckGo Help</source>
+        <target state="new">DuckDuckGo Help</target>
+        <note>Main Menu Help item</note>
+      </trans-unit>
+      <trans-unit id="DuckDuckGo browser version" xml:space="preserve">
+        <source>DuckDuckGo browser version</source>
+        <target state="new">DuckDuckGo browser version</target>
+        <note>Data import failure Report dialog description of a report field providing current DuckDuckGo Browser version</note>
+      </trans-unit>
+      <trans-unit id="DuckDuckGo needs your permission to read the %@ bookmarks file. Select the %@ folder to import bookmarks." xml:space="preserve">
+        <source>DuckDuckGo needs your permission to read the %1$@ bookmarks file. Select the %2$@ folder to import bookmarks.</source>
+        <target state="new">DuckDuckGo needs your permission to read the %1$@ bookmarks file. Select the %2$@ folder to import bookmarks.</target>
+        <note>Data import warning that DuckDuckGo browser requires file reading permissions for another browser name (%1$@), and instruction to select its (same browser name - %2$@) bookmarks folder.</note>
+      </trans-unit>
+      <trans-unit id="Duplicate Bookmarks Skipped:" xml:space="preserve">
+        <source>Duplicate Bookmarks Skipped:</source>
+        <target state="new">Duplicate Bookmarks Skipped:</target>
+        <note>Data import summary format of how many duplicate bookmarks (%lld) were skipped during import.</note>
+      </trans-unit>
+      <trans-unit id="Edit…" xml:space="preserve">
+        <source>Edit…</source>
+        <target state="new">Edit…</target>
+        <note>Command</note>
+      </trans-unit>
+      <trans-unit id="Enter Full Screen" xml:space="preserve">
+        <source>Enter Full Screen</source>
+        <target state="new">Enter Full Screen</target>
+        <note>Main Menu View item</note>
+      </trans-unit>
+      <trans-unit id="Error message &amp; code" xml:space="preserve">
+        <source>Error message &amp; code</source>
+        <target state="new">Error message &amp; code</target>
+        <note>Title of the section of a dialog (form where the user can report feedback) where the error message and the error code are shown</note>
+      </trans-unit>
+      <trans-unit id="Favorite This Page…" xml:space="preserve">
+        <source>Favorite This Page…</source>
+        <target state="new">Favorite This Page…</target>
+        <note>Main Menu History item</note>
+      </trans-unit>
+      <trans-unit id="Help" xml:space="preserve">
+        <source>Help</source>
+        <target state="new">Help</target>
+        <note>Main Menu Help</note>
+      </trans-unit>
+      <trans-unit id="Hide" xml:space="preserve">
+        <source>Hide</source>
+        <target state="new">Hide</target>
+        <note>Main Menu &gt; View &gt; Home Button &gt; None item
+   Preferences &gt; Home Button &gt; None item</note>
+      </trans-unit>
+      <trans-unit id="History" xml:space="preserve">
+        <source>History</source>
+        <target state="new">History</target>
+        <note>Main Menu </note>
+      </trans-unit>
+      <trans-unit id="Home" xml:space="preserve">
+        <source>Home</source>
+        <target state="new">Home</target>
+        <note>Main Menu View item</note>
+      </trans-unit>
+      <trans-unit id="Home Button" xml:space="preserve">
+        <source>Home Button</source>
+        <target state="new">Home Button</target>
+        <note>Main Menu &gt; View &gt; Home Button item</note>
+      </trans-unit>
+      <trans-unit id="If your computer prompts you to enter a password prior to import, DuckDuckGo will not see that password.&#10;&#10;Imported passwords are stored securely using encryption." xml:space="preserve">
+        <source>If your computer prompts you to enter a password prior to import, DuckDuckGo will not see that password.
+
+Imported passwords are stored securely using encryption.</source>
+        <target state="new">If your computer prompts you to enter a password prior to import, DuckDuckGo will not see that password.
+
+Imported passwords are stored securely using encryption.</target>
+        <note>Warning that Chromium data import would require entering system passwords.</note>
+      </trans-unit>
+      <trans-unit id="Import" xml:space="preserve">
+        <source>Import</source>
+        <target state="new">Import</target>
+        <note>Menu item</note>
+      </trans-unit>
+      <trans-unit id="Import Bookmarks" xml:space="preserve">
+        <source>Import Bookmarks</source>
+        <target state="new">Import Bookmarks</target>
+        <note>Title of dialog with instruction for the user to import bookmarks from another browser</note>
+      </trans-unit>
+      <trans-unit id="Import Passwords" xml:space="preserve">
+        <source>Import Passwords</source>
+        <target state="new">Import Passwords</target>
+        <note>Title of dialog with instruction for the user to import passwords from another browser</note>
+      </trans-unit>
+      <trans-unit id="Import Results:" xml:space="preserve">
+        <source>Import Results:</source>
+        <target state="new">Import Results:</target>
+        <note>Data Import result summary headline</note>
+      </trans-unit>
+      <trans-unit id="JavaScript Console" xml:space="preserve">
+        <source>JavaScript Console</source>
+        <target state="new">JavaScript Console</target>
+        <note>Main Menu View-Developer item</note>
+      </trans-unit>
+      <trans-unit id="Let’s try doing it manually. It won’t take long." xml:space="preserve">
+        <source>Let’s try doing it manually. It won’t take long.</source>
+        <target state="new">Let’s try doing it manually. It won’t take long.</target>
+        <note>Suggestion to switch to a Manual File Data Import when data import fails.</note>
+      </trans-unit>
+      <trans-unit id="Location:" xml:space="preserve">
+        <source>Location:</source>
+        <target state="new">Location:</target>
+        <note>Add Folder popover: parent folder picker title</note>
+      </trans-unit>
+      <trans-unit id="Make Lower Case" xml:space="preserve">
+        <source>Make Lower Case</source>
+        <target state="new">Make Lower Case</target>
+        <note>Main Menu Edit-Transformations item</note>
+      </trans-unit>
+      <trans-unit id="Make Upper Case" xml:space="preserve">
+        <source>Make Upper Case</source>
+        <target state="new">Make Upper Case</target>
+        <note>Main Menu Edit-Transformations item</note>
+      </trans-unit>
+      <trans-unit id="Manage Bookmarks" xml:space="preserve">
+        <source>Manage Bookmarks</source>
+        <target state="new">Manage Bookmarks</target>
+        <note>Main Menu History item</note>
+      </trans-unit>
+      <trans-unit id="Merge All Windows" xml:space="preserve">
+        <source>Merge All Windows</source>
+        <target state="new">Merge All Windows</target>
+        <note>Main Menu Window item</note>
+      </trans-unit>
+      <trans-unit id="Minimize" xml:space="preserve">
+        <source>Minimize</source>
+        <target state="new">Minimize</target>
+        <note>Main Menu Window item</note>
+      </trans-unit>
+      <trans-unit id="Never Show" xml:space="preserve">
+        <source>Never Show</source>
+        <target state="new">Never Show</target>
+        <note>Preference for never showing the bookmarks bar on new tab</note>
+      </trans-unit>
+      <trans-unit id="Only Show on New Tab" xml:space="preserve">
+        <source>Only Show on New Tab</source>
+        <target state="new">Only Show on New Tab</target>
+        <note>Preference for only showing the bookmarks bar on new tab</note>
+      </trans-unit>
+      <trans-unit id="Password import complete. You can now delete the saved passwords file." xml:space="preserve">
+        <source>Password import complete. You can now delete the saved passwords file.</source>
+        <target state="new">Password import complete. You can now delete the saved passwords file.</target>
+        <note>message about Passwords Data Import completion</note>
+      </trans-unit>
+      <trans-unit id="Password import failed." xml:space="preserve">
+        <source>Password import failed.</source>
+        <target state="new">Password import failed.</target>
+        <note>Data import summary message of failed passwords import.</note>
+      </trans-unit>
+      <trans-unit id="Password import failed: " xml:space="preserve">
+        <source>Password import failed: </source>
+        <target state="new">Password import failed: </target>
+        <note>Data import summary format of how many passwords (%lld) failed to import.</note>
+      </trans-unit>
+      <trans-unit id="Passwords:" xml:space="preserve">
+        <source>Passwords:</source>
+        <target state="new">Passwords:</target>
+        <note>Data import summary format of how many passwords (%lld) were successfully imported.</note>
+      </trans-unit>
+      <trans-unit id="Please submit a report to help us fix the issue." xml:space="preserve">
+        <source>Please submit a report to help us fix the issue.</source>
+        <target state="new">Please submit a report to help us fix the issue.</target>
+        <note>Data import failure Report dialog title.</note>
+      </trans-unit>
+      <trans-unit id="Recently Closed" xml:space="preserve">
+        <source>Recently Closed</source>
+        <target state="new">Recently Closed</target>
+        <note>Main Menu History item</note>
+      </trans-unit>
+      <trans-unit id="Reload Page" xml:space="preserve">
+        <source>Reload Page</source>
+        <target state="new">Reload Page</target>
+        <note>Main Menu View item</note>
+      </trans-unit>
+      <trans-unit id="Remove" xml:space="preserve">
+        <source>Remove</source>
+        <target state="new">Remove</target>
+        <note>Remove bookmark button title</note>
+      </trans-unit>
+      <trans-unit id="Reopen All Windows from Last Session" xml:space="preserve">
+        <source>Reopen All Windows from Last Session</source>
+        <target state="new">Reopen All Windows from Last Session</target>
+        <note>Main Menu History item</note>
+      </trans-unit>
+      <trans-unit id="Select %@ Folder…" xml:space="preserve">
+        <source>Select %@ Folder…</source>
+        <target state="new">Select %@ Folder…</target>
+        <note/>
+      </trans-unit>
+      <trans-unit id="Select Profile:" xml:space="preserve">
+        <source>Select Profile:</source>
+        <target state="new">Select Profile:</target>
+        <note>Browser Profile picker title for Data Import</note>
+      </trans-unit>
+      <trans-unit id="Select data to import:" xml:space="preserve">
+        <source>Select data to import:</source>
+        <target state="new">Select data to import:</target>
+        <note>Data Import section title for checkboxes of data type to import: Passwords or Bookmarks.</note>
+      </trans-unit>
+      <trans-unit id="Settings…" xml:space="preserve">
+        <source>Settings…</source>
+        <target state="new">Settings…</target>
+        <note>Menu item</note>
+      </trans-unit>
+      <trans-unit id="Show Autofill Shortcut" xml:space="preserve">
+        <source>Show Autofill Shortcut</source>
+        <target state="new">Show Autofill Shortcut</target>
+        <note>Main Menu View item</note>
+      </trans-unit>
+      <trans-unit id="Show Bookmarks Shortcut" xml:space="preserve">
+        <source>Show Bookmarks Shortcut</source>
+        <target state="new">Show Bookmarks Shortcut</target>
+        <note>Main Menu View item</note>
+      </trans-unit>
+      <trans-unit id="Show Downloads Shortcut" xml:space="preserve">
+        <source>Show Downloads Shortcut</source>
+        <target state="new">Show Downloads Shortcut</target>
+        <note>Main Menu View item</note>
+      </trans-unit>
+      <trans-unit id="Show Left of the Back Button" xml:space="preserve">
+        <source>Show Left of the Back Button</source>
+        <target state="new">Show Left of the Back Button</target>
+        <note>Main Menu &gt; View &gt; Home Button &gt; left position item</note>
+      </trans-unit>
+      <trans-unit id="Show Next Tab" xml:space="preserve">
+        <source>Show Next Tab</source>
+        <target state="new">Show Next Tab</target>
+        <note>Main Menu Window item</note>
+      </trans-unit>
+      <trans-unit id="Show Page Source" xml:space="preserve">
+        <source>Show Page Source</source>
+        <target state="new">Show Page Source</target>
+        <note>Main Menu View-Developer item</note>
+      </trans-unit>
+      <trans-unit id="Show Previous Tab" xml:space="preserve">
+        <source>Show Previous Tab</source>
+        <target state="new">Show Previous Tab</target>
+        <note>Main Menu Window item</note>
+      </trans-unit>
+      <trans-unit id="Show Resources" xml:space="preserve">
+        <source>Show Resources</source>
+        <target state="new">Show Resources</target>
+        <note>Main Menu View-Developer item</note>
+      </trans-unit>
+      <trans-unit id="Show Right of the Reload Button" xml:space="preserve">
+        <source>Show Right of the Reload Button</source>
+        <target state="new">Show Right of the Reload Button</target>
+        <note>Main Menu &gt; View &gt; Home Button &gt; right position item</note>
+      </trans-unit>
+      <trans-unit id="Show Substitutions" xml:space="preserve">
+        <source>Show Substitutions</source>
+        <target state="new">Show Substitutions</target>
+        <note>Main Menu Edit-Substitutions item</note>
+      </trans-unit>
+      <trans-unit id="Show left of the back button" xml:space="preserve">
+        <source>Show left of the back button</source>
+        <target state="new">Show left of the back button</target>
+        <note>Preferences &gt; Home Button &gt; left position item</note>
+      </trans-unit>
+      <trans-unit id="Show right of the reload button" xml:space="preserve">
+        <source>Show right of the reload button</source>
+        <target state="new">Show right of the reload button</target>
+        <note>Preferences &gt; Home Button &gt; right position item</note>
+      </trans-unit>
+      <trans-unit id="Smart Copy/Paste" xml:space="preserve">
+        <source>Smart Copy/Paste</source>
+        <target state="new">Smart Copy/Paste</target>
+        <note>Main Menu Edit-Substitutions item</note>
+      </trans-unit>
+      <trans-unit id="Smart Dashes" xml:space="preserve">
+        <source>Smart Dashes</source>
+        <target state="new">Smart Dashes</target>
+        <note>Main Menu Edit-Substitutions item</note>
+      </trans-unit>
+      <trans-unit id="Smart Links" xml:space="preserve">
+        <source>Smart Links</source>
+        <target state="new">Smart Links</target>
+        <note>Main Menu Edit-Substitutions item</note>
+      </trans-unit>
+      <trans-unit id="Smart Quotes" xml:space="preserve">
+        <source>Smart Quotes</source>
+        <target state="new">Smart Quotes</target>
+        <note>Main Menu Edit-Substitutions item</note>
+      </trans-unit>
+      <trans-unit id="Speech" xml:space="preserve">
+        <source>Speech</source>
+        <target state="new">Speech</target>
+        <note>Main Menu Edit item</note>
+      </trans-unit>
+      <trans-unit id="Start Speaking" xml:space="preserve">
+        <source>Start Speaking</source>
+        <target state="new">Start Speaking</target>
+        <note>Main Menu Edit-Speech item</note>
+      </trans-unit>
+      <trans-unit id="Stop" xml:space="preserve">
+        <source>Stop</source>
+        <target state="new">Stop</target>
+        <note>Main Menu View item</note>
+      </trans-unit>
+      <trans-unit id="Stop Speaking" xml:space="preserve">
+        <source>Stop Speaking</source>
+        <target state="new">Stop Speaking</target>
+        <note>Main Menu Edit-Speech item</note>
+      </trans-unit>
+      <trans-unit id="Text Replacement" xml:space="preserve">
+        <source>Text Replacement</source>
+        <target state="new">Text Replacement</target>
+        <note>Main Menu Edit-Substitutions item</note>
+      </trans-unit>
+      <trans-unit id="That didn’t work either. Please submit a report to help us fix the issue." xml:space="preserve">
+        <source>That didn’t work either. Please submit a report to help us fix the issue.</source>
+        <target state="new">That didn’t work either. Please submit a report to help us fix the issue.</target>
+        <note>Data import failure Report dialog title containing a message that not only automatic data import has failed failed but manual browser data import didn‘t work either.</note>
+      </trans-unit>
+      <trans-unit id="The following information will be sent to DuckDuckGo. No personally identifiable information will be sent." xml:space="preserve">
+        <source>The following information will be sent to DuckDuckGo. No personally identifiable information will be sent.</source>
+        <target state="new">The following information will be sent to DuckDuckGo. No personally identifiable information will be sent.</target>
+        <note>Data import failure Report dialog subtitle about the data being collected with the report.</note>
+      </trans-unit>
+      <trans-unit id="The version of the browser you are trying to import from" xml:space="preserve">
+        <source>The version of the browser you are trying to import from</source>
+        <target state="new">The version of the browser you are trying to import from</target>
+        <note>Data import failure Report dialog description of a report field providing version of a browser user is trying to import data from</note>
+      </trans-unit>
+      <trans-unit id="Title:" xml:space="preserve">
+        <source>Title:</source>
+        <target state="new">Title:</target>
+        <note>Add Bookmark dialog bookmark title field heading</note>
+      </trans-unit>
+      <trans-unit id="Transformations" xml:space="preserve">
+        <source>Transformations</source>
+        <target state="new">Transformations</target>
+        <note>Main Menu Edit item</note>
+      </trans-unit>
+      <trans-unit id="Try importing bookmarks manually instead." xml:space="preserve">
+        <source>Try importing bookmarks manually instead.</source>
+        <target state="new">Try importing bookmarks manually instead.</target>
+        <note>Data import error subtitle: suggestion to import Bookmarks manually by selecting a CSV or HTML file.</note>
+      </trans-unit>
+      <trans-unit id="Try importing passwords manually instead." xml:space="preserve">
+        <source>Try importing passwords manually instead.</source>
+        <target state="new">Try importing passwords manually instead.</target>
+        <note>Data import error subtitle: suggestion to import Passwords manually by selecting a CSV or HTML file.</note>
+      </trans-unit>
+      <trans-unit id="View" xml:space="preserve">
+        <source>View</source>
+        <target state="new">View</target>
+        <note>Main Menu View</note>
+      </trans-unit>
+      <trans-unit id="We couldn‘t find any bookmarks." xml:space="preserve">
+        <source>We couldn‘t find any bookmarks.</source>
+        <target state="new">We couldn‘t find any bookmarks.</target>
+        <note>Data import error message: Bookmarks weren‘t found.</note>
+      </trans-unit>
+      <trans-unit id="We couldn‘t find any passwords." xml:space="preserve">
+        <source>We couldn‘t find any passwords.</source>
+        <target state="new">We couldn‘t find any passwords.</target>
+        <note>Data import error message: Passwords weren‘t found.</note>
+      </trans-unit>
+      <trans-unit id="We were unable to import bookmarks directly from %@." xml:space="preserve">
+        <source>We were unable to import bookmarks directly from %@.</source>
+        <target state="new">We were unable to import bookmarks directly from %@.</target>
+        <note>Message when data import fails from a browser. %@ - a browser name</note>
+      </trans-unit>
+      <trans-unit id="We were unable to import passwords directly from %@." xml:space="preserve">
+        <source>We were unable to import passwords directly from %@.</source>
+        <target state="new">We were unable to import passwords directly from %@.</target>
+        <note>Message when data import fails from a browser. %@ - a browser name</note>
+      </trans-unit>
+      <trans-unit id="Window" xml:space="preserve">
+        <source>Window</source>
+        <target state="new">Window</target>
+        <note>Main Menu </note>
+      </trans-unit>
+      <trans-unit id="You'll be asked to enter your Primary Password for %@.&#10;&#10;Imported passwords are encrypted and only stored on this computer." xml:space="preserve">
+        <source>You'll be asked to enter your Primary Password for %@.
+
+Imported passwords are encrypted and only stored on this computer.</source>
+        <target state="new">You'll be asked to enter your Primary Password for %@.
+
+Imported passwords are encrypted and only stored on this computer.</target>
+        <note>Warning that Firefox-based browser name (%@) data import would require entering a Primary Password for the browser.</note>
+      </trans-unit>
+      <trans-unit id="Zoom In" xml:space="preserve">
+        <source>Zoom In</source>
+        <target state="new">Zoom In</target>
+        <note>Main Menu View item</note>
+      </trans-unit>
+      <trans-unit id="Zoom Out" xml:space="preserve">
+        <source>Zoom Out</source>
+        <target state="new">Zoom Out</target>
+        <note>Main Menu View item</note>
+      </trans-unit>
+      <trans-unit id="`continue`" xml:space="preserve">
+        <source>Continue</source>
+        <target state="new">Continue</target>
+        <note>Continue button</note>
+      </trans-unit>
+      <trans-unit id="about.app_name" xml:space="preserve">
+        <source>DuckDuckGo</source>
+        <target state="new">DuckDuckGo</target>
+        <note>Application name to be displayed in the About dialog</note>
+      </trans-unit>
+      <trans-unit id="about.app_name_app_store" xml:space="preserve">
+        <source>DuckDuckGo for Mac App Store</source>
+        <target state="new">DuckDuckGo for Mac App Store</target>
+        <note>Application name to be displayed in the About dialog in App Store app</note>
+      </trans-unit>
+      <trans-unit id="action-cannot-be-undone" xml:space="preserve">
+        <source>This action cannot be undone.</source>
+        <target state="new">This action cannot be undone.</target>
+        <note>Text used in alerts to warn user that a given action cannot be undone</note>
+      </trans-unit>
+      <trans-unit id="add.bookmark.name" xml:space="preserve">
+        <source>Name:</source>
+        <target state="new">Name:</target>
+        <note>New bookmark folder dialog folder name field heading</note>
+      </trans-unit>
+      <trans-unit id="add.favorite" xml:space="preserve">
+        <source>Add Favorite</source>
+        <target state="new">Add Favorite</target>
+        <note>Button for adding a favorite bookmark</note>
+      </trans-unit>
+      <trans-unit id="add.folder.name" xml:space="preserve">
+        <source>Name:</source>
+        <target state="new">Name:</target>
+        <note>Add Folder popover: folder name text field title</note>
+      </trans-unit>
+      <trans-unit id="add.link.to.bookmarks" xml:space="preserve">
+        <source>Add Link to Bookmarks</source>
+        <target state="new">Add Link to Bookmarks</target>
+        <note>Context menu item</note>
+      </trans-unit>
+      <trans-unit id="add.to.favorites" xml:space="preserve">
+        <source>Add to Favorites</source>
+        <target state="new">Add to Favorites</target>
+        <note>Button for adding bookmarks to favorites</note>
+      </trans-unit>
+      <trans-unit id="address.bar.placeholder" xml:space="preserve">
+        <source>Search or enter address</source>
+        <target state="new">Search or enter address</target>
+        <note>Empty Address Bar placeholder text displayed on the new tab page.</note>
+      </trans-unit>
+      <trans-unit id="address.bar.search.suffix" xml:space="preserve">
+        <source>Search DuckDuckGo</source>
+        <target state="new">Search DuckDuckGo</target>
+        <note>Suffix of searched terms in address bar. Example: best watching machine . Search DuckDuckGo</note>
+      </trans-unit>
+      <trans-unit id="address.bar.visit.suffix" xml:space="preserve">
+        <source>Visit</source>
+        <target state="new">Visit</target>
+        <note>Address bar suffix of possibly visited website. Example: spreadprivacy.com . Visit spreadprivacy.com</note>
+      </trans-unit>
+      <trans-unit id="after.bitwarden.installation.info" xml:space="preserve">
+        <source>After installing, return to DuckDuckGo to complete the setup.</source>
+        <target state="new">After installing, return to DuckDuckGo to complete the setup.</target>
+        <note>Setup of the integration with Bitwarden app</note>
+      </trans-unit>
+      <trans-unit id="alert.sync-bookmarks-paused-description" xml:space="preserve">
+        <source>You have exceeded the bookmarks sync limit. Try deleting some bookmarks. Until this is resolved your bookmarks will not be backed up.</source>
+        <target state="new">You have exceeded the bookmarks sync limit. Try deleting some bookmarks. Until this is resolved your bookmarks will not be backed up.</target>
+        <note>Description for alert shown when sync bookmarks paused for too many items</note>
+      </trans-unit>
+      <trans-unit id="alert.sync-bookmarks-paused-title" xml:space="preserve">
+        <source>Bookmarks Sync is Paused</source>
+        <target state="new">Bookmarks Sync is Paused</target>
+        <note>Title for alert shown when sync bookmarks paused for too many items</note>
+      </trans-unit>
+      <trans-unit id="alert.sync-credentials-paused-description" xml:space="preserve">
+        <source>You have exceeded the passwords sync limit. Try deleting some passwords. Until this is resolved your passwords will not be backed up.</source>
+        <target state="new">You have exceeded the passwords sync limit. Try deleting some passwords. Until this is resolved your passwords will not be backed up.</target>
+        <note>Description for alert shown when sync credentials paused for too many items</note>
+      </trans-unit>
+      <trans-unit id="alert.sync-credentials-paused-title" xml:space="preserve">
+        <source>Passwords Sync is Paused</source>
+        <target state="new">Passwords Sync is Paused</target>
+        <note>Title for alert shown when sync credentials paused for too many items</note>
+      </trans-unit>
+      <trans-unit id="alert.sync.warning.data-syncing-disabled-upgrade-required" xml:space="preserve">
+        <source>Sorry, but Sync &amp; Backup is no longer available in this app version. Please update DuckDuckGo to the latest version to continue.</source>
+        <target state="new">Sorry, but Sync &amp; Backup is no longer available in this app version. Please update DuckDuckGo to the latest version to continue.</target>
+        <note>Data syncing unavailable warning message</note>
+      </trans-unit>
+      <trans-unit id="alert.sync.warning.sync-paused" xml:space="preserve">
+        <source>Sync &amp; Backup is Paused</source>
+        <target state="new">Sync &amp; Backup is Paused</target>
+        <note>Title of the warning message</note>
+      </trans-unit>
+      <trans-unit id="alert.sync.warning.sync-unavailable-message" xml:space="preserve">
+        <source>Sorry, but Sync &amp; Backup is currently unavailable. Please try again later.</source>
+        <target state="new">Sorry, but Sync &amp; Backup is currently unavailable. Please try again later.</target>
+        <note>Data syncing unavailable warning message</note>
+      </trans-unit>
+      <trans-unit id="alert.title" xml:space="preserve">
+        <source>A message from %@</source>
+        <target state="new">A message from %@</target>
+        <note>Title formatted with presenting domain</note>
+      </trans-unit>
+      <trans-unit id="allow.integration" xml:space="preserve">
+        <source>Allow Integration with DuckDuckGo</source>
+        <target state="new">Allow Integration with DuckDuckGo</target>
+        <note>Setup of the integration with Bitwarden app</note>
+      </trans-unit>
+      <trans-unit id="auth.alert.login.button" xml:space="preserve">
+        <source>Sign In</source>
+        <target state="new">Sign In</target>
+        <note>Authentication Alert Sign In Button</note>
+      </trans-unit>
+      <trans-unit id="auth.alert.message.encrypted" xml:space="preserve">
+        <source>Sign in to %@. Your login information will be sent securely.</source>
+        <target state="new">Sign in to %@. Your login information will be sent securely.</target>
+        <note>Authentication Alert - populated with a domain name</note>
+      </trans-unit>
+      <trans-unit id="auth.alert.message.plain" xml:space="preserve">
+        <source>Log in to %@. Your password will be sent insecurely because the connection is unencrypted.</source>
+        <target state="new">Log in to %@. Your password will be sent insecurely because the connection is unencrypted.</target>
+        <note>Authentication Alert - populated with a domain name</note>
+      </trans-unit>
+      <trans-unit id="auth.alert.password.placeholder" xml:space="preserve">
+        <source>Password</source>
+        <target state="new">Password</target>
+        <note>Authentication Password field placeholder</note>
+      </trans-unit>
+      <trans-unit id="auth.alert.title" xml:space="preserve">
+        <source>Authentication Required</source>
+        <target state="new">Authentication Required</target>
+        <note>Authentication Alert Title</note>
+      </trans-unit>
+      <trans-unit id="auth.alert.username.placeholder" xml:space="preserve">
+        <source>Username</source>
+        <target state="new">Username</target>
+        <note>Authentication User name field placeholder</note>
+      </trans-unit>
+      <trans-unit id="autoconsent.checkbox.title" xml:space="preserve">
+        <source>Automatically handle cookie pop-ups</source>
+        <target state="new">Automatically handle cookie pop-ups</target>
+        <note>Autoconsent settings checkbox title</note>
+      </trans-unit>
+      <trans-unit id="autoconsent.explanation" xml:space="preserve">
+        <source>DuckDuckGo will try to select the most private settings available and hide these pop-ups for you.</source>
+        <target state="new">DuckDuckGo will try to select the most private settings available and hide these pop-ups for you.</target>
+        <note>Autoconsent feature explanation in settings</note>
+      </trans-unit>
+      <trans-unit id="autoconsent.from.setup.modal.body" xml:space="preserve">
+        <source>When we detect cookie pop-ups on sites you visit, we can try to select the most private settings available and hide pop-ups like this.</source>
+        <target state="new">When we detect cookie pop-ups on sites you visit, we can try to select the most private settings available and hide pop-ups like this.</target>
+        <note>Body for modal asking the user to auto manage cookies</note>
+      </trans-unit>
+      <trans-unit id="autoconsent.from.setup.modal.cta.confirm" xml:space="preserve">
+        <source>Handle Pop-ups For Me</source>
+        <target state="new">Handle Pop-ups For Me</target>
+        <note>Confirm button for modal asking the user to auto manage cookies</note>
+      </trans-unit>
+      <trans-unit id="autoconsent.from.setup.modal.title" xml:space="preserve">
+        <source>Want DuckDuckGo to handle cookie pop-ups?</source>
+        <target state="new">Want DuckDuckGo to handle cookie pop-ups?</target>
+        <note>Title for modal asking the user to auto manage cookies</note>
+      </trans-unit>
+      <trans-unit id="autoconsent.modal.body" xml:space="preserve">
+        <source>Want me to handle these for you? I can try to minimize cookies, maximize privacy, and hide pop-ups like these.</source>
+        <target state="new">Want me to handle these for you? I can try to minimize cookies, maximize privacy, and hide pop-ups like these.</target>
+        <note>Body for modal asking the user to auto manage cookies</note>
+      </trans-unit>
+      <trans-unit id="autoconsent.modal.cta.confirm" xml:space="preserve">
+        <source>Manage Cookie Pop-ups</source>
+        <target state="new">Manage Cookie Pop-ups</target>
+        <note>Confirm button for modal asking the user to auto manage cookies</note>
+      </trans-unit>
+      <trans-unit id="autoconsent.modal.cta.deny" xml:space="preserve">
+        <source>No Thanks</source>
+        <target state="new">No Thanks</target>
+        <note>Deny button for modal asking the user to auto manage cookies</note>
+      </trans-unit>
+      <trans-unit id="autoconsent.modal.title" xml:space="preserve">
+        <source>Looks like this site has a cookie pop-up 👇</source>
+        <target state="new">Looks like this site has a cookie pop-up 👇</target>
+        <note>Title for modal asking the user to auto manage cookies</note>
+      </trans-unit>
+      <trans-unit id="autoconsent.title" xml:space="preserve">
+        <source>Cookie Pop-ups</source>
+        <target state="new">Cookie Pop-ups</target>
+        <note>Autoconsent settings section title</note>
+      </trans-unit>
+      <trans-unit id="autofill.addresses" xml:space="preserve">
+        <source>Addresses</source>
+        <target state="new">Addresses</target>
+        <note>Autofill autosaved data type</note>
+      </trans-unit>
+      <trans-unit id="autofill.ask-to-save" xml:space="preserve">
+        <source>Save and Autofill</source>
+        <target state="new">Save and Autofill</target>
+        <note>Autofill settings section title</note>
+      </trans-unit>
+      <trans-unit id="autofill.ask-to-save.explanation" xml:space="preserve">
+        <source>Receive prompts to save new information and autofill online forms.</source>
+        <target state="new">Receive prompts to save new information and autofill online forms.</target>
+        <note>Description of Autofill autosaving feature - used in settings</note>
+      </trans-unit>
+      <trans-unit id="autofill.auto-lock" xml:space="preserve">
+        <source>Auto-lock</source>
+        <target state="new">Auto-lock</target>
+        <note>Autofill settings section title</note>
+      </trans-unit>
+      <trans-unit id="autofill.autolock-locks-form-filling" xml:space="preserve">
+        <source>Also lock password form fill</source>
+        <target state="new">Also lock password form fill</target>
+        <note>Lock form filling when auto-lock is active text</note>
+      </trans-unit>
+      <trans-unit id="autofill.copy-password" xml:space="preserve">
+        <source>Copy password</source>
+        <target state="new">Copy password</target>
+        <note>Tooltip for the Autofill panel's Copy Password button</note>
+      </trans-unit>
+      <trans-unit id="autofill.copy-username" xml:space="preserve">
+        <source>Copy username</source>
+        <target state="new">Copy username</target>
+        <note>Tooltip for the Autofill panel's Copy Username button</note>
+      </trans-unit>
+      <trans-unit id="autofill.excluded-sites" xml:space="preserve">
+        <source>Excluded Sites</source>
+        <target state="new">Excluded Sites</target>
+        <note>Autofill settings section title</note>
+      </trans-unit>
+      <trans-unit id="autofill.excluded-sites.explanation" xml:space="preserve">
+        <source>Websites you selected to never ask to save your password.</source>
+        <target state="new">Websites you selected to never ask to save your password.</target>
+        <note>Subtitle providing additional information about the excluded sites section</note>
+      </trans-unit>
+      <trans-unit id="autofill.excluded-sites.reset" xml:space="preserve">
+        <source>Reset</source>
+        <target state="new">Reset</target>
+        <note>Button title allowing users to reset their list of excluded sites</note>
+      </trans-unit>
+      <trans-unit id="autofill.excluded-sites.reset.action.message" xml:space="preserve">
+        <source>If you reset excluded sites, you will be prompted to save your password next time you sign in to any of these sites.</source>
+        <target state="new">If you reset excluded sites, you will be prompted to save your password next time you sign in to any of these sites.</target>
+        <note>Alert title</note>
+      </trans-unit>
+      <trans-unit id="autofill.excluded-sites.reset.action.title" xml:space="preserve">
+        <source>Reset Excluded Sites?</source>
+        <target state="new">Reset Excluded Sites?</target>
+        <note>Alert title</note>
+      </trans-unit>
+      <trans-unit id="autofill.hide-password" xml:space="preserve">
+        <source>Hide password</source>
+        <target state="new">Hide password</target>
+        <note>Tooltip for the Autofill panel's Hide Password button</note>
+      </trans-unit>
+      <trans-unit id="autofill.lock-when-idle" xml:space="preserve">
+        <source>Lock autofill after computer is idle for</source>
+        <target state="new">Lock autofill after computer is idle for</target>
+        <note>Autofill auto-lock setting</note>
+      </trans-unit>
+      <trans-unit id="autofill.management.credit-cards.unknown.card" xml:space="preserve">
+        <source>Card</source>
+        <target state="new">Card</target>
+        <note>Used as placeholder when user iserts a credit card of unknown type (e.g. not Visa, Mastercard)</note>
+      </trans-unit>
+      <trans-unit id="autofill.manager.status.locked" xml:space="preserve">
+        <source>Locked</source>
+        <target state="new">Locked</target>
+        <note>Locked status for password manager</note>
+      </trans-unit>
+      <trans-unit id="autofill.manager.status.unlocked" xml:space="preserve">
+        <source>Unlocked</source>
+        <target state="new">Unlocked</target>
+        <note>Unlocked status for password manager</note>
+      </trans-unit>
+      <trans-unit id="autofill.never-lock" xml:space="preserve">
+        <source>Never lock autofill</source>
+        <target state="new">Never lock autofill</target>
+        <note>Autofill auto-lock setting</note>
+      </trans-unit>
+      <trans-unit id="autofill.never-lock-warning" xml:space="preserve">
+        <source>If not locked, anyone with access to your device will be able to use and modify your autofill data. For security purposes, credit card form fill always requires authentication.</source>
+        <target state="new">If not locked, anyone with access to your device will be able to use and modify your autofill data. For security purposes, credit card form fill always requires authentication.</target>
+        <note>Autofill disabled auto-lock warning</note>
+      </trans-unit>
+      <trans-unit id="autofill.password-manager" xml:space="preserve">
+        <source>Password Manager</source>
+        <target state="new">Password Manager</target>
+        <note>Autofill settings section title</note>
+      </trans-unit>
+      <trans-unit id="autofill.password-manager.bitwarden" xml:space="preserve">
+        <source>Bitwarden</source>
+        <target state="new">Bitwarden</target>
+        <note>Autofill password manager row title</note>
+      </trans-unit>
+      <trans-unit id="autofill.password-manager.bitwarden.disclaimer" xml:space="preserve">
+        <source>Setup requires installing the Bitwarden app.</source>
+        <target state="new">Setup requires installing the Bitwarden app.</target>
+        <note>Autofill password manager Bitwarden disclaimer</note>
+      </trans-unit>
+      <trans-unit id="autofill.password-manager.duckduckgo" xml:space="preserve">
+        <source>DuckDuckGo built-in password manager</source>
+        <target state="new">DuckDuckGo built-in password manager</target>
+        <note>Autofill password manager row title</note>
+      </trans-unit>
+      <trans-unit id="autofill.payment-methods" xml:space="preserve">
+        <source>Payment methods</source>
+        <target state="new">Payment methods</target>
+        <note>Autofill autosaved data type</note>
+      </trans-unit>
+      <trans-unit id="autofill.popover.autosave.button.text" xml:space="preserve">
+        <source>View</source>
+        <target state="new">View</target>
+        <note>Button to view the recently autosaved password</note>
+      </trans-unit>
+      <trans-unit id="autofill.popover.autosave.text" xml:space="preserve">
+        <source>Password saved for %@</source>
+        <target state="new">Password saved for %@</target>
+        <note>Text confirming a password has been saved for the %@ domain</note>
+      </trans-unit>
+      <trans-unit id="autofill.popover.change-in" xml:space="preserve">
+        <source>Change in</source>
+        <target state="new">Change in</target>
+        <note>Suffix of the label - change in settings - </note>
+      </trans-unit>
+      <trans-unit id="autofill.popover.open-password-manager" xml:space="preserve">
+        <source>Open %@</source>
+        <target state="new">Open %@</target>
+        <note>Open password manager button</note>
+      </trans-unit>
+      <trans-unit id="autofill.popover.password-manager-connected-to-user" xml:space="preserve">
+        <source>Connected to user %@</source>
+        <target state="new">Connected to user %@</target>
+        <note>Label describing what user is connected to the password manager</note>
+      </trans-unit>
+      <trans-unit id="autofill.popover.password-manager-title" xml:space="preserve">
+        <source>You're using %@ to manage passwords</source>
+        <target state="new">You're using %@ to manage passwords</target>
+        <note>Explanation of what password manager is being used</note>
+      </trans-unit>
+      <trans-unit id="autofill.popover.settings-button" xml:space="preserve">
+        <source>Settings</source>
+        <target state="new">Settings</target>
+        <note>Open Settings Button</note>
+      </trans-unit>
+      <trans-unit id="autofill.show-password" xml:space="preserve">
+        <source>Show password</source>
+        <target state="new">Show password</target>
+        <note>Tooltip for the Autofill panel's Show Password button</note>
+      </trans-unit>
+      <trans-unit id="autofill.usernames-and-passwords" xml:space="preserve">
+        <source>Usernames and passwords</source>
+        <target state="new">Usernames and passwords</target>
+        <note>Autofill autosaved data type</note>
+      </trans-unit>
+      <trans-unit id="autofill.view-autofill-content" xml:space="preserve">
+        <source>View Autofill Content…</source>
+        <target state="new">View Autofill Content…</target>
+        <note>View Autofill Content Button name in the autofill settings</note>
+      </trans-unit>
+      <trans-unit id="bitwarden.app.found" xml:space="preserve">
+        <source>Bitwarden app found!</source>
+        <target state="new">Bitwarden app found!</target>
+        <note>Setup of the integration with Bitwarden app</note>
+      </trans-unit>
+      <trans-unit id="bitwarden.cant.access.container" xml:space="preserve">
+        <source>DuckDuckGo needs permission to access Bitwarden. You can grant DuckDuckGo Full Disk Access in System Settings, or switch back to the built-in password manager.</source>
+        <target state="new">DuckDuckGo needs permission to access Bitwarden. You can grant DuckDuckGo Full Disk Access in System Settings, or switch back to the built-in password manager.</target>
+        <note>Requests user Full Disk access in order to access password manager Birwarden</note>
+      </trans-unit>
+      <trans-unit id="bitwarden.connect.communication-info" xml:space="preserve">
+        <source>All communication between Bitwarden and DuckDuckGo is encrypted and the data never leaves your device.</source>
+        <target state="new">All communication between Bitwarden and DuckDuckGo is encrypted and the data never leaves your device.</target>
+        <note>Warns users that all communication between the DuckDuckGo browser and the password manager Bitwarden is encrypted and doesn't leave the user device</note>
+      </trans-unit>
+      <trans-unit id="bitwarden.connect.description" xml:space="preserve">
+        <source>We’ll walk you through connecting to Bitwarden, so you can use it in DuckDuckGo.</source>
+        <target state="new">We’ll walk you through connecting to Bitwarden, so you can use it in DuckDuckGo.</target>
+        <note>Description for when the user wants to connect the browser to the password manager Bitwarned.</note>
+      </trans-unit>
+      <trans-unit id="bitwarden.connect.history-info" xml:space="preserve">
+        <source>Bitwarden will have access to your browsing history.</source>
+        <target state="new">Bitwarden will have access to your browsing history.</target>
+        <note>Warn users that the password Manager Bitwarden will have access to their browsing history</note>
+      </trans-unit>
+      <trans-unit id="bitwarden.connect.privacy" xml:space="preserve">
+        <source>Privacy</source>
+        <target state="new">Privacy</target>
+        <note/>
+      </trans-unit>
+      <trans-unit id="bitwarden.connect.title" xml:space="preserve">
+        <source>Connect to Bitwarden</source>
+        <target state="new">Connect to Bitwarden</target>
+        <note>Title for the Bitwarden onboarding flow</note>
+      </trans-unit>
+      <trans-unit id="bitwarden.connecting" xml:space="preserve">
+        <source>Connecting to Bitwarden</source>
+        <target state="new">Connecting to Bitwarden</target>
+        <note>It appears in a dialog when the users are connecting to Bitwardern and shows the status of the action, in this case we are in the progress of connecting the browser to the Bitwarden password maanger.</note>
+      </trans-unit>
+      <trans-unit id="bitwarden.error" xml:space="preserve">
+        <source>Unable to find or connect to Bitwarden</source>
+        <target state="new">Unable to find or connect to Bitwarden</target>
+        <note>This message appears when the application is unable to find or connect to Bitwarden, indicating a connection issue.</note>
+      </trans-unit>
+      <trans-unit id="bitwarden.handshake.not.approved" xml:space="preserve">
+        <source>Handshake not approved in Bitwarden app</source>
+        <target state="new">Handshake not approved in Bitwarden app</target>
+        <note>It appears in a dialog when the users are connecting to Bitwardern and shows the status of the action. This message indicates that the handshake process was not approved in the Bitwarden app.</note>
+      </trans-unit>
+      <trans-unit id="bitwarden.install" xml:space="preserve">
+        <source>Install Bitwarden</source>
+        <target state="new">Install Bitwarden</target>
+        <note>Button to install Bitwarden app</note>
+      </trans-unit>
+      <trans-unit id="bitwarden.install.info" xml:space="preserve">
+        <source>To begin setup, first install Bitwarden from the App Store.</source>
+        <target state="new">To begin setup, first install Bitwarden from the App Store.</target>
+        <note>Setup of the integration with Bitwarden app</note>
+      </trans-unit>
+      <trans-unit id="bitwarden.integration.complete" xml:space="preserve">
+        <source>Bitwarden integration complete!</source>
+        <target state="new">Bitwarden integration complete!</target>
+        <note>Setup of the integration with Bitwarden app</note>
+      </trans-unit>
+      <trans-unit id="bitwarden.integration.complete.info" xml:space="preserve">
+        <source>You are now using Bitwarden as your password manager.</source>
+        <target state="new">You are now using Bitwarden as your password manager.</target>
+        <note>Setup of the integration with Bitwarden app</note>
+      </trans-unit>
+      <trans-unit id="bitwarden.integration.not.approved" xml:space="preserve">
+        <source>Integration with DuckDuckGo is not approved in Bitwarden app</source>
+        <target state="new">Integration with DuckDuckGo is not approved in Bitwarden app</target>
+        <note>While the user tries to connect the DuckDuckGo Browser to password manager Bitwarden This message indicates that the integration with DuckDuckGo has not been approved in the Bitwarden app.</note>
+      </trans-unit>
+      <trans-unit id="bitwarden.is.ready.to.connect" xml:space="preserve">
+        <source>Bitwarden is ready to connect to DuckDuckGo!</source>
+        <target state="new">Bitwarden is ready to connect to DuckDuckGo!</target>
+        <note>Setup of the integration with Bitwarden app</note>
+      </trans-unit>
+      <trans-unit id="bitwarden.missing.handshake" xml:space="preserve">
+        <source>Missing handshake</source>
+        <target state="new">Missing handshake</target>
+        <note>While the user tries to connect the DuckDuckGo Browser to password manager Bitwarden This message indicates a missing handshake (a way for two devices or systems to say hello to each other and agree to communicate or exchange information).</note>
+      </trans-unit>
+      <trans-unit id="bitwarden.not.installed" xml:space="preserve">
+        <source>Bitwarden app is not installed</source>
+        <target state="new">Bitwarden app is not installed</target>
+        <note/>
+      </trans-unit>
+      <trans-unit id="bitwarden.old.version" xml:space="preserve">
+        <source>Please update Bitwarden to the latest version</source>
+        <target state="new">Please update Bitwarden to the latest version</target>
+        <note>Message that warns user they need to update their password manager Bitwarden app vesion</note>
+      </trans-unit>
+      <trans-unit id="bitwarden.preferences.complete-setup" xml:space="preserve">
+        <source>Complete Setup…</source>
+        <target state="new">Complete Setup…</target>
+        <note>action option that prompts the user to complete the setup process in Bitwarden preferences</note>
+      </trans-unit>
+      <trans-unit id="bitwarden.preferences.open-bitwarden" xml:space="preserve">
+        <source>Open Bitwarden</source>
+        <target state="new">Open Bitwarden</target>
+        <note>Button to open Bitwarden app</note>
+      </trans-unit>
+      <trans-unit id="bitwarden.preferences.run" xml:space="preserve">
+        <source>Bitwarden app not running</source>
+        <target state="new">Bitwarden app not running</target>
+        <note>Warns user that the password manager Bitwarden app is not running</note>
+      </trans-unit>
+      <trans-unit id="bitwarden.preferences.unable-to-connect" xml:space="preserve">
+        <source>Unable to find or connect to Bitwarden</source>
+        <target state="new">Unable to find or connect to Bitwarden</target>
+        <note>Dialog telling the user Bitwarden (a password manager) is not available</note>
+      </trans-unit>
+      <trans-unit id="bitwarden.preferences.unlock" xml:space="preserve">
+        <source>Unlock Bitwarden</source>
+        <target state="new">Unlock Bitwarden</target>
+        <note>Asks the user to unlock the password manager Bitwarden</note>
+      </trans-unit>
+      <trans-unit id="bitwarden.waiting.for.handshake" xml:space="preserve">
+        <source>Waiting for the handshake approval in Bitwarden app</source>
+        <target state="new">Waiting for the handshake approval in Bitwarden app</target>
+        <note>While the user tries to connect the DuckDuckGo Browser to password manager Bitwarden This message indicates the system is waiting for the handshake (a way for two devices or systems to say hello to each other and agree to communicate or exchange information).</note>
+      </trans-unit>
+      <trans-unit id="bitwarden.waiting.for.permissions" xml:space="preserve">
+        <source>Waiting for permission to use Bitwarden in DuckDuckGo…</source>
+        <target state="new">Waiting for permission to use Bitwarden in DuckDuckGo…</target>
+        <note>Setup of the integration with Bitwarden app</note>
+      </trans-unit>
+      <trans-unit id="bitwarden.waiting.for.status.response" xml:space="preserve">
+        <source>Waiting for the status response from Bitwarden</source>
+        <target state="new">Waiting for the status response from Bitwarden</target>
+        <note>It appears in a dialog when the users are connecting to Bitwardern and shows the status of the action, in this case that the application is currently waiting for a response from the Bitwarden service.</note>
+      </trans-unit>
+      <trans-unit id="bookmark.dialog.add" xml:space="preserve">
+        <source>Add</source>
+        <target state="new">Add</target>
+        <note>Button to confim a bookmark creation</note>
+      </trans-unit>
+      <trans-unit id="bookmark.page" xml:space="preserve">
+        <source>Bookmark Page</source>
+        <target state="new">Bookmark Page</target>
+        <note>Context menu item</note>
+      </trans-unit>
+      <trans-unit id="bookmark.this.page" xml:space="preserve">
+        <source>Bookmark This Page</source>
+        <target state="new">Bookmark This Page</target>
+        <note>Menu item for bookmarking current page</note>
+      </trans-unit>
+      <trans-unit id="bookmark.update" xml:space="preserve">
+        <source>Update Bookmark</source>
+        <target state="new">Update Bookmark</target>
+        <note>Option for updating a bookmark</note>
+      </trans-unit>
+      <trans-unit id="bookmarks" xml:space="preserve">
+        <source>Bookmarks</source>
+        <target state="new">Bookmarks</target>
+        <note>Button for bookmarks</note>
+      </trans-unit>
+      <trans-unit id="bookmarks.add.dialog.title" xml:space="preserve">
+        <source>New Bookmark</source>
+        <target state="new">New Bookmark</target>
+        <note>Bookmark creation dialog title</note>
+      </trans-unit>
+      <trans-unit id="bookmarks.bar.context-menu.copy" xml:space="preserve">
+        <source>Copy</source>
+        <target state="new">Copy</target>
+        <note>Copy menu item for the bookmarks bar context menu</note>
+      </trans-unit>
+      <trans-unit id="bookmarks.bar.context-menu.delete" xml:space="preserve">
+        <source>Delete</source>
+        <target state="new">Delete</target>
+        <note>Delete menu item for the bookmarks bar context menu</note>
+      </trans-unit>
+      <trans-unit id="bookmarks.bar.context-menu.move-to-end" xml:space="preserve">
+        <source>Move to End</source>
+        <target state="new">Move to End</target>
+        <note>Move to End menu item for the bookmarks bar context menu</note>
+      </trans-unit>
+      <trans-unit id="bookmarks.bar.folder.empty" xml:space="preserve">
+        <source>Empty</source>
+        <target state="new">Empty</target>
+        <note>Empty state for a bookmarks bar folder</note>
+      </trans-unit>
+      <trans-unit id="bookmarks.bar.preferences.show" xml:space="preserve">
+        <source>Show Bookmarks Bar</source>
+        <target state="new">Show Bookmarks Bar</target>
+        <note>Preference item for showing the bookmarks bar</note>
+      </trans-unit>
+      <trans-unit id="bookmarks.bar.prompt.accept" xml:space="preserve">
+        <source>Show</source>
+        <target state="new">Show</target>
+        <note>Accept button label on bookmarks bar prompt</note>
+      </trans-unit>
+      <trans-unit id="bookmarks.bar.prompt.dismiss" xml:space="preserve">
+        <source>Hide</source>
+        <target state="new">Hide</target>
+        <note>Dismiss button label on bookmarks bar prompt</note>
+      </trans-unit>
+      <trans-unit id="bookmarks.bar.prompt.message" xml:space="preserve">
+        <source>Show the Bookmarks Bar for quick access to your new bookmarks.</source>
+        <target state="new">Show the Bookmarks Bar for quick access to your new bookmarks.</target>
+        <note>Message show for bookmarks bar prompt</note>
+      </trans-unit>
+      <trans-unit id="bookmarks.bar.prompt.title" xml:space="preserve">
+        <source>Show Bookmarks Bar?</source>
+        <target state="new">Show Bookmarks Bar?</target>
+        <note>Title for bookmarks bar prompt</note>
+      </trans-unit>
+      <trans-unit id="bookmarks.bar.show" xml:space="preserve">
+        <source>Bookmarks Bar</source>
+        <target state="new">Bookmarks Bar</target>
+        <note>Menu item for showing the bookmarks bar</note>
+      </trans-unit>
+      <trans-unit id="bookmarks.bar.show.always" xml:space="preserve">
+        <source>Always show</source>
+        <target state="new">Always show</target>
+        <note>Preference for always showing the bookmarks bar</note>
+      </trans-unit>
+      <trans-unit id="bookmarks.bar.show.new-tab-only" xml:space="preserve">
+        <source>Only show on New Tab</source>
+        <target state="new">Only show on New Tab</target>
+        <note>Preference for only showing the bookmarks bar on new tab</note>
+      </trans-unit>
+      <trans-unit id="bookmarks.dialog.action.addBookmark" xml:space="preserve">
+        <source>Add Bookmark</source>
+        <target state="new">Add Bookmark</target>
+        <note>CTA title for adding a Bookmark</note>
+      </trans-unit>
+      <trans-unit id="bookmarks.dialog.action.addFolder" xml:space="preserve">
+        <source>Add Folder</source>
+        <target state="new">Add Folder</target>
+        <note>CTA title for adding a Folder</note>
+      </trans-unit>
+      <trans-unit id="bookmarks.dialog.field.location" xml:space="preserve">
+        <source>Location</source>
+        <target state="new">Location</target>
+        <note>Location field label for Bookmark folder</note>
+      </trans-unit>
+      <trans-unit id="bookmarks.dialog.field.name" xml:space="preserve">
+        <source>Name</source>
+        <target state="new">Name</target>
+        <note>Name field label for Bookmark or Folder</note>
+      </trans-unit>
+      <trans-unit id="bookmarks.dialog.field.url" xml:space="preserve">
+        <source>URL</source>
+        <target state="new">URL</target>
+        <note>URL field label for Bookmar</note>
+      </trans-unit>
+      <trans-unit id="bookmarks.dialog.folder.title.add" xml:space="preserve">
+        <source>Add Folder</source>
+        <target state="new">Add Folder</target>
+        <note>Bookmark folder creation dialog title</note>
+      </trans-unit>
+      <trans-unit id="bookmarks.dialog.folder.title.edit" xml:space="preserve">
+        <source>Edit Folder</source>
+        <target state="new">Edit Folder</target>
+        <note>Bookmark folder edit dialog title</note>
+      </trans-unit>
+      <trans-unit id="bookmarks.dialog.title.add" xml:space="preserve">
+        <source>Add bookmark</source>
+        <target state="new">Add bookmark</target>
+        <note>Bookmark creation dialog title</note>
+      </trans-unit>
+      <trans-unit id="bookmarks.dialog.title.added" xml:space="preserve">
+        <source>Bookmark Added</source>
+        <target state="new">Bookmark Added</target>
+        <note>Bookmark added popover title</note>
+      </trans-unit>
+      <trans-unit id="bookmarks.dialog.title.edit" xml:space="preserve">
+        <source>Edit bookmark</source>
+        <target state="new">Edit bookmark</target>
+        <note>Bookmark edit dialog title</note>
+      </trans-unit>
+      <trans-unit id="bookmarks.empty.state.message" xml:space="preserve">
+        <source>If your bookmarks are saved in another browser, you can import them into DuckDuckGo.</source>
+        <target state="new">If your bookmarks are saved in another browser, you can import them into DuckDuckGo.</target>
+        <note>Text displayed in Bookmark Manager when there is no bookmarks yet</note>
+      </trans-unit>
+      <trans-unit id="bookmarks.empty.state.title" xml:space="preserve">
+        <source>No bookmarks yet</source>
+        <target state="new">No bookmarks yet</target>
+        <note>Title displayed in Bookmark Manager when there is no bookmarks yet</note>
+      </trans-unit>
+      <trans-unit id="bookmarks.import.button.title" xml:space="preserve">
+        <source>Import</source>
+        <target state="new">Import</target>
+        <note>Button text to open bookmark import dialog</note>
+      </trans-unit>
+      <trans-unit id="bookmarks.imported.from.folder" xml:space="preserve">
+        <source>Imported from</source>
+        <target state="new">Imported from</target>
+        <note>Name of the folder the imported bookmarks are saved into</note>
+      </trans-unit>
+      <trans-unit id="bookmarks.imported.mobile.folder.title" xml:space="preserve">
+        <source>Mobile bookmarks</source>
+        <target state="new">Mobile bookmarks</target>
+        <note>Name of the "Mobile bookmarks" folder imported from other browser</note>
+      </trans-unit>
+      <trans-unit id="bookmarks.imported.other.folder.title" xml:space="preserve">
+        <source>Other bookmarks</source>
+        <target state="new">Other bookmarks</target>
+        <note>Name of the "Other bookmarks" folder imported from other browser</note>
+      </trans-unit>
+      <trans-unit id="bookmarks.manage" xml:space="preserve">
+        <source>Manage</source>
+        <target state="new">Manage</target>
+        <note>Button for opening the bookmarks management interface</note>
+      </trans-unit>
+      <trans-unit id="bookmarks.manage-bookmarks" xml:space="preserve">
+        <source>Manage Bookmarks</source>
+        <target state="new">Manage Bookmarks</target>
+        <note>Menu item for opening the bookmarks management interface</note>
+      </trans-unit>
+      <trans-unit id="bookmarks.open.in.new.tabs" xml:space="preserve">
+        <source>Open in New Tabs</source>
+        <target state="new">Open in New Tabs</target>
+        <note>Open all bookmarks in folder in new tabs</note>
+      </trans-unit>
+      <trans-unit id="bookmarks.show-toolbar-panel" xml:space="preserve">
+        <source>Open Bookmarks Panel</source>
+        <target state="new">Open Bookmarks Panel</target>
+        <note>Menu item for opening the bookmarks panel</note>
+      </trans-unit>
+      <trans-unit id="burner.homepage.description.1" xml:space="preserve">
+        <source>Browse without saving local history</source>
+        <target state="new">Browse without saving local history</target>
+        <note>Descriptions of features Fire page. Provides information about browsing functionalities such as browsing without saving local history, signing in to a site with a different account, and troubleshooting websites.</note>
+      </trans-unit>
+      <trans-unit id="burner.homepage.description.2" xml:space="preserve">
+        <source>Sign in to a site with a different account</source>
+        <target state="new">Sign in to a site with a different account</target>
+        <note>Descriptions of features Fire page. Provides information about browsing functionalities such as browsing without saving local history, signing in to a site with a different account, and troubleshooting websites.</note>
+      </trans-unit>
+      <trans-unit id="burner.homepage.description.3" xml:space="preserve">
+        <source>Troubleshoot websites</source>
+        <target state="new">Troubleshoot websites</target>
+        <note>Descriptions of features Fire page. Provides information about browsing functionalities such as browsing without saving local history, signing in to a site with a different account, and troubleshooting websites.</note>
+      </trans-unit>
+      <trans-unit id="burner.homepage.description.4" xml:space="preserve">
+        <source>Fire windows are isolated from other browser data, and their data is burned when you close them. They have the same tracking protection as other windows.</source>
+        <target state="new">Fire windows are isolated from other browser data, and their data is burned when you close them. They have the same tracking protection as other windows.</target>
+        <note>This describes the functionality of one of out browser feature Fire Window, highlighting their isolation from other browser data and the automatic deletion of their data upon closure. Additionally, it emphasizes that fire windows offer the same level of tracking protection as other browsing windows.</note>
+      </trans-unit>
+      <trans-unit id="burner.tab.home.title" xml:space="preserve">
+        <source>New Fire Tab</source>
+        <target state="new">New Fire Tab</target>
+        <note>Tab title for Fire Tab</note>
+      </trans-unit>
+      <trans-unit id="burner.window.header" xml:space="preserve">
+        <source>Fire Window</source>
+        <target state="new">Fire Window</target>
+        <note>Header shown on the hompage of the Fire Window</note>
+      </trans-unit>
+      <trans-unit id="cancel" xml:space="preserve">
+        <source>Cancel</source>
+        <target state="new">Cancel</target>
+        <note>Cancel button</note>
+      </trans-unit>
+      <trans-unit id="cannot.open.file.alert.header" xml:space="preserve">
+        <source>Cannot Open File</source>
+        <target state="new">Cannot Open File</target>
+        <note>Header of the alert dialog informing user it is not possible to open the file</note>
+      </trans-unit>
+      <trans-unit id="cannot.open.file.alert.informative" xml:space="preserve">
+        <source>The App Store version of DuckDuckGo can only access local files if you drag-and-drop them into a browser window.
+
+ To navigate local files using the address bar, please download DuckDuckGo directly from https://duckduckgo.com/mac.</source>
+        <target state="new">The App Store version of DuckDuckGo can only access local files if you drag-and-drop them into a browser window.
+
+ To navigate local files using the address bar, please download DuckDuckGo directly from https://duckduckgo.com/mac.</target>
+        <note>Informative of the alert dialog informing user it is not possible to open the file</note>
+      </trans-unit>
+      <trans-unit id="check.allow.integration" xml:space="preserve">
+        <source>Check Allow integration with DuckDuckGo.</source>
+        <target state="new">Check Allow integration with DuckDuckGo.</target>
+        <note>Setup of the integration with Bitwarden app</note>
+      </trans-unit>
+      <trans-unit id="check.for.update" xml:space="preserve">
+        <source>Check for Update</source>
+        <target state="new">Check for Update</target>
+        <note>Button users can use to check for a new update</note>
+      </trans-unit>
+      <trans-unit id="clear" xml:space="preserve">
+        <source>Clear</source>
+        <target state="new">Clear</target>
+        <note>Clear button</note>
+      </trans-unit>
+      <trans-unit id="close.other.tabs" xml:space="preserve">
+        <source>Close Other Tabs</source>
+        <target state="new">Close Other Tabs</target>
+        <note>Menu item</note>
+      </trans-unit>
+      <trans-unit id="close.tab" xml:space="preserve">
+        <source>Close Tab</source>
+        <target state="new">Close Tab</target>
+        <note>Menu item</note>
+      </trans-unit>
+      <trans-unit id="close.tab.on.back" xml:space="preserve">
+        <source>Close and Return to Previous Tab</source>
+        <target state="new">Close and Return to Previous Tab</target>
+        <note>Close Child Tab on Back Button press and return Back to the Parent Tab without title</note>
+      </trans-unit>
+      <trans-unit id="close.tab.on.back.format" xml:space="preserve">
+        <source>Close and Return to “%@”</source>
+        <target state="new">Close and Return to “%@”</target>
+        <note>Close Child Tab on Back Button press and return Back to the Parent Tab titled “%@”</note>
+      </trans-unit>
+      <trans-unit id="close.tabs.to.the.right" xml:space="preserve">
+        <source>Close Tabs to the Right</source>
+        <target state="new">Close Tabs to the Right</target>
+        <note>Menu item</note>
+      </trans-unit>
+      <trans-unit id="copy" xml:space="preserve">
+        <source>Copy</source>
+        <target state="new">Copy</target>
+        <note>Copy button</note>
+      </trans-unit>
+      <trans-unit id="copy-selection" xml:space="preserve">
+        <source>Copy</source>
+        <target state="new">Copy</target>
+        <note>Copy selection menu item</note>
+      </trans-unit>
+      <trans-unit id="copy.email.address" xml:space="preserve">
+        <source>Copy Email Address</source>
+        <target state="new">Copy Email Address</target>
+        <note>Context menu item</note>
+      </trans-unit>
+      <trans-unit id="copy.email.addresses" xml:space="preserve">
+        <source>Copy Email Addresses</source>
+        <target state="new">Copy Email Addresses</target>
+        <note>Context menu item</note>
+      </trans-unit>
+      <trans-unit id="copy.image.address" xml:space="preserve">
+        <source>Copy Image Address</source>
+        <target state="new">Copy Image Address</target>
+        <note>Context menu item</note>
+      </trans-unit>
+      <trans-unit id="crash-report.description" xml:space="preserve">
+        <source>Click “Send to DuckDuckGo“ to submit report to DuckDuckGo. Crash reports help DuckDuckGo diagnose issues and improve our products. No personal information is sent with this report.</source>
+        <target state="new">Click “Send to DuckDuckGo“ to submit report to DuckDuckGo. Crash reports help DuckDuckGo diagnose issues and improve our products. No personal information is sent with this report.</target>
+        <note>Description of the dialog where the user can send a crash report</note>
+      </trans-unit>
+      <trans-unit id="crash-report.dont-send-button" xml:space="preserve">
+        <source>Don’t Send</source>
+        <target state="new">Don’t Send</target>
+        <note>Button the user can press to not send the crash report</note>
+      </trans-unit>
+      <trans-unit id="crash-report.send-button" xml:space="preserve">
+        <source>Send to DuckDuckGo</source>
+        <target state="new">Send to DuckDuckGo</target>
+        <note>Button the user can press to send the crash report to DuckDuckGo</note>
+      </trans-unit>
+      <trans-unit id="crash-report.textfield.title" xml:space="preserve">
+        <source>Problem Details</source>
+        <target state="new">Problem Details</target>
+        <note>Title of the text field where the problems that caused the crashed are detailed</note>
+      </trans-unit>
+      <trans-unit id="crash-report.title" xml:space="preserve">
+        <source>DuckDuckGo Privacy Browser quit unexpectedly.</source>
+        <target state="new">DuckDuckGo Privacy Browser quit unexpectedly.</target>
+        <note>Title of the dialog where the user can send a crash report</note>
+      </trans-unit>
+      <trans-unit id="dashboard.permission.allow" xml:space="preserve">
+        <source>Always allow</source>
+        <target state="new">Always allow</target>
+        <note>Privacy Dashboard: Website can always access input media device</note>
+      </trans-unit>
+      <trans-unit id="dashboard.permission.allow.on" xml:space="preserve">
+        <source>Always allow on</source>
+        <target state="new">Always allow on</target>
+        <note>Permission Popover 'Always allow on' (for domainName) checkbox</note>
+      </trans-unit>
+      <trans-unit id="dashboard.permission.ask" xml:space="preserve">
+        <source>Ask every time</source>
+        <target state="new">Ask every time</target>
+        <note>Privacy Dashboard: Website should always Ask for permission for input media device access</note>
+      </trans-unit>
+      <trans-unit id="dashboard.permission.deny" xml:space="preserve">
+        <source>Always deny</source>
+        <target state="new">Always deny</target>
+        <note>Privacy Dashboard: Website can never access input media device</note>
+      </trans-unit>
+      <trans-unit id="dashboard.popups.ask" xml:space="preserve">
+        <source>Notify</source>
+        <target state="new">Notify</target>
+        <note>Make PopUp Windows always asked from user for current domain</note>
+      </trans-unit>
+      <trans-unit id="database.factory.failed.information" xml:space="preserve">
+        <source>Restart your Mac and try again</source>
+        <target state="new">Restart your Mac and try again</target>
+        <note>Info to restart macOS after database init failure</note>
+      </trans-unit>
+      <trans-unit id="database.factory.failed.message" xml:space="preserve">
+        <source>There was an error initializing the database</source>
+        <target state="new">There was an error initializing the database</target>
+        <note>Alert title when we fail to init database</note>
+      </trans-unit>
+      <trans-unit id="default.browser.prompt.button" xml:space="preserve">
+        <source>Set Default…</source>
+        <target state="new">Set Default…</target>
+        <note>represents a prompt message asking the user to make DuckDuckGo their default browser.</note>
+      </trans-unit>
+      <trans-unit id="default.browser.prompt.message" xml:space="preserve">
+        <source>Make DuckDuckGo your default browser</source>
+        <target state="new">Make DuckDuckGo your default browser</target>
+        <note>represents a prompt message asking the user to make DuckDuckGo their default browser.</note>
+      </trans-unit>
+      <trans-unit id="delete-bookmark" xml:space="preserve">
+        <source>Delete Bookmark</source>
+        <target state="new">Delete Bookmark</target>
+        <note>Delete Bookmark button</note>
+      </trans-unit>
+      <trans-unit id="details" xml:space="preserve">
+        <source>Details</source>
+        <target state="new">Details</target>
+        <note>details button</note>
+      </trans-unit>
+      <trans-unit id="disable" xml:space="preserve">
+        <source>Disable</source>
+        <target state="new">Disable</target>
+        <note>Email protection Disable button text</note>
+      </trans-unit>
+      <trans-unit id="disable.email.protection.mesage" xml:space="preserve">
+        <source>This will only disable Autofill for Duck Addresses in this browser. 
+
+ You can still manually enter Duck Addresses and continue to receive forwarded email.</source>
+        <target state="new">This will only disable Autofill for Duck Addresses in this browser. 
+
+ You can still manually enter Duck Addresses and continue to receive forwarded email.</target>
+        <note>Message for alert shown when user disables email protection</note>
+      </trans-unit>
+      <trans-unit id="disable.email.protection.title" xml:space="preserve">
+        <source>Disable Email Protection Autofill?</source>
+        <target state="new">Disable Email Protection Autofill?</target>
+        <note>Title for alert shown when user disables email protection</note>
+      </trans-unit>
+      <trans-unit id="domain-is-fireproof" xml:space="preserve">
+        <source>%@ is now Fireproof</source>
+        <target state="new">%@ is now Fireproof</target>
+        <note>Domain fireproof status</note>
+      </trans-unit>
+      <trans-unit id="done" xml:space="preserve">
+        <source>Done</source>
+        <target state="new">Done</target>
+        <note>Done button</note>
+      </trans-unit>
+      <trans-unit id="dont.quit" xml:space="preserve">
+        <source>Don’t Quit</source>
+        <target state="new">Don’t Quit</target>
+        <note>Don’t Quit button</note>
+      </trans-unit>
+      <trans-unit id="dont.save" xml:space="preserve">
+        <source>Don't Save</source>
+        <target state="new">Don't Save</target>
+        <note>Don't Save button</note>
+      </trans-unit>
+      <trans-unit id="dont.update" xml:space="preserve">
+        <source>Don't Update</source>
+        <target state="new">Don't Update</target>
+        <note>Don't Update button</note>
+      </trans-unit>
+      <trans-unit id="download.finishing" xml:space="preserve">
+        <source>Finishing download…</source>
+        <target state="new">Finishing download…</target>
+        <note>Download being finished information text</note>
+      </trans-unit>
+      <trans-unit id="download.linked.file.at" xml:space="preserve">
+        <source>Download Linked File As…</source>
+        <target state="new">Download Linked File As…</target>
+        <note>Context menu item</note>
+      </trans-unit>
+      <trans-unit id="download.starting" xml:space="preserve">
+        <source>Starting download…</source>
+        <target state="new">Starting download…</target>
+        <note>Download being initiated information text</note>
+      </trans-unit>
+      <trans-unit id="downloads.active.alert.message.and.others" xml:space="preserve">
+        <source>, and other files</source>
+        <target state="new">, and other files</target>
+        <note>Alert text format element for “, and other files”</note>
+      </trans-unit>
+      <trans-unit id="downloads.active.alert.message.format" xml:space="preserve">
+        <source>Are you sure you want to quit? DuckDuckGo Privacy Browser is currently downloading “%1$@”%2$@. If you quit now DuckDuckGo Privacy Browser won’t finish downloading this file.</source>
+        <target state="new">Are you sure you want to quit? DuckDuckGo Privacy Browser is currently downloading “%1$@”%2$@. If you quit now DuckDuckGo Privacy Browser won’t finish downloading this file.</target>
+        <note>Alert text format when trying to quit application while file “filename”[, and others] are being downloaded</note>
+      </trans-unit>
+      <trans-unit id="downloads.active.alert.title" xml:space="preserve">
+        <source>A download is in progress.</source>
+        <target state="new">A download is in progress.</target>
+        <note>Alert title when trying to quit application while files are being downloaded</note>
+      </trans-unit>
+      <trans-unit id="downloads.always-ask" xml:space="preserve">
+        <source>Always ask where to save files</source>
+        <target state="new">Always ask where to save files</target>
+        <note>Downloads preferences checkbox</note>
+      </trans-unit>
+      <trans-unit id="downloads.bytes.format" xml:space="preserve">
+        <source>%1$@ of %2$@</source>
+        <target state="new">%1$@ of %2$@</target>
+        <note>Number of bytes out of total bytes downloaded (1Mb of 2Mb)</note>
+      </trans-unit>
+      <trans-unit id="downloads.change" xml:space="preserve">
+        <source>Change…</source>
+        <target state="new">Change…</target>
+        <note>Change downloads directory button</note>
+      </trans-unit>
+      <trans-unit id="downloads.clear-all.item" xml:space="preserve">
+        <source>Clear All</source>
+        <target state="new">Clear All</target>
+        <note>Contextual menu item in downloads manager to clear all downloaded items from the list</note>
+      </trans-unit>
+      <trans-unit id="downloads.copy-link.item" xml:space="preserve">
+        <source>Copy Download Link</source>
+        <target state="new">Copy Download Link</target>
+        <note>Contextual menu item in downloads manager to copy the downloaded link</note>
+      </trans-unit>
+      <trans-unit id="downloads.dialog.title" xml:space="preserve">
+        <source>Downloads</source>
+        <target state="new">Downloads</target>
+        <note>Title of the dialog that manages the Downloads in the browser</note>
+      </trans-unit>
+      <trans-unit id="downloads.error.canceled" xml:space="preserve">
+        <source>Canceled</source>
+        <target state="new">Canceled</target>
+        <note>Short error description when downloaded file download was canceled</note>
+      </trans-unit>
+      <trans-unit id="downloads.error.move.failed" xml:space="preserve">
+        <source>Could not move file to Downloads</source>
+        <target state="new">Could not move file to Downloads</target>
+        <note>Short error description when could not move downloaded file to the Downloads folder</note>
+      </trans-unit>
+      <trans-unit id="downloads.error.other" xml:space="preserve">
+        <source>Error</source>
+        <target state="new">Error</target>
+        <note>Short error description when Download failed</note>
+      </trans-unit>
+      <trans-unit id="downloads.error.removed" xml:space="preserve">
+        <source>Removed</source>
+        <target state="new">Removed</target>
+        <note>Short error description when downloaded file removed from Downloads folder</note>
+      </trans-unit>
+      <trans-unit id="downloads.location" xml:space="preserve">
+        <source>Location</source>
+        <target state="new">Location</target>
+        <note>Downloads directory location</note>
+      </trans-unit>
+      <trans-unit id="downloads.no-recent-downloads" xml:space="preserve">
+        <source>No recent downloads</source>
+        <target state="new">No recent downloads</target>
+        <note>Label in the downloads manager that shows that there are no recently downloaded items</note>
+      </trans-unit>
+      <trans-unit id="downloads.open-downloads-folder" xml:space="preserve">
+        <source>Open Downloads Folder</source>
+        <target state="new">Open Downloads Folder</target>
+        <note>Button in the downloads manager that allows the user to open the downloads folder</note>
+      </trans-unit>
+      <trans-unit id="downloads.open-website.item" xml:space="preserve">
+        <source>Open Originating Website</source>
+        <target state="new">Open Originating Website</target>
+        <note>Contextual menu item in downloads manager to open the downloaded file originating website</note>
+      </trans-unit>
+      <trans-unit id="downloads.open.item" xml:space="preserve">
+        <source>Open</source>
+        <target state="new">Open</target>
+        <note>Contextual menu item in downloads manager to open the downloaded file</note>
+      </trans-unit>
+      <trans-unit id="downloads.open.on.completion" xml:space="preserve">
+        <source>Automatically open the Downloads panel when downloads complete</source>
+        <target state="new">Automatically open the Downloads panel when downloads complete</target>
+        <note>Checkbox to open a Download Manager popover when downloads are completed</note>
+      </trans-unit>
+      <trans-unit id="downloads.remove-from-list.item" xml:space="preserve">
+        <source>Remove from List</source>
+        <target state="new">Remove from List</target>
+        <note>Contextual menu item in downloads manager to remove the given downloaded from the list of downloaded files</note>
+      </trans-unit>
+      <trans-unit id="downloads.restart.item" xml:space="preserve">
+        <source>Stop</source>
+        <target state="new">Stop</target>
+        <note>Contextual menu item in downloads manager to restart the download</note>
+      </trans-unit>
+      <trans-unit id="downloads.show-in-finder.item" xml:space="preserve">
+        <source>Show in Finder</source>
+        <target state="new">Show in Finder</target>
+        <note>Contextual menu item in downloads manager to show the downloaded file in Finder</note>
+      </trans-unit>
+      <trans-unit id="downloads.speed.format" xml:space="preserve">
+        <source>%@/s</source>
+        <target state="new">%@/s</target>
+        <note>Download speed format (1Mb/sec)</note>
+      </trans-unit>
+      <trans-unit id="downloads.stop.item" xml:space="preserve">
+        <source>Stop</source>
+        <target state="new">Stop</target>
+        <note>Contextual menu item in downloads manager to stop the download</note>
+      </trans-unit>
+      <trans-unit id="downloads.tooltip.cancel" xml:space="preserve">
+        <source>Cancel Download</source>
+        <target state="new">Cancel Download</target>
+        <note>Mouse-over tooltip for Cancel Download button</note>
+      </trans-unit>
+      <trans-unit id="downloads.tooltip.redownload" xml:space="preserve">
+        <source>Download Again</source>
+        <target state="new">Download Again</target>
+        <note>Mouse-over tooltip for Download [deleted file] Again button</note>
+      </trans-unit>
+      <trans-unit id="downloads.tooltip.restart" xml:space="preserve">
+        <source>Restart Download</source>
+        <target state="new">Restart Download</target>
+        <note>Mouse-over tooltip for Restart Download button</note>
+      </trans-unit>
+      <trans-unit id="downloads.tooltip.reveal" xml:space="preserve">
+        <source>Show in Finder</source>
+        <target state="new">Show in Finder</target>
+        <note>Mouse-over tooltip for Show in Finder button</note>
+      </trans-unit>
+      <trans-unit id="duck-player.always-open-in-player" xml:space="preserve">
+        <source>Always open YouTube videos in Duck Player</source>
+        <target state="new">Always open YouTube videos in Duck Player</target>
+        <note>Private YouTube Player option</note>
+      </trans-unit>
+      <trans-unit id="duck-player.explanation" xml:space="preserve">
+        <source>Duck Player provides a clean viewing experience without personalized ads and prevents viewing activity from influencing your YouTube recommendations.</source>
+        <target state="new">Duck Player provides a clean viewing experience without personalized ads and prevents viewing activity from influencing your YouTube recommendations.</target>
+        <note>Private YouTube Player explanation in settings</note>
+      </trans-unit>
+      <trans-unit id="duck-player.off" xml:space="preserve">
+        <source>Never use Duck Player</source>
+        <target state="new">Never use Duck Player</target>
+        <note>Private YouTube Player option</note>
+      </trans-unit>
+      <trans-unit id="duck-player.show-buttons" xml:space="preserve">
+        <source>Show option to use Duck Player over YouTube previews on hover</source>
+        <target state="new">Show option to use Duck Player over YouTube previews on hover</target>
+        <note>Private YouTube Player option</note>
+      </trans-unit>
+      <trans-unit id="duck-player.title" xml:space="preserve">
+        <source>Duck Player</source>
+        <target state="new">Duck Player</target>
+        <note>Private YouTube Player settings title</note>
+      </trans-unit>
+      <trans-unit id="duplicate.tab" xml:space="preserve">
+        <source>Duplicate Tab</source>
+        <target state="new">Duplicate Tab</target>
+        <note>Menu item. Duplicate as a verb</note>
+      </trans-unit>
+      <trans-unit id="edit" xml:space="preserve">
+        <source>Edit</source>
+        <target state="new">Edit</target>
+        <note>Edit button</note>
+      </trans-unit>
+      <trans-unit id="edit.favorite" xml:space="preserve">
+        <source>Edit Favorite</source>
+        <target state="new">Edit Favorite</target>
+        <note>Header of the view that edits a favorite bookmark</note>
+      </trans-unit>
+      <trans-unit id="edit.folder" xml:space="preserve">
+        <source>Edit Folder</source>
+        <target state="new">Edit Folder</target>
+        <note>Header of the view that edits a bookmark folder</note>
+      </trans-unit>
+      <trans-unit id="email.copied" xml:space="preserve">
+        <source>New address copied to your clipboard</source>
+        <target state="new">New address copied to your clipboard</target>
+        <note>Notification that the Private email address was copied to clipboard after the user generated a new address</note>
+      </trans-unit>
+      <trans-unit id="email.optionsMenu" xml:space="preserve">
+        <source>Email Protection</source>
+        <target state="new">Email Protection</target>
+        <note>Menu item email feature</note>
+      </trans-unit>
+      <trans-unit id="email.optionsMenu.createAddress" xml:space="preserve">
+        <source>Generate Private Duck Address</source>
+        <target state="new">Generate Private Duck Address</target>
+        <note>Create an email alias sub menu item</note>
+      </trans-unit>
+      <trans-unit id="email.optionsMenu.manageAccount" xml:space="preserve">
+        <source>Manage Account</source>
+        <target state="new">Manage Account</target>
+        <note>Manage private email account sub menu item</note>
+      </trans-unit>
+      <trans-unit id="email.optionsMenu.turnOff" xml:space="preserve">
+        <source>Disable Email Protection Autofill</source>
+        <target state="new">Disable Email Protection Autofill</target>
+        <note>Disable email sub menu item</note>
+      </trans-unit>
+      <trans-unit id="email.optionsMenu.turnOn" xml:space="preserve">
+        <source>Enable Email Protection</source>
+        <target state="new">Enable Email Protection</target>
+        <note>Sub menu item to enable Email Protection</note>
+      </trans-unit>
+      <trans-unit id="error.unknown.try.again" xml:space="preserve">
+        <source>An unknown error has occurred</source>
+        <target state="new">An unknown error has occurred</target>
+        <note>Generic error message on a dialog for when the cause is not known.</note>
+      </trans-unit>
+      <trans-unit id="export.bookmarks.failed.informative" xml:space="preserve">
+        <source>Please check that no file exists at the location you selected.</source>
+        <target state="new">Please check that no file exists at the location you selected.</target>
+        <note>Alert message when exporting bookmarks fails</note>
+      </trans-unit>
+      <trans-unit id="export.bookmarks.failed.message" xml:space="preserve">
+        <source>Failed to Export Bookmarks…</source>
+        <target state="new">Failed to Export Bookmarks…</target>
+        <note>Alert title when exporting login data fails</note>
+      </trans-unit>
+      <trans-unit id="export.bookmarks.file.name.suffix" xml:space="preserve">
+        <source>Bookmarks</source>
+        <target state="new">Bookmarks</target>
+        <note>The last part of the suggested file for exporting bookmarks</note>
+      </trans-unit>
+      <trans-unit id="export.bookmarks.menu.item" xml:space="preserve">
+        <source>Export Bookmarks…</source>
+        <target state="new">Export Bookmarks…</target>
+        <note>Export bookmarks menu item</note>
+      </trans-unit>
+      <trans-unit id="export.logins.data" xml:space="preserve">
+        <source>Export Passwords…</source>
+        <target state="new">Export Passwords…</target>
+        <note>Opens Export Logins Data dialog</note>
+      </trans-unit>
+      <trans-unit id="export.logins.failed.informative" xml:space="preserve">
+        <source>Please check that no file exists at the location you selected.</source>
+        <target state="new">Please check that no file exists at the location you selected.</target>
+        <note>Alert message when exporting login data fails</note>
+      </trans-unit>
+      <trans-unit id="export.logins.failed.message" xml:space="preserve">
+        <source>Failed to Export Passwords</source>
+        <target state="new">Failed to Export Passwords</target>
+        <note>Alert title when exporting login data fails</note>
+      </trans-unit>
+      <trans-unit id="export.logins.file.name.suffix" xml:space="preserve">
+        <source>Passwords</source>
+        <target state="new">Passwords</target>
+        <note>The last part of the suggested file name for exporting logins</note>
+      </trans-unit>
+      <trans-unit id="export.logins.warning" xml:space="preserve">
+        <source>This file contains your passwords in plain text and should be saved in a secure location and deleted when you are done.
+Anyone with access to this file will be able to read your passwords.</source>
+        <target state="new">This file contains your passwords in plain text and should be saved in a secure location and deleted when you are done.
+Anyone with access to this file will be able to read your passwords.</target>
+        <note>Warning text presented when exporting logins.</note>
+      </trans-unit>
+      <trans-unit id="favorites" xml:space="preserve">
+        <source>Favorites</source>
+        <target state="new">Favorites</target>
+        <note>Title text for the Favorites menu item</note>
+      </trans-unit>
+      <trans-unit id="feedback.bug.description" xml:space="preserve">
+        <source>Please describe the problem in as much detail as possible:</source>
+        <target state="new">Please describe the problem in as much detail as possible:</target>
+        <note>Label in the feedback form that users can submit to say that a website is not working properly in DuckDuckGo</note>
+      </trans-unit>
+      <trans-unit id="feedback.disclaimer" xml:space="preserve">
+        <source>Reports sent to DuckDuckGo are 100% anonymous and only include your message, the DuckDuckGo app version, and your macOS version.</source>
+        <target state="new">Reports sent to DuckDuckGo are 100% anonymous and only include your message, the DuckDuckGo app version, and your macOS version.</target>
+        <note>Disclaimer in breakage form - a form that users can submit to say that a website is not working properly in DuckDuckGo</note>
+      </trans-unit>
+      <trans-unit id="feedback.feature.request.description" xml:space="preserve">
+        <source>What feature would you like to see?</source>
+        <target state="new">What feature would you like to see?</target>
+        <note>Label in the feedback form for feature requests.</note>
+      </trans-unit>
+      <trans-unit id="feedback.other.description" xml:space="preserve">
+        <source>Please give us your feedback:</source>
+        <target state="new">Please give us your feedback:</target>
+        <note>Label in the feedback form</note>
+      </trans-unit>
+      <trans-unit id="find-in-page.text-field.placeholder" xml:space="preserve">
+        <source>Find in page</source>
+        <target state="new">Find in page</target>
+        <note>Placeholder text for the text field where the user inputs strings to searcg in the web page</note>
+      </trans-unit>
+      <trans-unit id="find.in.page" xml:space="preserve">
+        <source>%1$d of %2$d</source>
+        <target state="new">%1$d of %2$d</target>
+        <note>Find in page status (e.g. 1 of 99)</note>
+      </trans-unit>
+      <trans-unit id="find.in.page.menu.item" xml:space="preserve">
+        <source>Find in Page…</source>
+        <target state="new">Find in Page…</target>
+        <note>Menu item title</note>
+      </trans-unit>
+      <trans-unit id="fire.active-tabs-info" xml:space="preserve">
+        <source>Close active tabs (%1$d) and clear all browsing history and cookies (sites: %2$d).</source>
+        <target state="new">Close active tabs (%1$d) and clear all browsing history and cookies (sites: %2$d).</target>
+        <note>Info in the Fire Button popover</note>
+      </trans-unit>
+      <trans-unit id="fire.all-data.description" xml:space="preserve">
+        <source>Clear all tabs and related site data</source>
+        <target state="new">Clear all tabs and related site data</target>
+        <note>Description of the 'All Data' configuration option for the fire button</note>
+      </trans-unit>
+      <trans-unit id="fire.all-sites" xml:space="preserve">
+        <source>All sites</source>
+        <target state="new">All sites</target>
+        <note>Configuration option for fire button</note>
+      </trans-unit>
+      <trans-unit id="fire.current-window.description" xml:space="preserve">
+        <source>Clear current window and related site data</source>
+        <target state="new">Clear current window and related site data</target>
+        <note>Description of the 'Current Window' configuration option for the fire button</note>
+      </trans-unit>
+      <trans-unit id="fire.currentTab" xml:space="preserve">
+        <source>All sites visited in current tab</source>
+        <target state="new">All sites visited in current tab</target>
+        <note>Configuration option for fire button</note>
+      </trans-unit>
+      <trans-unit id="fire.currentWindow" xml:space="preserve">
+        <source>All sites visited in current window</source>
+        <target state="new">All sites visited in current window</target>
+        <note>Configuration option for fire button</note>
+      </trans-unit>
+      <trans-unit id="fire.dialog.all-windows-will-close" xml:space="preserve">
+        <source>All windows will close</source>
+        <target state="new">All windows will close</target>
+        <note>Warning label shown in an expanded view of the fire popover</note>
+      </trans-unit>
+      <trans-unit id="fire.dialog.clear.sites" xml:space="preserve">
+        <source>Selected sites will be cleared</source>
+        <target state="new">Selected sites will be cleared</target>
+        <note>Category of domains in fire button dialog</note>
+      </trans-unit>
+      <trans-unit id="fire.dialog.close-burner-window" xml:space="preserve">
+        <source>Close and Burn This Window</source>
+        <target state="new">Close and Burn This Window</target>
+        <note>Button that allows the user to close and burn the browser burner window</note>
+      </trans-unit>
+      <trans-unit id="fire.dialog.deliting.data" xml:space="preserve">
+        <source>Deleting browsing data…</source>
+        <target state="new">Deleting browsing data…</target>
+        <note>Text shown in dialog while removing browsing data</note>
+      </trans-unit>
+      <trans-unit id="fire.dialog.details" xml:space="preserve">
+        <source>Details</source>
+        <target state="new">Details</target>
+        <note>Button to show more details</note>
+      </trans-unit>
+      <trans-unit id="fire.dialog.fire-window.close-tabs" xml:space="preserve">
+        <source>Close Tabs and Clear Data</source>
+        <target state="new">Close Tabs and Clear Data</target>
+        <note>Title of the dialog where the user can close browser tabs and clear data.</note>
+      </trans-unit>
+      <trans-unit id="fire.dialog.fire-window.description" xml:space="preserve">
+        <source>An isolated window that doesn’t save any data</source>
+        <target state="new">An isolated window that doesn’t save any data</target>
+        <note>Explanation of what a fire window is.</note>
+      </trans-unit>
+      <trans-unit id="fire.dialog.fire-window.title" xml:space="preserve">
+        <source>Open New Fire Window</source>
+        <target state="new">Open New Fire Window</target>
+        <note>Title of the part of the dialog where the user can open a fire window.</note>
+      </trans-unit>
+      <trans-unit id="fire.dialog.fireproof.sites" xml:space="preserve">
+        <source>Fireproof sites won't be cleared</source>
+        <target state="new">Fireproof sites won't be cleared</target>
+        <note>Category of domains in fire button dialog</note>
+      </trans-unit>
+      <trans-unit id="fire.dialog.tab-will-close" xml:space="preserve">
+        <source>Current tab will close</source>
+        <target state="new">Current tab will close</target>
+        <note>Warning label shown in an expanded view of the fire popover</note>
+      </trans-unit>
+      <trans-unit id="fire.dialog.tab-will-reload" xml:space="preserve">
+        <source>Pinned tab will reload</source>
+        <target state="new">Pinned tab will reload</target>
+        <note>Warning label shown in an expanded view of the fire popover</note>
+      </trans-unit>
+      <trans-unit id="fire.dialog.window-will-close" xml:space="preserve">
+        <source>Current window will close</source>
+        <target state="new">Current window will close</target>
+        <note>Warning label shown in an expanded view of the fire popover</note>
+      </trans-unit>
+      <trans-unit id="fire.info.dialog.description" xml:space="preserve">
+        <source>Data, browsing history, and cookies can build up in your browser over time. Use the Fire Button to clear it all away.</source>
+        <target state="new">Data, browsing history, and cookies can build up in your browser over time. Use the Fire Button to clear it all away.</target>
+        <note>Description in the dialog that explains the Fire feature.</note>
+      </trans-unit>
+      <trans-unit id="fire.info.dialog.title" xml:space="preserve">
+        <source>Leave No Trace</source>
+        <target state="new">Leave No Trace</target>
+        <note>Title of the dialog that explains the Fire feature.</note>
+      </trans-unit>
+      <trans-unit id="fire.one-tab-info" xml:space="preserve">
+        <source>Close this tab and clear its browsing history and cookies (sites: %d).</source>
+        <target state="new">Close this tab and clear its browsing history and cookies (sites: %d).</target>
+        <note>Info in the Fire Button popover</note>
+      </trans-unit>
+      <trans-unit id="fire.select-site-to-clear" xml:space="preserve">
+        <source>Select a site to clear its data.</source>
+        <target state="new">Select a site to clear its data.</target>
+        <note>Info label in the fire button popover</note>
+      </trans-unit>
+      <trans-unit id="fire.selected-domains.description" xml:space="preserve">
+        <source>Clear data only for selected domains</source>
+        <target state="new">Clear data only for selected domains</target>
+        <note>Description of the 'Current Window' configuration option for the fire button</note>
+      </trans-unit>
+      <trans-unit id="fireproof" xml:space="preserve">
+        <source>Fireproof</source>
+        <target state="new">Fireproof</target>
+        <note>Fireproof button</note>
+      </trans-unit>
+      <trans-unit id="fireproof.checkbox.title" xml:space="preserve">
+        <source>Ask to Fireproof websites when signing in</source>
+        <target state="new">Ask to Fireproof websites when signing in</target>
+        <note>Fireproof settings checkbox title</note>
+      </trans-unit>
+      <trans-unit id="fireproof.confirmation.message" xml:space="preserve">
+        <source>Fireproofing this site will keep you signed in after using the Fire Button.</source>
+        <target state="new">Fireproofing this site will keep you signed in after using the Fire Button.</target>
+        <note>Fireproof confirmation message</note>
+      </trans-unit>
+      <trans-unit id="fireproof.confirmation.title" xml:space="preserve">
+        <source>Would you like to Fireproof %@?</source>
+        <target state="new">Would you like to Fireproof %@?</target>
+        <note>Fireproof confirmation title</note>
+      </trans-unit>
+      <trans-unit id="fireproof.domains.remove.all" xml:space="preserve">
+        <source>Remove All</source>
+        <target state="new">Remove All</target>
+        <note>Label of a button that allows the user to remove all the websites from the fireproofed list</note>
+      </trans-unit>
+      <trans-unit id="fireproof.explanation" xml:space="preserve">
+        <source>When you Fireproof a site, cookies won't be erased and you'll stay signed in, even after using the Fire Button.</source>
+        <target state="new">When you Fireproof a site, cookies won't be erased and you'll stay signed in, even after using the Fire Button.</target>
+        <note>Fireproofing mechanism explanation</note>
+      </trans-unit>
+      <trans-unit id="fireproof.manage-sites" xml:space="preserve">
+        <source>Manage Fireproof Sites…</source>
+        <target state="new">Manage Fireproof Sites…</target>
+        <note>Fireproof settings button caption</note>
+      </trans-unit>
+      <trans-unit id="fireproof.sites" xml:space="preserve">
+        <source>Fireproof Sites</source>
+        <target state="new">Fireproof Sites</target>
+        <note>Fireproof sites list title</note>
+      </trans-unit>
+      <trans-unit id="folder.dialog.add" xml:space="preserve">
+        <source>Add</source>
+        <target state="new">Add</target>
+        <note>Button to confim a bookmark folder creation</note>
+      </trans-unit>
+      <trans-unit id="folder.optionsMenu.deleteFolder" xml:space="preserve">
+        <source>Delete Folder</source>
+        <target state="new">Delete Folder</target>
+        <note>Option for deleting a folder</note>
+      </trans-unit>
+      <trans-unit id="folder.optionsMenu.newFolder" xml:space="preserve">
+        <source>New Folder</source>
+        <target state="new">New Folder</target>
+        <note>Option for creating a new folder</note>
+      </trans-unit>
+      <trans-unit id="folder.optionsMenu.renameFolder" xml:space="preserve">
+        <source>Rename Folder</source>
+        <target state="new">Rename Folder</target>
+        <note>Option for renaming a folder</note>
+      </trans-unit>
+      <trans-unit id="generic.discard.button" xml:space="preserve">
+        <source>Discard</source>
+        <target state="new">Discard</target>
+        <note>Label of a button that allows the user discard an action/change</note>
+      </trans-unit>
+      <trans-unit id="generic.remove.button" xml:space="preserve">
+        <source>Remove</source>
+        <target state="new">Remove</target>
+        <note>Label of a button that allows the user to remove an item</note>
+      </trans-unit>
+      <trans-unit id="got.it" xml:space="preserve">
+        <source>Got It!</source>
+        <target state="new">Got It!</target>
+        <note>Got it button</note>
+      </trans-unit>
+      <trans-unit id="gpc.checkbox.title" xml:space="preserve">
+        <source>Enable Global Privacy Control</source>
+        <target state="new">Enable Global Privacy Control</target>
+        <note>GPC settings checkbox title</note>
+      </trans-unit>
+      <trans-unit id="gpc.explanation" xml:space="preserve">
+        <source>Tells participating websites not to sell or share your data.</source>
+        <target state="new">Tells participating websites not to sell or share your data.</target>
+        <note>GPC explanation in settings</note>
+      </trans-unit>
+      <trans-unit id="gpc.title" xml:space="preserve">
+        <source>Global Privacy Control (GPC)</source>
+        <target state="new">Global Privacy Control (GPC)</target>
+        <note>GPC settings title</note>
+      </trans-unit>
+      <trans-unit id="history.menu.clear.all.history.description" xml:space="preserve">
+        <source>Cookies and site data for all sites will also be cleared, unless the site is Fireproof.</source>
+        <target state="new">Cookies and site data for all sites will also be cleared, unless the site is Fireproof.</target>
+        <note>Description in the alert with the confirmation to clear all data</note>
+      </trans-unit>
+      <trans-unit id="history.menu.clear.all.history.question" xml:space="preserve">
+        <source>Clear all history and 
+close all tabs?</source>
+        <target state="new">Clear all history and 
+close all tabs?</target>
+        <note>Alert with the confirmation to clear all history and data</note>
+      </trans-unit>
+      <trans-unit id="history.menu.clear.data.description" xml:space="preserve">
+        <source>Cookies and other data for sites visited on this day will also be cleared unless the site is Fireproof. History from other days will not be cleared.</source>
+        <target state="new">Cookies and other data for sites visited on this day will also be cleared unless the site is Fireproof. History from other days will not be cleared.</target>
+        <note>Description in the alert with the confirmation to clear browsing history</note>
+      </trans-unit>
+      <trans-unit id="history.menu.clear.data.question" xml:space="preserve">
+        <source>Clear History for %@?</source>
+        <target state="new">Clear History for %@?</target>
+        <note>Alert with the confirmation to clear all data</note>
+      </trans-unit>
+      <trans-unit id="history.menu.clear.data.today.description" xml:space="preserve">
+        <source>Cookies and other data for sites visited today will also be cleared unless the site is Fireproof. History from other days will not be cleared.</source>
+        <target state="new">Cookies and other data for sites visited today will also be cleared unless the site is Fireproof. History from other days will not be cleared.</target>
+        <note>Description in the alert with the confirmation to clear browsing history</note>
+      </trans-unit>
+      <trans-unit id="history.menu.clear.data.today.question" xml:space="preserve">
+        <source>Clear history for today 
+and close all tabs?</source>
+        <target state="new">Clear history for today 
+and close all tabs?</target>
+        <note>Alert with the confirmation to clear all data</note>
+      </trans-unit>
+      <trans-unit id="history.menu.clear.this.history" xml:space="preserve">
+        <source>Clear This History…</source>
+        <target state="new">Clear This History…</target>
+        <note>Menu item to clear parts of history and data</note>
+      </trans-unit>
+      <trans-unit id="history.menu.older" xml:space="preserve">
+        <source>Older…</source>
+        <target state="new">Older…</target>
+        <note>Menu item representing older history</note>
+      </trans-unit>
+      <trans-unit id="history.menu.recently.visited" xml:space="preserve">
+        <source>Recently Visited</source>
+        <target state="new">Recently Visited</target>
+        <note>Section header of the history menu</note>
+      </trans-unit>
+      <trans-unit id="home.page.burn.fireproof.site.alert" xml:space="preserve">
+        <source>History will be cleared for this site, but related data will remain, because this site is Fireproof</source>
+        <target state="new">History will be cleared for this site, but related data will remain, because this site is Fireproof</target>
+        <note>Message for an alert displayed when trying to burn a fireproof website</note>
+      </trans-unit>
+      <trans-unit id="home.page.clear.history" xml:space="preserve">
+        <source>Clear History</source>
+        <target state="new">Clear History</target>
+        <note>Button caption for the burn fireproof website alert</note>
+      </trans-unit>
+      <trans-unit id="home.page.empty.state.item.message" xml:space="preserve">
+        <source>Keep browsing to see how many trackers were blocked</source>
+        <target state="new">Keep browsing to see how many trackers were blocked</target>
+        <note>This string represents the message for an empty state item on the home page, encouraging the user to keep browsing to see how many trackers were blocked</note>
+      </trans-unit>
+      <trans-unit id="home.page.empty.state.item.title" xml:space="preserve">
+        <source>Recently visited sites appear here</source>
+        <target state="new">Recently visited sites appear here</target>
+        <note>This string represents the title for an empty state item on the home page, indicating that recently visited sites will appear here</note>
+      </trans-unit>
+      <trans-unit id="home.page.no.trackers.blocked" xml:space="preserve">
+        <source>No trackers blocked</source>
+        <target state="new">No trackers blocked</target>
+        <note>This string represents a message on the home page indicating that no trackers were blocked</note>
+      </trans-unit>
+      <trans-unit id="home.page.no.trackers.found" xml:space="preserve">
+        <source>No trackers found</source>
+        <target state="new">No trackers found</target>
+        <note>This string represents a message on the home page indicating that no trackers were found</note>
+      </trans-unit>
+      <trans-unit id="home.page.protection.duration" xml:space="preserve">
+        <source>PAST 7 DAYS</source>
+        <target state="new">PAST 7 DAYS</target>
+        <note>Past 7 days in uppercase.</note>
+      </trans-unit>
+      <trans-unit id="home.page.protection.summary.info" xml:space="preserve">
+        <source>No recent activity</source>
+        <target state="new">No recent activity</target>
+        <note>This string represents a message in the protection summary on the home page, indicating that there is no recent activity</note>
+      </trans-unit>
+      <trans-unit id="home.page.protection.summary.message" xml:space="preserve">
+        <source>%@ tracking attempts blocked</source>
+        <target state="new">%@ tracking attempts blocked</target>
+        <note>The number of tracking attempts blocked in the last 7 days, shown on a new tab, translate as: Tracking attempts blocked: %@</note>
+      </trans-unit>
+      <trans-unit id="import.bookmarks.bookmarks" xml:space="preserve">
+        <source>Bookmarks</source>
+        <target state="new">Bookmarks</target>
+        <note>Title text for the Bookmarks import option</note>
+      </trans-unit>
+      <trans-unit id="import.bookmarks.html.title" xml:space="preserve">
+        <source>HTML Bookmarks File (for other browsers)</source>
+        <target state="new">HTML Bookmarks File (for other browsers)</target>
+        <note>Title text for the HTML Bookmarks importer</note>
+      </trans-unit>
+      <trans-unit id="import.bookmarks.indefinite.progress.text" xml:space="preserve">
+        <source>Importing bookmarks…</source>
+        <target state="new">Importing bookmarks…</target>
+        <note>Operation progress info message about indefinite number of bookmarks being imported</note>
+      </trans-unit>
+      <trans-unit id="import.bookmarks.number.progress.text" xml:space="preserve">
+        <source>Importing bookmarks (%d)…</source>
+        <target state="new">Importing bookmarks (%d)…</target>
+        <note>Operation progress info message about %d number of bookmarks being imported</note>
+      </trans-unit>
+      <trans-unit id="import.bookmarks.safari.permission-button.title" xml:space="preserve">
+        <source>Select Safari Folder…</source>
+        <target state="new">Select Safari Folder…</target>
+        <note>Text for the Safari data import permission button</note>
+      </trans-unit>
+      <trans-unit id="import.bookmarks.select-html-file" xml:space="preserve">
+        <source>Select Bookmarks HTML File…</source>
+        <target state="new">Select Bookmarks HTML File…</target>
+        <note>Button text for selecting HTML Bookmarks file</note>
+      </trans-unit>
+      <trans-unit id="import.browser.data" xml:space="preserve">
+        <source>Import Browser Data</source>
+        <target state="new">Import Browser Data</target>
+        <note>Import Browser Data dialog title</note>
+      </trans-unit>
+      <trans-unit id="import.browser.data.bookmarks" xml:space="preserve">
+        <source>Import Bookmarks…</source>
+        <target state="new">Import Bookmarks…</target>
+        <note>Opens Import Browser Data dialog</note>
+      </trans-unit>
+      <trans-unit id="import.browser.data.passwords" xml:space="preserve">
+        <source>Import Passwords…</source>
+        <target state="new">Import Passwords…</target>
+        <note>Opens Import Browser Data dialog</note>
+      </trans-unit>
+      <trans-unit id="import.csv.instructions.bitwarden" xml:space="preserve">
+        <source>%1$d Open and unlock **%2$s**
+%3$d Select **File → Export vault** from the Menu Bar
+%4$d Select the File Format: **.csv**
+%5$d Enter your Bitwarden master password
+%6$d Click %7$@ and save the file someplace you can find it (e.g., Desktop)
+%8$d %9$@</source>
+        <target state="new">%1$d Open and unlock **%2$s**
+%3$d Select **File → Export vault** from the Menu Bar
+%4$d Select the File Format: **.csv**
+%5$d Enter your Bitwarden master password
+%6$d Click %7$@ and save the file someplace you can find it (e.g., Desktop)
+%8$d %9$@</target>
+        <note>Instructions to import Passwords as CSV from Bitwarden.
+%2$s - app name (Bitwarden)
+%7$@ - hamburger menu icon
+%9$@ - “Select Bitwarden CSV File” button
+**bold text**; _italic text_</note>
+      </trans-unit>
+      <trans-unit id="import.csv.instructions.brave" xml:space="preserve">
+        <source>%1$d Open **%2$s**
+%3$d Click %4$@ to open the application menu then click **Password Manager**
+%5$d Click %6$@ **at the top left** of the Password Manager and select **Settings**
+%7$d Find “Export Passwords” and click **Download File**
+%8$d Save the passwords file someplace you can find it (e.g., Desktop)
+%9$d %10$@</source>
+        <target state="new">%1$d Open **%2$s**
+%3$d Click %4$@ to open the application menu then click **Password Manager**
+%5$d Click %6$@ **at the top left** of the Password Manager and select **Settings**
+%7$d Find “Export Passwords” and click **Download File**
+%8$d Save the passwords file someplace you can find it (e.g., Desktop)
+%9$d %10$@</target>
+        <note>Instructions to import Passwords as CSV from Brave browser.
+%N$d - step number
+%2$s - browser name (Brave)
+%4$@, %6$@ - hamburger menu icon
+%10$@ - “Select Passwords CSV File” button
+**bold text**; _italic text_</note>
+      </trans-unit>
+      <trans-unit id="import.csv.instructions.chrome" xml:space="preserve">
+        <source>%1$d Open **%2$s**
+%3$d In a fresh tab, click %4$@ then **Google Password Manager → Settings**
+%5$d Find “Export Passwords” and click **Download File**
+%6$d Save the passwords file someplace you can find it (e.g., Desktop)
+%7$d %8$@</source>
+        <target state="new">%1$d Open **%2$s**
+%3$d In a fresh tab, click %4$@ then **Google Password Manager → Settings**
+%5$d Find “Export Passwords” and click **Download File**
+%6$d Save the passwords file someplace you can find it (e.g., Desktop)
+%7$d %8$@</target>
+        <note>Instructions to import Passwords as CSV from Google Chrome browser.
+%N$d - step number
+%2$s - browser name (Chrome)
+%4$@ - hamburger menu icon
+%8$@ - “Select Passwords CSV File” button
+**bold text**; _italic text_</note>
+      </trans-unit>
+      <trans-unit id="import.csv.instructions.chromium" xml:space="preserve">
+        <source>%1$d Open **%2$s**
+%3$d In a fresh tab, click %4$@ then **Password Manager → Settings**
+%5$d Find “Export Passwords” and click **Download File**
+%6$d Save the passwords file someplace you can find it (e.g., Desktop)
+%7$d %8$@</source>
+        <target state="new">%1$d Open **%2$s**
+%3$d In a fresh tab, click %4$@ then **Password Manager → Settings**
+%5$d Find “Export Passwords” and click **Download File**
+%6$d Save the passwords file someplace you can find it (e.g., Desktop)
+%7$d %8$@</target>
+        <note>Instructions to import Passwords as CSV from Chromium-based browsers.
+%N$d - step number
+%2$s - browser name
+%4$@ - hamburger menu icon
+%8$@ - “Select Passwords CSV File” button
+**bold text**; _italic text_</note>
+      </trans-unit>
+      <trans-unit id="import.csv.instructions.coccoc" xml:space="preserve">
+        <source>%1$d Open **%2$s**
+%3$d Type “_coccoc://settings/passwords_” into the Address bar
+%4$d Click %5$@ (on the right from _Saved Passwords_) and select **Export passwords**
+%6$d Save the passwords file someplace you can find it (e.g., Desktop)
+%7$d %8$@</source>
+        <target state="new">%1$d Open **%2$s**
+%3$d Type “_coccoc://settings/passwords_” into the Address bar
+%4$d Click %5$@ (on the right from _Saved Passwords_) and select **Export passwords**
+%6$d Save the passwords file someplace you can find it (e.g., Desktop)
+%7$d %8$@</target>
+        <note>Instructions to import Passwords as CSV from Cốc Cốc browser.
+%N$d - step number
+%2$s - browser name (Cốc Cốc)
+%5$@ - hamburger menu icon
+%8$@ - “Select Passwords CSV File” button
+**bold text**; _italic text_</note>
+      </trans-unit>
+      <trans-unit id="import.csv.instructions.firefox" xml:space="preserve">
+        <source>%1$d Open **%2$s**
+%3$d Click %4$@ to open the application menu then click **Passwords**
+%5$d Click %6$@ then **Export Logins…**
+%7$d Save the passwords file someplace you can find it (e.g., Desktop)
+%8$d %9$@</source>
+        <target state="new">%1$d Open **%2$s**
+%3$d Click %4$@ to open the application menu then click **Passwords**
+%5$d Click %6$@ then **Export Logins…**
+%7$d Save the passwords file someplace you can find it (e.g., Desktop)
+%8$d %9$@</target>
+        <note>Instructions to import Passwords as CSV from Firefox.
+%N$d - step number
+%2$s - browser name (Firefox)
+%4$@, %6$@ - hamburger menu icon
+%9$@ - “Select Passwords CSV File” button
+**bold text**; _italic text_</note>
+      </trans-unit>
+      <trans-unit id="import.csv.instructions.generic" xml:space="preserve">
+        <source>The CSV importer will try to match column headers to their position.
+If there is no header, it supports two formats:
+%1$d URL, Username, Password
+%2$d Title, URL, Username, Password
+%3$@</source>
+        <target state="new">The CSV importer will try to match column headers to their position.
+If there is no header, it supports two formats:
+%1$d URL, Username, Password
+%2$d Title, URL, Username, Password
+%3$@</target>
+        <note>Instructions to import a generic CSV passwords file.
+%N$d - step number
+%3$@ - “Select Passwords CSV File” button
+**bold text**; _italic text_</note>
+      </trans-unit>
+      <trans-unit id="import.csv.instructions.lastpass" xml:space="preserve">
+        <source>%1$d Click on the **%2$s** icon in your browser and enter your master password
+%3$d Select **Open My Vault**
+%4$d From the sidebar select **Advanced Options → Export**
+%5$d Enter your LastPass master password
+%6$d Select the File Format: **Comma Delimited Text (.csv)**
+%7$d %8$@</source>
+        <target state="new">%1$d Click on the **%2$s** icon in your browser and enter your master password
+%3$d Select **Open My Vault**
+%4$d From the sidebar select **Advanced Options → Export**
+%5$d Enter your LastPass master password
+%6$d Select the File Format: **Comma Delimited Text (.csv)**
+%7$d %8$@</target>
+        <note>Instructions to import Passwords as CSV from LastPass.
+%2$s - app name (LastPass)
+%8$@ - “Select LastPass CSV File” button
+**bold text**; _italic text_</note>
+      </trans-unit>
+      <trans-unit id="import.csv.instructions.onePassword7" xml:space="preserve">
+        <source>%1$d Open and unlock **%2$s**
+%3$d Select the vault you want to export (you can only export one vault at a time)
+%4$d Select **File → Export → All Items** from the Menu Bar
+%5$d Enter your 1Password master or account password
+%6$d Select the File Format: **iCloud Keychain (.csv)**
+%7$d Save the passwords file someplace you can find it (e.g., Desktop)
+%8$d %9$@</source>
+        <target state="new">%1$d Open and unlock **%2$s**
+%3$d Select the vault you want to export (you can only export one vault at a time)
+%4$d Select **File → Export → All Items** from the Menu Bar
+%5$d Enter your 1Password master or account password
+%6$d Select the File Format: **iCloud Keychain (.csv)**
+%7$d Save the passwords file someplace you can find it (e.g., Desktop)
+%8$d %9$@</target>
+        <note>Instructions to import Passwords as CSV from 1Password 7.
+%2$s - app name (1Password)
+%9$@ - “Select 1Password CSV File” button
+**bold text**; _italic text_</note>
+      </trans-unit>
+      <trans-unit id="import.csv.instructions.onePassword8" xml:space="preserve">
+        <source>%1$d Open and unlock **%2$s**
+%3$d Select **File → Export** from the Menu Bar and choose the account you want to export
+%4$d Enter your 1Password account password
+%5$d Select the File Format: **CSV (Logins and Passwords only)**
+%6$d Click Export Data and save the file someplace you can find it (e.g., Desktop)
+%7$d %8$@</source>
+        <target state="new">%1$d Open and unlock **%2$s**
+%3$d Select **File → Export** from the Menu Bar and choose the account you want to export
+%4$d Enter your 1Password account password
+%5$d Select the File Format: **CSV (Logins and Passwords only)**
+%6$d Click Export Data and save the file someplace you can find it (e.g., Desktop)
+%7$d %8$@</target>
+        <note>Instructions to import Passwords as CSV from 1Password 8.
+%2$s - app name (1Password)
+%8$@ - “Select 1Password CSV File” button
+**bold text**; _italic text_</note>
+      </trans-unit>
+      <trans-unit id="import.csv.instructions.opera" xml:space="preserve">
+        <source>%1$d Open **%2$s**
+%3$d Use the Menu Bar to select **View → Show Password Manager**
+%4$d Select **Settings**
+%5$d Find “Export Passwords” and click **Download File**
+%6$d Save the passwords file someplace you can find it (e.g., Desktop)
+%7$d %8$@</source>
+        <target state="new">%1$d Open **%2$s**
+%3$d Use the Menu Bar to select **View → Show Password Manager**
+%4$d Select **Settings**
+%5$d Find “Export Passwords” and click **Download File**
+%6$d Save the passwords file someplace you can find it (e.g., Desktop)
+%7$d %8$@</target>
+        <note>Instructions to import Passwords as CSV from Opera browser.
+%N$d - step number
+%2$s - browser name (Opera)
+%8$@ - “Select Passwords CSV File” button
+**bold text**; _italic text_</note>
+      </trans-unit>
+      <trans-unit id="import.csv.instructions.operagx" xml:space="preserve">
+        <source>%1$d Open **%2$s**
+%3$d Use the Menu Bar to select **View → Show Password Manager**
+%4$d Click %5$@ (on the right from _Saved Passwords_) and select **Export passwords**
+%6$d Save the passwords file someplace you can find it (e.g., Desktop)
+%7$d %8$@</source>
+        <target state="new">%1$d Open **%2$s**
+%3$d Use the Menu Bar to select **View → Show Password Manager**
+%4$d Click %5$@ (on the right from _Saved Passwords_) and select **Export passwords**
+%6$d Save the passwords file someplace you can find it (e.g., Desktop)
+%7$d %8$@</target>
+        <note>Instructions to import Passwords as CSV from Opera GX browsers.
+%N$d - step number
+%2$s - browser name (Opera GX)
+%5$@ - menu button icon
+%8$@ - “Select Passwords CSV File” button
+**bold text**; _italic text_</note>
+      </trans-unit>
+      <trans-unit id="import.csv.instructions.safari" xml:space="preserve">
+        <source>%1$d Open **Safari**
+%2$d Select **File → Export → Passwords**
+%3$d Save the passwords file someplace you can find it (e.g., Desktop)
+%4$d %5$@</source>
+        <target state="new">%1$d Open **Safari**
+%2$d Select **File → Export → Passwords**
+%3$d Save the passwords file someplace you can find it (e.g., Desktop)
+%4$d %5$@</target>
+        <note>Instructions to import Passwords as CSV from Safari.
+%N$d - step number
+%5$@ - “Select Passwords CSV File” button
+**bold text**; _italic text_</note>
+      </trans-unit>
+      <trans-unit id="import.csv.instructions.vivaldi" xml:space="preserve">
+        <source>%1$d Open **%2$s**
+%3$d Type “_chrome://settings/passwords_” into the Address bar
+%4$d Click %5$@ (on the right from _Saved Passwords_) and select **Export passwords**
+%6$d Save the file someplace you can find it (e.g., Desktop)
+%7$d %8$@</source>
+        <target state="new">%1$d Open **%2$s**
+%3$d Type “_chrome://settings/passwords_” into the Address bar
+%4$d Click %5$@ (on the right from _Saved Passwords_) and select **Export passwords**
+%6$d Save the file someplace you can find it (e.g., Desktop)
+%7$d %8$@</target>
+        <note>Instructions to import Passwords exported as CSV from Vivaldi browser.
+%N$d - step number
+%2$s - browser name (Vivaldi)
+%5$@ - menu button icon
+%8$@ - “Select Passwords CSV File” button
+**bold text**; _italic text_</note>
+      </trans-unit>
+      <trans-unit id="import.csv.instructions.yandex" xml:space="preserve">
+        <source>%1$d Open **%2$s**
+%3$d Click %4$@ to open the application menu then click **Passwords and cards**
+%5$d Click %6$@ then **Export passwords**
+%7$d Choose **To a text file (not secure)** and click **Export**
+%8$d Save the passwords file someplace you can find it (e.g., Desktop)
+%9$d %10$@</source>
+        <target state="new">%1$d Open **%2$s**
+%3$d Click %4$@ to open the application menu then click **Passwords and cards**
+%5$d Click %6$@ then **Export passwords**
+%7$d Choose **To a text file (not secure)** and click **Export**
+%8$d Save the passwords file someplace you can find it (e.g., Desktop)
+%9$d %10$@</target>
+        <note>Instructions to import Passwords as CSV from Yandex Browser.
+%N$d - step number
+%2$s - browser name (Yandex)
+%4$@ - hamburger menu icon
+%8$@ - “Select Passwords CSV File” button
+**bold text**; _italic text_</note>
+      </trans-unit>
+      <trans-unit id="import.data.alert.cancel" xml:space="preserve">
+        <source>Cancel</source>
+        <target state="new">Cancel</target>
+        <note>Cancel button for data import alerts</note>
+      </trans-unit>
+      <trans-unit id="import.data.alert.import" xml:space="preserve">
+        <source>Import</source>
+        <target state="new">Import</target>
+        <note>Import button for data import alerts</note>
+      </trans-unit>
+      <trans-unit id="import.data.done" xml:space="preserve">
+        <source>Done</source>
+        <target state="new">Done</target>
+        <note>Button text for finishing the data import</note>
+      </trans-unit>
+      <trans-unit id="import.data.initiate" xml:space="preserve">
+        <source>Import</source>
+        <target state="new">Import</target>
+        <note>Button text for importing data</note>
+      </trans-unit>
+      <trans-unit id="import.data.manual" xml:space="preserve">
+        <source>Manual import…</source>
+        <target state="new">Manual import…</target>
+        <note>Button text for initiating manual data import using a HTML or CSV file when automatic import has failed</note>
+      </trans-unit>
+      <trans-unit id="import.data.requires-password.body" xml:space="preserve">
+        <source>DuckDuckGo won't save or share your %1$@ Primary Password, but DuckDuckGo needs it to access and import passwords from %1$@.</source>
+        <target state="new">DuckDuckGo won't save or share your %1$@ Primary Password, but DuckDuckGo needs it to access and import passwords from %1$@.</target>
+        <note>Alert body text when the data import needs a password</note>
+      </trans-unit>
+      <trans-unit id="import.data.requires-password.title" xml:space="preserve">
+        <source>Enter Primary Password for %@</source>
+        <target state="new">Enter Primary Password for %@</target>
+        <note>Alert title text when the data import needs a password</note>
+      </trans-unit>
+      <trans-unit id="import.data.skip" xml:space="preserve">
+        <source>Skip</source>
+        <target state="new">Skip</target>
+        <note>Button text to skip an import step</note>
+      </trans-unit>
+      <trans-unit id="import.data.skip.bookmarks" xml:space="preserve">
+        <source>Skip bookmarks</source>
+        <target state="new">Skip bookmarks</target>
+        <note>Button text to skip bookmarks manual import</note>
+      </trans-unit>
+      <trans-unit id="import.data.skip.passwords" xml:space="preserve">
+        <source>Skip passwords</source>
+        <target state="new">Skip passwords</target>
+        <note>Button text to skip bookmarks manual import</note>
+      </trans-unit>
+      <trans-unit id="import.html.instructions.chromium" xml:space="preserve">
+        <source>%1$d Open **%2$s**
+%3$d Use the Menu Bar to select **Bookmarks → Bookmark Manager**
+%4$d Click %5$@ then **Export Bookmarks**
+%6$d Save the file someplace you can find it (e.g., Desktop)
+%7$d %8$@</source>
+        <target state="new">%1$d Open **%2$s**
+%3$d Use the Menu Bar to select **Bookmarks → Bookmark Manager**
+%4$d Click %5$@ then **Export Bookmarks**
+%6$d Save the file someplace you can find it (e.g., Desktop)
+%7$d %8$@</target>
+        <note>Instructions to import Bookmarks exported as HTML from Chromium-based browsers.
+%N$d - step number
+%2$s - browser name
+%5$@ - hamburger menu icon
+%8$@ - “Select Bookmarks HTML File” button
+**bold text**; _italic text_</note>
+      </trans-unit>
+      <trans-unit id="import.html.instructions.firefox" xml:space="preserve">
+        <source>%1$d Open **%2$s**
+%3$d Use the Menu Bar to select **Bookmarks → Manage Bookmarks**
+%4$d Click %5$@ then **Export bookmarks to HTML…**
+%6$d Save the file someplace you can find it (e.g., Desktop)
+%7$d %8$@</source>
+        <target state="new">%1$d Open **%2$s**
+%3$d Use the Menu Bar to select **Bookmarks → Manage Bookmarks**
+%4$d Click %5$@ then **Export bookmarks to HTML…**
+%6$d Save the file someplace you can find it (e.g., Desktop)
+%7$d %8$@</target>
+        <note>Instructions to import Bookmarks exported as HTML from Firefox based browsers.
+%N$d - step number
+%2$s - browser name (Firefox)
+%5$@ - hamburger menu icon
+%8$@ - “Select Bookmarks HTML File” button
+**bold text**; _italic text_</note>
+      </trans-unit>
+      <trans-unit id="import.html.instructions.generic" xml:space="preserve">
+        <source>%1$d Open your old browser
+%2$d Open **Bookmark Manager**
+%3$d Export bookmarks to HTML…
+%4$d Save the file someplace you can find it (e.g., Desktop)
+%5$d %6$@</source>
+        <target state="new">%1$d Open your old browser
+%2$d Open **Bookmark Manager**
+%3$d Export bookmarks to HTML…
+%4$d Save the file someplace you can find it (e.g., Desktop)
+%5$d %6$@</target>
+        <note>Instructions to import a generic HTML Bookmarks file.
+%N$d - step number
+%6$@ - “Select Bookmarks HTML File” button
+**bold text**; _italic text_</note>
+      </trans-unit>
+      <trans-unit id="import.html.instructions.opera" xml:space="preserve">
+        <source>%1$d Open **%2$s**
+%3$d Use the Menu Bar to select **Bookmarks → Bookmarks**
+%4$d Click **Open full Bookmarks view…** in the bottom left
+%5$d Click **Import/Export…** in the bottom left and select **Export Bookmarks**
+%6$d Save the file someplace you can find it (e.g., Desktop)
+%7$d %8$@</source>
+        <target state="new">%1$d Open **%2$s**
+%3$d Use the Menu Bar to select **Bookmarks → Bookmarks**
+%4$d Click **Open full Bookmarks view…** in the bottom left
+%5$d Click **Import/Export…** in the bottom left and select **Export Bookmarks**
+%6$d Save the file someplace you can find it (e.g., Desktop)
+%7$d %8$@</target>
+        <note>Instructions to import Bookmarks exported as HTML from Opera browser.
+%N$d - step number
+%2$s - browser name (Opera)
+%8$@ - “Select Bookmarks HTML File” button
+**bold text**; _italic text_</note>
+      </trans-unit>
+      <trans-unit id="import.html.instructions.operagx" xml:space="preserve">
+        <source>%1$d Open **%2$s**
+%3$d Use the Menu Bar to select **Bookmarks → Bookmarks**
+%4$d Click **Import/Export…** in the bottom left and select **Export Bookmarks**
+%5$d Save the file someplace you can find it (e.g., Desktop)
+%6$d %7$@</source>
+        <target state="new">%1$d Open **%2$s**
+%3$d Use the Menu Bar to select **Bookmarks → Bookmarks**
+%4$d Click **Import/Export…** in the bottom left and select **Export Bookmarks**
+%5$d Save the file someplace you can find it (e.g., Desktop)
+%6$d %7$@</target>
+        <note>Instructions to import Bookmarks exported as HTML from Opera GX browser.
+%N$d - step number
+%2$s - browser name (Opera GX)
+%7$@ - “Select Bookmarks HTML File” button
+**bold text**; _italic text_</note>
+      </trans-unit>
+      <trans-unit id="import.html.instructions.safari" xml:space="preserve">
+        <source>%1$d Open **Safari**
+%2$d Select **File → Export → Bookmarks**
+%3$d Save the passwords file someplace you can find it (e.g., Desktop)
+%4$d %5$@</source>
+        <target state="new">%1$d Open **Safari**
+%2$d Select **File → Export → Bookmarks**
+%3$d Save the passwords file someplace you can find it (e.g., Desktop)
+%4$d %5$@</target>
+        <note>Instructions to import Bookmarks exported as HTML from Safari.
+%N$d - step number
+%5$@ - “Select Bookmarks HTML File” button
+**bold text**; _italic text_</note>
+      </trans-unit>
+      <trans-unit id="import.html.instructions.vivaldi" xml:space="preserve">
+        <source>%1$d Open **%2$s**
+%3$d Use the Menu Bar to select **File → Export Bookmarks…**
+%4$d Save the file someplace you can find it (e.g., Desktop)
+%5$d %6$@</source>
+        <target state="new">%1$d Open **%2$s**
+%3$d Use the Menu Bar to select **File → Export Bookmarks…**
+%4$d Save the file someplace you can find it (e.g., Desktop)
+%5$d %6$@</target>
+        <note>Instructions to import Bookmarks exported as HTML from Vivaldi browser.
+%N$d - step number
+%2$s - browser name (Vivaldi)
+%6$@ - “Select Bookmarks HTML File” button
+**bold text**; _italic text_</note>
+      </trans-unit>
+      <trans-unit id="import.html.instructions.yandex" xml:space="preserve">
+        <source>%1$d Open **%2$s**
+%3$d Use the Menu Bar to select **Favorites → Bookmark Manager**
+%4$d Click %5$@ then **Export bookmarks to HTML file**
+%6$d Save the file someplace you can find it (e.g., Desktop)
+%7$d %8$@</source>
+        <target state="new">%1$d Open **%2$s**
+%3$d Use the Menu Bar to select **Favorites → Bookmark Manager**
+%4$d Click %5$@ then **Export bookmarks to HTML file**
+%6$d Save the file someplace you can find it (e.g., Desktop)
+%7$d %8$@</target>
+        <note>Instructions to import Bookmarks exported as HTML from Yandex Browser.
+%N$d - step number
+%2$s - browser name (Yandex)
+%5$@ - hamburger menu icon
+%8$@ - “Select Bookmarks HTML File” button
+**bold text**; _italic text_</note>
+      </trans-unit>
+      <trans-unit id="import.logins.csv.title" xml:space="preserve">
+        <source>CSV Passwords File (for other browsers)</source>
+        <target state="new">CSV Passwords File (for other browsers)</target>
+        <note>Title text for the CSV importer</note>
+      </trans-unit>
+      <trans-unit id="import.logins.passwords" xml:space="preserve">
+        <source>Passwords</source>
+        <target state="new">Passwords</target>
+        <note>Title text for the Passwords import option</note>
+      </trans-unit>
+      <trans-unit id="import.logins.select-csv-file" xml:space="preserve">
+        <source>Select Passwords CSV File…</source>
+        <target state="new">Select Passwords CSV File…</target>
+        <note>Button text for selecting a CSV file</note>
+      </trans-unit>
+      <trans-unit id="import.logins.select-csv-file.source" xml:space="preserve">
+        <source>Select %@ CSV File…</source>
+        <target state="new">Select %@ CSV File…</target>
+        <note>Button text for selecting a CSV file exported from (LastPass or Bitwarden or 1Password - %@)</note>
+      </trans-unit>
+      <trans-unit id="import.onePassword.app.version.info" xml:space="preserve">
+        <source>You can find your version by selecting **%1$s → About %2$s** from the Menu Bar.</source>
+        <target state="new">You can find your version by selecting **%1$s → About %2$s** from the Menu Bar.</target>
+        <note>Instructions how to find an installed 1Password password manager app version.
+%1$s, %2$s - app name (1Password)</note>
+      </trans-unit>
+      <trans-unit id="import.passwords.indefinite.progress.text" xml:space="preserve">
+        <source>Importing passwords…</source>
+        <target state="new">Importing passwords…</target>
+        <note>Operation progress info message about indefinite number of passwords being imported</note>
+      </trans-unit>
+      <trans-unit id="import.passwords.number.progress.text" xml:space="preserve">
+        <source>Importing passwords (%d)…</source>
+        <target state="new">Importing passwords (%d)…</target>
+        <note>Operation progress info message about %d number of passwords being imported</note>
+      </trans-unit>
+      <trans-unit id="invite.dialog.get.started.button" xml:space="preserve">
+        <source>Get Started</source>
+        <target state="new">Get Started</target>
+        <note>Get Started button on an invite dialog</note>
+      </trans-unit>
+      <trans-unit id="invite.dialog.unrecognized.code.message" xml:space="preserve">
+        <source>We didn’t recognize this Invite Code.</source>
+        <target state="new">We didn’t recognize this Invite Code.</target>
+        <note>Message to show after user enters an unrecognized invite code</note>
+      </trans-unit>
+      <trans-unit id="learnmore.link" xml:space="preserve">
+        <source>Learn More</source>
+        <target state="new">Learn More</target>
+        <note>Learn More link</note>
+      </trans-unit>
+      <trans-unit id="looking.for.bitwarden" xml:space="preserve">
+        <source>Bitwarden not installed…</source>
+        <target state="new">Bitwarden not installed…</target>
+        <note>Setup of the integration with Bitwarden app</note>
+      </trans-unit>
+      <trans-unit id="macOS version" xml:space="preserve">
+        <source>macOS version</source>
+        <target state="new">macOS version</target>
+        <note>Data import failure Report dialog description of a report field providing user‘s macOS version</note>
+      </trans-unit>
+      <trans-unit id="main-menu.app.check-for-updates" xml:space="preserve">
+        <source>Check for Updates…</source>
+        <target state="new">Check for Updates…</target>
+        <note>Main Menu DuckDuckGo item</note>
+      </trans-unit>
+      <trans-unit id="main-menu.app.hide-duck-duck-go" xml:space="preserve">
+        <source>Hide DuckDuckGo</source>
+        <target state="new">Hide DuckDuckGo</target>
+        <note>Main Menu DuckDuckGo item</note>
+      </trans-unit>
+      <trans-unit id="main-menu.app.hide-others" xml:space="preserve">
+        <source>Hide Others</source>
+        <target state="new">Hide Others</target>
+        <note>Main Menu DuckDuckGo item</note>
+      </trans-unit>
+      <trans-unit id="main-menu.app.preferences" xml:space="preserve">
+        <source>Preferences…</source>
+        <target state="new">Preferences…</target>
+        <note>Main Menu DuckDuckGo item</note>
+      </trans-unit>
+      <trans-unit id="main-menu.app.quit-duck-duck-go" xml:space="preserve">
+        <source>Quit DuckDuckGo</source>
+        <target state="new">Quit DuckDuckGo</target>
+        <note>Main Menu DuckDuckGo item</note>
+      </trans-unit>
+      <trans-unit id="main-menu.app.services" xml:space="preserve">
+        <source>Services</source>
+        <target state="new">Services</target>
+        <note>Main Menu DuckDuckGo item</note>
+      </trans-unit>
+      <trans-unit id="main-menu.app.show-all" xml:space="preserve">
+        <source>Show All</source>
+        <target state="new">Show All</target>
+        <note>Main Menu DuckDuckGo item</note>
+      </trans-unit>
+      <trans-unit id="main-menu.edit" xml:space="preserve">
+        <source>Edit</source>
+        <target state="new">Edit</target>
+        <note>Main Menu Edit</note>
+      </trans-unit>
+      <trans-unit id="main-menu.edit.copy" xml:space="preserve">
+        <source>Copy</source>
+        <target state="new">Copy</target>
+        <note>Main Menu Edit item</note>
+      </trans-unit>
+      <trans-unit id="main-menu.edit.cut" xml:space="preserve">
+        <source>Cut</source>
+        <target state="new">Cut</target>
+        <note>Main Menu Edit item</note>
+      </trans-unit>
+      <trans-unit id="main-menu.edit.delete" xml:space="preserve">
+        <source>Delete</source>
+        <target state="new">Delete</target>
+        <note>Main Menu Edit item</note>
+      </trans-unit>
+      <trans-unit id="main-menu.edit.edit-spelling-and-grammar" xml:space="preserve">
+        <source>Spelling and Grammar</source>
+        <target state="new">Spelling and Grammar</target>
+        <note>Main Menu Edit item</note>
+      </trans-unit>
+      <trans-unit id="main-menu.edit.find" xml:space="preserve">
+        <source>Find</source>
+        <target state="new">Find</target>
+        <note>Main Menu Edit item</note>
+      </trans-unit>
+      <trans-unit id="main-menu.edit.find.find-next" xml:space="preserve">
+        <source>Find Next</source>
+        <target state="new">Find Next</target>
+        <note>Main Menu Edit-Find item</note>
+      </trans-unit>
+      <trans-unit id="main-menu.edit.find.find-previous" xml:space="preserve">
+        <source>Find Previous</source>
+        <target state="new">Find Previous</target>
+        <note>Main Menu Edit-Find item</note>
+      </trans-unit>
+      <trans-unit id="main-menu.edit.find.hide-find" xml:space="preserve">
+        <source>Hide Find</source>
+        <target state="new">Hide Find</target>
+        <note>Main Menu Edit-Find item</note>
+      </trans-unit>
+      <trans-unit id="main-menu.edit.paste" xml:space="preserve">
+        <source>Paste</source>
+        <target state="new">Paste</target>
+        <note>Main Menu Edit item</note>
+      </trans-unit>
+      <trans-unit id="main-menu.edit.paste-and-match-style" xml:space="preserve">
+        <source>Paste and Match Style</source>
+        <target state="new">Paste and Match Style</target>
+        <note>Main Menu Edit item - Action that allows the user to paste copy into a target document and the target document's style will be retained (instead of the source style)</note>
+      </trans-unit>
+      <trans-unit id="main-menu.edit.redo" xml:space="preserve">
+        <source>Redo</source>
+        <target state="new">Redo</target>
+        <note>Main Menu Edit item</note>
+      </trans-unit>
+      <trans-unit id="main-menu.edit.select-all" xml:space="preserve">
+        <source>Select All</source>
+        <target state="new">Select All</target>
+        <note>Main Menu Edit item</note>
+      </trans-unit>
+      <trans-unit id="main-menu.edit.spelling-and.check-document-now" xml:space="preserve">
+        <source>Check Document Now</source>
+        <target state="new">Check Document Now</target>
+        <note>Main Menu Edit-Spellingand item</note>
+      </trans-unit>
+      <trans-unit id="main-menu.edit.spelling-and.check-grammar-with-spelling" xml:space="preserve">
+        <source>Check Grammar With Spelling</source>
+        <target state="new">Check Grammar With Spelling</target>
+        <note>Main Menu Edit-Spellingand item</note>
+      </trans-unit>
+      <trans-unit id="main-menu.edit.spelling-and.check-spelling-while-typing" xml:space="preserve">
+        <source>Check Spelling While Typing</source>
+        <target state="new">Check Spelling While Typing</target>
+        <note>Main Menu Edit-Spellingand item</note>
+      </trans-unit>
+      <trans-unit id="main-menu.edit.spelling-and.correct-spelling-automatically" xml:space="preserve">
+        <source>Correct Spelling Automatically</source>
+        <target state="new">Correct Spelling Automatically</target>
+        <note>Main Menu Edit-Spellingand item</note>
+      </trans-unit>
+      <trans-unit id="main-menu.edit.spelling-and.show-spelling-and-grammar" xml:space="preserve">
+        <source>Show Spelling and Grammar</source>
+        <target state="new">Show Spelling and Grammar</target>
+        <note>Main Menu Edit-Spellingand item</note>
+      </trans-unit>
+      <trans-unit id="main-menu.edit.subsitutions" xml:space="preserve">
+        <source>Substitutions</source>
+        <target state="new">Substitutions</target>
+        <note>Main Menu Edit item</note>
+      </trans-unit>
+      <trans-unit id="main-menu.edit.undo" xml:space="preserve">
+        <source>Undo</source>
+        <target state="new">Undo</target>
+        <note>Main Menu Edit item</note>
+      </trans-unit>
+      <trans-unit id="main-menu.file" xml:space="preserve">
+        <source>File</source>
+        <target state="new">File</target>
+        <note>Main Menu File</note>
+      </trans-unit>
+      <trans-unit id="main-menu.file.close-all-windows" xml:space="preserve">
+        <source>Close All Windows</source>
+        <target state="new">Close All Windows</target>
+        <note>Main Menu File item</note>
+      </trans-unit>
+      <trans-unit id="main-menu.file.close-window" xml:space="preserve">
+        <source>Close Window</source>
+        <target state="new">Close Window</target>
+        <note>Main Menu File item</note>
+      </trans-unit>
+      <trans-unit id="main-menu.file.export" xml:space="preserve">
+        <source>Export</source>
+        <target state="new">Export</target>
+        <note>Main Menu File item</note>
+      </trans-unit>
+      <trans-unit id="main-menu.file.export-bookmarks" xml:space="preserve">
+        <source>Bookmarks…</source>
+        <target state="new">Bookmarks…</target>
+        <note>Main Menu File-Export item</note>
+      </trans-unit>
+      <trans-unit id="main-menu.file.export-passwords" xml:space="preserve">
+        <source>Passwords…</source>
+        <target state="new">Passwords…</target>
+        <note>Main Menu File-Export item</note>
+      </trans-unit>
+      <trans-unit id="main-menu.file.import-bookmarks-and-passwords" xml:space="preserve">
+        <source>Import Bookmarks and Passwords…</source>
+        <target state="new">Import Bookmarks and Passwords…</target>
+        <note>Main Menu File item</note>
+      </trans-unit>
+      <trans-unit id="main-menu.file.new-tab" xml:space="preserve">
+        <source>New Tab</source>
+        <target state="new">New Tab</target>
+        <note>Main Menu File item</note>
+      </trans-unit>
+      <trans-unit id="main-menu.file.open-location" xml:space="preserve">
+        <source>Open Location…</source>
+        <target state="new">Open Location…</target>
+        <note>Main Menu File item- Menu option that allows the user to connect to an address (type an address) on click the address bar of the browser is selected and the user can type.</note>
+      </trans-unit>
+      <trans-unit id="main-menu.file.save-as" xml:space="preserve">
+        <source>Save As…</source>
+        <target state="new">Save As…</target>
+        <note>Main Menu File item</note>
+      </trans-unit>
+      <trans-unit id="main.menu.close.downloads" xml:space="preserve">
+        <source>Hide Downloads</source>
+        <target state="new">Hide Downloads</target>
+        <note>Hide Downloads Popover</note>
+      </trans-unit>
+      <trans-unit id="main.menu.close.inspector" xml:space="preserve">
+        <source>Close Developer Tools</source>
+        <target state="new">Close Developer Tools</target>
+        <note>Hide Web Inspector/Close Developer Tools</note>
+      </trans-unit>
+      <trans-unit id="main.menu.show.downloads" xml:space="preserve">
+        <source>Show Downloads</source>
+        <target state="new">Show Downloads</target>
+        <note>Show Downloads Popover</note>
+      </trans-unit>
+      <trans-unit id="main.menu.show.inspector" xml:space="preserve">
+        <source>Open Developer Tools</source>
+        <target state="new">Open Developer Tools</target>
+        <note>Show Web Inspector/Open Developer Tools</note>
+      </trans-unit>
+      <trans-unit id="menu.add.folder" xml:space="preserve">
+        <source>Add Folder…</source>
+        <target state="new">Add Folder…</target>
+        <note>Menu item to add a folder</note>
+      </trans-unit>
+      <trans-unit id="menu.bookmarks.edit" xml:space="preserve">
+        <source>Edit…</source>
+        <target state="new">Edit…</target>
+        <note>Menu item to edit a bookmark or a folder</note>
+      </trans-unit>
+      <trans-unit id="menu.item.new.tab" xml:space="preserve">
+        <source>New Tab</source>
+        <target state="new">New Tab</target>
+        <note>Context menu item</note>
+      </trans-unit>
+      <trans-unit id="more-options.zoom.default-zoom-page" xml:space="preserve">
+        <source>Change Default Page Zoom…</source>
+        <target state="new">Change Default Page Zoom…</target>
+        <note>Default page zoom picker title</note>
+      </trans-unit>
+      <trans-unit id="more.or.less.collapse" xml:space="preserve">
+        <source>Show Less</source>
+        <target state="new">Show Less</target>
+        <note>For collapsing views to show less.</note>
+      </trans-unit>
+      <trans-unit id="more.or.less.expand" xml:space="preserve">
+        <source>Show More</source>
+        <target state="new">Show More</target>
+        <note>For expanding views to show more.</note>
+      </trans-unit>
+      <trans-unit id="mute.tab" xml:space="preserve">
+        <source>Mute Tab</source>
+        <target state="new">Mute Tab</target>
+        <note>Menu item. Mute tab</note>
+      </trans-unit>
+      <trans-unit id="n.more.tabs" xml:space="preserve">
+        <source>Window with multiple tabs (%d)</source>
+        <target state="new">Window with multiple tabs (%d)</target>
+        <note>String in Recently Closed menu item for recently closed browser window and number of tabs contained in the closed window</note>
+      </trans-unit>
+      <trans-unit id="navigate.back" xml:space="preserve">
+        <source>Back</source>
+        <target state="new">Back</target>
+        <note>Context menu item</note>
+      </trans-unit>
+      <trans-unit id="navigate.forward" xml:space="preserve">
+        <source>Forward</source>
+        <target state="new">Forward</target>
+        <note>Context menu item</note>
+      </trans-unit>
+      <trans-unit id="never.for.this.site" xml:space="preserve">
+        <source>Never Ask for This Site</source>
+        <target state="new">Never Ask for This Site</target>
+        <note>Never ask to save login credentials for this site button</note>
+      </trans-unit>
+      <trans-unit id="new.burner.window.menu.item" xml:space="preserve">
+        <source>New Fire Window</source>
+        <target state="new">New Fire Window</target>
+        <note>Menu item title</note>
+      </trans-unit>
+      <trans-unit id="new.window.menu.item" xml:space="preserve">
+        <source>New Window</source>
+        <target state="new">New Window</target>
+        <note>Menu item title</note>
+      </trans-unit>
+      <trans-unit id="newTab.bottom.popover.title" xml:space="preserve">
+        <source>New Tab Page</source>
+        <target state="new">New Tab Page</target>
+        <note>Title of the popover that appears when pressing the bottom right button</note>
+      </trans-unit>
+      <trans-unit id="newTab.favorites.section.title" xml:space="preserve">
+        <source>Favorites</source>
+        <target state="new">Favorites</target>
+        <note>Title of the Favorites section in the home page</note>
+      </trans-unit>
+      <trans-unit id="newTab.menu.item.show.continue.setup" xml:space="preserve">
+        <source>Show Next Steps</source>
+        <target state="new">Show Next Steps</target>
+        <note>Title of the menu item in the home page to show/hide continue setup section</note>
+      </trans-unit>
+      <trans-unit id="newTab.menu.item.show.favorite" xml:space="preserve">
+        <source>Show Favorites</source>
+        <target state="new">Show Favorites</target>
+        <note>Title of the menu item in the home page to show/hide favorite section</note>
+      </trans-unit>
+      <trans-unit id="newTab.menu.item.show.recent.activity" xml:space="preserve">
+        <source>Show Recent Activity</source>
+        <target state="new">Show Recent Activity</target>
+        <note>Title of the menu item in the home page to show/hide recent activity section</note>
+      </trans-unit>
+      <trans-unit id="newTab.recent.activity.section.title" xml:space="preserve">
+        <source>Recent Activity</source>
+        <target state="new">Recent Activity</target>
+        <note>Title of the RecentActivity section in the home page</note>
+      </trans-unit>
+      <trans-unit id="newTab.setup.Import.action" xml:space="preserve">
+        <source>Import Now</source>
+        <target state="new">Import Now</target>
+        <note>Action title on the action menu of the Import card of the Set Up section in the home page</note>
+      </trans-unit>
+      <trans-unit id="newTab.setup.default.browser.action" xml:space="preserve">
+        <source>Make Default Browser</source>
+        <target state="new">Make Default Browser</target>
+        <note>Action title on the action menu of the Default Browser card</note>
+      </trans-unit>
+      <trans-unit id="newTab.setup.default.browser.summary" xml:space="preserve">
+        <source>We automatically block trackers as you browse. It's privacy, simplified.</source>
+        <target state="new">We automatically block trackers as you browse. It's privacy, simplified.</target>
+        <note>Summary of the Default Browser card</note>
+      </trans-unit>
+      <trans-unit id="newTab.setup.default.browser.title" xml:space="preserve">
+        <source>Default to Privacy</source>
+        <target state="new">Default to Privacy</target>
+        <note>Title of the Default Browser card of the Set Up section in the home page</note>
+      </trans-unit>
+      <trans-unit id="newTab.setup.duck.player.action" xml:space="preserve">
+        <source>Try Duck Player</source>
+        <target state="new">Try Duck Player</target>
+        <note>Action title on the action menu of the Duck Player card of the Set Up section in the home page</note>
+      </trans-unit>
+      <trans-unit id="newTab.setup.duck.player.summary" xml:space="preserve">
+        <source>Enjoy a clean viewing experience without personalized ads.</source>
+        <target state="new">Enjoy a clean viewing experience without personalized ads.</target>
+        <note>Summary of the Duck Player card of the Set Up section in the home page</note>
+      </trans-unit>
+      <trans-unit id="newTab.setup.duck.player.title" xml:space="preserve">
+        <source>Clean Up YouTube</source>
+        <target state="new">Clean Up YouTube</target>
+        <note>Title of the Duck Player card of the Set Up section in the home page</note>
+      </trans-unit>
+      <trans-unit id="newTab.setup.email.protection.action" xml:space="preserve">
+        <source>Get a Duck Address</source>
+        <target state="new">Get a Duck Address</target>
+        <note>Action title on the action menu of the Email Protection card of the Set Up section in the home page</note>
+      </trans-unit>
+      <trans-unit id="newTab.setup.email.protection.summary" xml:space="preserve">
+        <source>Generate custom @duck.com addresses that clean trackers from incoming email.</source>
+        <target state="new">Generate custom @duck.com addresses that clean trackers from incoming email.</target>
+        <note>Summary of the Email Protection card of the Set Up section in the home page</note>
+      </trans-unit>
+      <trans-unit id="newTab.setup.email.protection.title" xml:space="preserve">
+        <source>Protect Your Inbox</source>
+        <target state="new">Protect Your Inbox</target>
+        <note>Title of the Email Protection card of the Set Up section in the home page</note>
+      </trans-unit>
+      <trans-unit id="newTab.setup.import.summary" xml:space="preserve">
+        <source>Import bookmarks, favorites, and passwords from your old browser.</source>
+        <target state="new">Import bookmarks, favorites, and passwords from your old browser.</target>
+        <note>Summary of the Import card of the Set Up section in the home page</note>
+      </trans-unit>
+      <trans-unit id="newTab.setup.import.title" xml:space="preserve">
+        <source>Bring Your Stuff</source>
+        <target state="new">Bring Your Stuff</target>
+        <note>Title of the Import card of the Set Up section in the home page</note>
+      </trans-unit>
+      <trans-unit id="newTab.setup.remove.item" xml:space="preserve">
+        <source>Dismiss</source>
+        <target state="new">Dismiss</target>
+        <note>Action title on the action menu of the set up cards card of the SetUp section in the home page to remove the item</note>
+      </trans-unit>
+      <trans-unit id="newTab.setup.section.title" xml:space="preserve">
+        <source>Next Steps</source>
+        <target state="new">Next Steps</target>
+        <note>Title of the setup section in the home page</note>
+      </trans-unit>
+      <trans-unit id="newTab.setup.survey.day.0.action" xml:space="preserve">
+        <source>Share Your Thoughts</source>
+        <target state="new">Share Your Thoughts</target>
+        <note>Action title of the Day 0 durvey of the Set Up section in the home page</note>
+      </trans-unit>
+      <trans-unit id="newTab.setup.survey.day.0.summary" xml:space="preserve">
+        <source>Take our short survey and help us build the best browser.</source>
+        <target state="new">Take our short survey and help us build the best browser.</target>
+        <note>Summary of the Day 0 durvey of the Set Up section in the home page</note>
+      </trans-unit>
+      <trans-unit id="newTab.setup.survey.day.0.title" xml:space="preserve">
+        <source>Tell Us What Brought You Here</source>
+        <target state="new">Tell Us What Brought You Here</target>
+        <note>Title of the Day 0 durvey of the Set Up section in the home page</note>
+      </trans-unit>
+      <trans-unit id="newTab.setup.survey.day.7.action" xml:space="preserve">
+        <source>Share Your Thoughts</source>
+        <target state="new">Share Your Thoughts</target>
+        <note>Action title of the Day 7 durvey of the Set Up section in the home page</note>
+      </trans-unit>
+      <trans-unit id="newTab.setup.survey.day.7.summary" xml:space="preserve">
+        <source>Take our short survey and help us build the best browser.</source>
+        <target state="new">Take our short survey and help us build the best browser.</target>
+        <note>Summary of the Day 7 durvey of the Set Up section in the home page</note>
+      </trans-unit>
+      <trans-unit id="newTab.setup.survey.day.7.title" xml:space="preserve">
+        <source>Help Us Improve</source>
+        <target state="new">Help Us Improve</target>
+        <note>Title of the Day 7 durvey of the Set Up section in the home page</note>
+      </trans-unit>
+      <trans-unit id="next" xml:space="preserve">
+        <source>Next</source>
+        <target state="new">Next</target>
+        <note>Next button</note>
+      </trans-unit>
+      <trans-unit id="no.access.to.downloads.folder.header" xml:space="preserve">
+        <source>DuckDuckGo needs permission to access your Downloads folder</source>
+        <target state="new">DuckDuckGo needs permission to access your Downloads folder</target>
+        <note>Header of the alert dialog warning the user they need to give the browser permission to access the Downloads folder</note>
+      </trans-unit>
+      <trans-unit id="no.access.to.downloads.folder.legacy" xml:space="preserve">
+        <source>Grant access in Security &amp; Privacy preferences in System Settings.</source>
+        <target state="new">Grant access in Security &amp; Privacy preferences in System Settings.</target>
+        <note>Alert presented to user if the app doesn't have rights to access Downloads folder. This is used for macOS version 12 and below</note>
+      </trans-unit>
+      <trans-unit id="no.access.to.downloads.folder.modern" xml:space="preserve">
+        <source>Grant access in Privacy &amp; Security preferences in System Settings.</source>
+        <target state="new">Grant access in Privacy &amp; Security preferences in System Settings.</target>
+        <note>Alert presented to user if the app doesn't have rights to access Downloads folder. This is used for macOS version 13 and above</note>
+      </trans-unit>
+      <trans-unit id="no.access.to.selected.folder" xml:space="preserve">
+        <source>Grant access to the location of download.</source>
+        <target state="new">Grant access to the location of download.</target>
+        <note>Alert presented to user if the app doesn't have rights to access selected folder</note>
+      </trans-unit>
+      <trans-unit id="no.access.to.selected.folder.header" xml:space="preserve">
+        <source>DuckDuckGo needs permission to access selected folder</source>
+        <target state="new">DuckDuckGo needs permission to access selected folder</target>
+        <note>Header of the alert dialog informing user about failed download</note>
+      </trans-unit>
+      <trans-unit id="notification.badge.cookiesmanaged" xml:space="preserve">
+        <source>Cookies Managed</source>
+        <target state="new">Cookies Managed</target>
+        <note>Notification that appears when browser automatically handle cookies</note>
+      </trans-unit>
+      <trans-unit id="notification.badge.popuphidden" xml:space="preserve">
+        <source>Pop-up Hidden</source>
+        <target state="new">Pop-up Hidden</target>
+        <note>Notification that appears when browser cosmetically hides a cookie popup</note>
+      </trans-unit>
+      <trans-unit id="notnow" xml:space="preserve">
+        <source>Not Now</source>
+        <target state="new">Not Now</target>
+        <note>Not Now button</note>
+      </trans-unit>
+      <trans-unit id="ok" xml:space="preserve">
+        <source>OK</source>
+        <target state="new">OK</target>
+        <note>OK button</note>
+      </trans-unit>
+      <trans-unit id="onboarding.importdata.button" xml:space="preserve">
+        <source>Import</source>
+        <target state="new">Import</target>
+        <note>Launch the import data UI</note>
+      </trans-unit>
+      <trans-unit id="onboarding.importdata.text" xml:space="preserve">
+        <source>First, let me help you import your bookmarks 📖 and passwords 🔑 from those less private browsers.</source>
+        <target state="new">First, let me help you import your bookmarks 📖 and passwords 🔑 from those less private browsers.</target>
+        <note>Call to action to import data from other browsers</note>
+      </trans-unit>
+      <trans-unit id="onboarding.notnow.button" xml:space="preserve">
+        <source>Maybe Later</source>
+        <target state="new">Maybe Later</target>
+        <note>Skip a step of the onboarding flow</note>
+      </trans-unit>
+      <trans-unit id="onboarding.setdefault.button" xml:space="preserve">
+        <source>Let's Do It!</source>
+        <target state="new">Let's Do It!</target>
+        <note>Launch the set default UI</note>
+      </trans-unit>
+      <trans-unit id="onboarding.setdefault.text" xml:space="preserve">
+        <source>Next, try setting DuckDuckGo as your default️ browser, so you can open links with peace of mind, every time.</source>
+        <target state="new">Next, try setting DuckDuckGo as your default️ browser, so you can open links with peace of mind, every time.</target>
+        <note>Call to action to set the browser as default</note>
+      </trans-unit>
+      <trans-unit id="onboarding.startbrowsing.text" xml:space="preserve">
+        <source>You’re all set!
+
+Want to see how I protect you? Try visiting one of your favorite sites 👆
+
+Keep watching the address bar as you go. I’ll be blocking trackers and upgrading the security of your connection when possibleu{00A0}🔒</source>
+        <target state="new">You’re all set!
+
+Want to see how I protect you? Try visiting one of your favorite sites 👆
+
+Keep watching the address bar as you go. I’ll be blocking trackers and upgrading the security of your connection when possibleu{00A0}🔒</target>
+        <note>Call to action to start using the app as a browser</note>
+      </trans-unit>
+      <trans-unit id="onboarding.welcome.button" xml:space="preserve">
+        <source>Get Started</source>
+        <target state="new">Get Started</target>
+        <note>Start the onboarding flow</note>
+      </trans-unit>
+      <trans-unit id="onboarding.welcome.text" xml:space="preserve">
+        <source>Tired of being tracked online? You've come to the right place 👍
+
+I'll help you stay private️ as you search and browse the web. Trackers be gone!</source>
+        <target state="new">Tired of being tracked online? You've come to the right place 👍
+
+I'll help you stay private️ as you search and browse the web. Trackers be gone!</target>
+        <note>Detailed welcome to the app text</note>
+      </trans-unit>
+      <trans-unit id="onboarding.welcome.title" xml:space="preserve">
+        <source>Welcome to DuckDuckGo!</source>
+        <target state="new">Welcome to DuckDuckGo!</target>
+        <note>General welcome to the app title</note>
+      </trans-unit>
+      <trans-unit id="open" xml:space="preserve">
+        <source>Open</source>
+        <target state="new">Open</target>
+        <note>Open button</note>
+      </trans-unit>
+      <trans-unit id="open.all.in.new.tabs" xml:space="preserve">
+        <source>Open All in New Tabs</source>
+        <target state="new">Open All in New Tabs</target>
+        <note>Menu item that opens all the bookmarks in a folder to new tabs</note>
+      </trans-unit>
+      <trans-unit id="open.all.tabs.in.new.window" xml:space="preserve">
+        <source>Open All in New Window</source>
+        <target state="new">Open All in New Window</target>
+        <note>Menu item that opens all the bookmarks in a folder in a new window</note>
+      </trans-unit>
+      <trans-unit id="open.bitwarden" xml:space="preserve">
+        <source>Open Bitwarden</source>
+        <target state="new">Open Bitwarden</target>
+        <note>Button to open Bitwarden app</note>
+      </trans-unit>
+      <trans-unit id="open.bitwarden.and.log.in.or.unlock" xml:space="preserve">
+        <source>Open Bitwarden and Log in or Unlock your vault.</source>
+        <target state="new">Open Bitwarden and Log in or Unlock your vault.</target>
+        <note>Setup of the integration with Bitwarden app</note>
+      </trans-unit>
+      <trans-unit id="open.externally.failed" xml:space="preserve">
+        <source>The app required to open that link can’t be found</source>
+        <target state="new">The app required to open that link can’t be found</target>
+        <note>’Link’ is link on a website, it couldn't be opened due to the required app not being found</note>
+      </trans-unit>
+      <trans-unit id="open.image.in.new.burner.tab" xml:space="preserve">
+        <source>Open Image in New Fire Tab</source>
+        <target state="new">Open Image in New Fire Tab</target>
+        <note>Context menu item</note>
+      </trans-unit>
+      <trans-unit id="open.image.in.new.tab" xml:space="preserve">
+        <source>Open Image in New Tab</source>
+        <target state="new">Open Image in New Tab</target>
+        <note>Context menu item</note>
+      </trans-unit>
+      <trans-unit id="open.in" xml:space="preserve">
+        <source>Open in %@</source>
+        <target state="new">Open in %@</target>
+        <note>Opening an entity in other application</note>
+      </trans-unit>
+      <trans-unit id="open.in.new.tab" xml:space="preserve">
+        <source>Open in New Tab</source>
+        <target state="new">Open in New Tab</target>
+        <note>Menu item that opens the link in a new tab</note>
+      </trans-unit>
+      <trans-unit id="open.in.new.window" xml:space="preserve">
+        <source>Open in New Window</source>
+        <target state="new">Open in New Window</target>
+        <note>Menu item that opens the link in a new window</note>
+      </trans-unit>
+      <trans-unit id="open.link.in.new.burner.tab" xml:space="preserve">
+        <source>Open Link in New Fire Tab</source>
+        <target state="new">Open Link in New Fire Tab</target>
+        <note>Context menu item</note>
+      </trans-unit>
+      <trans-unit id="open.link.in.new.tab" xml:space="preserve">
+        <source>Open Link in New Tab</source>
+        <target state="new">Open Link in New Tab</target>
+        <note>Context menu item</note>
+      </trans-unit>
+      <trans-unit id="open.preferences" xml:space="preserve">
+        <source>Open System Preferences</source>
+        <target state="new">Open System Preferences</target>
+        <note>Open System Preferences (to re-enable permission for the App) (up to and including macOS 12</note>
+      </trans-unit>
+      <trans-unit id="open.settings" xml:space="preserve">
+        <source>Open System Settings…</source>
+        <target state="new">Open System Settings…</target>
+        <note>This string represents a prompt or button label prompting the user to open system settings</note>
+      </trans-unit>
+      <trans-unit id="options.menu.fireproof-site" xml:space="preserve">
+        <source>Fireproof This Site</source>
+        <target state="new">Fireproof This Site</target>
+        <note>Context menu item</note>
+      </trans-unit>
+      <trans-unit id="options.menu.move.tab.to.new.window" xml:space="preserve">
+        <source>Move Tab to New Window</source>
+        <target state="new">Move Tab to New Window</target>
+        <note>Context menu item</note>
+      </trans-unit>
+      <trans-unit id="options.menu.remove-fireproofing" xml:space="preserve">
+        <source>Remove Fireproofing</source>
+        <target state="new">Remove Fireproofing</target>
+        <note>Context menu item</note>
+      </trans-unit>
+      <trans-unit id="page.crash.header" xml:space="preserve">
+        <source>This webpage has crashed.</source>
+        <target state="new">This webpage has crashed.</target>
+        <note>Error page heading text shown when a Web Page process had crashed</note>
+      </trans-unit>
+      <trans-unit id="page.crash.message" xml:space="preserve">
+        <source>Try reloading the page or come back later.</source>
+        <target state="new">Try reloading the page or come back later.</target>
+        <note>Error page message text shown when a Web Page process had crashed</note>
+      </trans-unit>
+      <trans-unit id="page.error.header" xml:space="preserve">
+        <source>DuckDuckGo can’t load this page.</source>
+        <target state="new">DuckDuckGo can’t load this page.</target>
+        <note>Error page heading text</note>
+      </trans-unit>
+      <trans-unit id="passsword.management" xml:space="preserve">
+        <source>Autofill</source>
+        <target state="new">Autofill</target>
+        <note>Used as title for password management user interface</note>
+      </trans-unit>
+      <trans-unit id="passsword.management.all-items" xml:space="preserve">
+        <source>All Items</source>
+        <target state="new">All Items</target>
+        <note>Used as title for the Autofill All Items option</note>
+      </trans-unit>
+      <trans-unit id="passsword.management.credit-cards" xml:space="preserve">
+        <source>Credit Cards</source>
+        <target state="new">Credit Cards</target>
+        <note>Used as title for the Autofill Credit Cards option</note>
+      </trans-unit>
+      <trans-unit id="passsword.management.identities" xml:space="preserve">
+        <source>Identities</source>
+        <target state="new">Identities</target>
+        <note>Used as title for the Autofill Identities option</note>
+      </trans-unit>
+      <trans-unit id="passsword.management.lock" xml:space="preserve">
+        <source>Lock</source>
+        <target state="new">Lock</target>
+        <note>Lock Logins Vault menu</note>
+      </trans-unit>
+      <trans-unit id="passsword.management.logins" xml:space="preserve">
+        <source>Passwords</source>
+        <target state="new">Passwords</target>
+        <note>Used as title for the Autofill Logins option</note>
+      </trans-unit>
+      <trans-unit id="passsword.management.notes" xml:space="preserve">
+        <source>Notes</source>
+        <target state="new">Notes</target>
+        <note>Used as title for the Autofill Notes option</note>
+      </trans-unit>
+      <trans-unit id="passsword.management.save.address" xml:space="preserve">
+        <source>Save Address?</source>
+        <target state="new">Save Address?</target>
+        <note>Title of dialog that allows the user to save an address method</note>
+      </trans-unit>
+      <trans-unit id="passsword.management.save.credentials.account.label" xml:space="preserve">
+        <source>Connected to %@</source>
+        <target state="new">Connected to %@</target>
+        <note>In the password manager dialog, label that specifies the password manager vault we are connected with</note>
+      </trans-unit>
+      <trans-unit id="passsword.management.save.credentials.fireproof.checkbox.description" xml:space="preserve">
+        <source>Keeps you signed in after using the Fire Button</source>
+        <target state="new">Keeps you signed in after using the Fire Button</target>
+        <note>In the password manager dialog, description of the section that allows the user to fireproof a website via a checkbox</note>
+      </trans-unit>
+      <trans-unit id="passsword.management.save.credentials.fireproof.checkbox.title" xml:space="preserve">
+        <source>Fireproof?</source>
+        <target state="new">Fireproof?</target>
+        <note>In the password manager dialog, title of the section that allows the user to fireproof a website via a checkbox</note>
+      </trans-unit>
+      <trans-unit id="passsword.management.save.credentials.password.manager.title" xml:space="preserve">
+        <source>Save Login to Bitwarden?</source>
+        <target state="new">Save Login to Bitwarden?</target>
+        <note>Title of the passwored manager section of dialog that allows the user to save credentials</note>
+      </trans-unit>
+      <trans-unit id="passsword.management.save.credentials.unlock.password.manager" xml:space="preserve">
+        <source>Unlock Bitwarden to Save</source>
+        <target state="new">Unlock Bitwarden to Save</target>
+        <note>In the password manager dialog, alerts the user that they need to unlock Bitworden before being able to save the credential</note>
+      </trans-unit>
+      <trans-unit id="passsword.management.save.payment" xml:space="preserve">
+        <source>Save Payment Method?</source>
+        <target state="new">Save Payment Method?</target>
+        <note>Title of dialog that allows the user to save a payment method</note>
+      </trans-unit>
+      <trans-unit id="passsword.management.unlock" xml:space="preserve">
+        <source>Unlock</source>
+        <target state="new">Unlock</target>
+        <note>Unlock Logins Vault menu</note>
+      </trans-unit>
+      <trans-unit id="passsword.manager.alert.delete" xml:space="preserve">
+        <source>Delete</source>
+        <target state="new">Delete</target>
+        <note>Button of the alert that asks the user to confirm they want to delete an password, login or credential to actually delete</note>
+      </trans-unit>
+      <trans-unit id="passsword.manager.alert.duplicate.password" xml:space="preserve">
+        <source>Duplicate Password</source>
+        <target state="new">Duplicate Password</target>
+        <note>Title of the alert that the password inserted already exists</note>
+      </trans-unit>
+      <trans-unit id="passsword.manager.alert.duplicate.password.description" xml:space="preserve">
+        <source>You already have a password saved for this username and website.</source>
+        <target state="new">You already have a password saved for this username and website.</target>
+        <note>Text of the alert that explains the password inserted already exists for a given website</note>
+      </trans-unit>
+      <trans-unit id="passsword.manager.alert.remove-card.confirmation" xml:space="preserve">
+        <source>Are you sure you want to delete this saved credit card?</source>
+        <target state="new">Are you sure you want to delete this saved credit card?</target>
+        <note>Text of the alert that asks the user to confirm they want to delete a credit card</note>
+      </trans-unit>
+      <trans-unit id="passsword.manager.alert.remove-identity.confirmation" xml:space="preserve">
+        <source>Are you sure you want to delete this saved autofill info?</source>
+        <target state="new">Are you sure you want to delete this saved autofill info?</target>
+        <note>Text of the alert that asks the user to confirm they want to delete an identity</note>
+      </trans-unit>
+      <trans-unit id="passsword.manager.alert.remove-note.confirmation" xml:space="preserve">
+        <source>Are you sure you want to delete this note?</source>
+        <target state="new">Are you sure you want to delete this note?</target>
+        <note>Text of the alert that asks the user to confirm they want to delete a note</note>
+      </trans-unit>
+      <trans-unit id="passsword.manager.alert.remove-password.confirmation" xml:space="preserve">
+        <source>Are you sure you want to delete this saved password</source>
+        <target state="new">Are you sure you want to delete this saved password</target>
+        <note>Text of the alert that asks the user to confirm they want to delete a password</note>
+      </trans-unit>
+      <trans-unit id="passsword.manager.alert.save-changes" xml:space="preserve">
+        <source>Save the changes you made?</source>
+        <target state="new">Save the changes you made?</target>
+        <note>Text of the alert that asks the user if the want to save the changes made</note>
+      </trans-unit>
+      <trans-unit id="passsword.manager.empty.state.message" xml:space="preserve">
+        <source>If your logins are saved in another browser, you can import them into DuckDuckGo.</source>
+        <target state="new">If your logins are saved in another browser, you can import them into DuckDuckGo.</target>
+        <note>In the password manager message when there are no items</note>
+      </trans-unit>
+      <trans-unit id="passsword.manager.empty.state.title" xml:space="preserve">
+        <source>No logins or credit card info yet</source>
+        <target state="new">No logins or credit card info yet</target>
+        <note>In the password manager title when there are no items</note>
+      </trans-unit>
+      <trans-unit id="passsword.manager.unlock.autofill" xml:space="preserve">
+        <source>Unlock your Autofill info</source>
+        <target state="new">Unlock your Autofill info</target>
+        <note>In the password manager text of button to unlock autofill info</note>
+      </trans-unit>
+      <trans-unit id="password.manager" xml:space="preserve">
+        <source>Password Manager</source>
+        <target state="new">Password Manager</target>
+        <note>Section header</note>
+      </trans-unit>
+      <trans-unit id="paste-from-clipboard" xml:space="preserve">
+        <source>Paste from Clipboard</source>
+        <target state="new">Paste from Clipboard</target>
+        <note>Paste button</note>
+      </trans-unit>
+      <trans-unit id="paste.and.go" xml:space="preserve">
+        <source>Paste &amp; Go</source>
+        <target state="new">Paste &amp; Go</target>
+        <note>Paste &amp; Go button</note>
+      </trans-unit>
+      <trans-unit id="paste.and.search" xml:space="preserve">
+        <source>Paste &amp; Search</source>
+        <target state="new">Paste &amp; Search</target>
+        <note>Paste &amp; Search button</note>
+      </trans-unit>
+      <trans-unit id="permission.allow.externalScheme.format" xml:space="preserve">
+        <source>Allow “%1$@“ to open %2$@</source>
+        <target state="new">Allow “%1$@“ to open %2$@</target>
+        <note>Allow to open External Link (%@ 2) to open on current domain (%@ 1)</note>
+      </trans-unit>
+      <trans-unit id="permission.allow.externalScheme.menu-header" xml:space="preserve">
+        <source>Allow the %1$@ to open “%2$@” links</source>
+        <target state="new">Allow the %1$@ to open “%2$@” links</target>
+        <note>Allow the App Name(%@ 1) to open “URL Scheme”(%@ 2) links</note>
+      </trans-unit>
+      <trans-unit id="permission.authorization.externalScheme.empty.format" xml:space="preserve">
+        <source>Open this link in %@?</source>
+        <target state="new">Open this link in %@?</target>
+        <note>Popover asking to open link in External App (%@)</note>
+      </trans-unit>
+      <trans-unit id="permission.authorization.externalScheme.format" xml:space="preserve">
+        <source>“%1$@” would like to open this link in %2$@</source>
+        <target state="new">“%1$@” would like to open this link in %2$@</target>
+        <note>Popover asking for domain %@ to open link in External App (%@)</note>
+      </trans-unit>
+      <trans-unit id="permission.authorization.format" xml:space="preserve">
+        <source>Allow “%1$@“ to use your %2$@?</source>
+        <target state="new">Allow “%1$@“ to use your %2$@?</target>
+        <note>Popover asking for domain %@ to use camera/mic/location (%@)</note>
+      </trans-unit>
+      <trans-unit id="permission.authorization.popups.format" xml:space="preserve">
+        <source>Allow “%@“ to open PopUp Window?</source>
+        <target state="new">Allow “%@“ to open PopUp Window?</target>
+        <note>Popover asking for domain %@ to open Popup Window</note>
+      </trans-unit>
+      <trans-unit id="permission.authorization.popups.menu-header" xml:space="preserve">
+        <source>Allow “%@“ to open PopUp Windows?</source>
+        <target state="new">Allow “%@“ to open PopUp Windows?</target>
+        <note>Popover asking for domain %@ to open Popup Window</note>
+      </trans-unit>
+      <trans-unit id="permission.camera" xml:space="preserve">
+        <source>Camera</source>
+        <target state="new">Camera</target>
+        <note>Camera input media device name</note>
+      </trans-unit>
+      <trans-unit id="permission.cameraAndmicrophone" xml:space="preserve">
+        <source>Camera and Microphone</source>
+        <target state="new">Camera and Microphone</target>
+        <note>camera and microphone input media devices name</note>
+      </trans-unit>
+      <trans-unit id="permission.disabled.app" xml:space="preserve">
+        <source>%1$@ access is disabled for %2$@</source>
+        <target state="new">%1$@ access is disabled for %2$@</target>
+        <note>The app (DuckDuckGo: %@ 2) has no access permission to (%@ 1) media device</note>
+      </trans-unit>
+      <trans-unit id="permission.disabled.system" xml:space="preserve">
+        <source>System location services are disabled</source>
+        <target state="new">System location services are disabled</target>
+        <note>Geolocation Services are disabled in System Preferences</note>
+      </trans-unit>
+      <trans-unit id="permission.externalScheme.open.format" xml:space="preserve">
+        <source>Open %@</source>
+        <target state="new">Open %@</target>
+        <note>Open %@ App Name</note>
+      </trans-unit>
+      <trans-unit id="permission.geolocation" xml:space="preserve">
+        <source>Location</source>
+        <target state="new">Location</target>
+        <note>User's Geolocation permission access name</note>
+      </trans-unit>
+      <trans-unit id="permission.microphone" xml:space="preserve">
+        <source>Microphone</source>
+        <target state="new">Microphone</target>
+        <note>Microphone input media device name</note>
+      </trans-unit>
+      <trans-unit id="permission.mute" xml:space="preserve">
+        <source>Pause %1$@ use on “%2$@”</source>
+        <target state="new">Pause %1$@ use on “%2$@”</target>
+        <note>Temporarily pause input media device %@ access for %@2 website</note>
+      </trans-unit>
+      <trans-unit id="permission.open.settings" xml:space="preserve">
+        <source>Open System Settings</source>
+        <target state="new">Open System Settings</target>
+        <note>Open System Settings (to re-enable permission for the App) (macOS 13 and above)</note>
+      </trans-unit>
+      <trans-unit id="permission.popover.deny" xml:space="preserve">
+        <source>Deny</source>
+        <target state="new">Deny</target>
+        <note>Permission Popover: Deny Website input media device access</note>
+      </trans-unit>
+      <trans-unit id="permission.popup.allow.button" xml:space="preserve">
+        <source>Allow</source>
+        <target state="new">Allow</target>
+        <note>Button that the user can use to authorise a web site to for, for example access location or camera and microphone etc.</note>
+      </trans-unit>
+      <trans-unit id="permission.popup.blocked.popover" xml:space="preserve">
+        <source>Pop-up Blocked</source>
+        <target state="new">Pop-up Blocked</target>
+        <note>Text of popver warning the user that the a pop-up as been blocked</note>
+      </trans-unit>
+      <trans-unit id="permission.popup.learn-more.link" xml:space="preserve">
+        <source>Learn more about location services</source>
+        <target state="new">Learn more about location services</target>
+        <note>Text of link that leads to web page with more informations about location services.</note>
+      </trans-unit>
+      <trans-unit id="permission.popup.open.format" xml:space="preserve">
+        <source>%@</source>
+        <target state="new">%@</target>
+        <note>Open %@ URL Pop-up</note>
+      </trans-unit>
+      <trans-unit id="permission.popup.title" xml:space="preserve">
+        <source>Blocked Pop-ups</source>
+        <target state="new">Blocked Pop-ups</target>
+        <note>Title of a popup that has a list of blocked popups</note>
+      </trans-unit>
+      <trans-unit id="permission.popups" xml:space="preserve">
+        <source>Pop-ups</source>
+        <target state="new">Pop-ups</target>
+        <note>Open Pop Up Windows permission access name</note>
+      </trans-unit>
+      <trans-unit id="permission.reloadPage" xml:space="preserve">
+        <source>Reload to ask permission again</source>
+        <target state="new">Reload to ask permission again</target>
+        <note>Reload webpage to ask for input media device access permission again</note>
+      </trans-unit>
+      <trans-unit id="permission.unmute" xml:space="preserve">
+        <source>Resume %1$@ use on “%2$@”</source>
+        <target state="new">Resume %1$@ use on “%2$@”</target>
+        <note>Resume input media device %@ access for %@ website</note>
+      </trans-unit>
+      <trans-unit id="pin.tab" xml:space="preserve">
+        <source>Pin Tab</source>
+        <target state="new">Pin Tab</target>
+        <note>Menu item. Pin as a verb</note>
+      </trans-unit>
+      <trans-unit id="pinning.hide-autofill-shortcut" xml:space="preserve">
+        <source>Hide Autofill Shortcut</source>
+        <target state="new">Hide Autofill Shortcut</target>
+        <note>Menu item for hiding the autofill shortcut</note>
+      </trans-unit>
+      <trans-unit id="pinning.hide-bookmarks-shortcut" xml:space="preserve">
+        <source>Hide Bookmarks Shortcut</source>
+        <target state="new">Hide Bookmarks Shortcut</target>
+        <note>Menu item for hiding the bookmarks shortcut</note>
+      </trans-unit>
+      <trans-unit id="pinning.hide-downloads-shortcut" xml:space="preserve">
+        <source>Hide Downloads Shortcut</source>
+        <target state="new">Hide Downloads Shortcut</target>
+        <note>Menu item for hiding the downloads shortcut</note>
+      </trans-unit>
+      <trans-unit id="pinning.hide-netp-shortcut" xml:space="preserve">
+        <source>Hide VPN Shortcut</source>
+        <target state="new">Hide VPN Shortcut</target>
+        <note>Menu item for hiding the NetP shortcut</note>
+      </trans-unit>
+      <trans-unit id="pinning.show-autofill-shortcut" xml:space="preserve">
+        <source>Show Autofill Shortcut</source>
+        <target state="new">Show Autofill Shortcut</target>
+        <note>Menu item for showing the autofill shortcut</note>
+      </trans-unit>
+      <trans-unit id="pinning.show-bookmarks-shortcut" xml:space="preserve">
+        <source>Show Bookmarks Shortcut</source>
+        <target state="new">Show Bookmarks Shortcut</target>
+        <note>Menu item for showing the bookmarks shortcut</note>
+      </trans-unit>
+      <trans-unit id="pinning.show-downloads-shortcut" xml:space="preserve">
+        <source>Show Downloads Shortcut</source>
+        <target state="new">Show Downloads Shortcut</target>
+        <note>Menu item for showing the downloads shortcut</note>
+      </trans-unit>
+      <trans-unit id="pinning.show-netp-shortcut" xml:space="preserve">
+        <source>Show VPN Shortcut</source>
+        <target state="new">Show VPN Shortcut</target>
+        <note>Menu item for showing the NetP shortcut</note>
+      </trans-unit>
+      <trans-unit id="pm.activate" xml:space="preserve">
+        <source>Reactivate</source>
+        <target state="new">Reactivate</target>
+        <note>Activate button</note>
+      </trans-unit>
+      <trans-unit id="pm.activate.private.email" xml:space="preserve">
+        <source>Reactivate Duck Address</source>
+        <target state="new">Reactivate Duck Address</target>
+        <note>Activate private email address button</note>
+      </trans-unit>
+      <trans-unit id="pm.add.card" xml:space="preserve">
+        <source>Add Credit Card</source>
+        <target state="new">Add Credit Card</target>
+        <note>Add New Credit Card button</note>
+      </trans-unit>
+      <trans-unit id="pm.add.identity" xml:space="preserve">
+        <source>Add Identity</source>
+        <target state="new">Add Identity</target>
+        <note>Add New Identity button</note>
+      </trans-unit>
+      <trans-unit id="pm.add.login" xml:space="preserve">
+        <source>Add Password</source>
+        <target state="new">Add Password</target>
+        <note>Add New Login button</note>
+      </trans-unit>
+      <trans-unit id="pm.add.new" xml:space="preserve">
+        <source>Add New</source>
+        <target state="new">Add New</target>
+        <note>Add New item button</note>
+      </trans-unit>
+      <trans-unit id="pm.added" xml:space="preserve">
+        <source>Added</source>
+        <target state="new">Added</target>
+        <note>Label for login added data</note>
+      </trans-unit>
+      <trans-unit id="pm.address.address1" xml:space="preserve">
+        <source>Address 1</source>
+        <target state="new">Address 1</target>
+        <note>Label for address 1 title</note>
+      </trans-unit>
+      <trans-unit id="pm.address.address2" xml:space="preserve">
+        <source>Address 2</source>
+        <target state="new">Address 2</target>
+        <note>Label for address 2 title</note>
+      </trans-unit>
+      <trans-unit id="pm.address.city" xml:space="preserve">
+        <source>City</source>
+        <target state="new">City</target>
+        <note>Label for city title</note>
+      </trans-unit>
+      <trans-unit id="pm.address.postal-code" xml:space="preserve">
+        <source>Postal Code</source>
+        <target state="new">Postal Code</target>
+        <note>Label for postal code title</note>
+      </trans-unit>
+      <trans-unit id="pm.address.state-province" xml:space="preserve">
+        <source>State/Province</source>
+        <target state="new">State/Province</target>
+        <note>Label for state/province title</note>
+      </trans-unit>
+      <trans-unit id="pm.cancel" xml:space="preserve">
+        <source>Cancel</source>
+        <target state="new">Cancel</target>
+        <note>Cancel button</note>
+      </trans-unit>
+      <trans-unit id="pm.card.cardholder-name" xml:space="preserve">
+        <source>Cardholder Name</source>
+        <target state="new">Cardholder Name</target>
+        <note>Label for cardholder name title</note>
+      </trans-unit>
+      <trans-unit id="pm.card.cvv" xml:space="preserve">
+        <source>CVV</source>
+        <target state="new">CVV</target>
+        <note>Label for CVV title</note>
+      </trans-unit>
+      <trans-unit id="pm.card.expiration-date" xml:space="preserve">
+        <source>Expiration Date</source>
+        <target state="new">Expiration Date</target>
+        <note>Label for expiration date title</note>
+      </trans-unit>
+      <trans-unit id="pm.card.number" xml:space="preserve">
+        <source>Card Number</source>
+        <target state="new">Card Number</target>
+        <note>Label for card number title</note>
+      </trans-unit>
+      <trans-unit id="pm.day" xml:space="preserve">
+        <source>Day</source>
+        <target state="new">Day</target>
+        <note>Label for Day title</note>
+      </trans-unit>
+      <trans-unit id="pm.deactivate" xml:space="preserve">
+        <source>Deactivate</source>
+        <target state="new">Deactivate</target>
+        <note>Deactivate button</note>
+      </trans-unit>
+      <trans-unit id="pm.deactivate.private.email" xml:space="preserve">
+        <source>Deactivate Duck Address</source>
+        <target state="new">Deactivate Duck Address</target>
+        <note>Deactivate private email address button</note>
+      </trans-unit>
+      <trans-unit id="pm.delete" xml:space="preserve">
+        <source>Delete</source>
+        <target state="new">Delete</target>
+        <note>Delete button</note>
+      </trans-unit>
+      <trans-unit id="pm.edit" xml:space="preserve">
+        <source>Edit</source>
+        <target state="new">Edit</target>
+        <note>Edit button</note>
+      </trans-unit>
+      <trans-unit id="pm.email-address" xml:space="preserve">
+        <source>Email Address</source>
+        <target state="new">Email Address</target>
+        <note>Label for email address title</note>
+      </trans-unit>
+      <trans-unit id="pm.empty.cards.title" xml:space="preserve">
+        <source>No Cards</source>
+        <target state="new">No Cards</target>
+        <note>Label for cards empty state title</note>
+      </trans-unit>
+      <trans-unit id="pm.empty.default.description" xml:space="preserve">
+        <source>If your passwords are saved in another browser, you can import them into DuckDuckGo.</source>
+        <target state="new">If your passwords are saved in another browser, you can import them into DuckDuckGo.</target>
+        <note>Label for default empty state description</note>
+      </trans-unit>
+      <trans-unit id="pm.empty.default.title" xml:space="preserve">
+        <source>No passwords or credit cards saved yet</source>
+        <target state="new">No passwords or credit cards saved yet</target>
+        <note>Label for default empty state title</note>
+      </trans-unit>
+      <trans-unit id="pm.empty.identities.title" xml:space="preserve">
+        <source>No Identities</source>
+        <target state="new">No Identities</target>
+        <note>Label for identities empty state title</note>
+      </trans-unit>
+      <trans-unit id="pm.empty.logins.title" xml:space="preserve">
+        <source>No passwords</source>
+        <target state="new">No passwords</target>
+        <note>Label for logins empty state title</note>
+      </trans-unit>
+      <trans-unit id="pm.empty.notes.title" xml:space="preserve">
+        <source>No Notes</source>
+        <target state="new">No Notes</target>
+        <note>Label for notes empty state title</note>
+      </trans-unit>
+      <trans-unit id="pm.enable.email.protection" xml:space="preserve">
+        <source>Enable Email Protection</source>
+        <target state="new">Enable Email Protection</target>
+        <note>Text link to email protection website</note>
+      </trans-unit>
+      <trans-unit id="pm.identification" xml:space="preserve">
+        <source>Identification</source>
+        <target state="new">Identification</target>
+        <note>Label for identification title</note>
+      </trans-unit>
+      <trans-unit id="pm.identity.autofill.title.default" xml:space="preserve">
+        <source>Address</source>
+        <target state="new">Address</target>
+        <note>Default title for Addresses/Identities</note>
+      </trans-unit>
+      <trans-unit id="pm.last.updated" xml:space="preserve">
+        <source>Last Updated</source>
+        <target state="new">Last Updated</target>
+        <note>Label for last updated edit field</note>
+      </trans-unit>
+      <trans-unit id="pm.lock-screen.duration" xml:space="preserve">
+        <source>Your autofill info will remain unlocked until your computer is idle for %@.</source>
+        <target state="new">Your autofill info will remain unlocked until your computer is idle for %@.</target>
+        <note>Message about the duration for which autofill information remains unlocked on the lock screen.</note>
+      </trans-unit>
+      <trans-unit id="pm.lock-screen.preferences.label" xml:space="preserve">
+        <source>Change in</source>
+        <target state="new">Change in</target>
+        <note>Label used for a button that opens preferences</note>
+      </trans-unit>
+      <trans-unit id="pm.lock-screen.preferences.link" xml:space="preserve">
+        <source>Settings</source>
+        <target state="new">Settings</target>
+        <note>Label used for a button that opens preferences</note>
+      </trans-unit>
+      <trans-unit id="pm.lock-screen.prompt.autofill" xml:space="preserve">
+        <source>unlock access to your autofill info</source>
+        <target state="new">unlock access to your autofill info</target>
+        <note>Label presented when autofilling credit card information</note>
+      </trans-unit>
+      <trans-unit id="pm.lock-screen.prompt.change-settings" xml:space="preserve">
+        <source>change your autofill info access settings</source>
+        <target state="new">change your autofill info access settings</target>
+        <note>Label presented when changing Auto-Lock settings</note>
+      </trans-unit>
+      <trans-unit id="pm.lock-screen.prompt.export-logins" xml:space="preserve">
+        <source>export your usernames and passwords</source>
+        <target state="new">export your usernames and passwords</target>
+        <note>Label presented when exporting logins</note>
+      </trans-unit>
+      <trans-unit id="pm.lock-screen.prompt.unlock-logins" xml:space="preserve">
+        <source>unlock access to your autofill info</source>
+        <target state="new">unlock access to your autofill info</target>
+        <note>Label presented when unlocking Autofill</note>
+      </trans-unit>
+      <trans-unit id="pm.lock-screen.threshold.1-hour" xml:space="preserve">
+        <source>1 hour</source>
+        <target state="new">1 hour</target>
+        <note>Label used when selecting the Auto-Lock threshold</note>
+      </trans-unit>
+      <trans-unit id="pm.lock-screen.threshold.1-minute" xml:space="preserve">
+        <source>1 minute</source>
+        <target state="new">1 minute</target>
+        <note>Label used when selecting the Auto-Lock threshold</note>
+      </trans-unit>
+      <trans-unit id="pm.lock-screen.threshold.5-minutes" xml:space="preserve">
+        <source>5 minutes</source>
+        <target state="new">5 minutes</target>
+        <note>Label used when selecting the Auto-Lock threshold</note>
+      </trans-unit>
+      <trans-unit id="pm.lock-screen.threshold.12-hours" xml:space="preserve">
+        <source>12 hours</source>
+        <target state="new">12 hours</target>
+        <note>Label used when selecting the Auto-Lock threshold</note>
+      </trans-unit>
+      <trans-unit id="pm.lock-screen.threshold.15-minutes" xml:space="preserve">
+        <source>15 minutes</source>
+        <target state="new">15 minutes</target>
+        <note>Label used when selecting the Auto-Lock threshold</note>
+      </trans-unit>
+      <trans-unit id="pm.lock-screen.threshold.30-minutes" xml:space="preserve">
+        <source>30 minutes</source>
+        <target state="new">30 minutes</target>
+        <note>Label used when selecting the Auto-Lock threshold</note>
+      </trans-unit>
+      <trans-unit id="pm.month" xml:space="preserve">
+        <source>Month</source>
+        <target state="new">Month</target>
+        <note>Label for Month title</note>
+      </trans-unit>
+      <trans-unit id="pm.name.first" xml:space="preserve">
+        <source>First Name</source>
+        <target state="new">First Name</target>
+        <note>Label for first name title</note>
+      </trans-unit>
+      <trans-unit id="pm.name.last" xml:space="preserve">
+        <source>Last Name</source>
+        <target state="new">Last Name</target>
+        <note>Label for last name title</note>
+      </trans-unit>
+      <trans-unit id="pm.name.middle" xml:space="preserve">
+        <source>Middle Name</source>
+        <target state="new">Middle Name</target>
+        <note>Label for middle name title</note>
+      </trans-unit>
+      <trans-unit id="pm.new.card" xml:space="preserve">
+        <source>Credit Card</source>
+        <target state="new">Credit Card</target>
+        <note>Label for new card title</note>
+      </trans-unit>
+      <trans-unit id="pm.new.identity" xml:space="preserve">
+        <source>Identity</source>
+        <target state="new">Identity</target>
+        <note>Label for new identity title</note>
+      </trans-unit>
+      <trans-unit id="pm.new.login" xml:space="preserve">
+        <source>Password</source>
+        <target state="new">Password</target>
+        <note>Label for new login title</note>
+      </trans-unit>
+      <trans-unit id="pm.new.note" xml:space="preserve">
+        <source>Note</source>
+        <target state="new">Note</target>
+        <note>Label for new note title</note>
+      </trans-unit>
+      <trans-unit id="pm.note" xml:space="preserve">
+        <source>Note</source>
+        <target state="new">Note</target>
+        <note>Label for note title</note>
+      </trans-unit>
+      <trans-unit id="pm.note.empty" xml:space="preserve">
+        <source>Empty note</source>
+        <target state="new">Empty note</target>
+        <note>Label for empty note title</note>
+      </trans-unit>
+      <trans-unit id="pm.notes" xml:space="preserve">
+        <source>Notes</source>
+        <target state="new">Notes</target>
+        <note>Label for notes edit field</note>
+      </trans-unit>
+      <trans-unit id="pm.password" xml:space="preserve">
+        <source>Password</source>
+        <target state="new">Password</target>
+        <note>Label for password edit field</note>
+      </trans-unit>
+      <trans-unit id="pm.phone-number" xml:space="preserve">
+        <source>Phone Number</source>
+        <target state="new">Phone Number</target>
+        <note>Label for phone number title</note>
+      </trans-unit>
+      <trans-unit id="pm.private.email.mesage.activate.confirm.content" xml:space="preserve">
+        <source>Emails sent to %@ will again be forwarded to your inbox.</source>
+        <target state="new">Emails sent to %@ will again be forwarded to your inbox.</target>
+        <note>Text for the confirmation message displayed when a user tries activate a Private Email Address</note>
+      </trans-unit>
+      <trans-unit id="pm.private.email.mesage.activate.confirm.title" xml:space="preserve">
+        <source>Reactivate Private Duck Address?</source>
+        <target state="new">Reactivate Private Duck Address?</target>
+        <note>Title for the confirmation message  displayed when a user tries activate a Private Email Address</note>
+      </trans-unit>
+      <trans-unit id="pm.private.email.mesage.active" xml:space="preserve">
+        <source>Duck Address Active</source>
+        <target state="new">Duck Address Active</target>
+        <note>Mesasage displayed when a private email address is active</note>
+      </trans-unit>
+      <trans-unit id="pm.private.email.mesage.deactivate.confirm.content" xml:space="preserve">
+        <source>Emails sent to %@ will no longer be forwarded to your inbox.</source>
+        <target state="new">Emails sent to %@ will no longer be forwarded to your inbox.</target>
+        <note>Text for the confirmation message displayed when a user tries deactivate a Private Email Address</note>
+      </trans-unit>
+      <trans-unit id="pm.private.email.mesage.deactivate.confirm.title" xml:space="preserve">
+        <source>Deactivate Private Duck Address?</source>
+        <target state="new">Deactivate Private Duck Address?</target>
+        <note>Title for the confirmation message displayed when a user tries deactivate a Private Email Address</note>
+      </trans-unit>
+      <trans-unit id="pm.private.email.mesage.error" xml:space="preserve">
+        <source>Management of this address is temporarily unavailable.</source>
+        <target state="new">Management of this address is temporarily unavailable.</target>
+        <note>Mesasage displayed when a user tries to manage a private email address but the service is not available, returns an error or network is down</note>
+      </trans-unit>
+      <trans-unit id="pm.private.email.mesage.inactive" xml:space="preserve">
+        <source>Duck Address Deactivated</source>
+        <target state="new">Duck Address Deactivated</target>
+        <note>Mesasage displayed when a private email address is inactive</note>
+      </trans-unit>
+      <trans-unit id="pm.removed.duck.address.button" xml:space="preserve">
+        <source>Got it</source>
+        <target state="new">Got it</target>
+        <note>Button text for the alert dialog telling the user an updated username is no longer a private email address</note>
+      </trans-unit>
+      <trans-unit id="pm.removed.duck.address.content" xml:space="preserve">
+        <source>You can still manage this Duck Address from emails received from it in your personal inbox.</source>
+        <target state="new">You can still manage this Duck Address from emails received from it in your personal inbox.</target>
+        <note>Content for the alert dialog telling the user an updated username is no longer a private email address</note>
+      </trans-unit>
+      <trans-unit id="pm.removed.duck.address.title" xml:space="preserve">
+        <source>Private Duck Address username was removed</source>
+        <target state="new">Private Duck Address username was removed</target>
+        <note>Title for the alert dialog telling the user an updated username is no longer a private email address</note>
+      </trans-unit>
+      <trans-unit id="pm.save" xml:space="preserve">
+        <source>Save</source>
+        <target state="new">Save</target>
+        <note>Save button</note>
+      </trans-unit>
+      <trans-unit id="pm.save-credentials.editable.title" xml:space="preserve">
+        <source>Save password?</source>
+        <target state="new">Save password?</target>
+        <note>Title for the editable Save Credentials popover</note>
+      </trans-unit>
+      <trans-unit id="pm.save-credentials.non-editable.title" xml:space="preserve">
+        <source>New Password Saved</source>
+        <target state="new">New Password Saved</target>
+        <note>Title for the non-editable Save Credentials popover</note>
+      </trans-unit>
+      <trans-unit id="pm.signin.to.manage" xml:space="preserve">
+        <source>%@ to manage your Duck Addresses on this device.</source>
+        <target state="new">%@ to manage your Duck Addresses on this device.</target>
+        <note>Message displayed to the user when they are logged out of Email protection.</note>
+      </trans-unit>
+      <trans-unit id="pm.sort.date.ascending" xml:space="preserve">
+        <source>Newest First</source>
+        <target state="new">Newest First</target>
+        <note>Label for Ascending date sort order</note>
+      </trans-unit>
+      <trans-unit id="pm.sort.date.descending" xml:space="preserve">
+        <source>Oldest First</source>
+        <target state="new">Oldest First</target>
+        <note>Label for Descending date sort order</note>
+      </trans-unit>
+      <trans-unit id="pm.sort.parameter.date-created" xml:space="preserve">
+        <source>Date Created</source>
+        <target state="new">Date Created</target>
+        <note>Label for Date Created sort parameter</note>
+      </trans-unit>
+      <trans-unit id="pm.sort.parameter.date-modified" xml:space="preserve">
+        <source>Date Modified</source>
+        <target state="new">Date Modified</target>
+        <note>Label for Date Modified sort parameter</note>
+      </trans-unit>
+      <trans-unit id="pm.sort.parameter.title" xml:space="preserve">
+        <source>Title</source>
+        <target state="new">Title</target>
+        <note>Label for Title sort parameter</note>
+      </trans-unit>
+      <trans-unit id="pm.sort.string.ascending" xml:space="preserve">
+        <source>Alphabetically</source>
+        <target state="new">Alphabetically</target>
+        <note>Label for Ascending string sort order</note>
+      </trans-unit>
+      <trans-unit id="pm.sort.string.descending" xml:space="preserve">
+        <source>Reverse Alphabetically</source>
+        <target state="new">Reverse Alphabetically</target>
+        <note>Label for Descending string sort order</note>
+      </trans-unit>
+      <trans-unit id="pm.username" xml:space="preserve">
+        <source>Username</source>
+        <target state="new">Username</target>
+        <note>Label for username edit field</note>
+      </trans-unit>
+      <trans-unit id="pm.website" xml:space="preserve">
+        <source>Website URL</source>
+        <target state="new">Website URL</target>
+        <note>Label for website edit field</note>
+      </trans-unit>
+      <trans-unit id="pm.year" xml:space="preserve">
+        <source>Year</source>
+        <target state="new">Year</target>
+        <note>Label for Year title</note>
+      </trans-unit>
+      <trans-unit id="preferences-homepage-address" xml:space="preserve">
+        <source>Address:</source>
+        <target state="new">Address:</target>
+        <note>Homepage address field label</note>
+      </trans-unit>
+      <trans-unit id="preferences-homepage-customPage" xml:space="preserve">
+        <source>Specific page</source>
+        <target state="new">Specific page</target>
+        <note>Option to control Specific Home Page</note>
+      </trans-unit>
+      <trans-unit id="preferences-homepage-newTab" xml:space="preserve">
+        <source>New Tab page</source>
+        <target state="new">New Tab page</target>
+        <note>Option to open a new tab</note>
+      </trans-unit>
+      <trans-unit id="preferences-homepage-set-homePage" xml:space="preserve">
+        <source>Set Homepage</source>
+        <target state="new">Set Homepage</target>
+        <note>Set Homepage dialog title</note>
+      </trans-unit>
+      <trans-unit id="preferences-homepage-set-page" xml:space="preserve">
+        <source>Set Page…</source>
+        <target state="new">Set Page…</target>
+        <note>Option to control the Specific Page</note>
+      </trans-unit>
+      <trans-unit id="preferences-homepage.description" xml:space="preserve">
+        <source>When navigating home or opening new windows.</source>
+        <target state="new">When navigating home or opening new windows.</target>
+        <note>Homepage behavior description</note>
+      </trans-unit>
+      <trans-unit id="preferences-homepage.title" xml:space="preserve">
+        <source>Homepage</source>
+        <target state="new">Homepage</target>
+        <note>Title for Homepage section in settings</note>
+      </trans-unit>
+      <trans-unit id="preferences.about" xml:space="preserve">
+        <source>About</source>
+        <target state="new">About</target>
+        <note>Show about screen</note>
+      </trans-unit>
+      <trans-unit id="preferences.about.about-duckduckgo" xml:space="preserve">
+        <source>About DuckDuckGo</source>
+        <target state="new">About DuckDuckGo</target>
+        <note>About screen</note>
+      </trans-unit>
+      <trans-unit id="preferences.about.more-at" xml:space="preserve">
+        <source>More at %@</source>
+        <target state="new">More at %@</target>
+        <note>Link to the about page</note>
+      </trans-unit>
+      <trans-unit id="preferences.about.privacy-policy" xml:space="preserve">
+        <source>Privacy Policy</source>
+        <target state="new">Privacy Policy</target>
+        <note>Link to privacy policy page</note>
+      </trans-unit>
+      <trans-unit id="preferences.about.privacy-simplified" xml:space="preserve">
+        <source>Privacy, simplified.</source>
+        <target state="new">Privacy, simplified.</target>
+        <note>About screen</note>
+      </trans-unit>
+      <trans-unit id="preferences.about.send-feedback" xml:space="preserve">
+        <source>Send Feedback</source>
+        <target state="new">Send Feedback</target>
+        <note>Feedback button in the about preferences page</note>
+      </trans-unit>
+      <trans-unit id="preferences.about.unsupported-device-info1" xml:space="preserve">
+        <source>DuckDuckGo is no longer providing browser updates for your version of macOS.</source>
+        <target state="new">DuckDuckGo is no longer providing browser updates for your version of macOS.</target>
+        <note>This string represents a message informing the user that DuckDuckGo is no longer providing browser updates for their version of macOS</note>
+      </trans-unit>
+      <trans-unit id="preferences.about.unsupported-device-info2" xml:space="preserve">
+        <source>Please update to macOS %@ or later to use the most recent version of DuckDuckGo. You can also keep using your current version of the browser, but it will not receive further updates.</source>
+        <target state="new">Please update to macOS %@ or later to use the most recent version of DuckDuckGo. You can also keep using your current version of the browser, but it will not receive further updates.</target>
+        <note>Copy in section that tells the user to update their macOS version since their current version is unsupported</note>
+      </trans-unit>
+      <trans-unit id="preferences.appearance" xml:space="preserve">
+        <source>Appearance</source>
+        <target state="new">Appearance</target>
+        <note>Show appearance preferences</note>
+      </trans-unit>
+      <trans-unit id="preferences.appearance.address-bar" xml:space="preserve">
+        <source>Address Bar</source>
+        <target state="new">Address Bar</target>
+        <note>Theme preferences</note>
+      </trans-unit>
+      <trans-unit id="preferences.appearance.show-autocomplete-suggestions" xml:space="preserve">
+        <source>Autocomplete suggestions</source>
+        <target state="new">Autocomplete suggestions</target>
+        <note>Option to show autocomplete suggestions in the address bar</note>
+      </trans-unit>
+      <trans-unit id="preferences.appearance.show-full-url" xml:space="preserve">
+        <source>Full website address</source>
+        <target state="new">Full website address</target>
+        <note>Option to show full URL in the address bar</note>
+      </trans-unit>
+      <trans-unit id="preferences.appearance.theme" xml:space="preserve">
+        <source>Theme</source>
+        <target state="new">Theme</target>
+        <note>Theme preferences</note>
+      </trans-unit>
+      <trans-unit id="preferences.appearance.theme.dark" xml:space="preserve">
+        <source>Dark</source>
+        <target state="new">Dark</target>
+        <note>In the preferences for themes, the option to select for activating dark mode in the app.</note>
+      </trans-unit>
+      <trans-unit id="preferences.appearance.theme.light" xml:space="preserve">
+        <source>Light</source>
+        <target state="new">Light</target>
+        <note>In the preferences for themes, the option to select for activating light mode in the app.</note>
+      </trans-unit>
+      <trans-unit id="preferences.appearance.theme.system" xml:space="preserve">
+        <source>System</source>
+        <target state="new">System</target>
+        <note>In the preferences for themes, the option to select for use the change the mode based on the system preferences.</note>
+      </trans-unit>
+      <trans-unit id="preferences.appearance.zoom" xml:space="preserve">
+        <source>Zoom</source>
+        <target state="new">Zoom</target>
+        <note>Zoom settings section title</note>
+      </trans-unit>
+      <trans-unit id="preferences.appearance.zoom-picker" xml:space="preserve">
+        <source>Default page zoom</source>
+        <target state="new">Default page zoom</target>
+        <note>Default page zoom picker title</note>
+      </trans-unit>
+      <trans-unit id="preferences.autofill" xml:space="preserve">
+        <source>Autofill</source>
+        <target state="new">Autofill</target>
+        <note>Show Autofill preferences</note>
+      </trans-unit>
+      <trans-unit id="preferences.default-browser" xml:space="preserve">
+        <source>Default Browser</source>
+        <target state="new">Default Browser</target>
+        <note>Show default browser preferences</note>
+      </trans-unit>
+      <trans-unit id="preferences.default-browser.active" xml:space="preserve">
+        <source>DuckDuckGo is your default browser</source>
+        <target state="new">DuckDuckGo is your default browser</target>
+        <note>Indicate that the browser is the default</note>
+      </trans-unit>
+      <trans-unit id="preferences.default-browser.button.make-default" xml:space="preserve">
+        <source>Make DuckDuckGo Default…</source>
+        <target state="new">Make DuckDuckGo Default…</target>
+        <note>represents a prompt message asking the user to make DuckDuckGo their default browser.</note>
+      </trans-unit>
+      <trans-unit id="preferences.default-browser.inactive" xml:space="preserve">
+        <source>DuckDuckGo is not your default browser.</source>
+        <target state="new">DuckDuckGo is not your default browser.</target>
+        <note>Indicate that the browser is not the default</note>
+      </trans-unit>
+      <trans-unit id="preferences.downloads" xml:space="preserve">
+        <source>Downloads</source>
+        <target state="new">Downloads</target>
+        <note>Show downloads browser preferences</note>
+      </trans-unit>
+      <trans-unit id="preferences.duck-player" xml:space="preserve">
+        <source>Duck Player</source>
+        <target state="new">Duck Player</target>
+        <note>Show Duck Player browser preferences</note>
+      </trans-unit>
+      <trans-unit id="preferences.general" xml:space="preserve">
+        <source>General</source>
+        <target state="new">General</target>
+        <note>Show general preferences</note>
+      </trans-unit>
+      <trans-unit id="preferences.on-startup" xml:space="preserve">
+        <source>On Startup</source>
+        <target state="new">On Startup</target>
+        <note>Name of the preferences section related to app startup</note>
+      </trans-unit>
+      <trans-unit id="preferences.privacy" xml:space="preserve">
+        <source>Privacy</source>
+        <target state="new">Privacy</target>
+        <note>Show privacy browser preferences</note>
+      </trans-unit>
+      <trans-unit id="preferences.reopen-windows" xml:space="preserve">
+        <source>Reopen all windows from last session</source>
+        <target state="new">Reopen all windows from last session</target>
+        <note>Option to control session restoration</note>
+      </trans-unit>
+      <trans-unit id="preferences.show-home" xml:space="preserve">
+        <source>Open a new window</source>
+        <target state="new">Open a new window</target>
+        <note>Option to control session startup</note>
+      </trans-unit>
+      <trans-unit id="preferences.sync" xml:space="preserve">
+        <source>Sync &amp; Backup</source>
+        <target state="new">Sync &amp; Backup</target>
+        <note>Show sync preferences</note>
+      </trans-unit>
+      <trans-unit id="preferences.sync.auto-lock-prompt" xml:space="preserve">
+        <source>Unlock device to setup Sync &amp; Backup</source>
+        <target state="new">Unlock device to setup Sync &amp; Backup</target>
+        <note>Reason for auth when setting up Sync</note>
+      </trans-unit>
+      <trans-unit id="preferences.vpn" xml:space="preserve">
+        <source>VPN</source>
+        <target state="new">VPN</target>
+        <note>Show VPN preferences</note>
+      </trans-unit>
+      <trans-unit id="print.menu.item" xml:space="preserve">
+        <source>Print…</source>
+        <target state="new">Print…</target>
+        <note>Menu item title</note>
+      </trans-unit>
+      <trans-unit id="quit" xml:space="preserve">
+        <source>Quit</source>
+        <target state="new">Quit</target>
+        <note>Quit button</note>
+      </trans-unit>
+      <trans-unit id="reload.page" xml:space="preserve">
+        <source>Reload Page</source>
+        <target state="new">Reload Page</target>
+        <note>Context menu item</note>
+      </trans-unit>
+      <trans-unit id="remove-favorite" xml:space="preserve">
+        <source>Remove Favorite</source>
+        <target state="new">Remove Favorite</target>
+        <note>Remove Favorite button</note>
+      </trans-unit>
+      <trans-unit id="remove.from.favorites" xml:space="preserve">
+        <source>Remove from Favorites</source>
+        <target state="new">Remove from Favorites</target>
+        <note>Button for removing bookmarks from favorites</note>
+      </trans-unit>
+      <trans-unit id="reopen.last.closed.tab" xml:space="preserve">
+        <source>Reopen Last Closed Tab</source>
+        <target state="new">Reopen Last Closed Tab</target>
+        <note>This string represents an action to reopen the last closed tab in the browser</note>
+      </trans-unit>
+      <trans-unit id="reopen.last.closed.window" xml:space="preserve">
+        <source>Reopen Last Closed Window</source>
+        <target state="new">Reopen Last Closed Window</target>
+        <note>This string represents an action to reopen the last closed window in the browser</note>
+      </trans-unit>
+      <trans-unit id="report.broken.site" xml:space="preserve">
+        <source>Report Broken Site</source>
+        <target state="new">Report Broken Site</target>
+        <note>Menu with feedback commands</note>
+      </trans-unit>
+      <trans-unit id="restart.bitwarden" xml:space="preserve">
+        <source>Restart Bitwarden</source>
+        <target state="new">Restart Bitwarden</target>
+        <note>Button to restart Bitwarden application</note>
+      </trans-unit>
+      <trans-unit id="restart.bitwarden.info" xml:space="preserve">
+        <source>Bitwarden is not responding. Please restart it to initiate the communication again</source>
+        <target state="new">Bitwarden is not responding. Please restart it to initiate the communication again</target>
+        <note>This string represents a message informing the user that Bitwarden is not responding and prompts them to restart the application to initiate communication again.</note>
+      </trans-unit>
+      <trans-unit id="save" xml:space="preserve">
+        <source>Save</source>
+        <target state="new">Save</target>
+        <note>Save button</note>
+      </trans-unit>
+      <trans-unit id="save.image.as" xml:space="preserve">
+        <source>Save Image As…</source>
+        <target state="new">Save Image As…</target>
+        <note>Context menu item</note>
+      </trans-unit>
+      <trans-unit id="scroll.to.find.app.settings" xml:space="preserve">
+        <source>Scroll to find the App Settings (All Accounts) section.</source>
+        <target state="new">Scroll to find the App Settings (All Accounts) section.</target>
+        <note>Setup of the integration with Bitwarden app</note>
+      </trans-unit>
+      <trans-unit id="search.with.DuckDuckGo" xml:space="preserve">
+        <source>Search with DuckDuckGo</source>
+        <target state="new">Search with DuckDuckGo</target>
+        <note>Context menu item</note>
+      </trans-unit>
+      <trans-unit id="select.bitwarden.preferences" xml:space="preserve">
+        <source>Select Bitwarden → Preferences from the Mac menu bar.</source>
+        <target state="new">Select Bitwarden → Preferences from the Mac menu bar.</target>
+        <note>Setup of the integration with Bitwarden app (up to and including macOS 12)</note>
+      </trans-unit>
+      <trans-unit id="select.bitwarden.settings" xml:space="preserve">
+        <source>Select Bitwarden → Settings from the Mac menu bar.</source>
+        <target state="new">Select Bitwarden → Settings from the Mac menu bar.</target>
+        <note>Setup of the integration with Bitwarden app (macOS 13 and above)</note>
+      </trans-unit>
+      <trans-unit id="send.browser.feedback" xml:space="preserve">
+        <source>Send Browser Feedback</source>
+        <target state="new">Send Browser Feedback</target>
+        <note>Menu with feedback commands</note>
+      </trans-unit>
+      <trans-unit id="send.browser.feedback.feedback-helps" xml:space="preserve">
+        <source>Your feedback will help us improve the DuckDuckGo app.</source>
+        <target state="new">Your feedback will help us improve the DuckDuckGo app.</target>
+        <note>Text shown to the user when they provide feedback.</note>
+      </trans-unit>
+      <trans-unit id="send.browser.feedback.general-feedback" xml:space="preserve">
+        <source>General feedback</source>
+        <target state="new">General feedback</target>
+        <note>Name of the option the user can chose to give general browser feedback</note>
+      </trans-unit>
+      <trans-unit id="send.browser.feedback.report-problem" xml:space="preserve">
+        <source>Report a problem</source>
+        <target state="new">Report a problem</target>
+        <note>Name of the option the user can chose to give browser feedback about a problem they enountered</note>
+      </trans-unit>
+      <trans-unit id="send.browser.feedback.request-feature" xml:space="preserve">
+        <source>Request a feature</source>
+        <target state="new">Request a feature</target>
+        <note>Name of the option the user can chose to give browser feedback about a feature they would like</note>
+      </trans-unit>
+      <trans-unit id="send.browser.feedback.select-category" xml:space="preserve">
+        <source>Select a category</source>
+        <target state="new">Select a category</target>
+        <note>Title of the picker where the user can chose the category of the feedback they want ot send.</note>
+      </trans-unit>
+      <trans-unit id="send.browser.feedback.thankyou" xml:space="preserve">
+        <source>Thank you!</source>
+        <target state="new">Thank you!</target>
+        <note>Thanks the user for sending feedback</note>
+      </trans-unit>
+      <trans-unit id="send.browser.feedback.title" xml:space="preserve">
+        <source>Help Improve the DuckDuckGo Browser</source>
+        <target state="new">Help Improve the DuckDuckGo Browser</target>
+        <note>Title of the interface to send feedback on the browser</note>
+      </trans-unit>
+      <trans-unit id="settings" xml:space="preserve">
+        <source>Settings</source>
+        <target state="new">Settings</target>
+        <note>Menu item for opening settings</note>
+      </trans-unit>
+      <trans-unit id="share.menu.item" xml:space="preserve">
+        <source>Share</source>
+        <target state="new">Share</target>
+        <note>Menu item title</note>
+      </trans-unit>
+      <trans-unit id="share.menu.item.qr.code" xml:space="preserve">
+        <source>Create QR Code</source>
+        <target state="new">Create QR Code</target>
+        <note>Menu item title</note>
+      </trans-unit>
+      <trans-unit id="sharing.more" xml:space="preserve">
+        <source>More…</source>
+        <target state="new">More…</target>
+        <note>Sharing Menu -&gt; More…</note>
+      </trans-unit>
+      <trans-unit id="show.folder.contents" xml:space="preserve">
+        <source>Show Folder Contents</source>
+        <target state="new">Show Folder Contents</target>
+        <note>Menu item that shows the content of a folder </note>
+      </trans-unit>
+      <trans-unit id="submit" xml:space="preserve">
+        <source>Submit</source>
+        <target state="new">Submit</target>
+        <note>Submit button</note>
+      </trans-unit>
+      <trans-unit id="submit.report" xml:space="preserve">
+        <source>Submit Report</source>
+        <target state="new">Submit Report</target>
+        <note>Submit Report button</note>
+      </trans-unit>
+      <trans-unit id="tab.bookmarks.title" xml:space="preserve">
+        <source>Bookmarks</source>
+        <target state="new">Bookmarks</target>
+        <note>Tab bookmarks title</note>
+      </trans-unit>
+      <trans-unit id="tab.error.title" xml:space="preserve">
+        <source>Failed to open page</source>
+        <target state="new">Failed to open page</target>
+        <note>Tab error title</note>
+      </trans-unit>
+      <trans-unit id="tab.home.title" xml:space="preserve">
+        <source>New Tab</source>
+        <target state="new">New Tab</target>
+        <note>Tab home title</note>
+      </trans-unit>
+      <trans-unit id="tab.onboarding.title" xml:space="preserve">
+        <source>Welcome</source>
+        <target state="new">Welcome</target>
+        <note>Tab onboarding title</note>
+      </trans-unit>
+      <trans-unit id="tab.preferences.title" xml:space="preserve">
+        <source>Settings</source>
+        <target state="new">Settings</target>
+        <note>Tab preferences title</note>
+      </trans-unit>
+      <trans-unit id="tooltip.addToFavorites" xml:space="preserve">
+        <source>Add to Favorites</source>
+        <target state="new">Add to Favorites</target>
+        <note>Tooltip for add to favorites button</note>
+      </trans-unit>
+      <trans-unit id="tooltip.application-menu.show" xml:space="preserve">
+        <source>Open application menu</source>
+        <target state="new">Open application menu</target>
+        <note>Tooltip for the Application Menu button</note>
+      </trans-unit>
+      <trans-unit id="tooltip.autofill.add-item" xml:space="preserve">
+        <source>Add item</source>
+        <target state="new">Add item</target>
+        <note>Tooltip for the Add Item button</note>
+      </trans-unit>
+      <trans-unit id="tooltip.autofill.more-options" xml:space="preserve">
+        <source>More options</source>
+        <target state="new">More options</target>
+        <note>Tooltip for the More Options button</note>
+      </trans-unit>
+      <trans-unit id="tooltip.autofill.shortcut" xml:space="preserve">
+        <source>Autofill</source>
+        <target state="new">Autofill</target>
+        <note>Tooltip for the autofill shortcut</note>
+      </trans-unit>
+      <trans-unit id="tooltip.bookmark.add" xml:space="preserve">
+        <source>Bookmark this page</source>
+        <target state="new">Bookmark this page</target>
+        <note>Tooltip for the Add Bookmark button</note>
+      </trans-unit>
+      <trans-unit id="tooltip.bookmark.edit" xml:space="preserve">
+        <source>Edit bookmark</source>
+        <target state="new">Edit bookmark</target>
+        <note>Tooltip for the Edit Bookmark button</note>
+      </trans-unit>
+      <trans-unit id="tooltip.bookmarks.manage-bookmarks" xml:space="preserve">
+        <source>Manage bookmarks</source>
+        <target state="new">Manage bookmarks</target>
+        <note>Tooltip for the Manage Bookmarks button</note>
+      </trans-unit>
+      <trans-unit id="tooltip.bookmarks.new-bookmark" xml:space="preserve">
+        <source>New bookmark</source>
+        <target state="new">New bookmark</target>
+        <note>Tooltip for the New Bookmark button</note>
+      </trans-unit>
+      <trans-unit id="tooltip.bookmarks.new-folder" xml:space="preserve">
+        <source>New folder</source>
+        <target state="new">New folder</target>
+        <note>Tooltip for the New Folder button</note>
+      </trans-unit>
+      <trans-unit id="tooltip.bookmarks.shortcut" xml:space="preserve">
+        <source>Bookmarks</source>
+        <target state="new">Bookmarks</target>
+        <note>Tooltip for the bookmarks shortcut</note>
+      </trans-unit>
+      <trans-unit id="tooltip.clearHistory" xml:space="preserve">
+        <source>Clear browsing history for %@</source>
+        <target state="new">Clear browsing history for %@</target>
+        <note>Tooltip for burn button where %@ is the domain</note>
+      </trans-unit>
+      <trans-unit id="tooltip.clearHistoryAndData" xml:space="preserve">
+        <source>Clear browsing history and data for %@</source>
+        <target state="new">Clear browsing history and data for %@</target>
+        <note>Tooltip for burn button where %@ is the domain</note>
+      </trans-unit>
+      <trans-unit id="tooltip.downloads.clear-download-history" xml:space="preserve">
+        <source>Clear download history</source>
+        <target state="new">Clear download history</target>
+        <note>Tooltip for the Clear Downloads button</note>
+      </trans-unit>
+      <trans-unit id="tooltip.downloads.open-downloads-folder" xml:space="preserve">
+        <source>Open downloads folder</source>
+        <target state="new">Open downloads folder</target>
+        <note>Tooltip for the Open Downloads Folder button</note>
+      </trans-unit>
+      <trans-unit id="tooltip.downloads.shortcut" xml:space="preserve">
+        <source>Downloads</source>
+        <target state="new">Downloads</target>
+        <note>Tooltip for the downloads shortcut</note>
+      </trans-unit>
+      <trans-unit id="tooltip.find-in-page.close" xml:space="preserve">
+        <source>Close find bar</source>
+        <target state="new">Close find bar</target>
+        <note>Tooltip for the Find In Page bar's Close button</note>
+      </trans-unit>
+      <trans-unit id="tooltip.find-in-page.next" xml:space="preserve">
+        <source>Next result</source>
+        <target state="new">Next result</target>
+        <note>Tooltip for the Find In Page bar's Next button</note>
+      </trans-unit>
+      <trans-unit id="tooltip.find-in-page.previous" xml:space="preserve">
+        <source>Previous result</source>
+        <target state="new">Previous result</target>
+        <note>Tooltip for the Find In Page bar's Previous button</note>
+      </trans-unit>
+      <trans-unit id="tooltip.fire.clear-browsing-history" xml:space="preserve">
+        <source>Clear browsing history</source>
+        <target state="new">Clear browsing history</target>
+        <note>Tooltip for the Fire button</note>
+      </trans-unit>
+      <trans-unit id="tooltip.home.button" xml:space="preserve">
+        <source>Home</source>
+        <target state="new">Home</target>
+        <note>Tooltip for the home button</note>
+      </trans-unit>
+      <trans-unit id="tooltip.navigation.back" xml:space="preserve">
+        <source>Show the previous page
+Hold to show history</source>
+        <target state="new">Show the previous page
+Hold to show history</target>
+        <note>Tooltip for the Back button</note>
+      </trans-unit>
+      <trans-unit id="tooltip.navigation.forward" xml:space="preserve">
+        <source>Show the next page
+Hold to show history</source>
+        <target state="new">Show the next page
+Hold to show history</target>
+        <note>Tooltip for the Forward button</note>
+      </trans-unit>
+      <trans-unit id="tooltip.navigation.refresh" xml:space="preserve">
+        <source>Reload this page</source>
+        <target state="new">Reload this page</target>
+        <note>Tooltip for the Refresh button</note>
+      </trans-unit>
+      <trans-unit id="tooltip.navigation.stop" xml:space="preserve">
+        <source>Stop loading this page</source>
+        <target state="new">Stop loading this page</target>
+        <note>Tooltip for the Stop Navigation button</note>
+      </trans-unit>
+      <trans-unit id="tooltip.privacy-dashboard.show" xml:space="preserve">
+        <source>Show the Privacy Dashboard and manage site settings</source>
+        <target state="new">Show the Privacy Dashboard and manage site settings</target>
+        <note>Tooltip for the Privacy Dashboard button</note>
+      </trans-unit>
+      <trans-unit id="tooltip.tab.new-tab" xml:space="preserve">
+        <source>Open a new tab</source>
+        <target state="new">Open a new tab</target>
+        <note>Tooltip for the New Tab button</note>
+      </trans-unit>
+      <trans-unit id="uninstall" xml:space="preserve">
+        <source>Uninstall</source>
+        <target state="new">Uninstall</target>
+        <note>Uninstall button</note>
+      </trans-unit>
+      <trans-unit id="unmute.tab" xml:space="preserve">
+        <source>Unmute Tab</source>
+        <target state="new">Unmute Tab</target>
+        <note>Menu item. Unmute tab</note>
+      </trans-unit>
+      <trans-unit id="unpin.tab" xml:space="preserve">
+        <source>Unpin Tab</source>
+        <target state="new">Unpin Tab</target>
+        <note>Menu item. Unpin as a verb</note>
+      </trans-unit>
+      <trans-unit id="unsupported.device.info.alert.header" xml:space="preserve">
+        <source>Your version of macOS is no longer supported.</source>
+        <target state="new">Your version of macOS is no longer supported.</target>
+        <note>his string represents the header for an alert informing the user that their version of macOS is no longer supported</note>
+      </trans-unit>
+      <trans-unit id="update" xml:space="preserve">
+        <source>Update</source>
+        <target state="new">Update</target>
+        <note>Update button</note>
+      </trans-unit>
+      <trans-unit id="version" xml:space="preserve">
+        <source>Version %1$@ (%2$@)</source>
+        <target state="new">Version %1$@ (%2$@)</target>
+        <note>Displays the version and build numbers</note>
+      </trans-unit>
+      <trans-unit id="web.tracking.protection.explenation" xml:space="preserve">
+        <source>DuckDuckGo automatically blocks hidden trackers as you browse the web.</source>
+        <target state="new">DuckDuckGo automatically blocks hidden trackers as you browse the web.</target>
+        <note>feature explanation in settings</note>
+      </trans-unit>
+      <trans-unit id="web.tracking.protection.title" xml:space="preserve">
+        <source>Web Tracking Protection</source>
+        <target state="new">Web Tracking Protection</target>
+        <note>Web tracking protection settings section title</note>
+      </trans-unit>
+      <trans-unit id="zoom" xml:space="preserve">
+        <source>Zoom</source>
+        <target state="new">Zoom</target>
+        <note>Menu with Zooming commands</note>
+      </trans-unit>
+      <trans-unit id="••••••••••••" xml:space="preserve">
+        <source>••••••••••••</source>
+        <target state="new">••••••••••••</target>
+        <note/>
+      </trans-unit>
+      <trans-unit id="⚠️ Notes are deprecated." xml:space="preserve">
+        <source>⚠️ Notes are deprecated.</source>
+        <target state="new">⚠️ Notes are deprecated.</target>
+        <note/>
+      </trans-unit>
+    </body>
+  </file>
+  <file original="LocalPackages/SyncUI/Sources/SyncUI/Resources/Localizable.xcstrings" source-language="en" target-language="en" datatype="plaintext">
+    <header>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.2" build-num="15C500b"/>
+    </header>
+    <body>
+      <trans-unit id="(%@)" xml:space="preserve">
+        <source>(%@)</source>
+        <target state="new">(%@)</target>
+        <note/>
+      </trans-unit>
+      <trans-unit id="alert.invalid-code-description" xml:space="preserve">
+        <source>Sorry, this code is invalid. Please make sure it was entered correctly.</source>
+        <target state="new">Sorry, this code is invalid. Please make sure it was entered correctly.</target>
+        <note>Description for invalid code error</note>
+      </trans-unit>
+      <trans-unit id="alert.sync-error" xml:space="preserve">
+        <source>Sync &amp; Backup Error</source>
+        <target state="new">Sync &amp; Backup Error</target>
+        <note>Title for sync error alert</note>
+      </trans-unit>
+      <trans-unit id="alert.unable-to-create-recovery-pdf-description" xml:space="preserve">
+        <source>Unable to create the recovery PDF.</source>
+        <target state="new">Unable to create the recovery PDF.</target>
+        <note>Description for unable to create recovery pdf error</note>
+      </trans-unit>
+      <trans-unit id="alert.unable-to-delete-data-description" xml:space="preserve">
+        <source>Unable to delete data on the server.</source>
+        <target state="new">Unable to delete data on the server.</target>
+        <note>Description for unable to delete data error</note>
+      </trans-unit>
+      <trans-unit id="alert.unable-to-merge-two-accounts-description" xml:space="preserve">
+        <source>To pair these devices, turn off Sync &amp; Backup on one device then tap "Sync With Another Device" on the other device.</source>
+        <target state="new">To pair these devices, turn off Sync &amp; Backup on one device then tap "Sync With Another Device" on the other device.</target>
+        <note>Description for unable to merge two accounts error</note>
+      </trans-unit>
+      <trans-unit id="alert.unable-to-remove-device-description" xml:space="preserve">
+        <source>Unable to remove this device from Sync &amp; Backup.</source>
+        <target state="new">Unable to remove this device from Sync &amp; Backup.</target>
+        <note>Description for unable to remove device error</note>
+      </trans-unit>
+      <trans-unit id="alert.unable-to-sync-to-server-description" xml:space="preserve">
+        <source>Unable to connect to the server.</source>
+        <target state="new">Unable to connect to the server.</target>
+        <note>Description for unable to sync to server error</note>
+      </trans-unit>
+      <trans-unit id="alert.unable-to-sync-with-another-device-description" xml:space="preserve">
+        <source>Unable to Sync with another device.</source>
+        <target state="new">Unable to Sync with another device.</target>
+        <note>Description for unable to sync with another device error</note>
+      </trans-unit>
+      <trans-unit id="alert.unable-to-turn-sync-off-description" xml:space="preserve">
+        <source>Unable to turn Sync &amp; Backup off.</source>
+        <target state="new">Unable to turn Sync &amp; Backup off.</target>
+        <note>Description for unable to turn sync off error</note>
+      </trans-unit>
+      <trans-unit id="alert.unable-to-update-device-name-description" xml:space="preserve">
+        <source>Unable to update the device name.</source>
+        <target state="new">Unable to update the device name.</target>
+        <note>Description for unable to update device name error</note>
+      </trans-unit>
+      <trans-unit id="cancel" xml:space="preserve">
+        <source>Cancel</source>
+        <target state="new">Cancel</target>
+        <note>Cancel button</note>
+      </trans-unit>
+      <trans-unit id="copy" xml:space="preserve">
+        <source>Copy</source>
+        <target state="new">Copy</target>
+        <note>Copy button</note>
+      </trans-unit>
+      <trans-unit id="done" xml:space="preserve">
+        <source>Done</source>
+        <target state="new">Done</target>
+        <note>Done button</note>
+      </trans-unit>
+      <trans-unit id="next" xml:space="preserve">
+        <source>Next</source>
+        <target state="new">Next</target>
+        <note>Next button</note>
+      </trans-unit>
+      <trans-unit id="notnow" xml:space="preserve">
+        <source>Not Now</source>
+        <target state="new">Not Now</target>
+        <note>Not Now button</note>
+      </trans-unit>
+      <trans-unit id="ok" xml:space="preserve">
+        <source>OK</source>
+        <target state="new">OK</target>
+        <note>OK button</note>
+      </trans-unit>
+      <trans-unit id="paste" xml:space="preserve">
+        <source>Paste</source>
+        <target state="new">Paste</target>
+        <note>Paste button</note>
+      </trans-unit>
+      <trans-unit id="paste-from-clipboard" xml:space="preserve">
+        <source>Paste from Clipboard</source>
+        <target state="new">Paste from Clipboard</target>
+        <note>Paste from Clipboard button</note>
+      </trans-unit>
+      <trans-unit id="preferences.begin-sync.card-button" xml:space="preserve">
+        <source>Sync With Another Device</source>
+        <target state="new">Sync With Another Device</target>
+        <note>Button text on the Begin Syncing card in sync settings</note>
+      </trans-unit>
+      <trans-unit id="preferences.begin-sync.card-description" xml:space="preserve">
+        <source>Securely sync bookmarks and passwords between your devices.</source>
+        <target state="new">Securely sync bookmarks and passwords between your devices.</target>
+        <note>Begin Syncing card description in sync settings</note>
+      </trans-unit>
+      <trans-unit id="preferences.begin-sync.card-footer" xml:space="preserve">
+        <source>Your data is end-to-end encrypted, and DuckDuckGo does not have access to the encryption key.</source>
+        <target state="new">Your data is end-to-end encrypted, and DuckDuckGo does not have access to the encryption key.</target>
+        <note>Footer / caption on the Begin Syncing card in sync settings</note>
+      </trans-unit>
+      <trans-unit id="preferences.begin-sync.card-title" xml:space="preserve">
+        <source>Begin Syncing</source>
+        <target state="new">Begin Syncing</target>
+        <note>Begin Syncing card title in sync settings</note>
+      </trans-unit>
+      <trans-unit id="preferences.enter-recovery-code.dialog-action1" xml:space="preserve">
+        <source>Paste Code Here</source>
+        <target state="new">Paste Code Here</target>
+        <note>Sync enter recovery code dialog first possible action</note>
+      </trans-unit>
+      <trans-unit id="preferences.enter-recovery-code.dialog-action2" xml:space="preserve">
+        <source>or scan QR code with a device that is still connected</source>
+        <target state="new">or scan QR code with a device that is still connected</target>
+        <note>Sync enter recovery code dialog second possible action</note>
+      </trans-unit>
+      <trans-unit id="preferences.enter-recovery-code.dialog-subtitle" xml:space="preserve">
+        <source>Enter the code on your Recovery PDF, or another synced device, to recover your synced data.</source>
+        <target state="new">Enter the code on your Recovery PDF, or another synced device, to recover your synced data.</target>
+        <note>Sync enter recovery code dialog subtitle</note>
+      </trans-unit>
+      <trans-unit id="preferences.enter-recovery-code.dialog-title" xml:space="preserve">
+        <source>Enter Code</source>
+        <target state="new">Enter Code</target>
+        <note>Sync enter recovery code dialog title</note>
+      </trans-unit>
+      <trans-unit id="preferences.other-options.section-title" xml:space="preserve">
+        <source>Other Options</source>
+        <target state="new">Other Options</target>
+        <note>Sync settings. Other Options section title</note>
+      </trans-unit>
+      <trans-unit id="preferences.preparing-to-sync.dialog-action" xml:space="preserve">
+        <source>Connecting…</source>
+        <target state="new">Connecting…</target>
+        <note>Sync preparing to sync dialog action</note>
+      </trans-unit>
+      <trans-unit id="preferences.preparing-to-sync.dialog-subtitle" xml:space="preserve">
+        <source>We're setting up the connection to synchronize your bookmarks and saved logins with the other device.</source>
+        <target state="new">We're setting up the connection to synchronize your bookmarks and saved logins with the other device.</target>
+        <note>Preparing to sync dialog subtitle during sync set up</note>
+      </trans-unit>
+      <trans-unit id="preferences.preparing-to-sync.dialog-title" xml:space="preserve">
+        <source>Preparing To Sync</source>
+        <target state="new">Preparing To Sync</target>
+        <note>Preparing to sync dialog title during sync set up</note>
+      </trans-unit>
+      <trans-unit id="preferences.recover-data.link-title" xml:space="preserve">
+        <source>Recover Synced Data</source>
+        <target state="new">Recover Synced Data</target>
+        <note>Sync settings. Link to recover synced data.</note>
+      </trans-unit>
+      <trans-unit id="preferences.recover-synced-data.dialog-button" xml:space="preserve">
+        <source>Get Started</source>
+        <target state="new">Get Started</target>
+        <note>Sync recover synced data dialog button</note>
+      </trans-unit>
+      <trans-unit id="preferences.recover-synced-data.dialog-subtitle" xml:space="preserve">
+        <source>To restore your synced data, you'll need the Recovery Code you saved when you first set up Sync. This code may have been saved as a PDF on the device you originally used to set up Sync.</source>
+        <target state="new">To restore your synced data, you'll need the Recovery Code you saved when you first set up Sync. This code may have been saved as a PDF on the device you originally used to set up Sync.</target>
+        <note>Recover synced data during Sync recovery process dialog subtitle</note>
+      </trans-unit>
+      <trans-unit id="preferences.recover-synced-data.dialog-title" xml:space="preserve">
+        <source>Recover Synced Data</source>
+        <target state="new">Recover Synced Data</target>
+        <note>Sync recover synced data dialog title</note>
+      </trans-unit>
+      <trans-unit id="preferences.sync" xml:space="preserve">
+        <source>Sync &amp; Backup</source>
+        <target state="new">Sync &amp; Backup</target>
+        <note>Show sync preferences</note>
+      </trans-unit>
+      <trans-unit id="preferences.sync-this-device.link-title" xml:space="preserve">
+        <source>Sync and Back Up This Device</source>
+        <target state="new">Sync and Back Up This Device</target>
+        <note>Sync settings. Title of a link to start setting up sync and backup the device</note>
+      </trans-unit>
+      <trans-unit id="preferences.sync.connected" xml:space="preserve">
+        <source>Sync Enabled</source>
+        <target state="new">Sync Enabled</target>
+        <note>Sync state is enabled</note>
+      </trans-unit>
+      <trans-unit id="preferences.sync.current-device-details" xml:space="preserve">
+        <source>Details...</source>
+        <target state="new">Details...</target>
+        <note>Sync Settings device details button</note>
+      </trans-unit>
+      <trans-unit id="preferences.sync.remove-device" xml:space="preserve">
+        <source>Remove...</source>
+        <target state="new">Remove...</target>
+        <note>Button to remove a device</note>
+      </trans-unit>
+      <trans-unit id="preferences.sync.remove-device-button" xml:space="preserve">
+        <source>Remove Device</source>
+        <target state="new">Remove Device</target>
+        <note>Button text on remove a device confirmation button</note>
+      </trans-unit>
+      <trans-unit id="preferences.sync.remove-device-message" xml:space="preserve">
+        <source>"%@" will no longer be able to access your synced data.</source>
+        <target state="new">"%@" will no longer be able to access your synced data.</target>
+        <note>Message to confirm the device will no longer be able to access the synced data - devoce name item inserted</note>
+      </trans-unit>
+      <trans-unit id="preferences.sync.remove-device-title" xml:space="preserve">
+        <source>Remove device?</source>
+        <target state="new">Remove device?</target>
+        <note>Title on remove a device confirmation</note>
+      </trans-unit>
+      <trans-unit id="preferences.sync.rollout-banner.description" xml:space="preserve">
+        <source>Sync &amp; Backup is rolling out gradually and may not be available yet within DuckDuckGo on your other devices.</source>
+        <target state="new">Sync &amp; Backup is rolling out gradually and may not be available yet within DuckDuckGo on your other devices.</target>
+        <note>Description of rollout banner</note>
+      </trans-unit>
+      <trans-unit id="preferences.sync.sync-with-another-device.dialog-subtitle1" xml:space="preserve">
+        <source>Go to %@ in the DuckDuckGo Browser on another device and select Sync With Another Device.</source>
+        <target state="new">Go to %@ in the DuckDuckGo Browser on another device and select Sync With Another Device.</target>
+        <note>Sync with another device dialog subtitle - Instruction with sync menu path item inserted</note>
+      </trans-unit>
+      <trans-unit id="preferences.sync.sync-with-another-device.dialog-title" xml:space="preserve">
+        <source>Sync With Another Device</source>
+        <target state="new">Sync With Another Device</target>
+        <note>Sync with another device dialog title</note>
+      </trans-unit>
+      <trans-unit id="preferences.sync.sync-with-another-device.enter-code-button" xml:space="preserve">
+        <source>Enter Code</source>
+        <target state="new">Enter Code</target>
+        <note>Text on enter code button on Sync with another device dialog</note>
+      </trans-unit>
+      <trans-unit id="preferences.sync.sync-with-another-device.enter-code-explanation" xml:space="preserve">
+        <source>Paste the code here to sync.</source>
+        <target state="new">Paste the code here to sync.</target>
+        <note>Sync with another device dialog enter code explanation</note>
+      </trans-unit>
+      <trans-unit id="preferences.sync.sync-with-another-device.show-code-button" xml:space="preserve">
+        <source>Show Code</source>
+        <target state="new">Show Code</target>
+        <note>Text on show code button on Sync with another device dialog</note>
+      </trans-unit>
+      <trans-unit id="preferences.sync.sync-with-another-device.show-code-explanation" xml:space="preserve">
+        <source>Share this code to connect with a desktop machine.</source>
+        <target state="new">Share this code to connect with a desktop machine.</target>
+        <note>Sync with another device dialog show code explanation</note>
+      </trans-unit>
+      <trans-unit id="preferences.sync.sync-with-another-device.show-qr-code-explanation" xml:space="preserve">
+        <source>Scan this QR code to connect.</source>
+        <target state="new">Scan this QR code to connect.</target>
+        <note>Sync with another device dialog show qr code explanation</note>
+      </trans-unit>
+      <trans-unit id="preferences.sync.sync-with-another-device.view-qr-code-link" xml:space="preserve">
+        <source>View QR Code</source>
+        <target state="new">View QR Code</target>
+        <note>Sync with another device dialog view qr code link</note>
+      </trans-unit>
+      <trans-unit id="preferences.sync.sync-with-another-device.view-text-code-link" xml:space="preserve">
+        <source>View Text Code</source>
+        <target state="new">View Text Code</target>
+        <note>Sync with another device dialog view text code link</note>
+      </trans-unit>
+      <trans-unit id="preferences.sync.sync-with-server-button" xml:space="preserve">
+        <source>Turn On Sync &amp; Backup</source>
+        <target state="new">Turn On Sync &amp; Backup</target>
+        <note>Sync with server dialog button</note>
+      </trans-unit>
+      <trans-unit id="preferences.sync.sync-with-server-subtitle1" xml:space="preserve">
+        <source>This creates an encrypted backup of your bookmarks and passwords on DuckDuckGo’s secure server, which can be synced with your other devices.</source>
+        <target state="new">This creates an encrypted backup of your bookmarks and passwords on DuckDuckGo’s secure server, which can be synced with your other devices.</target>
+        <note>Sync with server dialog first subtitle</note>
+      </trans-unit>
+      <trans-unit id="preferences.sync.sync-with-server-subtitle2" xml:space="preserve">
+        <source>The encryption key is only stored on your device, DuckDuckGo cannot access it.</source>
+        <target state="new">The encryption key is only stored on your device, DuckDuckGo cannot access it.</target>
+        <note>Sync with server dialog second subtitle</note>
+      </trans-unit>
+      <trans-unit id="preferences.sync.sync-with-server-title" xml:space="preserve">
+        <source>Sync and Back Up This Device</source>
+        <target state="new">Sync and Back Up This Device</target>
+        <note>Sync with server dialog title</note>
+      </trans-unit>
+      <trans-unit id="preferences.sync.synced-devices" xml:space="preserve">
+        <source>Synced Devices</source>
+        <target state="new">Synced Devices</target>
+        <note>Settings section title</note>
+      </trans-unit>
+      <trans-unit id="preferences.sync.this-device" xml:space="preserve">
+        <source>This Device</source>
+        <target state="new">This Device</target>
+        <note>Indicator of a current user's device on the list</note>
+      </trans-unit>
+      <trans-unit id="preferences.sync.turn-off" xml:space="preserve">
+        <source>Turn Off</source>
+        <target state="new">Turn Off</target>
+        <note>Turn off sync confirmation dialog button title</note>
+      </trans-unit>
+      <trans-unit id="preferences.sync.turn-off-and-delete-data" xml:space="preserve">
+        <source>Turn Off and Delete Server Data…</source>
+        <target state="new">Turn Off and Delete Server Data…</target>
+        <note>Disable and delete data sync button caption</note>
+      </trans-unit>
+      <trans-unit id="preferences.sync.turn-off.confirm.message" xml:space="preserve">
+        <source>This device will no longer be able to access your synced data.</source>
+        <target state="new">This device will no longer be able to access your synced data.</target>
+        <note>Turn off sync confirmation dialog message</note>
+      </trans-unit>
+      <trans-unit id="preferences.sync.turn-off.confirm.title" xml:space="preserve">
+        <source>Turn off sync?</source>
+        <target state="new">Turn off sync?</target>
+        <note>Turn off sync confirmation dialog title</note>
+      </trans-unit>
+      <trans-unit id="preferences.sync.turn-off.ellipsis" xml:space="preserve">
+        <source>Turn Off Sync…</source>
+        <target state="new">Turn Off Sync…</target>
+        <note>Disable sync button caption</note>
+      </trans-unit>
+      <trans-unit id="prefrences.sync.bookmarks-limit-exceeded-action" xml:space="preserve">
+        <source>Manage Bookmarks</source>
+        <target state="new">Manage Bookmarks</target>
+        <note>Button title for sync bookmarks limits exceeded warning to go to manage bookmarks</note>
+      </trans-unit>
+      <trans-unit id="prefrences.sync.bookmarks-limit-exceeded-description" xml:space="preserve">
+        <source>Bookmark limit exceeded. Delete some to resume syncing.</source>
+        <target state="new">Bookmark limit exceeded. Delete some to resume syncing.</target>
+        <note>Description for sync bookmarks limits exceeded warning</note>
+      </trans-unit>
+      <trans-unit id="prefrences.sync.credentials-limit-exceeded-action" xml:space="preserve">
+        <source>Manage passwords…</source>
+        <target state="new">Manage passwords…</target>
+        <note>Button title for sync credentials limits exceeded warning to go to manage passwords</note>
+      </trans-unit>
+      <trans-unit id="prefrences.sync.credentials-limit-exceeded-description" xml:space="preserve">
+        <source>Logins limit exceeded. Delete some to resume syncing.</source>
+        <target state="new">Logins limit exceeded. Delete some to resume syncing.</target>
+        <note>Description for sync credentials limits exceeded warning</note>
+      </trans-unit>
+      <trans-unit id="prefrences.sync.delete-account.button" xml:space="preserve">
+        <source>Delete Data</source>
+        <target state="new">Delete Data</target>
+        <note>Label for delete account button</note>
+      </trans-unit>
+      <trans-unit id="prefrences.sync.delete-account.message" xml:space="preserve">
+        <source>These devices will be disconnected and your synced data will be deleted from the server.</source>
+        <target state="new">These devices will be disconnected and your synced data will be deleted from the server.</target>
+        <note>Message for delete account confirmation pop up</note>
+      </trans-unit>
+      <trans-unit id="prefrences.sync.delete-account.title" xml:space="preserve">
+        <source>Delete server data?</source>
+        <target state="new">Delete server data?</target>
+        <note>Title for delete account confirmation pop up</note>
+      </trans-unit>
+      <trans-unit id="prefrences.sync.device-details.label" xml:space="preserve">
+        <source>Name</source>
+        <target state="new">Name</target>
+        <note>The text entry label to name the device</note>
+      </trans-unit>
+      <trans-unit id="prefrences.sync.device-details.prompt" xml:space="preserve">
+        <source>Device name</source>
+        <target state="new">Device name</target>
+        <note>The text entry prompt to name the device</note>
+      </trans-unit>
+      <trans-unit id="prefrences.sync.device-details.title" xml:space="preserve">
+        <source>Device Details</source>
+        <target state="new">Device Details</target>
+        <note>The title of the device details dialog</note>
+      </trans-unit>
+      <trans-unit id="prefrences.sync.device-synced" xml:space="preserve">
+        <source>Your data is synced!</source>
+        <target state="new">Your data is synced!</target>
+        <note>Sync setup confirmation dialog title</note>
+      </trans-unit>
+      <trans-unit id="prefrences.sync.fetch-favicons-onboarding-message" xml:space="preserve">
+        <source>Do you want this device to automatically download icons for any new bookmarks synced from your other devices? This will expose the download to your network any time a bookmark is synced.</source>
+        <target state="new">Do you want this device to automatically download icons for any new bookmarks synced from your other devices? This will expose the download to your network any time a bookmark is synced.</target>
+        <note>Text for fetch favicons onboarding dialog</note>
+      </trans-unit>
+      <trans-unit id="prefrences.sync.fetch-favicons-onboarding-title" xml:space="preserve">
+        <source>Download Missing Icons?</source>
+        <target state="new">Download Missing Icons?</target>
+        <note>Title for fetch favicons onboarding dialog</note>
+      </trans-unit>
+      <trans-unit id="prefrences.sync.fetch-favicons-option-caption" xml:space="preserve">
+        <source>Automatically download icons for synced bookmarks. Icon downloads are exposed to your network.</source>
+        <target state="new">Automatically download icons for synced bookmarks. Icon downloads are exposed to your network.</target>
+        <note>Caption for fetch favicons option</note>
+      </trans-unit>
+      <trans-unit id="prefrences.sync.fetch-favicons-option-title" xml:space="preserve">
+        <source>Auto-Download Icons</source>
+        <target state="new">Auto-Download Icons</target>
+        <note>Title for fetch favicons option</note>
+      </trans-unit>
+      <trans-unit id="prefrences.sync.keep-favicons-updated" xml:space="preserve">
+        <source>Keep Bookmarks Icons Updated</source>
+        <target state="new">Keep Bookmarks Icons Updated</target>
+        <note>Title of the confirmation button for favicons fetching</note>
+      </trans-unit>
+      <trans-unit id="prefrences.sync.limit-exceeded-title" xml:space="preserve">
+        <source>Sync Paused</source>
+        <target state="new">Sync Paused</target>
+        <note>Title for sync limits exceeded warning</note>
+      </trans-unit>
+      <trans-unit id="prefrences.sync.options-section-title" xml:space="preserve">
+        <source>Options</source>
+        <target state="new">Options</target>
+        <note>Title for options settings</note>
+      </trans-unit>
+      <trans-unit id="prefrences.sync.recovery" xml:space="preserve">
+        <source>Recovery</source>
+        <target state="new">Recovery</target>
+        <note>Sync settings section title</note>
+      </trans-unit>
+      <trans-unit id="prefrences.sync.recovery-instructions" xml:space="preserve">
+        <source>If you lose your device, you will need this recovery code to restore your synced data.</source>
+        <target state="new">If you lose your device, you will need this recovery code to restore your synced data.</target>
+        <note>Instructions on how to restore synced data</note>
+      </trans-unit>
+      <trans-unit id="prefrences.sync.recovery-pdf-copy-code-button" xml:space="preserve">
+        <source>Copy Code</source>
+        <target state="new">Copy Code</target>
+        <note>Sync recovery PDF copy code button</note>
+      </trans-unit>
+      <trans-unit id="prefrences.sync.recovery-pdf-explanation" xml:space="preserve">
+        <source>If you lose access to your devices, you will need this code to recover your synced data. You can save this code to your device as a PDF.</source>
+        <target state="new">If you lose access to your devices, you will need this code to recover your synced data. You can save this code to your device as a PDF.</target>
+        <note>Sync recovery PDF explanation</note>
+      </trans-unit>
+      <trans-unit id="prefrences.sync.recovery-pdf-save-pdf-button" xml:space="preserve">
+        <source>Save PDF</source>
+        <target state="new">Save PDF</target>
+        <note>Sync recovery PDF save pdf button</note>
+      </trans-unit>
+      <trans-unit id="prefrences.sync.recovery-pdf-warning" xml:space="preserve">
+        <source>Anyone with access to this code can access your synced data, so please keep it in a safe place.</source>
+        <target state="new">Anyone with access to this code can access your synced data, so please keep it in a safe place.</target>
+        <note>Sync recovery PDF warning</note>
+      </trans-unit>
+      <trans-unit id="prefrences.sync.save-recovery-pdf" xml:space="preserve">
+        <source>Save Your Recovery Code</source>
+        <target state="new">Save Your Recovery Code</target>
+        <note>Caption for a button to save Sync recovery PDF</note>
+      </trans-unit>
+      <trans-unit id="prefrences.sync.share-favorite-option-caption" xml:space="preserve">
+        <source>Use the same favorite bookmarks on all your devices. Leave off to keep mobile and desktop favorites separate.</source>
+        <target state="new">Use the same favorite bookmarks on all your devices. Leave off to keep mobile and desktop favorites separate.</target>
+        <note>Caption for share favorite option</note>
+      </trans-unit>
+      <trans-unit id="prefrences.sync.share-favorite-option-title" xml:space="preserve">
+        <source>Unify Favorites Across Devices</source>
+        <target state="new">Unify Favorites Across Devices</target>
+        <note>Title for share favorite option</note>
+      </trans-unit>
+      <trans-unit id="share" xml:space="preserve">
+        <source>Share</source>
+        <target state="new">Share</target>
+        <note>Share button</note>
+      </trans-unit>
+      <trans-unit id="submit" xml:space="preserve">
+        <source>Submit</source>
+        <target state="new">Submit</target>
+        <note>Submit button</note>
+      </trans-unit>
+      <trans-unit id="sync.menu.path" xml:space="preserve">
+        <source>Settings › Sync &amp; Backup</source>
+        <target state="new">Settings › Sync &amp; Backup</target>
+        <note>Sync Menu Path</note>
+      </trans-unit>
+      <trans-unit id="sync.warning.data-syncing-disabled-upgrade-required" xml:space="preserve">
+        <source>Sorry, but Sync &amp; Backup is no longer available in this app version. Please update DuckDuckGo to the latest version to continue.</source>
+        <target state="new">Sorry, but Sync &amp; Backup is no longer available in this app version. Please update DuckDuckGo to the latest version to continue.</target>
+        <note>Data syncing unavailable warning message</note>
+      </trans-unit>
+      <trans-unit id="sync.warning.sync-paused" xml:space="preserve">
+        <source>Sync &amp; Backup is Paused</source>
+        <target state="new">Sync &amp; Backup is Paused</target>
+        <note>Title of the warning message that Sync &amp; Backup is Paused</note>
+      </trans-unit>
+      <trans-unit id="sync.warning.sync-unavailable" xml:space="preserve">
+        <source>Sync &amp; Backup is Unavailable</source>
+        <target state="new">Sync &amp; Backup is Unavailable</target>
+        <note>Title of the warning message that sync and backup are unavailable</note>
+      </trans-unit>
+      <trans-unit id="sync.warning.sync-unavailable-message" xml:space="preserve">
+        <source>Sorry, but Sync &amp; Backup is currently unavailable. Please try again later.</source>
+        <target state="new">Sorry, but Sync &amp; Backup is currently unavailable. Please try again later.</target>
+        <note>Data syncing unavailable warning message</note>
+      </trans-unit>
+    </body>
+  </file>
+</xliff>
diff --git a/scripts/extract_release_notes.sh b/scripts/extract_release_notes.sh
index 9c7db812a6..f995620dfe 100755
--- a/scripts/extract_release_notes.sh
+++ b/scripts/extract_release_notes.sh
@@ -7,30 +7,133 @@
 #
 
 start_marker="release notes"
+pp_marker="^for privacy pro subscribers:?$"
 end_marker="this release includes:"
+placeholder="add release notes here"
 is_capturing=0
+is_capturing_pp=0
 has_content=0
+notes=
+pp_notes=
 
-if [[ "$1" == "-t" ]]; then
-    # capture included tasks instead of release notes
-    start_marker="this release includes:"
-    end_marker=
-fi
+output="html"
+
+case "$1" in
+	-a)
+		# Generate Asana rich text output
+		output="asana"
+		;;
+	-r)
+		# Generate raw output instead of HTML
+		output="raw"
+		;;
+	-t)
+		# Capture raw included tasks' URLs instead of release notes
+		output="tasks"
+		start_marker="this release includes:"
+		pp_marker=
+		end_marker=
+		;;
+	*)
+		;;
+esac
+
+html_escape() {
+	local input="$1"
+	sed -e 's/&/\&amp;/g' -e 's/</\&lt;/g' -e 's/>/\&gt;/g' <<< "$input"
+}
+
+make_links() {
+	local input="$1"
+	sed -E 's|(https://[^ ]*)|<a href="\1">\1</a>|' <<< "$input"
+}
+
+lowercase() {
+	local input="$1"
+	tr '[:upper:]' '[:lower:]' <<< "$input"
+}
+
+print_and_exit() {
+	echo -ne "$notes"
+	exit 0
+}
+
+add_to_notes() {
+	notes+="$1"
+	if [[ "$output" != "asana" ]]; then
+		notes+="\\n"
+	fi
+}
+
+add_to_pp_notes() {
+	pp_notes+="$1"
+	if [[ "$output" != "asana" ]]; then
+		pp_notes+="\\n"
+	fi
+}
+
+add_release_note() {
+	local release_note="$1"
+	local processed_release_note=
+	if [[ "$output" == "raw" || "$output" == "tasks" ]]; then
+		processed_release_note="$release_note"
+	else
+		processed_release_note="<li>$(make_links "$(html_escape "$release_note")")</li>"
+	fi
+	if [[ $is_capturing_pp -eq 1 ]]; then
+		add_to_pp_notes "$processed_release_note"
+	else
+		add_to_notes "$processed_release_note"
+	fi
+}
 
 while read -r line
 do
-    if [[ $(tr '[:upper:]' '[:lower:]' <<< "$line") == "$start_marker" ]]; then
-        is_capturing=1
-    elif [[ -n "$end_marker" && $(tr '[:upper:]' '[:lower:]' <<< "$line") == "$end_marker" ]]; then
-        exit 0
-    elif [[ $is_capturing -eq 1 && -n "$line" ]]; then
-        has_content=1
-        echo "$line"
-    fi
+	# Lowercase each line to compare with markers
+	lowercase_line="$(lowercase "$line")"
+
+	if [[ "$lowercase_line" == "$start_marker" ]]; then
+		# Only start capturing here
+		is_capturing=1
+		if [[ "$output" == "asana" ]]; then
+			add_to_notes "<ul>"
+		elif [[ "$output" == "html" ]]; then
+			# Add HTML header and start the list
+			add_to_notes "<h3 style=\"font-size:14px\">What's new</h3>"
+			add_to_notes "<ul>"
+		fi
+	elif [[ -n "$pp_marker" && "$lowercase_line" =~ $pp_marker ]]; then
+		is_capturing_pp=1
+		if [[ "$output" == "asana" ]]; then
+			add_to_pp_notes "</ul><h2>For Privacy Pro subscribers</h2><ul>"
+		elif [[ "$output" == "html" ]]; then
+			# If we've reached the PP marker, end the list and start the PP list
+			add_to_pp_notes "</ul>"
+			add_to_pp_notes "<h3 style=\"font-size:14px\">For Privacy Pro subscribers</h3>"
+			add_to_pp_notes "<ul>"
+		else
+			add_to_pp_notes "$line"
+		fi
+	elif [[ -n "$end_marker" && "$lowercase_line" == "$end_marker" ]]; then
+		# If we've reached the end marker, check if PP notes are present and not a placeholder, and add them verbatim to notes
+		# shellcheck disable=SC2076
+		if [[ -n "$pp_notes" && ! "$(lowercase "$pp_notes")" =~ "$placeholder" ]]; then
+			notes+="$pp_notes" # never add extra newline here (that's why we don't use `add_to_notes`)
+		fi
+		if [[ "$output" != "raw" ]]; then
+			# End the list on end marker
+			add_to_notes "</ul>"
+		fi
+		# Print output and exit
+		print_and_exit
+	elif [[ $is_capturing -eq 1 && -n "$line" ]]; then
+		has_content=1
+		add_release_note "$line"
+	fi
 done
 
 if [[ $has_content -eq 0 ]]; then
-    exit 1
+	exit 1
 fi
 
-exit 0
+print_and_exit
diff --git a/scripts/tests/extract_release_notes/extract_release_notes.bats b/scripts/tests/extract_release_notes/extract_release_notes.bats
new file mode 100644
index 0000000000..49f9a31e40
--- /dev/null
+++ b/scripts/tests/extract_release_notes/extract_release_notes.bats
@@ -0,0 +1,349 @@
+#!/usr/bin/env bats
+
+setup() {
+	DIR="$( cd "$( dirname "$BATS_TEST_FILENAME" )" >/dev/null 2>&1 && pwd )"
+	# make executables in ./../../ visible to PATH
+	PATH="$DIR/../..:$PATH"
+}
+
+main() {
+	bash extract_release_notes.sh "$@"
+}
+
+#
+# Functions below define inputs and expected outputs for the tests
+#
+
+# Placeholder release notes with placeholder Privacy Pro section
+placeholder() {
+	local mode="${1:-input}"
+	case "$mode" in
+		input)
+			cat <<-EOF
+			Note: This task's description is managed automatically.
+			Only the Release notes section below should be modified manually.
+			Please do not adjust formatting.
+
+			Release notes
+
+				<-- Add release notes here -->
+
+			For Privacy Pro subscribers
+
+				<-- Add release notes here -->
+
+			This release includes:
+			EOF
+			;;
+		raw)
+			cat <<-EOF
+			<-- Add release notes here -->
+			EOF
+			;;
+		html)
+			cat <<-EOF
+			<h3 style="font-size:14px">What's new</h3>
+			<ul>
+			<li>&lt;-- Add release notes here --&gt;</li>
+			</ul>
+			EOF
+			;;
+		asana)
+			cat <<-EOF
+			<ul><li>&lt;-- Add release notes here --&gt;</li></ul>
+			EOF
+			;;
+	esac
+}
+
+# Non-empty release notes with non-empty Privacy Pro section
+full() {
+	local mode="${1:-input}"
+	case "$mode" in
+		input)
+			cat <<-EOF
+			Note: This task's description is managed automatically.
+			Only the Release notes section below should be modified manually.
+			Please do not adjust formatting.
+
+			Release notes
+
+				You can now find browser windows listed in the "Window" app menu and in the Dock menu.
+				We also added "Duplicate Tab" to the app menu so you can use it as an action in Apple Shortcuts.
+				When watching videos in Duck Player, clicking endscreen recommendations will now open those videos in the same tab.
+				The bug that duplicated sites in your browsing history has been fixed, and the visual glitching that sometimes occurred during session restore and app launch has been addressed.
+
+			For Privacy Pro subscribers
+
+				VPN updates! More detailed connection info in the VPN dashboard, plus animations and usability improvements.
+				Visit https://duckduckgo.com/pro for more information. Privacy Pro is currently available to U.S. residents only.
+
+			This release includes:
+
+				https://app.asana.com/0/0/0/f/
+				https://app.asana.com/0/0/0/f/
+				https://app.asana.com/0/0/0/f/
+			EOF
+			;;
+		raw)
+			cat <<-EOF
+			You can now find browser windows listed in the "Window" app menu and in the Dock menu.
+			We also added "Duplicate Tab" to the app menu so you can use it as an action in Apple Shortcuts.
+			When watching videos in Duck Player, clicking endscreen recommendations will now open those videos in the same tab.
+			The bug that duplicated sites in your browsing history has been fixed, and the visual glitching that sometimes occurred during session restore and app launch has been addressed.
+			For Privacy Pro subscribers
+			VPN updates! More detailed connection info in the VPN dashboard, plus animations and usability improvements.
+			Visit https://duckduckgo.com/pro for more information. Privacy Pro is currently available to U.S. residents only.
+			EOF
+			;;
+		html)
+			cat <<-EOF
+			<h3 style="font-size:14px">What's new</h3>
+			<ul>
+			<li>You can now find browser windows listed in the "Window" app menu and in the Dock menu.</li>
+			<li>We also added "Duplicate Tab" to the app menu so you can use it as an action in Apple Shortcuts.</li>
+			<li>When watching videos in Duck Player, clicking endscreen recommendations will now open those videos in the same tab.</li>
+			<li>The bug that duplicated sites in your browsing history has been fixed, and the visual glitching that sometimes occurred during session restore and app launch has been addressed.</li>
+			</ul>
+			<h3 style="font-size:14px">For Privacy Pro subscribers</h3>
+			<ul>
+			<li>VPN updates! More detailed connection info in the VPN dashboard, plus animations and usability improvements.</li>
+			<li>Visit <a href="https://duckduckgo.com/pro">https://duckduckgo.com/pro</a> for more information. Privacy Pro is currently available to U.S. residents only.</li>
+			</ul>
+			EOF
+			;;
+		asana)
+			cat <<-EOF
+			<ul><li>You can now find browser windows listed in the "Window" app menu and in the Dock menu.</li><li>We also added "Duplicate Tab" to the app menu so you can use it as an action in Apple Shortcuts.</li><li>When watching videos in Duck Player, clicking endscreen recommendations will now open those videos in the same tab.</li><li>The bug that duplicated sites in your browsing history has been fixed, and the visual glitching that sometimes occurred during session restore and app launch has been addressed.</li></ul><h2>For Privacy Pro subscribers</h2><ul><li>VPN updates! More detailed connection info in the VPN dashboard, plus animations and usability improvements.</li><li>Visit <a href="https://duckduckgo.com/pro">https://duckduckgo.com/pro</a> for more information. Privacy Pro is currently available to U.S. residents only.</li></ul>
+			EOF
+			;;
+	esac
+}
+
+# Non-empty release notes and missing Privacy Pro section
+without_privacy_pro_section() {
+	local mode="${1:-input}"
+	case "$mode" in
+		input)
+			cat <<-EOF
+			Note: This task's description is managed automatically.
+			Only the Release notes section below should be modified manually.
+			Please do not adjust formatting.
+
+			Release notes
+
+				You can now find browser windows listed in the "Window" app menu and in the Dock menu.
+				We also added "Duplicate Tab" to the app menu so you can use it as an action in Apple Shortcuts.
+				When watching videos in Duck Player, clicking endscreen recommendations will now open those videos in the same tab.
+				The bug that duplicated sites in your browsing history has been fixed, and the visual glitching that sometimes occurred during session restore and app launch has been addressed.
+
+			This release includes:
+
+				https://app.asana.com/0/0/0/f/
+				https://app.asana.com/0/0/0/f/
+				https://app.asana.com/0/0/0/f/
+			EOF
+			;;
+		raw)
+			cat <<-EOF
+			You can now find browser windows listed in the "Window" app menu and in the Dock menu.
+			We also added "Duplicate Tab" to the app menu so you can use it as an action in Apple Shortcuts.
+			When watching videos in Duck Player, clicking endscreen recommendations will now open those videos in the same tab.
+			The bug that duplicated sites in your browsing history has been fixed, and the visual glitching that sometimes occurred during session restore and app launch has been addressed.
+			EOF
+			;;
+		html)
+			cat <<-EOF
+			<h3 style="font-size:14px">What's new</h3>
+			<ul>
+			<li>You can now find browser windows listed in the "Window" app menu and in the Dock menu.</li>
+			<li>We also added "Duplicate Tab" to the app menu so you can use it as an action in Apple Shortcuts.</li>
+			<li>When watching videos in Duck Player, clicking endscreen recommendations will now open those videos in the same tab.</li>
+			<li>The bug that duplicated sites in your browsing history has been fixed, and the visual glitching that sometimes occurred during session restore and app launch has been addressed.</li>
+			</ul>
+			EOF
+			;;
+		asana)
+			cat <<-EOF
+			<ul><li>You can now find browser windows listed in the "Window" app menu and in the Dock menu.</li><li>We also added "Duplicate Tab" to the app menu so you can use it as an action in Apple Shortcuts.</li><li>When watching videos in Duck Player, clicking endscreen recommendations will now open those videos in the same tab.</li><li>The bug that duplicated sites in your browsing history has been fixed, and the visual glitching that sometimes occurred during session restore and app launch has been addressed.</li></ul>
+			EOF
+			;;
+	esac
+}
+
+# Non-empty release notes and a placeholder Privacy Pro section
+placeholder_privacy_pro_section() {
+	local mode="${1:-input}"
+	case "$mode" in
+		input)
+			cat <<-EOF
+			Note: This task's description is managed automatically.
+			Only the Release notes section below should be modified manually.
+			Please do not adjust formatting.
+
+			Release notes
+
+				You can now find browser windows listed in the "Window" app menu and in the Dock menu.
+				We also added "Duplicate Tab" to the app menu so you can use it as an action in Apple Shortcuts.
+				When watching videos in Duck Player, clicking endscreen recommendations will now open those videos in the same tab.
+				The bug that duplicated sites in your browsing history has been fixed, and the visual glitching that sometimes occurred during session restore and app launch has been addressed.
+
+			For Privacy Pro subscribers
+
+				<-- Add release notes here -->
+
+			This release includes:
+
+				https://app.asana.com/0/0/0/f/
+				https://app.asana.com/0/0/0/f/
+				https://app.asana.com/0/0/0/f/
+			EOF
+			;;
+		*)
+			without_privacy_pro_section "$mode"
+			;;
+	esac
+}
+
+# Non-empty release notes and Privacy Pro release header as a bullet point inside regular release notes
+# Privacy Pro section header should be recognized and interpreted as a separate section (like in the full example)
+privacy_pro_in_regular_release_notes() {
+	local mode="${1:-input}"
+	case "$mode" in
+		input)
+			cat <<-EOF
+			Note: This task's description is managed automatically.
+			Only the Release notes section below should be modified manually.
+			Please do not adjust formatting.
+
+			Release notes
+
+				You can now find browser windows listed in the "Window" app menu and in the Dock menu.
+				We also added "Duplicate Tab" to the app menu so you can use it as an action in Apple Shortcuts.
+				When watching videos in Duck Player, clicking endscreen recommendations will now open those videos in the same tab.
+				The bug that duplicated sites in your browsing history has been fixed, and the visual glitching that sometimes occurred during session restore and app launch has been addressed.
+				For Privacy Pro subscribers
+				VPN updates! More detailed connection info in the VPN dashboard, plus animations and usability improvements.
+				Visit https://duckduckgo.com/pro for more information. Privacy Pro is currently available to U.S. residents only.
+
+			This release includes:
+
+				https://app.asana.com/0/0/0/f/
+				https://app.asana.com/0/0/0/f/
+				https://app.asana.com/0/0/0/f/
+			EOF
+			;;
+		*)
+			full "$mode"
+			;;
+	esac
+}
+
+#
+# Test cases start here
+#
+
+# bats test_tags=placeholder, raw
+@test "input: placeholder | output: raw" {
+	run main -r <<< "$(placeholder)"
+	[ "$status" -eq 0 ]
+	[ "$output" == "$(placeholder raw)" ]
+}
+
+# bats test_tags=placeholder, html
+@test "input: placeholder | output: html" {
+	run main -h <<< "$(placeholder)"
+	[ "$status" -eq 0 ]
+	[ "$output" == "$(placeholder html)" ]
+}
+
+# bats test_tags=placeholder, asana
+@test "input: placeholder | output: asana" {
+	run main -a <<< "$(placeholder)"
+	[ "$status" -eq 0 ]
+	[ "$output" == "$(placeholder asana)" ]
+}
+
+# bats test_tags=full, raw
+@test "input: full | output: raw" {
+	run main -r <<< "$(full)"
+	[ "$status" -eq 0 ]
+	[ "$output" == "$(full raw)" ]
+}
+
+# bats test_tags=full, html
+@test "input: full | output: html" {
+	run main -h <<< "$(full)"
+	[ "$status" -eq 0 ]
+	[ "$output" == "$(full html)" ]
+}
+
+# bats test_tags=full, asana
+@test "input: full | output: asana" {
+	run main -a <<< "$(full)"
+	[ "$status" -eq 0 ]
+	[ "$output" == "$(full asana)" ]
+}
+
+# bats test_tags=no-pp, raw
+@test "input: without_privacy_pro_section | output: raw" {
+	run main -r <<< "$(without_privacy_pro_section)"
+	[ "$status" -eq 0 ]
+	[ "$output" == "$(without_privacy_pro_section raw)" ]
+}
+
+# bats test_tags=no-pp, html
+@test "input: without_privacy_pro_section | output: html" {
+	run main -h <<< "$(without_privacy_pro_section)"
+	[ "$status" -eq 0 ]
+	[ "$output" == "$(without_privacy_pro_section html)" ]
+}
+
+# bats test_tags=no-pp, asana
+@test "input: without_privacy_pro_section | output: asana" {
+	run main -a <<< "$(without_privacy_pro_section)"
+	[ "$status" -eq 0 ]
+	[ "$output" == "$(without_privacy_pro_section asana)" ]
+}
+
+# bats test_tags=placeholder-pp, raw
+@test "input: placeholder_privacy_pro_section | output: raw" {
+	run main -r <<< "$(placeholder_privacy_pro_section)"
+	[ "$status" -eq 0 ]
+	[ "$output" == "$(placeholder_privacy_pro_section raw)" ]
+}
+
+# bats test_tags=placeholder-pp, html
+@test "input: placeholder_privacy_pro_section | output: html" {
+	run main -h <<< "$(placeholder_privacy_pro_section)"
+	[ "$status" -eq 0 ]
+	[ "$output" == "$(placeholder_privacy_pro_section html)" ]
+}
+
+# bats test_tags=placeholder-pp, asana
+@test "input: placeholder_privacy_pro_section | output: asana" {
+	run main -a <<< "$(placeholder_privacy_pro_section)"
+	[ "$status" -eq 0 ]
+	[ "$output" == "$(placeholder_privacy_pro_section asana)" ]
+}
+
+# bats test_tags=inline-pp, raw
+@test "input: privacy_pro_in_regular_release_notes | output: raw" {
+	run main -r <<< "$(privacy_pro_in_regular_release_notes)"
+	[ "$status" -eq 0 ]
+	[ "$output" == "$(privacy_pro_in_regular_release_notes raw)" ]
+}
+
+# bats test_tags=inline-pp, html
+@test "input: privacy_pro_in_regular_release_notes | output: html" {
+	run main -h <<< "$(privacy_pro_in_regular_release_notes)"
+	[ "$status" -eq 0 ]
+	[ "$output" == "$(privacy_pro_in_regular_release_notes html)" ]
+}
+
+# bats test_tags=inline-pp, asana
+@test "input: privacy_pro_in_regular_release_notes | output: asana" {
+	run main -a <<< "$(privacy_pro_in_regular_release_notes)"
+	[ "$status" -eq 0 ]
+	[ "$output" == "$(privacy_pro_in_regular_release_notes asana)" ]
+}
diff --git a/scripts/update_asana_for_release.sh b/scripts/update_asana_for_release.sh
index a0aef9c83e..b5610faed7 100755
--- a/scripts/update_asana_for_release.sh
+++ b/scripts/update_asana_for_release.sh
@@ -48,7 +48,7 @@ fetch_current_release_notes() {
 	curl -fLSs "${asana_api_url}/tasks/${release_task_id}?opt_fields=notes" \
 		-H "Authorization: Bearer ${ASANA_ACCESS_TOKEN}" \
 		| jq -r .data.notes \
-		| "${cwd}"/extract_release_notes.sh
+		| "${cwd}"/extract_release_notes.sh -a
 }
 
 get_task_id() {
@@ -58,19 +58,6 @@ get_task_id() {
 	fi
 }
 
-construct_release_notes() {
-	local escaped_release_note
-
-	if [[ -n "${release_notes[*]}" ]]; then
-		printf '%s' '<ul>'
-		for release_note in "${release_notes[@]}"; do
-			escaped_release_note="$(sed -e 's/&/\&amp;/g' -e 's/</\&lt;/g' -e 's/>/\&gt;/g' <<< "${release_note}")"
-			printf '%s' "<li>${escaped_release_note}</li>"
-		done
-		printf '%s' '</ul>'
-	fi
-}
-
 construct_this_release_includes() {
 	if [[ -n "${task_ids[*]}" ]]; then
 		printf '%s' '<ul>'
@@ -89,7 +76,7 @@ construct_release_task_description() {
 	printf '%s' 'Please do not adjust formatting.'
 
 	printf '%s' '<h1>Release notes</h1>'
-	construct_release_notes
+	printf '%s' "$release_notes"
 
 	printf '%s' '<h2>This release includes:</h2>'
 	construct_this_release_includes
@@ -105,7 +92,7 @@ construct_release_announcement_task_description() {
 	printf '%s' '</ul>\n<hr>'
 	
 	printf '%s' '<h1>Release notes</h1>'
-	construct_release_notes
+	printf '%s' "$release_notes"
 	printf '%s' '\n'
 	printf '%s' '<h2>This release includes:</h2>'
 
@@ -282,10 +269,8 @@ handle_internal_release() {
 	done <<< "$(find_task_urls_in_git_log "$last_release_tag")"
 
 	# 2. Fetch current release notes from Asana release task.
-	local release_notes=()
-	while read -r line; do
-		release_notes+=("$line")
-	done <<< "$(fetch_current_release_notes "${release_task_id}")"
+	local release_notes
+	release_notes="$(fetch_current_release_notes "${release_task_id}")"
 
 	# 3. Construct new release task description
 	local html_notes
@@ -325,10 +310,8 @@ handle_public_release() {
 	complete_tasks "${task_ids[@]}"
 
 	# 5. Fetch current release notes from Asana release task.
-	local release_notes=()
-	while read -r line; do
-		release_notes+=("$line")
-	done <<< "$(fetch_current_release_notes "${release_task_id}")"
+	local release_notes
+	release_notes="$(fetch_current_release_notes "${release_task_id}")"
 
 	# 6. Construct release announcement task description
 	local html_notes