Add Phone Service Providers (#2099 )

2025-10-28 18:16:34 +00:00 · 2023-03-23 11:28:17 -05:00
2049 changed files with 220585 additions and 2125 deletions
--- a/.cache/plugin/social/fonts/Bagnard/Bold.woff
+++ b/.cache/plugin/social/fonts/Bagnard/Bold.woff
@@ -1 +0,0 @@
-../../../../../theme/assets/brand/WOFF/bagnard/Bagnard.woff
--- a/.github/workflows/crowdin-download.yml
+++ b/.github/workflows/crowdin-download.yml
@@ -0,0 +1,54 @@
+# Copyright (c) 2022-2023 Jonah Aragon <jonah@triplebit.net>
+
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to
+# deal in the Software without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+# sell copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+# IN THE SOFTWARE.
+
+name: 💬 Crowdin Download
+
+on:
+  workflow_dispatch:
+  release:
+    types: [ published ]
+
+permissions: write-all
+
+jobs:
+  synchronize-with-crowdin:
+    runs-on: ubuntu-latest
+
+    steps:
+
+    - name: Checkout
+      uses: actions/checkout@v3
+
+    - name: crowdin action
+      uses: crowdin/github-action@v1.7.1
+      with:
+        upload_sources: false
+        upload_translations: false
+        download_translations: true
+        localization_branch_name: crowdin/l10n_translations
+        create_pull_request: true
+        pull_request_title: 'New Crowdin Translations'
+        pull_request_body: 'New Crowdin translations by [Crowdin GitHub Action](https://github.com/crowdin/github-action)'
+        pull_request_base_branch_name: 'main'
+        config: crowdin.yml
+      env:
+        GITHUB_TOKEN: ${{ secrets.REPO_TOKEN }}
+        CROWDIN_PROJECT_ID: ${{ secrets.CROWDIN_PROJECT_ID }}
+        CROWDIN_PERSONAL_TOKEN: ${{ secrets.CROWDIN_PERSONAL_TOKEN }}
--- a/.github/workflows/crowdin-upload.yml
+++ b/.github/workflows/crowdin-upload.yml
@@ -39,7 +39,7 @@ jobs:
      uses: actions/checkout@v3

    - name: crowdin action
-      uses: crowdin/github-action@v1.11.0
+      uses: crowdin/github-action@v1.7.1
      with:
        upload_sources: true
        upload_sources_args: '--auto-update --delete-obsolete'
--- a/.github/workflows/pages.yml
+++ b/.github/workflows/pages.yml
@@ -71,6 +71,9 @@ jobs:
          CARDS: true
        run: |
          pipenv run mkdocs build --config-file config/mkdocs.en.yml
+          pipenv run mkdocs build --config-file config/mkdocs.fr.yml
+          pipenv run mkdocs build --config-file config/mkdocs.he.yml
+          pipenv run mkdocs build --config-file config/mkdocs.nl.yml
          pipenv run mkdocs --version

      - name: Package website
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -26,28 +26,12 @@ on:
      - '*'

 jobs:
-  production:
-    name: Push release to production
+  build:
+    name: Create Release
    runs-on: ubuntu-latest
    permissions:
      contents: write

-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v3
-        with:
-          fetch-depth: '0'
-          ssh-key: ${{ secrets.ACTIONS_SSH_KEY }}
-          submodules: 'true'
-
-      - name: Push to production branch
-        run: |
-          git push origin HEAD:production
-  
-  build:
-    name: Create release packages
-    runs-on: ubuntu-latest
-
    steps:
      - name: Checkout repository
        uses: actions/checkout@v3
@@ -80,7 +64,7 @@ jobs:
          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
          CARDS: true
        run: |
-          pipenv run mkdocs build --config-file config/mkdocs-offline.yml
+          pipenv run mkdocs build --config-file config/mkdocs.offline.yml
          pipenv run mkdocs --version
      
      - name: Package website
@@ -103,7 +87,7 @@ jobs:
      - name: Create ZIM File
        uses: addnab/docker-run-action@v3
        with:
-          image: ghcr.io/openzim/zim-tools:3.1.3
+          image: openzim/zim-tools:latest
          options: -v ${{ github.workspace }}:/data
          run: |
            zimwriterfs -w index.html -I assets/brand/PNG/Square/pg-yellow.png -l eng -t "Privacy Guides" -d "Your central privacy and security resource to protect yourself online." -c "Privacy Guides" -p "Jonah Aragon" -n "Privacy Guides" -e "https://github.com/privacyguides/privacyguides.org" /data/site /data/privacy_guides.zim
@@ -114,26 +98,6 @@ jobs:
          name: privacy_guides.zim
          path: privacy_guides.zim

-  release:
-    name: Create release notes
-    needs: build
-    runs-on: ubuntu-latest
-    permissions:
-      contents: write
-
-    steps:
-      - uses: actions/download-artifact@v3
-        with:
-          name: offline.tar.gz
-
-      - uses: actions/download-artifact@v3
-        with:
-          name: offline.zip
-
-      - uses: actions/download-artifact@v3
-        with:
-          name: privacy_guides.zim
-
      - name: Create release notes
        uses: ncipollo/release-action@v1
        with:
--- a/.gitignore
+++ b/.gitignore
@@ -1,22 +1,2 @@
 site
-/i18n/
-/includes/*
-!/includes/*.en.*
-/static/i18n/*
-!/static/i18n/*.en.*
-/theme/overrides/*
-!/theme/overrides/*.en.*
-# include Bagnard font in social card
-# (not available in Google Fonts)
-# ridiculous hide-and-seek https://stackoverflow.com/a/72380673
-/.cache/* 
-!/.cache/plugin
-/.cache/plugin/*
-!/.cache/plugin/social
-/.cache/plugin/social/*
-!/.cache/plugin/social/fonts
-/.cache/plugin/social/fonts/*
-!/.cache/plugin/social/fonts/Bagnard
-
-# Local Netlify folder
-.netlify
+.cache
--- a/.gitmodules
+++ b/.gitmodules
@@ -3,4 +3,4 @@
 	url = https://github.com/privacyguides/brand.git
 [submodule "modules/mkdocs-material"]
 	path = modules/mkdocs-material
-	url = git@github.com:privacyguides/mkdocs-material-insiders.git
+	url = https://github.com/privacyguides/mkdocs-material-insiders.git
--- a/Brewfile.netlify
+++ b/Brewfile.netlify
@@ -1,2 +1 @@
 brew "pngquant"
-brew "crowdin"
--- a/Brewfile.preview.netlify
+++ b/Brewfile.preview.netlify
@@ -1 +0,0 @@
-brew "pngquant"
--- a/CITATION.cff
+++ b/CITATION.cff
@@ -1,4 +1,4 @@
-# Copyright (c) 2022-2023 Jonah Aragon <jonah@triplebit.net>
+# Copyright (c) 2022 Jonah Aragon <jonah@triplebit.net>

 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to
@@ -20,69 +20,38 @@

 cff-version: 1.2.0
 title: Privacy Guides
-message: "If you reference this website, please cite it in your work."
+message: 'If you reference this website, please cite it in your work.'
 type: software
 authors:
-  - family-names: Aragon
+  - email: jonah@privacyguides.org
    given-names: Jonah
-    website: "https://www.jonaharagon.com"
-    orcid: "https://orcid.org/0000-0001-6996-4965"
-  - name: The Privacy Guides Team
-    website: "https://github.com/orgs/privacyguides/people"
-repository-code: "https://github.com/privacyguides/privacyguides.org"
-license:
-  - MIT
-  - CC-BY-ND-4.0
+    family-names: Aragon
+    orcid: 'https://orcid.org/0000-0001-6996-4965'
+  - name: The Privacy Guides team
+    website: 'https://github.com/orgs/privacyguides/people'
+repository-code: 'https://github.com/privacyguides/privacyguides.org'
 references:
  - authors:
    - family-names: Donath
      given-names: Martin
-    title: "mkdocs-material"
+    title: 'mkdocs-material'
    type: software
-    repository-code: "https://github.com/squidfunk/mkdocs-material"
-    license: MIT
+    repository-code: 'https://github.com/squidfunk/mkdocs-material'
 preferred-citation:
  type: website
  title: Privacy Guides
  authors:
-    - family-names: Aragon
+    - email: jonah@privacyguides.org
      given-names: Jonah
-      website: "https://www.jonaharagon.com"
-      orcid: "https://orcid.org/0000-0001-6996-4965"
-    - family-names: Gray
-      given-names: Daniel
-      alias: dngray
-      website: "https://polarbear.army"
-    - family-names: Wilde
-      given-names: Niek
-      name-particle: de
-      alias: blacklight447
-    - given-names: Freddy
-      website: "https://freddy.lol"
-    - alias: mfwmyfacewhen
-      website: "https://github.com/mfwmyfacewhen"
-    - given-names: Olivia
-      alias: hook
-    - alias: nitrohorse
-      website: "https://nitrohorse.com"
-    - family-names: Suomalainen
-      given-names: Aminda
-      alias: Mikaela
-      website: "https://aminda.eu"
-    - family-names: Potocki
-      given-names: Dawid
-      website: "https://dawidpotocki.com"
-    - alias: matchboxbananasynergy
-      website: "https://banana.omg.lol"
-    - family-names: Tran
-      given-names: Thien
-      alias: Tommy
-      website: "https://tommytran.io"
-    - alias: samsepi0l
-      website: "https://github.com/d4rklynk"
-    - name: Privacy Guides Contributors
-      website: "https://github.com/privacyguides/privacyguides.org/graphs/contributors"
-  url: "https://www.privacyguides.org"
+      family-names: Aragon
+      orcid: 'https://orcid.org/0000-0001-6996-4965'
+    - given-names: Daniel
+      family-names: Gray
+      email: dngray@privacyguides.org
+    - name: The Privacy Guides team
+      website: 'https://github.com/orgs/privacyguides/people'
+    - name: Various project contributors
+  url: 'https://www.privacyguides.org'
  abstract: >-
    Privacy Guides is a socially motivated website that
    provides information for protecting your data
@@ -95,4 +64,4 @@ preferred-citation:
    - encryption
    - website
    - markdown
-  license: CC-BY-ND-4.0
+  license: "CC-BY-ND-4.0"
--- a/4
+++ b/4
@@ -1,4 +1,4 @@
-# Copyright (c) 2022-2023 Jonah Aragon <jonah@triplebit.net>
+# Copyright (c) 2022 Jonah Aragon <jonah@triplebit.net>

 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to
@@ -28,7 +28,7 @@ mkdocs-material = {path = "./modules/mkdocs-material"}
 mkdocs-git-revision-date-localized-plugin = "~=1.2"
 mkdocs-git-committers-plugin-2 = "~=1.1"
 mkdocs-macros-plugin = "~=0.7"
-pillow = "~=9.5"
+pillow = "~=9.4"
 cairosvg = "~=2.7"

 [dev-packages]
--- a/Pipfile.lock
+++ b/Pipfile.lock
@@ -1,7 +1,7 @@
 {
    "_meta": {
        "hash": {
-            "sha256": "e051706bdf466912ba699c0751d676c20b89501bf4e645f3b4cf81d0c0457be0"
+            "sha256": "277944f03f8186276babbd120f5236037510ab2a6a7c61b36ab1ac71c8f00156"
        },
        "pipfile-spec": 6,
        "requires": {
@@ -26,19 +26,18 @@
        },
        "beautifulsoup4": {
            "hashes": [
-                "sha256:492bbc69dca35d12daac71c4db1bfff0c876c00ef4a2ffacce226d4638eb72da",
-                "sha256:bd2520ca0d9d7d12694a53d44ac482d181b4ec1888909b035a3dbf40d0f57d4a"
+                "sha256:2130a5ad7f513200fae61a17abb5e338ca980fa28c439c0571014bc0217e9591",
+                "sha256:c5fceeaec29d09c84970e47c65f2f0efe57872f7cff494c9691a26ec0ff13234"
            ],
-            "markers": "python_full_version >= '3.6.0'",
-            "version": "==4.12.2"
+            "markers": "python_version >= '3.6'",
+            "version": "==4.12.0"
        },
        "cairocffi": {
            "hashes": [
-                "sha256:e7f21ea1546a5d490ceba77b6216c1393d7e0a7856e292864a88a7506092bf4d",
-                "sha256:fec979f3e904c1a38350b06dcc91d3c15f9a4954e618a068761622e3a0d5058c"
+                "sha256:d105b49009d9b4970a459e38ff030cb5dfc8c8ee231e867d28f77ee9df44495e"
            ],
            "markers": "python_version >= '3.7'",
-            "version": "==1.6.0"
+            "version": "==1.5.0"
        },
        "cairosvg": {
            "hashes": [
@@ -50,11 +49,11 @@
        },
        "certifi": {
            "hashes": [
-                "sha256:0f0d56dc5a6ad56fd4ba36484d6cc34451e1c6548c61daad8c320169f91eddc7",
-                "sha256:c6c2e98f5c7869efca1f8916fed228dd91539f9f1b444c314c06eef02980c716"
+                "sha256:35824b4c3a97115964b408844d64aa14db1cc518f6562e8d7261699d1350a9e3",
+                "sha256:4ad3232f5e926d6718ec31cfc1fcadfde020920e278684144551c91769c7bc18"
            ],
-            "markers": "python_full_version >= '3.6.0'",
-            "version": "==2023.5.7"
+            "markers": "python_version >= '3.6'",
+            "version": "==2022.12.7"
        },
        "cffi": {
            "hashes": [
@@ -279,11 +278,11 @@
        },
        "importlib-metadata": {
            "hashes": [
-                "sha256:1aaf550d4f73e5d6783e7acb77aec43d49da8017410afae93822cc9cca98c4d4",
-                "sha256:cb52082e659e97afc5dac71e79de97d8681de3aa07ff18578330904a9d18e5b5"
+                "sha256:43ce9281e097583d758c2c708c4376371261a02c34682491a8e98352365aad20",
+                "sha256:ff80f3b5394912eb1b108fcfd444dc78b7f1f3e16b16188054bd01cb9cb86f09"
            ],
            "markers": "python_version < '3.10'",
-            "version": "==6.7.0"
+            "version": "==6.1.0"
        },
        "jinja2": {
            "hashes": [
@@ -381,7 +380,7 @@
                "sha256:cbb516f16218e643d8e0a95b309f77eb118cb138d39a4f27851e6a63581db874",
                "sha256:f5da449a6e1c989a4cea2631aa8ee67caa5a2ef855d551c88f9e309f4634c621"
            ],
-            "markers": "python_full_version >= '3.6.0'",
+            "markers": "python_version >= '3.6'",
            "version": "==3.3.7"
        },
        "markdown2": {
@@ -394,83 +393,83 @@
        },
        "markupsafe": {
            "hashes": [
-                "sha256:05fb21170423db021895e1ea1e1f3ab3adb85d1c2333cbc2310f2a26bc77272e",
-                "sha256:0a4e4a1aff6c7ac4cd55792abf96c915634c2b97e3cc1c7129578aa68ebd754e",
-                "sha256:10bbfe99883db80bdbaff2dcf681dfc6533a614f700da1287707e8a5d78a8431",
-                "sha256:134da1eca9ec0ae528110ccc9e48041e0828d79f24121a1a146161103c76e686",
-                "sha256:1577735524cdad32f9f694208aa75e422adba74f1baee7551620e43a3141f559",
-                "sha256:1b40069d487e7edb2676d3fbdb2b0829ffa2cd63a2ec26c4938b2d34391b4ecc",
-                "sha256:282c2cb35b5b673bbcadb33a585408104df04f14b2d9b01d4c345a3b92861c2c",
-                "sha256:2c1b19b3aaacc6e57b7e25710ff571c24d6c3613a45e905b1fde04d691b98ee0",
-                "sha256:2ef12179d3a291be237280175b542c07a36e7f60718296278d8593d21ca937d4",
-                "sha256:338ae27d6b8745585f87218a3f23f1512dbf52c26c28e322dbe54bcede54ccb9",
-                "sha256:3c0fae6c3be832a0a0473ac912810b2877c8cb9d76ca48de1ed31e1c68386575",
-                "sha256:3fd4abcb888d15a94f32b75d8fd18ee162ca0c064f35b11134be77050296d6ba",
-                "sha256:42de32b22b6b804f42c5d98be4f7e5e977ecdd9ee9b660fda1a3edf03b11792d",
-                "sha256:504b320cd4b7eff6f968eddf81127112db685e81f7e36e75f9f84f0df46041c3",
-                "sha256:525808b8019e36eb524b8c68acdd63a37e75714eac50e988180b169d64480a00",
-                "sha256:56d9f2ecac662ca1611d183feb03a3fa4406469dafe241673d521dd5ae92a155",
-                "sha256:5bbe06f8eeafd38e5d0a4894ffec89378b6c6a625ff57e3028921f8ff59318ac",
-                "sha256:65c1a9bcdadc6c28eecee2c119465aebff8f7a584dd719facdd9e825ec61ab52",
-                "sha256:68e78619a61ecf91e76aa3e6e8e33fc4894a2bebe93410754bd28fce0a8a4f9f",
-                "sha256:69c0f17e9f5a7afdf2cc9fb2d1ce6aabdb3bafb7f38017c0b77862bcec2bbad8",
-                "sha256:6b2b56950d93e41f33b4223ead100ea0fe11f8e6ee5f641eb753ce4b77a7042b",
-                "sha256:787003c0ddb00500e49a10f2844fac87aa6ce977b90b0feaaf9de23c22508b24",
-                "sha256:7ef3cb2ebbf91e330e3bb937efada0edd9003683db6b57bb108c4001f37a02ea",
-                "sha256:8023faf4e01efadfa183e863fefde0046de576c6f14659e8782065bcece22198",
-                "sha256:8758846a7e80910096950b67071243da3e5a20ed2546e6392603c096778d48e0",
-                "sha256:8afafd99945ead6e075b973fefa56379c5b5c53fd8937dad92c662da5d8fd5ee",
-                "sha256:8c41976a29d078bb235fea9b2ecd3da465df42a562910f9022f1a03107bd02be",
-                "sha256:8e254ae696c88d98da6555f5ace2279cf7cd5b3f52be2b5cf97feafe883b58d2",
-                "sha256:9402b03f1a1b4dc4c19845e5c749e3ab82d5078d16a2a4c2cd2df62d57bb0707",
-                "sha256:962f82a3086483f5e5f64dbad880d31038b698494799b097bc59c2edf392fce6",
-                "sha256:9dcdfd0eaf283af041973bff14a2e143b8bd64e069f4c383416ecd79a81aab58",
-                "sha256:aa7bd130efab1c280bed0f45501b7c8795f9fdbeb02e965371bbef3523627779",
-                "sha256:ab4a0df41e7c16a1392727727e7998a467472d0ad65f3ad5e6e765015df08636",
-                "sha256:ad9e82fb8f09ade1c3e1b996a6337afac2b8b9e365f926f5a61aacc71adc5b3c",
-                "sha256:af598ed32d6ae86f1b747b82783958b1a4ab8f617b06fe68795c7f026abbdcad",
-                "sha256:b076b6226fb84157e3f7c971a47ff3a679d837cf338547532ab866c57930dbee",
-                "sha256:b7ff0f54cb4ff66dd38bebd335a38e2c22c41a8ee45aa608efc890ac3e3931bc",
-                "sha256:bfce63a9e7834b12b87c64d6b155fdd9b3b96191b6bd334bf37db7ff1fe457f2",
-                "sha256:c011a4149cfbcf9f03994ec2edffcb8b1dc2d2aede7ca243746df97a5d41ce48",
-                "sha256:c9c804664ebe8f83a211cace637506669e7890fec1b4195b505c214e50dd4eb7",
-                "sha256:ca379055a47383d02a5400cb0d110cef0a776fc644cda797db0c5696cfd7e18e",
-                "sha256:cb0932dc158471523c9637e807d9bfb93e06a95cbf010f1a38b98623b929ef2b",
-                "sha256:cd0f502fe016460680cd20aaa5a76d241d6f35a1c3350c474bac1273803893fa",
-                "sha256:ceb01949af7121f9fc39f7d27f91be8546f3fb112c608bc4029aef0bab86a2a5",
-                "sha256:d080e0a5eb2529460b30190fcfcc4199bd7f827663f858a226a81bc27beaa97e",
-                "sha256:dd15ff04ffd7e05ffcb7fe79f1b98041b8ea30ae9234aed2a9168b5797c3effb",
-                "sha256:df0be2b576a7abbf737b1575f048c23fb1d769f267ec4358296f31c2479db8f9",
-                "sha256:e09031c87a1e51556fdcb46e5bd4f59dfb743061cf93c4d6831bf894f125eb57",
-                "sha256:e4dd52d80b8c83fdce44e12478ad2e85c64ea965e75d66dbeafb0a3e77308fcc",
-                "sha256:fec21693218efe39aa7f8599346e90c705afa52c5b31ae019b2e57e8f6542bb2"
+                "sha256:0576fe974b40a400449768941d5d0858cc624e3249dfd1e0c33674e5c7ca7aed",
+                "sha256:085fd3201e7b12809f9e6e9bc1e5c96a368c8523fad5afb02afe3c051ae4afcc",
+                "sha256:090376d812fb6ac5f171e5938e82e7f2d7adc2b629101cec0db8b267815c85e2",
+                "sha256:0b462104ba25f1ac006fdab8b6a01ebbfbce9ed37fd37fd4acd70c67c973e460",
+                "sha256:137678c63c977754abe9086a3ec011e8fd985ab90631145dfb9294ad09c102a7",
+                "sha256:1bea30e9bf331f3fef67e0a3877b2288593c98a21ccb2cf29b74c581a4eb3af0",
+                "sha256:22152d00bf4a9c7c83960521fc558f55a1adbc0631fbb00a9471e097b19d72e1",
+                "sha256:22731d79ed2eb25059ae3df1dfc9cb1546691cc41f4e3130fe6bfbc3ecbbecfa",
+                "sha256:2298c859cfc5463f1b64bd55cb3e602528db6fa0f3cfd568d3605c50678f8f03",
+                "sha256:28057e985dace2f478e042eaa15606c7efccb700797660629da387eb289b9323",
+                "sha256:2e7821bffe00aa6bd07a23913b7f4e01328c3d5cc0b40b36c0bd81d362faeb65",
+                "sha256:2ec4f2d48ae59bbb9d1f9d7efb9236ab81429a764dedca114f5fdabbc3788013",
+                "sha256:340bea174e9761308703ae988e982005aedf427de816d1afe98147668cc03036",
+                "sha256:40627dcf047dadb22cd25ea7ecfe9cbf3bbbad0482ee5920b582f3809c97654f",
+                "sha256:40dfd3fefbef579ee058f139733ac336312663c6706d1163b82b3003fb1925c4",
+                "sha256:4cf06cdc1dda95223e9d2d3c58d3b178aa5dacb35ee7e3bbac10e4e1faacb419",
+                "sha256:50c42830a633fa0cf9e7d27664637532791bfc31c731a87b202d2d8ac40c3ea2",
+                "sha256:55f44b440d491028addb3b88f72207d71eeebfb7b5dbf0643f7c023ae1fba619",
+                "sha256:608e7073dfa9e38a85d38474c082d4281f4ce276ac0010224eaba11e929dd53a",
+                "sha256:63ba06c9941e46fa389d389644e2d8225e0e3e5ebcc4ff1ea8506dce646f8c8a",
+                "sha256:65608c35bfb8a76763f37036547f7adfd09270fbdbf96608be2bead319728fcd",
+                "sha256:665a36ae6f8f20a4676b53224e33d456a6f5a72657d9c83c2aa00765072f31f7",
+                "sha256:6d6607f98fcf17e534162f0709aaad3ab7a96032723d8ac8750ffe17ae5a0666",
+                "sha256:7313ce6a199651c4ed9d7e4cfb4aa56fe923b1adf9af3b420ee14e6d9a73df65",
+                "sha256:7668b52e102d0ed87cb082380a7e2e1e78737ddecdde129acadb0eccc5423859",
+                "sha256:7df70907e00c970c60b9ef2938d894a9381f38e6b9db73c5be35e59d92e06625",
+                "sha256:7e007132af78ea9df29495dbf7b5824cb71648d7133cf7848a2a5dd00d36f9ff",
+                "sha256:835fb5e38fd89328e9c81067fd642b3593c33e1e17e2fdbf77f5676abb14a156",
+                "sha256:8bca7e26c1dd751236cfb0c6c72d4ad61d986e9a41bbf76cb445f69488b2a2bd",
+                "sha256:8db032bf0ce9022a8e41a22598eefc802314e81b879ae093f36ce9ddf39ab1ba",
+                "sha256:99625a92da8229df6d44335e6fcc558a5037dd0a760e11d84be2260e6f37002f",
+                "sha256:9cad97ab29dfc3f0249b483412c85c8ef4766d96cdf9dcf5a1e3caa3f3661cf1",
+                "sha256:a4abaec6ca3ad8660690236d11bfe28dfd707778e2442b45addd2f086d6ef094",
+                "sha256:a6e40afa7f45939ca356f348c8e23048e02cb109ced1eb8420961b2f40fb373a",
+                "sha256:a6f2fcca746e8d5910e18782f976489939d54a91f9411c32051b4aab2bd7c513",
+                "sha256:a806db027852538d2ad7555b203300173dd1b77ba116de92da9afbc3a3be3eed",
+                "sha256:abcabc8c2b26036d62d4c746381a6f7cf60aafcc653198ad678306986b09450d",
+                "sha256:b8526c6d437855442cdd3d87eede9c425c4445ea011ca38d937db299382e6fa3",
+                "sha256:bb06feb762bade6bf3c8b844462274db0c76acc95c52abe8dbed28ae3d44a147",
+                "sha256:c0a33bc9f02c2b17c3ea382f91b4db0e6cde90b63b296422a939886a7a80de1c",
+                "sha256:c4a549890a45f57f1ebf99c067a4ad0cb423a05544accaf2b065246827ed9603",
+                "sha256:ca244fa73f50a800cf8c3ebf7fd93149ec37f5cb9596aa8873ae2c1d23498601",
+                "sha256:cf877ab4ed6e302ec1d04952ca358b381a882fbd9d1b07cccbfd61783561f98a",
+                "sha256:d9d971ec1e79906046aa3ca266de79eac42f1dbf3612a05dc9368125952bd1a1",
+                "sha256:da25303d91526aac3672ee6d49a2f3db2d9502a4a60b55519feb1a4c7714e07d",
+                "sha256:e55e40ff0cc8cc5c07996915ad367fa47da6b3fc091fdadca7f5403239c5fec3",
+                "sha256:f03a532d7dee1bed20bc4884194a16160a2de9ffc6354b3878ec9682bb623c54",
+                "sha256:f1cd098434e83e656abf198f103a8207a8187c0fc110306691a2e94a78d0abb2",
+                "sha256:f2bfb563d0211ce16b63c7cb9395d2c682a23187f54c3d79bfec33e6705473c6",
+                "sha256:f8ffb705ffcf5ddd0e80b65ddf7bed7ee4f5a441ea7d3419e861a12eaf41af58"
            ],
            "markers": "python_version >= '3.7'",
-            "version": "==2.1.3"
+            "version": "==2.1.2"
        },
        "mergedeep": {
            "hashes": [
                "sha256:0096d52e9dad9939c3d975a774666af186eda617e6ca84df4c94dec30004f2a8",
                "sha256:70775750742b25c0d8f36c55aed03d24c3384d17c951b3175d898bd778ef0307"
            ],
-            "markers": "python_full_version >= '3.6.0'",
+            "markers": "python_version >= '3.6'",
            "version": "==1.3.4"
        },
        "mkdocs": {
            "hashes": [
-                "sha256:5955093bbd4dd2e9403c5afaf57324ad8b04f16886512a3ee6ef828956481c57",
-                "sha256:6ee46d309bda331aac915cd24aab882c179a933bd9e77b80ce7d2eaaa3f689dd"
+                "sha256:8947af423a6d0facf41ea1195b8e1e8c85ad94ac95ae307fe11232e0424b11c5",
+                "sha256:c8856a832c1e56702577023cd64cc5f84948280c1c0fcc6af4cd39006ea6aa8c"
            ],
            "markers": "python_version >= '3.7'",
-            "version": "==1.4.3"
+            "version": "==1.4.2"
        },
        "mkdocs-git-committers-plugin-2": {
            "hashes": [
-                "sha256:745993c4b486de0023ea4c2758daa7a8790a60ac6e369b55203db165d203be80",
-                "sha256:7ffa7c6eaae3ade9eaac625bd7dc155e8a543261c81a0354d12909b49eb48588"
+                "sha256:14d4a89bf8965ab62ca9b8b0cd90f6c9b421bb89bfedca0d91c5119f18791360",
+                "sha256:4f6eb6137f35967dfa444703b6ea293f05bf2fd183506bc51db8fb21b061d5a3"
            ],
            "index": "pypi",
-            "version": "==1.1.2"
+            "version": "==1.1.1"
        },
        "mkdocs-git-revision-date-localized-plugin": {
            "hashes": [
@@ -490,7 +489,7 @@
        },
        "mkdocs-material": {
            "path": "./modules/mkdocs-material",
-            "version": "==9.1.16+insiders.4.36.0"
+            "version": "==9.1.3+insiders.4.32.3"
        },
        "mkdocs-material-extensions": {
            "hashes": [
@@ -502,11 +501,11 @@
        },
        "packaging": {
            "hashes": [
-                "sha256:994793af429502c4ea2ebf6bf664629d07c1a9fe974af92966e4b8d2df7edc61",
-                "sha256:a392980d2b6cffa644431898be54b0045151319d1e7ec34f0cfed48767dd334f"
+                "sha256:714ac14496c3e68c99c29b00845f7a2b85f3bb6f1078fd9f72fd20f0570002b2",
+                "sha256:b6ad297f8907de0fa2fe1ccbd26fdaf387f5f47c7275fedf8cce89f99446cf97"
            ],
            "markers": "python_version >= '3.7'",
-            "version": "==23.1"
+            "version": "==23.0"
        },
        "paginate": {
            "hashes": [
@@ -516,83 +515,94 @@
        },
        "pillow": {
            "hashes": [
-                "sha256:07999f5834bdc404c442146942a2ecadd1cb6292f5229f4ed3b31e0a108746b1",
-                "sha256:0852ddb76d85f127c135b6dd1f0bb88dbb9ee990d2cd9aa9e28526c93e794fba",
-                "sha256:1781a624c229cb35a2ac31cc4a77e28cafc8900733a864870c49bfeedacd106a",
-                "sha256:1e7723bd90ef94eda669a3c2c19d549874dd5badaeefabefd26053304abe5799",
-                "sha256:229e2c79c00e85989a34b5981a2b67aa079fd08c903f0aaead522a1d68d79e51",
-                "sha256:22baf0c3cf0c7f26e82d6e1adf118027afb325e703922c8dfc1d5d0156bb2eeb",
-                "sha256:252a03f1bdddce077eff2354c3861bf437c892fb1832f75ce813ee94347aa9b5",
-                "sha256:2dfaaf10b6172697b9bceb9a3bd7b951819d1ca339a5ef294d1f1ac6d7f63270",
-                "sha256:322724c0032af6692456cd6ed554bb85f8149214d97398bb80613b04e33769f6",
-                "sha256:35f6e77122a0c0762268216315bf239cf52b88865bba522999dc38f1c52b9b47",
-                "sha256:375f6e5ee9620a271acb6820b3d1e94ffa8e741c0601db4c0c4d3cb0a9c224bf",
-                "sha256:3ded42b9ad70e5f1754fb7c2e2d6465a9c842e41d178f262e08b8c85ed8a1d8e",
-                "sha256:432b975c009cf649420615388561c0ce7cc31ce9b2e374db659ee4f7d57a1f8b",
-                "sha256:482877592e927fd263028c105b36272398e3e1be3269efda09f6ba21fd83ec66",
-                "sha256:489f8389261e5ed43ac8ff7b453162af39c3e8abd730af8363587ba64bb2e865",
-                "sha256:54f7102ad31a3de5666827526e248c3530b3a33539dbda27c6843d19d72644ec",
-                "sha256:560737e70cb9c6255d6dcba3de6578a9e2ec4b573659943a5e7e4af13f298f5c",
-                "sha256:5671583eab84af046a397d6d0ba25343c00cd50bce03787948e0fff01d4fd9b1",
-                "sha256:5ba1b81ee69573fe7124881762bb4cd2e4b6ed9dd28c9c60a632902fe8db8b38",
-                "sha256:5d4ebf8e1db4441a55c509c4baa7a0587a0210f7cd25fcfe74dbbce7a4bd1906",
-                "sha256:60037a8db8750e474af7ffc9faa9b5859e6c6d0a50e55c45576bf28be7419705",
-                "sha256:608488bdcbdb4ba7837461442b90ea6f3079397ddc968c31265c1e056964f1ef",
-                "sha256:6608ff3bf781eee0cd14d0901a2b9cc3d3834516532e3bd673a0a204dc8615fc",
-                "sha256:662da1f3f89a302cc22faa9f14a262c2e3951f9dbc9617609a47521c69dd9f8f",
-                "sha256:7002d0797a3e4193c7cdee3198d7c14f92c0836d6b4a3f3046a64bd1ce8df2bf",
-                "sha256:763782b2e03e45e2c77d7779875f4432e25121ef002a41829d8868700d119392",
-                "sha256:77165c4a5e7d5a284f10a6efaa39a0ae8ba839da344f20b111d62cc932fa4e5d",
-                "sha256:7c9af5a3b406a50e313467e3565fc99929717f780164fe6fbb7704edba0cebbe",
-                "sha256:7ec6f6ce99dab90b52da21cf0dc519e21095e332ff3b399a357c187b1a5eee32",
-                "sha256:833b86a98e0ede388fa29363159c9b1a294b0905b5128baf01db683672f230f5",
-                "sha256:84a6f19ce086c1bf894644b43cd129702f781ba5751ca8572f08aa40ef0ab7b7",
-                "sha256:8507eda3cd0608a1f94f58c64817e83ec12fa93a9436938b191b80d9e4c0fc44",
-                "sha256:85ec677246533e27770b0de5cf0f9d6e4ec0c212a1f89dfc941b64b21226009d",
-                "sha256:8aca1152d93dcc27dc55395604dcfc55bed5f25ef4c98716a928bacba90d33a3",
-                "sha256:8d935f924bbab8f0a9a28404422da8af4904e36d5c33fc6f677e4c4485515625",
-                "sha256:8f36397bf3f7d7c6a3abdea815ecf6fd14e7fcd4418ab24bae01008d8d8ca15e",
-                "sha256:91ec6fe47b5eb5a9968c79ad9ed78c342b1f97a091677ba0e012701add857829",
-                "sha256:965e4a05ef364e7b973dd17fc765f42233415974d773e82144c9bbaaaea5d089",
-                "sha256:96e88745a55b88a7c64fa49bceff363a1a27d9a64e04019c2281049444a571e3",
-                "sha256:99eb6cafb6ba90e436684e08dad8be1637efb71c4f2180ee6b8f940739406e78",
-                "sha256:9adf58f5d64e474bed00d69bcd86ec4bcaa4123bfa70a65ce72e424bfb88ed96",
-                "sha256:9b1af95c3a967bf1da94f253e56b6286b50af23392a886720f563c547e48e964",
-                "sha256:a0aa9417994d91301056f3d0038af1199eb7adc86e646a36b9e050b06f526597",
-                "sha256:a0f9bb6c80e6efcde93ffc51256d5cfb2155ff8f78292f074f60f9e70b942d99",
-                "sha256:a127ae76092974abfbfa38ca2d12cbeddcdeac0fb71f9627cc1135bedaf9d51a",
-                "sha256:aaf305d6d40bd9632198c766fb64f0c1a83ca5b667f16c1e79e1661ab5060140",
-                "sha256:aca1c196f407ec7cf04dcbb15d19a43c507a81f7ffc45b690899d6a76ac9fda7",
-                "sha256:ace6ca218308447b9077c14ea4ef381ba0b67ee78d64046b3f19cf4e1139ad16",
-                "sha256:b416f03d37d27290cb93597335a2f85ed446731200705b22bb927405320de903",
-                "sha256:bf548479d336726d7a0eceb6e767e179fbde37833ae42794602631a070d630f1",
-                "sha256:c1170d6b195555644f0616fd6ed929dfcf6333b8675fcca044ae5ab110ded296",
-                "sha256:c380b27d041209b849ed246b111b7c166ba36d7933ec6e41175fd15ab9eb1572",
-                "sha256:c446d2245ba29820d405315083d55299a796695d747efceb5717a8b450324115",
-                "sha256:c830a02caeb789633863b466b9de10c015bded434deb3ec87c768e53752ad22a",
-                "sha256:cb841572862f629b99725ebaec3287fc6d275be9b14443ea746c1dd325053cbd",
-                "sha256:cfa4561277f677ecf651e2b22dc43e8f5368b74a25a8f7d1d4a3a243e573f2d4",
-                "sha256:cfcc2c53c06f2ccb8976fb5c71d448bdd0a07d26d8e07e321c103416444c7ad1",
-                "sha256:d3c6b54e304c60c4181da1c9dadf83e4a54fd266a99c70ba646a9baa626819eb",
-                "sha256:d3d403753c9d5adc04d4694d35cf0391f0f3d57c8e0030aac09d7678fa8030aa",
-                "sha256:d9c206c29b46cfd343ea7cdfe1232443072bbb270d6a46f59c259460db76779a",
-                "sha256:e49eb4e95ff6fd7c0c402508894b1ef0e01b99a44320ba7d8ecbabefddcc5569",
-                "sha256:f8286396b351785801a976b1e85ea88e937712ee2c3ac653710a4a57a8da5d9c",
-                "sha256:f8fc330c3370a81bbf3f88557097d1ea26cd8b019d6433aa59f71195f5ddebbf",
-                "sha256:fbd359831c1657d69bb81f0db962905ee05e5e9451913b18b831febfe0519082",
-                "sha256:fe7e1c262d3392afcf5071df9afa574544f28eac825284596ac6db56e6d11062",
-                "sha256:fed1e1cf6a42577953abbe8e6cf2fe2f566daebde7c34724ec8803c4c0cda579"
+                "sha256:013016af6b3a12a2f40b704677f8b51f72cb007dac785a9933d5c86a72a7fe33",
+                "sha256:0845adc64fe9886db00f5ab68c4a8cd933ab749a87747555cec1c95acea64b0b",
+                "sha256:0884ba7b515163a1a05440a138adeb722b8a6ae2c2b33aea93ea3118dd3a899e",
+                "sha256:09b89ddc95c248ee788328528e6a2996e09eaccddeeb82a5356e92645733be35",
+                "sha256:0dd4c681b82214b36273c18ca7ee87065a50e013112eea7d78c7a1b89a739153",
+                "sha256:0e51f608da093e5d9038c592b5b575cadc12fd748af1479b5e858045fff955a9",
+                "sha256:0f3269304c1a7ce82f1759c12ce731ef9b6e95b6df829dccd9fe42912cc48569",
+                "sha256:16a8df99701f9095bea8a6c4b3197da105df6f74e6176c5b410bc2df2fd29a57",
+                "sha256:19005a8e58b7c1796bc0167862b1f54a64d3b44ee5d48152b06bb861458bc0f8",
+                "sha256:1b4b4e9dda4f4e4c4e6896f93e84a8f0bcca3b059de9ddf67dac3c334b1195e1",
+                "sha256:28676836c7796805914b76b1837a40f76827ee0d5398f72f7dcc634bae7c6264",
+                "sha256:2968c58feca624bb6c8502f9564dd187d0e1389964898f5e9e1fbc8533169157",
+                "sha256:3f4cc516e0b264c8d4ccd6b6cbc69a07c6d582d8337df79be1e15a5056b258c9",
+                "sha256:3fa1284762aacca6dc97474ee9c16f83990b8eeb6697f2ba17140d54b453e133",
+                "sha256:43521ce2c4b865d385e78579a082b6ad1166ebed2b1a2293c3be1d68dd7ca3b9",
+                "sha256:451f10ef963918e65b8869e17d67db5e2f4ab40e716ee6ce7129b0cde2876eab",
+                "sha256:46c259e87199041583658457372a183636ae8cd56dbf3f0755e0f376a7f9d0e6",
+                "sha256:46f39cab8bbf4a384ba7cb0bc8bae7b7062b6a11cfac1ca4bc144dea90d4a9f5",
+                "sha256:519e14e2c49fcf7616d6d2cfc5c70adae95682ae20f0395e9280db85e8d6c4df",
+                "sha256:53dcb50fbdc3fb2c55431a9b30caeb2f7027fcd2aeb501459464f0214200a503",
+                "sha256:54614444887e0d3043557d9dbc697dbb16cfb5a35d672b7a0fcc1ed0cf1c600b",
+                "sha256:575d8912dca808edd9acd6f7795199332696d3469665ef26163cd090fa1f8bfa",
+                "sha256:5dd5a9c3091a0f414a963d427f920368e2b6a4c2f7527fdd82cde8ef0bc7a327",
+                "sha256:5f532a2ad4d174eb73494e7397988e22bf427f91acc8e6ebf5bb10597b49c493",
+                "sha256:60e7da3a3ad1812c128750fc1bc14a7ceeb8d29f77e0a2356a8fb2aa8925287d",
+                "sha256:653d7fb2df65efefbcbf81ef5fe5e5be931f1ee4332c2893ca638c9b11a409c4",
+                "sha256:6663977496d616b618b6cfa43ec86e479ee62b942e1da76a2c3daa1c75933ef4",
+                "sha256:6abfb51a82e919e3933eb137e17c4ae9c0475a25508ea88993bb59faf82f3b35",
+                "sha256:6c6b1389ed66cdd174d040105123a5a1bc91d0aa7059c7261d20e583b6d8cbd2",
+                "sha256:6d9dfb9959a3b0039ee06c1a1a90dc23bac3b430842dcb97908ddde05870601c",
+                "sha256:765cb54c0b8724a7c12c55146ae4647e0274a839fb6de7bcba841e04298e1011",
+                "sha256:7a21222644ab69ddd9967cfe6f2bb420b460dae4289c9d40ff9a4896e7c35c9a",
+                "sha256:7ac7594397698f77bce84382929747130765f66406dc2cd8b4ab4da68ade4c6e",
+                "sha256:7cfc287da09f9d2a7ec146ee4d72d6ea1342e770d975e49a8621bf54eaa8f30f",
+                "sha256:83125753a60cfc8c412de5896d10a0a405e0bd88d0470ad82e0869ddf0cb3848",
+                "sha256:847b114580c5cc9ebaf216dd8c8dbc6b00a3b7ab0131e173d7120e6deade1f57",
+                "sha256:87708d78a14d56a990fbf4f9cb350b7d89ee8988705e58e39bdf4d82c149210f",
+                "sha256:8a2b5874d17e72dfb80d917213abd55d7e1ed2479f38f001f264f7ce7bae757c",
+                "sha256:8f127e7b028900421cad64f51f75c051b628db17fb00e099eb148761eed598c9",
+                "sha256:94cdff45173b1919350601f82d61365e792895e3c3a3443cf99819e6fbf717a5",
+                "sha256:99d92d148dd03fd19d16175b6d355cc1b01faf80dae93c6c3eb4163709edc0a9",
+                "sha256:9a3049a10261d7f2b6514d35bbb7a4dfc3ece4c4de14ef5876c4b7a23a0e566d",
+                "sha256:9d9a62576b68cd90f7075876f4e8444487db5eeea0e4df3ba298ee38a8d067b0",
+                "sha256:9e5f94742033898bfe84c93c831a6f552bb629448d4072dd312306bab3bd96f1",
+                "sha256:a1c2d7780448eb93fbcc3789bf3916aa5720d942e37945f4056680317f1cd23e",
+                "sha256:a2e0f87144fcbbe54297cae708c5e7f9da21a4646523456b00cc956bd4c65815",
+                "sha256:a4dfdae195335abb4e89cc9762b2edc524f3c6e80d647a9a81bf81e17e3fb6f0",
+                "sha256:a96e6e23f2b79433390273eaf8cc94fec9c6370842e577ab10dabdcc7ea0a66b",
+                "sha256:aabdab8ec1e7ca7f1434d042bf8b1e92056245fb179790dc97ed040361f16bfd",
+                "sha256:b222090c455d6d1a64e6b7bb5f4035c4dff479e22455c9eaa1bdd4c75b52c80c",
+                "sha256:b52ff4f4e002f828ea6483faf4c4e8deea8d743cf801b74910243c58acc6eda3",
+                "sha256:b70756ec9417c34e097f987b4d8c510975216ad26ba6e57ccb53bc758f490dab",
+                "sha256:b8c2f6eb0df979ee99433d8b3f6d193d9590f735cf12274c108bd954e30ca858",
+                "sha256:b9b752ab91e78234941e44abdecc07f1f0d8f51fb62941d32995b8161f68cfe5",
+                "sha256:ba6612b6548220ff5e9df85261bddc811a057b0b465a1226b39bfb8550616aee",
+                "sha256:bd752c5ff1b4a870b7661234694f24b1d2b9076b8bf337321a814c612665f343",
+                "sha256:c3c4ed2ff6760e98d262e0cc9c9a7f7b8a9f61aa4d47c58835cdaf7b0b8811bb",
+                "sha256:c5c1362c14aee73f50143d74389b2c158707b4abce2cb055b7ad37ce60738d47",
+                "sha256:cb362e3b0976dc994857391b776ddaa8c13c28a16f80ac6522c23d5257156bed",
+                "sha256:d197df5489004db87d90b918033edbeee0bd6df3848a204bca3ff0a903bef837",
+                "sha256:d3b56206244dc8711f7e8b7d6cad4663917cd5b2d950799425076681e8766286",
+                "sha256:d5b2f8a31bd43e0f18172d8ac82347c8f37ef3e0b414431157718aa234991b28",
+                "sha256:d7081c084ceb58278dd3cf81f836bc818978c0ccc770cbbb202125ddabec6628",
+                "sha256:db74f5562c09953b2c5f8ec4b7dfd3f5421f31811e97d1dbc0a7c93d6e3a24df",
+                "sha256:df41112ccce5d47770a0c13651479fbcd8793f34232a2dd9faeccb75eb5d0d0d",
+                "sha256:e1339790c083c5a4de48f688b4841f18df839eb3c9584a770cbd818b33e26d5d",
+                "sha256:e621b0246192d3b9cb1dc62c78cfa4c6f6d2ddc0ec207d43c0dedecb914f152a",
+                "sha256:e8c5cf126889a4de385c02a2c3d3aba4b00f70234bfddae82a5eaa3ee6d5e3e6",
+                "sha256:e9d7747847c53a16a729b6ee5e737cf170f7a16611c143d95aa60a109a59c336",
+                "sha256:eaef5d2de3c7e9b21f1e762f289d17b726c2239a42b11e25446abf82b26ac132",
+                "sha256:ed3e4b4e1e6de75fdc16d3259098de7c6571b1a6cc863b1a49e7d3d53e036070",
+                "sha256:ef21af928e807f10bf4141cad4746eee692a0dd3ff56cfb25fce076ec3cc8abe",
+                "sha256:f09598b416ba39a8f489c124447b007fe865f786a89dbfa48bb5cf395693132a",
+                "sha256:f0caf4a5dcf610d96c3bd32932bfac8aee61c96e60481c2a0ea58da435e25acd",
+                "sha256:f6e78171be3fb7941f9910ea15b4b14ec27725865a73c15277bc39f5ca4f8391",
+                "sha256:f715c32e774a60a337b2bb8ad9839b4abf75b267a0f18806f6f4f5f1688c4b5a",
+                "sha256:fb5c1ad6bad98c57482236a21bf985ab0ef42bd51f7ad4e4538e89a997624e12"
            ],
            "index": "pypi",
-            "version": "==9.5.0"
+            "version": "==9.4.0"
        },
        "pipdeptree": {
            "hashes": [
-                "sha256:b4c56f455c9fd0aa7c281dc9b3ddff8bd8918f6bb8ca5aa50cec1c2764d64c86",
-                "sha256:d0049795a78c600bce97663a4d0ae3ebc212f7ccc2f1bd3efef910b7e8bf4591"
+                "sha256:058b53373ee5bb8a97b36a966af59029378165dc93829c977538efa4e20ba524",
+                "sha256:b0ed2685230c71ca28d35e96b09685406f6f9cc03b81b393264d2c6b14c5cf23"
            ],
            "markers": "python_version >= '3.7'",
-            "version": "==2.9.3"
+            "version": "==2.6.0"
        },
        "pycparser": {
            "hashes": [
@@ -603,19 +613,19 @@
        },
        "pygments": {
            "hashes": [
-                "sha256:8ace4d3c1dd481894b2005f560ead0f9f19ee64fe983366be1a21e171d12775c",
-                "sha256:db2db3deb4b4179f399a09054b023b6a586b76499d36965813c71aa8ed7b5fd1"
+                "sha256:b3ed06a9e8ac9a9aae5a6f5dbe78a8a58655d17b43b93c078f094ddc476ae297",
+                "sha256:fa7bd7bd2771287c0de303af8bfdfc731f51bd2c6a47ab69d117138893b82717"
            ],
-            "markers": "python_version >= '3.7'",
-            "version": "==2.15.1"
+            "markers": "python_version >= '3.6'",
+            "version": "==2.14.0"
        },
        "pymdown-extensions": {
            "hashes": [
-                "sha256:ae66d84013c5d027ce055693e09a4628b67e9dec5bce05727e45b0918e36f274",
-                "sha256:b44e1093a43b8a975eae17b03c3a77aad4681b3b56fce60ce746dbef1944c8cb"
+                "sha256:31eaa76ce6f96aabfcea98787c2fff2c5c0611b20a53a94213970cfbf05f02b8",
+                "sha256:562c38eee4ce3f101ce631b804bfc2177a8a76c7e4dc908871fb6741a90257a7"
            ],
            "markers": "python_version >= '3.7'",
-            "version": "==10.0.1"
+            "version": "==9.10"
        },
        "pyquery": {
            "hashes": [
@@ -634,11 +644,10 @@
        },
        "pytz": {
            "hashes": [
-                "sha256:1d8ce29db189191fb55338ee6d0387d82ab59f3d00eac103412d64e0ebd0c588",
-                "sha256:a151b3abb88eda1d4e34a9814df37de2a80e301e68ba0fd856fb9b46bfbbbffb"
+                "sha256:01a0681c4b9684a28304615eba55d1ab31ae00bf68ec157ec3708a8182dbbcd0",
+                "sha256:78f4f37d8198e0627c5f1143240bb0206b8691d8d7ac6d78fee88b78733f8c4a"
            ],
-            "markers": "python_version < '3.9'",
-            "version": "==2023.3"
+            "version": "==2022.7.1"
        },
        "pyyaml": {
            "hashes": [
@@ -683,7 +692,7 @@
                "sha256:e61ceaab6f49fb8bdfaa0f92c4b57bcfbea54c09277b1b4f7ac376bfb7a7c174",
                "sha256:f84fbc98b019fef2ee9a1cb3ce93e3187a6df0b2538a651bfb890254ba9f90b5"
            ],
-            "markers": "python_full_version >= '3.6.0'",
+            "markers": "python_version >= '3.6'",
            "version": "==6.0"
        },
        "pyyaml-env-tag": {
@@ -691,7 +700,7 @@
                "sha256:70092675bda14fdec33b31ba77e7543de9ddc88f2e5b99160396572d11525bdb",
                "sha256:af31106dec8a4d68c60207c1886031cbf839b68aa7abccdb19868200532c2069"
            ],
-            "markers": "python_full_version >= '3.6.0'",
+            "markers": "python_version >= '3.6'",
            "version": "==0.1"
        },
        "readtime": {
@@ -703,105 +712,105 @@
        },
        "regex": {
            "hashes": [
-                "sha256:0385e73da22363778ef2324950e08b689abdf0b108a7d8decb403ad7f5191938",
-                "sha256:051da80e6eeb6e239e394ae60704d2b566aa6a7aed6f2890a7967307267a5dc6",
-                "sha256:05ed27acdf4465c95826962528f9e8d41dbf9b1aa8531a387dee6ed215a3e9ef",
-                "sha256:0654bca0cdf28a5956c83839162692725159f4cda8d63e0911a2c0dc76166525",
-                "sha256:09e4a1a6acc39294a36b7338819b10baceb227f7f7dbbea0506d419b5a1dd8af",
-                "sha256:0b49c764f88a79160fa64f9a7b425620e87c9f46095ef9c9920542ab2495c8bc",
-                "sha256:0b71e63226e393b534105fcbdd8740410dc6b0854c2bfa39bbda6b0d40e59a54",
-                "sha256:0c29ca1bd61b16b67be247be87390ef1d1ef702800f91fbd1991f5c4421ebae8",
-                "sha256:10590510780b7541969287512d1b43f19f965c2ece6c9b1c00fc367b29d8dce7",
-                "sha256:10cb847aeb1728412c666ab2e2000ba6f174f25b2bdc7292e7dd71b16db07568",
-                "sha256:12b74fbbf6cbbf9dbce20eb9b5879469e97aeeaa874145517563cca4029db65c",
-                "sha256:20326216cc2afe69b6e98528160b225d72f85ab080cbdf0b11528cbbaba2248f",
-                "sha256:2239d95d8e243658b8dbb36b12bd10c33ad6e6933a54d36ff053713f129aa536",
-                "sha256:25be746a8ec7bc7b082783216de8e9473803706723b3f6bef34b3d0ed03d57e2",
-                "sha256:271f0bdba3c70b58e6f500b205d10a36fb4b58bd06ac61381b68de66442efddb",
-                "sha256:29cdd471ebf9e0f2fb3cac165efedc3c58db841d83a518b082077e612d3ee5df",
-                "sha256:2d44dc13229905ae96dd2ae2dd7cebf824ee92bc52e8cf03dcead37d926da019",
-                "sha256:3676f1dd082be28b1266c93f618ee07741b704ab7b68501a173ce7d8d0d0ca18",
-                "sha256:36efeba71c6539d23c4643be88295ce8c82c88bbd7c65e8a24081d2ca123da3f",
-                "sha256:3e5219bf9e75993d73ab3d25985c857c77e614525fac9ae02b1bebd92f7cecac",
-                "sha256:43e1dd9d12df9004246bacb79a0e5886b3b6071b32e41f83b0acbf293f820ee8",
-                "sha256:457b6cce21bee41ac292d6753d5e94dcbc5c9e3e3a834da285b0bde7aa4a11e9",
-                "sha256:463b6a3ceb5ca952e66550a4532cef94c9a0c80dc156c4cc343041951aec1697",
-                "sha256:4959e8bcbfda5146477d21c3a8ad81b185cd252f3d0d6e4724a5ef11c012fb06",
-                "sha256:4d3850beab9f527f06ccc94b446c864059c57651b3f911fddb8d9d3ec1d1b25d",
-                "sha256:5708089ed5b40a7b2dc561e0c8baa9535b77771b64a8330b684823cfd5116036",
-                "sha256:5c6b48d0fa50d8f4df3daf451be7f9689c2bde1a52b1225c5926e3f54b6a9ed1",
-                "sha256:61474f0b41fe1a80e8dfa70f70ea1e047387b7cd01c85ec88fa44f5d7561d787",
-                "sha256:6343c6928282c1f6a9db41f5fd551662310e8774c0e5ebccb767002fcf663ca9",
-                "sha256:65ba8603753cec91c71de423a943ba506363b0e5c3fdb913ef8f9caa14b2c7e0",
-                "sha256:687ea9d78a4b1cf82f8479cab23678aff723108df3edeac098e5b2498879f4a7",
-                "sha256:6b2675068c8b56f6bfd5a2bda55b8accbb96c02fd563704732fd1c95e2083461",
-                "sha256:7117d10690c38a622e54c432dfbbd3cbd92f09401d622902c32f6d377e2300ee",
-                "sha256:7178bbc1b2ec40eaca599d13c092079bf529679bf0371c602edaa555e10b41c3",
-                "sha256:72d1a25bf36d2050ceb35b517afe13864865268dfb45910e2e17a84be6cbfeb0",
-                "sha256:742e19a90d9bb2f4a6cf2862b8b06dea5e09b96c9f2df1779e53432d7275331f",
-                "sha256:74390d18c75054947e4194019077e243c06fbb62e541d8817a0fa822ea310c14",
-                "sha256:74419d2b50ecb98360cfaa2974da8689cb3b45b9deff0dcf489c0d333bcc1477",
-                "sha256:824bf3ac11001849aec3fa1d69abcb67aac3e150a933963fb12bda5151fe1bfd",
-                "sha256:83320a09188e0e6c39088355d423aa9d056ad57a0b6c6381b300ec1a04ec3d16",
-                "sha256:837328d14cde912af625d5f303ec29f7e28cdab588674897baafaf505341f2fc",
-                "sha256:841d6e0e5663d4c7b4c8099c9997be748677d46cbf43f9f471150e560791f7ff",
-                "sha256:87b2a5bb5e78ee0ad1de71c664d6eb536dc3947a46a69182a90f4410f5e3f7dd",
-                "sha256:890e5a11c97cf0d0c550eb661b937a1e45431ffa79803b942a057c4fb12a2da2",
-                "sha256:8abbc5d54ea0ee80e37fef009e3cec5dafd722ed3c829126253d3e22f3846f1e",
-                "sha256:8e3f1316c2293e5469f8f09dc2d76efb6c3982d3da91ba95061a7e69489a14ef",
-                "sha256:8f56fcb7ff7bf7404becdfc60b1e81a6d0561807051fd2f1860b0d0348156a07",
-                "sha256:9427a399501818a7564f8c90eced1e9e20709ece36be701f394ada99890ea4b3",
-                "sha256:976d7a304b59ede34ca2921305b57356694f9e6879db323fd90a80f865d355a3",
-                "sha256:9a5bfb3004f2144a084a16ce19ca56b8ac46e6fd0651f54269fc9e230edb5e4a",
-                "sha256:9beb322958aaca059f34975b0df135181f2e5d7a13b84d3e0e45434749cb20f7",
-                "sha256:9edcbad1f8a407e450fbac88d89e04e0b99a08473f666a3f3de0fd292badb6aa",
-                "sha256:9edce5281f965cf135e19840f4d93d55b3835122aa76ccacfd389e880ba4cf82",
-                "sha256:a4c3b7fa4cdaa69268748665a1a6ff70c014d39bb69c50fda64b396c9116cf77",
-                "sha256:a8105e9af3b029f243ab11ad47c19b566482c150c754e4c717900a798806b222",
-                "sha256:a99b50300df5add73d307cf66abea093304a07eb017bce94f01e795090dea87c",
-                "sha256:aad51907d74fc183033ad796dd4c2e080d1adcc4fd3c0fd4fd499f30c03011cd",
-                "sha256:af4dd387354dc83a3bff67127a124c21116feb0d2ef536805c454721c5d7993d",
-                "sha256:b28f5024a3a041009eb4c333863d7894d191215b39576535c6734cd88b0fcb68",
-                "sha256:b4598b1897837067a57b08147a68ac026c1e73b31ef6e36deeeb1fa60b2933c9",
-                "sha256:b6192d5af2ccd2a38877bfef086d35e6659566a335b1492786ff254c168b1693",
-                "sha256:b862c2b9d5ae38a68b92e215b93f98d4c5e9454fa36aae4450f61dd33ff48487",
-                "sha256:b956231ebdc45f5b7a2e1f90f66a12be9610ce775fe1b1d50414aac1e9206c06",
-                "sha256:bb60b503ec8a6e4e3e03a681072fa3a5adcbfa5479fa2d898ae2b4a8e24c4591",
-                "sha256:bbb02fd4462f37060122e5acacec78e49c0fbb303c30dd49c7f493cf21fc5b27",
-                "sha256:bdff5eab10e59cf26bc479f565e25ed71a7d041d1ded04ccf9aee1d9f208487a",
-                "sha256:c123f662be8ec5ab4ea72ea300359023a5d1df095b7ead76fedcd8babbedf969",
-                "sha256:c2b867c17a7a7ae44c43ebbeb1b5ff406b3e8d5b3e14662683e5e66e6cc868d3",
-                "sha256:c5f8037000eb21e4823aa485149f2299eb589f8d1fe4b448036d230c3f4e68e0",
-                "sha256:c6a57b742133830eec44d9b2290daf5cbe0a2f1d6acee1b3c7b1c7b2f3606df7",
-                "sha256:ccf91346b7bd20c790310c4147eee6ed495a54ddb6737162a36ce9dbef3e4751",
-                "sha256:cf67ca618b4fd34aee78740bea954d7c69fdda419eb208c2c0c7060bb822d747",
-                "sha256:d2da3abc88711bce7557412310dfa50327d5769a31d1c894b58eb256459dc289",
-                "sha256:d4f03bb71d482f979bda92e1427f3ec9b220e62a7dd337af0aa6b47bf4498f72",
-                "sha256:d54af539295392611e7efbe94e827311eb8b29668e2b3f4cadcfe6f46df9c777",
-                "sha256:d77f09bc4b55d4bf7cc5eba785d87001d6757b7c9eec237fe2af57aba1a071d9",
-                "sha256:d831c2f8ff278179705ca59f7e8524069c1a989e716a1874d6d1aab6119d91d1",
-                "sha256:dbbbfce33cd98f97f6bffb17801b0576e653f4fdb1d399b2ea89638bc8d08ae1",
-                "sha256:dcba6dae7de533c876255317c11f3abe4907ba7d9aa15d13e3d9710d4315ec0e",
-                "sha256:e0bb18053dfcfed432cc3ac632b5e5e5c5b7e55fb3f8090e867bfd9b054dbcbf",
-                "sha256:e2fbd6236aae3b7f9d514312cdb58e6494ee1c76a9948adde6eba33eb1c4264f",
-                "sha256:e5087a3c59eef624a4591ef9eaa6e9a8d8a94c779dade95d27c0bc24650261cd",
-                "sha256:e8915cc96abeb8983cea1df3c939e3c6e1ac778340c17732eb63bb96247b91d2",
-                "sha256:ea353ecb6ab5f7e7d2f4372b1e779796ebd7b37352d290096978fea83c4dba0c",
-                "sha256:ee2d1a9a253b1729bb2de27d41f696ae893507c7db224436abe83ee25356f5c1",
-                "sha256:f415f802fbcafed5dcc694c13b1292f07fe0befdb94aa8a52905bd115ff41e88",
-                "sha256:fb5ec16523dc573a4b277663a2b5a364e2099902d3944c9419a40ebd56a118f9",
-                "sha256:fea75c3710d4f31389eed3c02f62d0b66a9da282521075061ce875eb5300cf23"
+                "sha256:052b670fafbe30966bbe5d025e90b2a491f85dfe5b2583a163b5e60a85a321ad",
+                "sha256:0653d012b3bf45f194e5e6a41df9258811ac8fc395579fa82958a8b76286bea4",
+                "sha256:0a069c8483466806ab94ea9068c34b200b8bfc66b6762f45a831c4baaa9e8cdd",
+                "sha256:0cf0da36a212978be2c2e2e2d04bdff46f850108fccc1851332bcae51c8907cc",
+                "sha256:131d4be09bea7ce2577f9623e415cab287a3c8e0624f778c1d955ec7c281bd4d",
+                "sha256:144486e029793a733e43b2e37df16a16df4ceb62102636ff3db6033994711066",
+                "sha256:1ddf14031a3882f684b8642cb74eea3af93a2be68893901b2b387c5fd92a03ec",
+                "sha256:1eba476b1b242620c266edf6325b443a2e22b633217a9835a52d8da2b5c051f9",
+                "sha256:20f61c9944f0be2dc2b75689ba409938c14876c19d02f7585af4460b6a21403e",
+                "sha256:22960019a842777a9fa5134c2364efaed5fbf9610ddc5c904bd3a400973b0eb8",
+                "sha256:22e7ebc231d28393dfdc19b185d97e14a0f178bedd78e85aad660e93b646604e",
+                "sha256:23cbb932cc53a86ebde0fb72e7e645f9a5eec1a5af7aa9ce333e46286caef783",
+                "sha256:29c04741b9ae13d1e94cf93fca257730b97ce6ea64cfe1eba11cf9ac4e85afb6",
+                "sha256:2bde29cc44fa81c0a0c8686992c3080b37c488df167a371500b2a43ce9f026d1",
+                "sha256:2cdc55ca07b4e70dda898d2ab7150ecf17c990076d3acd7a5f3b25cb23a69f1c",
+                "sha256:370f6e97d02bf2dd20d7468ce4f38e173a124e769762d00beadec3bc2f4b3bc4",
+                "sha256:395161bbdbd04a8333b9ff9763a05e9ceb4fe210e3c7690f5e68cedd3d65d8e1",
+                "sha256:44136355e2f5e06bf6b23d337a75386371ba742ffa771440b85bed367c1318d1",
+                "sha256:44a6c2f6374e0033873e9ed577a54a3602b4f609867794c1a3ebba65e4c93ee7",
+                "sha256:4919899577ba37f505aaebdf6e7dc812d55e8f097331312db7f1aab18767cce8",
+                "sha256:4b4b1fe58cd102d75ef0552cf17242705ce0759f9695334a56644ad2d83903fe",
+                "sha256:4bdd56ee719a8f751cf5a593476a441c4e56c9b64dc1f0f30902858c4ef8771d",
+                "sha256:4bf41b8b0a80708f7e0384519795e80dcb44d7199a35d52c15cc674d10b3081b",
+                "sha256:4cac3405d8dda8bc6ed499557625585544dd5cbf32072dcc72b5a176cb1271c8",
+                "sha256:4fe7fda2fe7c8890d454f2cbc91d6c01baf206fbc96d89a80241a02985118c0c",
+                "sha256:50921c140561d3db2ab9f5b11c5184846cde686bb5a9dc64cae442926e86f3af",
+                "sha256:5217c25229b6a85049416a5c1e6451e9060a1edcf988641e309dbe3ab26d3e49",
+                "sha256:5352bea8a8f84b89d45ccc503f390a6be77917932b1c98c4cdc3565137acc714",
+                "sha256:542e3e306d1669b25936b64917285cdffcd4f5c6f0247636fec037187bd93542",
+                "sha256:543883e3496c8b6d58bd036c99486c3c8387c2fc01f7a342b760c1ea3158a318",
+                "sha256:586b36ebda81e6c1a9c5a5d0bfdc236399ba6595e1397842fd4a45648c30f35e",
+                "sha256:597f899f4ed42a38df7b0e46714880fb4e19a25c2f66e5c908805466721760f5",
+                "sha256:5a260758454580f11dd8743fa98319bb046037dfab4f7828008909d0aa5292bc",
+                "sha256:5aefb84a301327ad115e9d346c8e2760009131d9d4b4c6b213648d02e2abe144",
+                "sha256:5e6a5567078b3eaed93558842346c9d678e116ab0135e22eb72db8325e90b453",
+                "sha256:5ff525698de226c0ca743bfa71fc6b378cda2ddcf0d22d7c37b1cc925c9650a5",
+                "sha256:61edbca89aa3f5ef7ecac8c23d975fe7261c12665f1d90a6b1af527bba86ce61",
+                "sha256:659175b2144d199560d99a8d13b2228b85e6019b6e09e556209dfb8c37b78a11",
+                "sha256:6a9a19bea8495bb419dc5d38c4519567781cd8d571c72efc6aa959473d10221a",
+                "sha256:6b30bddd61d2a3261f025ad0f9ee2586988c6a00c780a2fb0a92cea2aa702c54",
+                "sha256:6ffd55b5aedc6f25fd8d9f905c9376ca44fcf768673ffb9d160dd6f409bfda73",
+                "sha256:702d8fc6f25bbf412ee706bd73019da5e44a8400861dfff7ff31eb5b4a1276dc",
+                "sha256:74bcab50a13960f2a610cdcd066e25f1fd59e23b69637c92ad470784a51b1347",
+                "sha256:75f591b2055523fc02a4bbe598aa867df9e953255f0b7f7715d2a36a9c30065c",
+                "sha256:763b64853b0a8f4f9cfb41a76a4a85a9bcda7fdda5cb057016e7706fde928e66",
+                "sha256:76c598ca73ec73a2f568e2a72ba46c3b6c8690ad9a07092b18e48ceb936e9f0c",
+                "sha256:78d680ef3e4d405f36f0d6d1ea54e740366f061645930072d39bca16a10d8c93",
+                "sha256:7b280948d00bd3973c1998f92e22aa3ecb76682e3a4255f33e1020bd32adf443",
+                "sha256:7db345956ecce0c99b97b042b4ca7326feeec6b75facd8390af73b18e2650ffc",
+                "sha256:7dbdce0c534bbf52274b94768b3498abdf675a691fec5f751b6057b3030f34c1",
+                "sha256:7ef6b5942e6bfc5706301a18a62300c60db9af7f6368042227ccb7eeb22d0892",
+                "sha256:7f5a3ffc731494f1a57bd91c47dc483a1e10048131ffb52d901bfe2beb6102e8",
+                "sha256:8a45b6514861916c429e6059a55cf7db74670eaed2052a648e3e4d04f070e001",
+                "sha256:8ad241da7fac963d7573cc67a064c57c58766b62a9a20c452ca1f21050868dfa",
+                "sha256:8b0886885f7323beea6f552c28bff62cbe0983b9fbb94126531693ea6c5ebb90",
+                "sha256:8ca88da1bd78990b536c4a7765f719803eb4f8f9971cc22d6ca965c10a7f2c4c",
+                "sha256:8e0caeff18b96ea90fc0eb6e3bdb2b10ab5b01a95128dfeccb64a7238decf5f0",
+                "sha256:957403a978e10fb3ca42572a23e6f7badff39aa1ce2f4ade68ee452dc6807692",
+                "sha256:9af69f6746120998cd9c355e9c3c6aec7dff70d47247188feb4f829502be8ab4",
+                "sha256:9c94f7cc91ab16b36ba5ce476f1904c91d6c92441f01cd61a8e2729442d6fcf5",
+                "sha256:a37d51fa9a00d265cf73f3de3930fa9c41548177ba4f0faf76e61d512c774690",
+                "sha256:a3a98921da9a1bf8457aeee6a551948a83601689e5ecdd736894ea9bbec77e83",
+                "sha256:a3c1ebd4ed8e76e886507c9eddb1a891673686c813adf889b864a17fafcf6d66",
+                "sha256:a5f9505efd574d1e5b4a76ac9dd92a12acb2b309551e9aa874c13c11caefbe4f",
+                "sha256:a8ff454ef0bb061e37df03557afda9d785c905dab15584860f982e88be73015f",
+                "sha256:a9d0b68ac1743964755ae2d89772c7e6fb0118acd4d0b7464eaf3921c6b49dd4",
+                "sha256:aa62a07ac93b7cb6b7d0389d8ef57ffc321d78f60c037b19dfa78d6b17c928ee",
+                "sha256:ac741bf78b9bb432e2d314439275235f41656e189856b11fb4e774d9f7246d81",
+                "sha256:ae1e96785696b543394a4e3f15f3f225d44f3c55dafe3f206493031419fedf95",
+                "sha256:b683e5fd7f74fb66e89a1ed16076dbab3f8e9f34c18b1979ded614fe10cdc4d9",
+                "sha256:b7a8b43ee64ca8f4befa2bea4083f7c52c92864d8518244bfa6e88c751fa8fff",
+                "sha256:b8e38472739028e5f2c3a4aded0ab7eadc447f0d84f310c7a8bb697ec417229e",
+                "sha256:bfff48c7bd23c6e2aec6454aaf6edc44444b229e94743b34bdcdda2e35126cf5",
+                "sha256:c14b63c9d7bab795d17392c7c1f9aaabbffd4cf4387725a0ac69109fb3b550c6",
+                "sha256:c27cc1e4b197092e50ddbf0118c788d9977f3f8f35bfbbd3e76c1846a3443df7",
+                "sha256:c28d3309ebd6d6b2cf82969b5179bed5fefe6142c70f354ece94324fa11bf6a1",
+                "sha256:c670f4773f2f6f1957ff8a3962c7dd12e4be54d05839b216cb7fd70b5a1df394",
+                "sha256:ce6910b56b700bea7be82c54ddf2e0ed792a577dfaa4a76b9af07d550af435c6",
+                "sha256:d0213671691e341f6849bf33cd9fad21f7b1cb88b89e024f33370733fec58742",
+                "sha256:d03fe67b2325cb3f09be029fd5da8df9e6974f0cde2c2ac6a79d2634e791dd57",
+                "sha256:d0e5af9a9effb88535a472e19169e09ce750c3d442fb222254a276d77808620b",
+                "sha256:d243b36fbf3d73c25e48014961e83c19c9cc92530516ce3c43050ea6276a2ab7",
+                "sha256:d26166acf62f731f50bdd885b04b38828436d74e8e362bfcb8df221d868b5d9b",
+                "sha256:d403d781b0e06d2922435ce3b8d2376579f0c217ae491e273bab8d092727d244",
+                "sha256:d8716f82502997b3d0895d1c64c3b834181b1eaca28f3f6336a71777e437c2af",
+                "sha256:e4f781ffedd17b0b834c8731b75cce2639d5a8afe961c1e58ee7f1f20b3af185",
+                "sha256:e613a98ead2005c4ce037c7b061f2409a1a4e45099edb0ef3200ee26ed2a69a8",
+                "sha256:ef4163770525257876f10e8ece1cf25b71468316f61451ded1a6f44273eedeb5"
            ],
-            "markers": "python_full_version >= '3.6.0'",
-            "version": "==2023.6.3"
+            "markers": "python_version >= '3.6'",
+            "version": "==2022.10.31"
        },
        "requests": {
            "hashes": [
-                "sha256:58cd2187c01e70e6e26505bca751777aa9f2ee0b7f4300988b709f44e013003f",
-                "sha256:942c5a758f98d790eaed1a29cb6eefc7ffb0d1cf7af05c3d2791656dbd6ad1e1"
+                "sha256:64299f4909223da747622c030b781c0d7811e359c37124b4bd368fb8c6518baa",
+                "sha256:98b1b2782e3c6c4904938b84c0eb932721069dfdb9134313beff7c83c2df24bf"
            ],
-            "markers": "python_version >= '3.7'",
-            "version": "==2.31.0"
+            "markers": "python_version >= '3.7' and python_version < '4'",
+            "version": "==2.28.2"
        },
        "six": {
            "hashes": [
@@ -816,24 +825,24 @@
                "sha256:2aba19d6a040e78d8b09de5c57e96207b09ed71d8e55ce0959eeee6c8e190d94",
                "sha256:c840e62059cd3be204b0c9c9f74be2c09d5648eddd4580d9314c3ecde0b30936"
            ],
-            "markers": "python_full_version >= '3.6.0'",
+            "markers": "python_version >= '3.6'",
            "version": "==5.0.0"
        },
        "soupsieve": {
            "hashes": [
-                "sha256:1c1bfee6819544a3447586c889157365a27e10d88cde3ad3da0cf0ddf646feb8",
-                "sha256:89d12b2d5dfcd2c9e8c22326da9d9aa9cb3dfab0a83a024f05704076ee8d35ea"
+                "sha256:49e5368c2cda80ee7e84da9dbe3e110b70a4575f196efb74e51b94549d921955",
+                "sha256:e28dba9ca6c7c00173e34e4ba57448f0688bb681b7c5e8bf4971daafc093d69a"
            ],
            "markers": "python_version >= '3.7'",
-            "version": "==2.4.1"
+            "version": "==2.4"
        },
        "termcolor": {
            "hashes": [
-                "sha256:3afb05607b89aed0ffe25202399ee0867ad4d3cb4180d98aaf8eefa6a5f7d475",
-                "sha256:b5b08f68937f138fe92f6c089b99f1e2da0ae56c52b78bf7075fd95420fd9a5a"
+                "sha256:91ddd848e7251200eac969846cbae2dacd7d71c2871e92733289e7e3666f48e7",
+                "sha256:dfc8ac3f350788f23b2947b3e6cfa5a53b630b612e6cd8965a015a776020b99a"
            ],
            "markers": "python_version >= '3.7'",
-            "version": "==2.3.0"
+            "version": "==2.2.0"
        },
        "tinycss2": {
            "hashes": [
@@ -845,11 +854,11 @@
        },
        "urllib3": {
            "hashes": [
-                "sha256:48e7fafa40319d358848e1bc6809b208340fafe2096f1725d05d67443d0483d1",
-                "sha256:bee28b5e56addb8226c96f7f13ac28cb4c301dd5ea8a6ca179c0b9835e032825"
+                "sha256:8a388717b9476f934a21484e8c8e61875ab60644d29b9b39e11e4b9dc1c6b305",
+                "sha256:aa751d169e23c7479ce47a0cb0da579e3ede798f994f5816a74e4f4500dcea42"
            ],
-            "markers": "python_version >= '3.7'",
-            "version": "==2.0.3"
+            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5'",
+            "version": "==1.26.15"
        },
        "watchdog": {
            "hashes": [
--- a/README.md
+++ b/README.md
@@ -38,23 +38,18 @@

 ## About

-**Privacy Guides** is a socially motivated website that provides information for protecting your data security and privacy. Our mission is to inform the public about the value of digital privacy, and global government initiatives which aim to monitor your online activity. We are a non-profit collective operated entirely by volunteer team members and contributors. Our website is free of advertisements and not affiliated with any of the listed providers.
+**Privacy Guides** is a socially motivated website that provides information for protecting your data security and privacy. We are a non-profit collective operated entirely by volunteer team members and contributors.

-The current list of team members can be found [here](https://www.privacyguides.org/about/#our-team). Additionally, [many people](https://github.com/privacyguides/privacyguides.org/graphs/contributors) have made contributions to the project, and you can too!
-
-*Featured on: [Tweakers](https://tweakers.net/reviews/10568/op-zoek-naar-privacyvriendelijke-tools-niek-de-wilde-van-privacy-guides.html), [The New York Times](https://www.nytimes.com/wirecutter/guides/online-security-social-media-privacy/), and [Wired](https://www.wired.com/story/firefox-mozilla-2022/)*
+Our current list of team members can be found [here](https://www.privacyguides.org/about/#our-team). Additionally, [many people](https://github.com/privacyguides/privacyguides.org/graphs/contributors) have made contributions to the project, and you can too!

 ## Contributing

 - 💬 [Start a discussion or suggest an idea](https://discuss.privacyguides.net/)
 - 💖 [Sponsor the project](https://github.com/sponsors/privacyguides)
- 🈴 [Help translate the site](https://crowdin.com/project/privacyguides) [[Matrix chat](https://matrix.to/#/#pg-i18n:aragon.sh)]
+- 🈴 [Help translate the site](https://crwd.in/privacyguides) [[Matrix chat](https://matrix.to/#/#pg-i18n:aragon.sh)]
 - 📝 Edit the site, everything's accessible in this repo
  - Browse our [open issues](https://github.com/privacyguides/privacyguides.org/issues) to see what needs to be updated
-  - View the list of [approved topics waiting for a PR](https://discuss.privacyguides.net/tag/approved)
-  - Read some writing tips in our [style guide](https://www.privacyguides.org/en/meta/writing-style/)
-
-All contributors to the site are listed [here](https://github.com/privacyguides/privacyguides.org/graphs/contributors). If you make a substantial (i.e. copyright eligible) contribution to the project and would like to be formally credited, you are welcome to include your information in the appropriate `authors` section in [`CITATION.cff`](/CITATION.cff) as well, just submit a PR or ask @jonaharagon to make the change.
+  - View some contribution tips on our [contributor's wiki](https://github.com/privacyguides/privacyguides.org/wiki)

 ## Mirrors

@@ -70,15 +65,7 @@ Copyright &copy; 2019 - 2023 [Privacy Guides contributors](https://github.com/pr

 Privacy Guides content is licensed under the [Creative Commons Attribution-NoDerivatives 4.0 International Public License](/LICENSE), and the underlying source code used to format and display that content on [www.privacyguides.org](https://www.privacyguides.org) is licensed under the [MIT License](/LICENSE-CODE).

-Generally speaking, **content** can be found in the [`/docs`](/docs), [`/theme/assets/img`](/theme/assets/img), [`/includes`](/includes), and [`/i18n`](/i18n) folders; and **source code** and configuration files can be found in the [`/config`](/config) and [`/theme`](/theme) folders, and in the root of this repository. Any source code snippets contained within documentation files are [MIT Licensed](/LICENSE-CODE). Please contact us if you require clarification on any of these terms.
-
-These licenses do not apply to any work where another license is otherwise noted.
-
-**Logos** in the [`/theme/assets/img`](/theme/assets/img) folder may not be original works of Privacy Guides and therefore cannot be (re)licensed by us. We believe that these logos obtained from third-party providers are either in the public domain or **fair use**. In a nutshell, legal [fair use doctrine](https://www.copyright.gov/fair-use/more-info.html) allows the use of copyrighted images in order to identify the subject for purposes of public comment. However, these logos and other images may still be subject to trademark laws in one or more jurisdictions. Before using this content, please ensure that it is used to identify the entity or organization that owns the trademark and that you have the right to use it under the laws which apply in the circumstances of your intended use. *When copying content from this website, you are solely responsible for ensuring that you do not infringe someone else's trademark or copyright.*
-
-You may comply with our license terms in any reasonable manner, but not in any way that suggests Privacy Guides endorses you or your use. You **may not** use the Privacy Guides branding in your own project without express approval from this project. Privacy Guides's brand trademarks include the "Privacy Guides" wordmark and shield logo.
-
-When you contribute to this repository you are doing so under the above licenses, and you are granting Privacy Guides a perpetual, worldwide, non-exclusive, transferable, royalty-free, irrevocable license with the right to sublicense such rights through multiple tiers of sublicensees, to reproduce, modify, display, perform and distribute your contribution as part of our project.
+[More info...](https://www.privacyguides.org/en/about/notices/#licenses)

 ## Developing

@@ -90,7 +77,7 @@ This website uses [`mkdocs-material-insiders`](https://squidfunk.github.io/mkdoc

 1. Clone this repository and submodules: `git clone --recurse-submodules https://github.com/privacyguides/privacyguides.org.git`
 2. Enable SSH commit verification with our local [`.allowed_signers`](/.allowed_signers) file: `git config gpg.ssh.allowedSignersFile .allowed_signers`
-3. Install Python **3.8**, this is the only version supported by Netlify
+3. Install Python **3.8**, this is the only version supported by Netlify.
 4. Install **pipenv**: `pip install pipenv`
 5. Install dependencies: `pipenv install --dev` (install [Pillow and CairoSVG](https://squidfunk.github.io/mkdocs-material/setup/setting-up-social-cards/#dependencies) as well to generate social cards)
 6. Serve the site locally: `pipenv run mkdocs serve --config-file config/mkdocs.en.yml` (set `CARDS=true` to generate social cards)
@@ -100,19 +87,8 @@ This website uses [`mkdocs-material-insiders`](https://squidfunk.github.io/mkdoc

 If you commit to `main` with commits signed with your SSH key, you should add your SSH key to [`.allowed_signers`](/.allowed_signers) in this repo.

-### Local Translated Site Builds
-
-1. Install the [Crowdin CLI Tool](https://developer.crowdin.com/cli-tool/) (`brew install crowdin`)
-2. Set the `CROWDIN_PERSONAL_TOKEN` environment variable to your Crowdin personal access token
-3. Run `crowdin download` in the root of this repo
-4. Serve the site locally: `pipenv run mkdocs serve --config-file config/mkdocs.fr.yml` (replacing the config file with any language in [/config](/config))
-
-Translations downloaded from Crowdin are [.gitignore](/.gitignore)'d, so any local changes to the translated site cannot be committed to this repo. Actual modifications need to be made on Crowdin. As an alternative to steps 1-3, you can copy the folders from [privacyguides/i18n](https://github.com/privacyguides/i18n) to the root of this repo to obtain the translated files.
-
 ## Releasing

-It is required to create a GitHub release to publish the current site to privacyguides.org. The current `main` branch can be previewed at [https://main.staging.privacyguides.dev](https://main.staging.privacyguides.dev) prior to release.
-
 1. Create a new tag: `git tag -s v3.X.X -m 'Some message'`
    - [View existing tags](https://github.com/privacyguides/privacyguides.org/tags)
    - Tag [numbering](https://semver.org/): Increment the MINOR (2nd) number when making significant changes (adding/deleting pages, etc.), increment the PATCH (3rd) number when making minor changes (typos, bug fixes). Probably leave the MAJOR number at 3 until a massive revamp (v1 -> v2 was the Jekyll to MkDocs transition, v2 -> v3 was the introduction of translations).
--- a/static/_redirects
+++ b/static/_redirects
@@ -1,39 +1,15 @@
-# Copyright (c) 2023 Jonah Aragon <jonah@triplebit.net>
-
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to
-# deal in the Software without restriction, including without limitation the
-# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-# sell copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-# IN THE SOFTWARE.
-
 /  /en/  302  Language=en
-/  /es/  302  Language=es
 /  /fr/  302  Language=fr
 /  /he/  302  Language=he
-/  /it/  302  Language=it
 /  /nl/  302  Language=nl
 /  /en/  302

 /.well-known/matrix/* https://matrix.privacyguides.org/.well-known/matrix/:splat 200
-/.well-known/* /well-known/:splat 200

-/kb /en/basics/why-privacy-matters/
-/:lang/kb /:lang/basics/why-privacy-matters/
+/kb /en/basics/threat-modeling/
+/:lang/kb /:lang/basics/threat-modeling/

-/coc /en/CODE_OF_CONDUCT/
-/license https://github.com/privacyguides/privacyguides.org/tree/main/README.md#license
+/coc/ /en/CODE_OF_CONDUCT/

 /team /en/about/
 /browsers /en/desktop-browsers/
--- a/config/layouts/custom.yml
+++ b/config/layouts/custom.yml
@@ -1,182 +0,0 @@
-definitions:
-
-  - &background_image >-
-    {%- if page.meta.cover -%}
-      theme/assets/img/cover/{{ page.meta.cover }}
-    {%- else -%}
-      {{ layout.background_image or "theme/assets/brand/PNG/Banner/cover-progress-notext-blur.png" }}
-    {%- endif -%}
-
-  - &background_color >-
-    #f7f7fcaa
-
-  #- &background_color >-
-  #  {%- if page.meta.cover -%}
-  #    #f7f7fcaa
-  #  {%- else -%}
-  #    #FFD06F
-  #  {%- endif -%}
-
-  - &color >-
-    {{ layout.color or "#2d2d2d" }}
-
-  - &title_font_family >-
-    {%- if config.theme.language == "he" -%}
-      Suez One
-    {%- else -%}
-      Bagnard
-    {%- endif -%}
-
-  - &font_family >-
-    {%- if config.theme.language == "he" -%}
-      Suez One
-    {%- else -%}
-      Public Sans
-    {%- endif -%}
-
-  - &site_name >-
-    {%- if page.is_homepage -%}
-    {%- else -%}
-      {{ config.site_name }}
-    {%- endif -%}
-
-  - &page_title >-
-    {%- if page.is_homepage -%}
-      Privacy Guides
-    {%- else -%}
-      {{ page.meta.get("title", page.title) }}
-    {%- endif -%}
-
-  - &page_title_with_site_name >-
-    {%- if page.meta.meta_title -%}
-      {{ page.meta.meta_title }}
-    {%- elif not page.is_homepage -%}
-      {{ page.meta.get("title", page.title) }} - {{ config.site_name }}
-    {%- else -%}
-      {{ page.meta.get("title", page.title) }}
-    {%- endif -%}
-
-  - &page_description >-
-    {%- if page.is_homepage -%}
-    {%- else -%}
-      {{ page.meta.get("description", config.site_description) or "" }}
-    {%- endif -%}
-  
-  - &homepage_description >-
-    {%- if page.is_homepage -%}
-      A socially motivated website which provides information about protecting your online data privacy and security.
-    {%- else -%}
-    {%- endif -%}
-
-  - &og_description >-
-    {{ page.meta.get("description", config.site_description) or "" }}
-
-  - &page_icon >-
-    {{ page.meta.icon or "" }}
-
-  - &logo >-
-    theme/assets/brand/SVG/Logo/privacy-guides-logo-notext.svg
-
-  #{%- if page.meta.cover -%}
-  #  theme/assets/brand/SVG/Logo/privacy-guides-logo-notext.svg
-  #{%- elif config.theme.logo -%}
-  #  {{ config.docs_dir }}/{{ config.theme.logo }}
-  #{%- endif -%}
-
-# Meta tags
-tags:
-
-  # Open Graph
-  og:type: website
-  og:title: *page_title_with_site_name
-  og:description: *og_description
-  og:image: "{{ image.url }}"
-  og:image:type: "{{ image.type }}"
-  og:image:width: "{{ image.width }}"
-  og:image:height: "{{ image.height }}"
-  og:url: "{{ page.canonical_url }}"
-
-  # Twitter
-  twitter:card: summary_large_image
-  twitter.title: *page_title_with_site_name
-  twitter:description: *page_description
-  twitter:image: "{{ image.url }}"
-
-# -----------------------------------------------------------------------------
-# Specification
-# -----------------------------------------------------------------------------
-
-# Card size and layers
-size: { width: 1200, height: 630 }
-layers:
-
-  # Background
-  - background:
-      image: *background_image
-      color: *background_color
-
-  # Page icon
-  - size: { width: 630, height: 630 }
-    offset: { x: 570, y: 0 }
-    icon:
-      value: *page_icon
-      color: "#00000033"
-
-  # Logo
-  - size: { width: 64, height: 64 }
-    offset: { x: 64, y: 64 }
-    background:
-      image: *logo
-
-  # Site name
-  - size: { width: 768, height: 42 }
-    offset: { x: 160, y: 78 }
-    typography:
-      content: *site_name
-      color: *color
-      font:
-        family: Bagnard
-        style: Bold
-
-  # Page title
-  - size: { width: 864, height: 256 }
-    offset: { x: 62, y: 192 }
-    typography:
-      content: *page_title
-      align: start
-      color: *color
-      line:
-        amount: 3
-        height: 1.5
-      font:
-        family: *title_font_family
-        style: Bold
-
-  # Page description
-  - size: { width: 864, height: 96 }
-    offset: { x: 64, y: 480 }
-    typography:
-      content: *page_description
-      align: start
-      color: *color
-      line:
-        amount: 3
-        height: 1.5
-      font:
-        family: *font_family
-        style: Regular
-  
-  # Homepage description
-  - size: { width: 864, height: 192 }
-    offset: { x: 64, y: 320 }
-    typography:
-      content: *homepage_description
-      overflow: shrink
-      align: start
-      color: *color
-      line:
-        amount: 3
-        height: 1.5
-      font:
-        family: *font_family
-        style: Regular
--- a/config/mkdocs.common.yml
+++ b/config/mkdocs.common.yml
@@ -19,7 +19,6 @@
 # IN THE SOFTWARE.

 extra:
-  context: !ENV [CONTEXT, "production"]
  social:
    - icon: simple/mastodon
      link: https://mastodon.neat.computer/@privacyguides
@@ -38,10 +37,6 @@ extra:
      link: /en/
      lang: en
      icon: https://raw.githubusercontent.com/twitter/twemoji/master/assets/svg/1f1fa-1f1f8.svg
-    - name: Español
-      link: /es/
-      lang: es
-      icon: https://raw.githubusercontent.com/twitter/twemoji/master/assets/svg/1f1ea-1f1f8.svg
    - name: Français
      link: /fr/
      lang: fr
@@ -50,10 +45,6 @@ extra:
      link: /he/
      lang: he
      icon: https://raw.githubusercontent.com/twitter/twemoji/master/assets/svg/1f1ee-1f1f1.svg
-    - name: Italian
-      link: /it/
-      lang: it
-      icon: https://raw.githubusercontent.com/twitter/twemoji/master/assets/svg/1f1ee-1f1ea.svg
    - name: Nederlands
      link: /nl/
      lang: nl
@@ -65,7 +56,6 @@ repo_name: ""
 theme:
  name: material
  custom_dir: ../theme
-  logo: ../../theme/assets/brand/SVG/Logo/privacy-guides-logo-notext-colorbg.svg
  favicon: assets/brand/png/favicon/favicon-32x32.png
  icon:
    repo: simple/github
@@ -88,7 +78,7 @@ extra_javascript:
 watch:
  - ../theme
  - ../includes
-  - mkdocs-common.yml
+  - mkdocs.common.yml

 plugins:
  tags: {}
@@ -105,17 +95,12 @@ plugins:
      - index.md
    fallback_to_build_date: true
  privacy:
-    assets_exclude:
+    external_assets_exclude:
      - cdn.jsdelivr.net/npm/mathjax@3/*
      - api.privacyguides.net/*
  optimize:
    enabled: !ENV [NETLIFY, false]
  typeset: {}
-  social:
-    cards: !ENV [CARDS, true]
-    cards_dir: assets/img/social
-    cards_layout_dir: config/layouts
-    cards_layout: custom

 markdown_extensions:
  admonition: {}
--- a/config/mkdocs.en.yml
+++ b/config/mkdocs.en.yml
@@ -18,7 +18,7 @@
 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 # IN THE SOFTWARE.

-INHERIT: mkdocs-common.yml
+INHERIT: mkdocs.common.yml
 docs_dir: '../docs'
 site_url: "https://www.privacyguides.org/en/"
 site_dir: '../site/en'
@@ -29,9 +29,9 @@ site_description: |
 copyright: |
  <b>Privacy Guides</b> is a non-profit, socially motivated website that provides information for protecting your data security and privacy.<br>
  We do not make money from recommending certain products, and we do not use affiliate links.<br>
-  &copy; 2019 - 2023 Privacy Guides and contributors.
+  &copy; 2022 Privacy Guides and contributors.
  <span class="twemoji"><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 496 512"><!--! Font Awesome Free 6.2.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License) Copyright 2022 Fonticons, Inc.--><path d="m245.83 214.87-33.22 17.28c-9.43-19.58-25.24-19.93-27.46-19.93-22.13 0-33.22 14.61-33.22 43.84 0 23.57 9.21 43.84 33.22 43.84 14.47 0 24.65-7.09 30.57-21.26l30.55 15.5c-6.17 11.51-25.69 38.98-65.1 38.98-22.6 0-73.96-10.32-73.96-77.05 0-58.69 43-77.06 72.63-77.06 30.72-.01 52.7 11.95 65.99 35.86zm143.05 0-32.78 17.28c-9.5-19.77-25.72-19.93-27.9-19.93-22.14 0-33.22 14.61-33.22 43.84 0 23.55 9.23 43.84 33.22 43.84 14.45 0 24.65-7.09 30.54-21.26l31 15.5c-2.1 3.75-21.39 38.98-65.09 38.98-22.69 0-73.96-9.87-73.96-77.05 0-58.67 42.97-77.06 72.63-77.06 30.71-.01 52.58 11.95 65.56 35.86zM247.56 8.05C104.74 8.05 0 123.11 0 256.05c0 138.49 113.6 248 247.56 248 129.93 0 248.44-100.87 248.44-248 0-137.87-106.62-248-248.44-248zm.87 450.81c-112.54 0-203.7-93.04-203.7-202.81 0-105.42 85.43-203.27 203.72-203.27 112.53 0 202.82 89.46 202.82 203.26-.01 121.69-99.68 202.82-202.84 202.82z"></path></svg></span><span class="twemoji"><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 496 512"><!--! Font Awesome Free 6.2.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License) Copyright 2022 Fonticons, Inc.--><path d="M314.9 194.4v101.4h-28.3v120.5h-77.1V295.9h-28.3V194.4c0-4.4 1.6-8.2 4.6-11.3 3.1-3.1 6.9-4.7 11.3-4.7H299c4.1 0 7.8 1.6 11.1 4.7 3.1 3.2 4.8 6.9 4.8 11.3zm-101.5-63.7c0-23.3 11.5-35 34.5-35s34.5 11.7 34.5 35c0 23-11.5 34.5-34.5 34.5s-34.5-11.5-34.5-34.5zM247.6 8C389.4 8 496 118.1 496 256c0 147.1-118.5 248-248.4 248C113.6 504 0 394.5 0 256 0 123.1 104.7 8 247.6 8zm.8 44.7C130.2 52.7 44.7 150.6 44.7 256c0 109.8 91.2 202.8 203.7 202.8 103.2 0 202.8-81.1 202.8-202.8.1-113.8-90.2-203.3-202.8-203.3z"></path></svg></span><span class="twemoji"><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 496 512"><!--! Font Awesome Free 6.2.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License) Copyright 2022 Fonticons, Inc.--><path d="M247.6 8C389.4 8 496 118.1 496 256c0 147.1-118.5 248-248.4 248C113.6 504 0 394.5 0 256 0 123.1 104.7 8 247.6 8zm.8 44.7C130.2 52.7 44.7 150.6 44.7 256c0 109.8 91.2 202.8 203.7 202.8 103.2 0 202.8-81.1 202.8-202.8.1-113.8-90.2-203.3-202.8-203.3zm94 144.3v42.5H162.1V197h180.3zm0 79.8v42.5H162.1v-42.5h180.3z"></path></svg></span>
-  Content licensed under <a href="/license"><strong>CC BY-ND 4.0</strong></a>.
+  Content licensed under <a href="/about/"><strong>CC BY-ND 4.0</strong></a>.
 edit_uri: edit/main/docs/

 extra:
@@ -53,7 +53,6 @@ extra:

 theme:
  language: en
-  # ENGLISH ONLY: this logo needs to be set separately because the relative path is different
  logo: ../theme/assets/brand/SVG/Logo/privacy-guides-logo-notext-colorbg.svg
  font:
    text: Public Sans
@@ -78,6 +77,16 @@ theme:
        icon: material/brightness-5
        name: "Switch to system theme"

+plugins:
+  social:
+    cards: !ENV [NETLIFY, false]
+    cards_color:
+      fill: "#FFD06F"
+      text: "#2d2d2d"
+    cards_dir: assets/img/social
+    cards_font: Public Sans
+    cache_dir: .cache/plugin/social-en
+
 markdown_extensions:
  pymdownx.snippets:
    auto_append: 
@@ -86,7 +95,6 @@ markdown_extensions:
 nav:
  - Home: 'index.md'
  - Knowledge Base:
-    - 'basics/why-privacy-matters.md'
    - 'basics/threat-modeling.md'
    - 'basics/common-threats.md'
    - 'basics/common-misconceptions.md'
@@ -97,15 +105,15 @@ nav:
      - 'basics/multi-factor-authentication.md'
      - 'basics/email-security.md'
      - 'basics/vpn-overview.md'
+    - Operating Systems:
+      - 'os/android-overview.md'
+      - 'os/linux-overview.md'
+      - 'os/qubes-overview.md'
    - Advanced Topics:
      - 'advanced/dns-overview.md'
      - 'advanced/tor-overview.md'
      - 'advanced/payments.md'
      - 'advanced/communication-network-types.md'
-    - Operating Systems:
-      - 'os/android-overview.md'
-      - 'os/linux-overview.md'
-      - 'os/qubes-overview.md'
    - kb-archive.md
  - Recommendations:
    - 'tools.md'
@@ -113,12 +121,17 @@ nav:
      - 'tor.md'
      - 'desktop-browsers.md'
      - 'mobile-browsers.md'
+    - Operating Systems:
+      - 'android.md'
+      - 'desktop.md'
+      - 'router.md'
    - Providers:
      - 'cloud.md'
      - 'dns.md'
      - 'email.md'
      - 'financial-services.md'
      - 'search-engines.md'
+      - 'phone.md'
      - 'vpn.md'
    - Software:
      - 'calendar.md'
@@ -135,10 +148,6 @@ nav:
      - 'productivity.md'
      - 'real-time-communication.md'
      - 'video-streaming.md'
-    - Operating Systems:
-      - 'android.md'
-      - 'desktop.md'
-      - 'router.md'
  - About:
    - 'about/index.md'
    - 'about/criteria.md'
--- a/config/mkdocs.es.yml
+++ b/config/mkdocs.es.yml
@@ -1,160 +0,0 @@
-# Copyright (c) 2022-2023 Jonah Aragon <jonah@triplebit.net>
-
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to
-# deal in the Software without restriction, including without limitation the
-# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-# sell copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-# IN THE SOFTWARE.
-
-INHERIT: mkdocs-common.yml
-docs_dir: '../i18n/es'
-site_url: "https://www.privacyguides.org/es/"
-site_dir: '../site/es'
-
-site_name: Privacy Guides
-site_description: |
-  Privacy Guides es tu recurso central de privacidad y seguridad para protegerte en línea.
-copyright: |
-  <b>Privacy Guides</b> es un sitio web sin fines lucrativos y de motivación social que ofrece información para proteger la seguridad y privacidad de sus datos.<br>
-  No ganamos dinero por recomendar determinados productos y no utilizamos enlaces de afiliados.<br>
-  &copy; 2019 - 2023 Privacy Guides y colaboradores.
-  <span class="twemoji"><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 496 512"><!--! Font Awesome Free 6.2.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License) Copyright 2022 Fonticons, Inc.--><path d="m245.83 214.87-33.22 17.28c-9.43-19.58-25.24-19.93-27.46-19.93-22.13 0-33.22 14.61-33.22 43.84 0 23.57 9.21 43.84 33.22 43.84 14.47 0 24.65-7.09 30.57-21.26l30.55 15.5c-6.17 11.51-25.69 38.98-65.1 38.98-22.6 0-73.96-10.32-73.96-77.05 0-58.69 43-77.06 72.63-77.06 30.72-.01 52.7 11.95 65.99 35.86zm143.05 0-32.78 17.28c-9.5-19.77-25.72-19.93-27.9-19.93-22.14 0-33.22 14.61-33.22 43.84 0 23.55 9.23 43.84 33.22 43.84 14.45 0 24.65-7.09 30.54-21.26l31 15.5c-2.1 3.75-21.39 38.98-65.09 38.98-22.69 0-73.96-9.87-73.96-77.05 0-58.67 42.97-77.06 72.63-77.06 30.71-.01 52.58 11.95 65.56 35.86zM247.56 8.05C104.74 8.05 0 123.11 0 256.05c0 138.49 113.6 248 247.56 248 129.93 0 248.44-100.87 248.44-248 0-137.87-106.62-248-248.44-248zm.87 450.81c-112.54 0-203.7-93.04-203.7-202.81 0-105.42 85.43-203.27 203.72-203.27 112.53 0 202.82 89.46 202.82 203.26-.01 121.69-99.68 202.82-202.84 202.82z"></path></svg></span><span class="twemoji"><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 496 512"><!--! Font Awesome Free 6.2.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License) Copyright 2022 Fonticons, Inc.--><path d="M314.9 194.4v101.4h-28.3v120.5h-77.1V295.9h-28.3V194.4c0-4.4 1.6-8.2 4.6-11.3 3.1-3.1 6.9-4.7 11.3-4.7H299c4.1 0 7.8 1.6 11.1 4.7 3.1 3.2 4.8 6.9 4.8 11.3zm-101.5-63.7c0-23.3 11.5-35 34.5-35s34.5 11.7 34.5 35c0 23-11.5 34.5-34.5 34.5s-34.5-11.5-34.5-34.5zM247.6 8C389.4 8 496 118.1 496 256c0 147.1-118.5 248-248.4 248C113.6 504 0 394.5 0 256 0 123.1 104.7 8 247.6 8zm.8 44.7C130.2 52.7 44.7 150.6 44.7 256c0 109.8 91.2 202.8 203.7 202.8 103.2 0 202.8-81.1 202.8-202.8.1-113.8-90.2-203.3-202.8-203.3z"></path></svg></span><span class="twemoji"><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 496 512"><!--! Font Awesome Free 6.2.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License) Copyright 2022 Fonticons, Inc.--><path d="M247.6 8C389.4 8 496 118.1 496 256c0 147.1-118.5 248-248.4 248C113.6 504 0 394.5 0 256 0 123.1 104.7 8 247.6 8zm.8 44.7C130.2 52.7 44.7 150.6 44.7 256c0 109.8 91.2 202.8 203.7 202.8 103.2 0 202.8-81.1 202.8-202.8.1-113.8-90.2-203.3-202.8-203.3zm94 144.3v42.5H162.1V197h180.3zm0 79.8v42.5H162.1v-42.5h180.3z"></path></svg></span>
-  Contenido bajo licencia <a href="/license"><strong>CC BY-ND 4.0</strong></a>.
-edit_uri: edit/main/i18n/es/
-
-extra:
-  generator: false
-  analytics:
-    provider: plausible
-    property: privacyguides.org
-    feedback:
-      title: "¿Le ha resultado útil esta página?"
-      ratings:
-        - icon: material/robot-happy-outline
-          name: "Esta página fue útil"
-          data: Helpful
-          note: "Gracias por sus comentarios!"
-        - icon: material/robot-confused
-          name: "Esta página se podría mejorar"
-          data: Needs Improvement
-          note: "Gracias por sus comentarios. Ayúdenos a mejorar esta página abriendo un <a href='https://discuss.privacyguides.net/'>debate en nuestro foro</a>."
-
-theme:
-  language: es
-  font:
-    text: Public Sans
-    code: DM Mono
-  palette:
-    - media: "(prefers-color-scheme)"
-      scheme: default
-      accent: deep purple
-      toggle:
-        icon: material/brightness-auto
-        name: "Cambiar a modo oscuro"
-    - media: "(prefers-color-scheme: dark)"
-      scheme: slate
-      accent: amber
-      toggle:
-        icon: material/brightness-2
-        name: "Cambiar a modo claro"
-    - media: "(prefers-color-scheme: light)"
-      scheme: default
-      accent: deep purple
-      toggle:
-        icon: material/brightness-5
-        name: "Cambiar al tema del sistema"
-
-markdown_extensions:
-  pymdownx.snippets:
-    auto_append: 
-      - includes/abbreviations.es.txt
-
-nav:
-  - Inicio: 'index.md'
-  - Base de conocimientos:
-    - 'basics/why-privacy-matters.md'
-    - 'basics/threat-modeling.md'
-    - 'basics/common-threats.md'
-    - 'basics/common-misconceptions.md'
-    - 'basics/account-creation.md'
-    - 'basics/account-deletion.md'
-    - "Aspectos tecnológicos esenciales":
-      - 'basics/passwords-overview.md'
-      - 'basics/multi-factor-authentication.md'
-      - 'basics/email-security.md'
-      - 'basics/vpn-overview.md'
-    - Temas avanzados:
-      - 'advanced/dns-overview.md'
-      - 'advanced/tor-overview.md'
-      - 'advanced/payments.md'
-      - 'advanced/communication-network-types.md'
-    - Sistemas operativos:
-      - 'os/android-overview.md'
-      - 'os/linux-overview.md'
-      - 'os/qubes-overview.md'
-    - kb-archive.md
-  - Recomendaciones:
-    - 'tools.md'
-    - "Navegación por Internet":
-      - 'tor.md'
-      - 'desktop-browsers.md'
-      - 'mobile-browsers.md'
-    - Proveedores:
-      - 'cloud.md'
-      - 'dns.md'
-      - 'email.md'
-      - 'financial-services.md'
-      - 'search-engines.md'
-      - 'vpn.md'
-    - Software:
-      - 'calendar.md'
-      - 'cryptocurrency.md'
-      - 'data-redaction.md'
-      - 'email-clients.md'
-      - 'encryption.md'
-      - 'file-sharing.md'
-      - 'frontends.md'
-      - 'multi-factor-authentication.md'
-      - 'news-aggregators.md'
-      - 'notebooks.md'
-      - 'passwords.md'
-      - 'productivity.md'
-      - 'real-time-communication.md'
-      - 'video-streaming.md'
-    - Sistemas operativos:
-      - 'android.md'
-      - 'desktop.md'
-      - 'router.md'
-  - Acerca de:
-    - 'about/index.md'
-    - 'about/criteria.md'
-    - 'about/statistics.md'
-    - 'about/notices.md'
-    - 'about/privacy-policy.md'
-    - Comunidad:
-      - 'about/donate.md'
-      - Servicios en línea: 'about/services.md'
-      - "Código de conducta": 'CODE_OF_CONDUCT.md'
-      - 'about/privacytools.md'
-    - Contribuir:
-      - "Guía de redacción":
-        - 'meta/writing-style.md'
-        - 'meta/brand.md'
-      - "Guías técnicas":
-        - 'meta/uploading-images.md'
-        - 'meta/git-recommendations.md'
-  - "Registro de cambios": 'https://github.com/privacyguides/privacyguides.org/releases'
-  - Foro: 'https://discuss.privacyguides.net/'
-  - Blog: 'https://blog.privacyguides.org/'
--- a/config/mkdocs.fr.yml
+++ b/config/mkdocs.fr.yml
@@ -18,7 +18,7 @@
 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 # IN THE SOFTWARE.

-INHERIT: mkdocs-common.yml
+INHERIT: mkdocs.common.yml
 docs_dir: '../i18n/fr'
 site_url: "https://www.privacyguides.org/fr/"
 site_dir: '../site/fr'
@@ -27,11 +27,11 @@ site_name: Privacy Guides
 site_description: |
  Privacy Guides est votre ressource centrale en matière de vie privée et de sécurité pour vous protéger en ligne.
 copyright: |
-  <b>Privacy Guides</b> est un site web à but non lucratif et à vocation sociale qui fournit des informations pour protéger la sécurité de vos données et votre vie privée.<br>
-  Nous ne gagnons pas d'argent en recommandant certains produits et nous n'utilisons pas de liens d'affiliation.<br>
-  &copy; 2019 - 2023 Privacy Guides et contributeurs.
+  <b>Privacy Guides</b> is a non-profit, socially motivated website that provides information for protecting your data security and privacy.<br>
+  We do not make money from recommending certain products, and we do not use affiliate links.<br>
+  &copy; 2022 Privacy Guides and contributors. 
  <span class="twemoji"><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 496 512"><!--! Font Awesome Free 6.2.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License) Copyright 2022 Fonticons, Inc.--><path d="m245.83 214.87-33.22 17.28c-9.43-19.58-25.24-19.93-27.46-19.93-22.13 0-33.22 14.61-33.22 43.84 0 23.57 9.21 43.84 33.22 43.84 14.47 0 24.65-7.09 30.57-21.26l30.55 15.5c-6.17 11.51-25.69 38.98-65.1 38.98-22.6 0-73.96-10.32-73.96-77.05 0-58.69 43-77.06 72.63-77.06 30.72-.01 52.7 11.95 65.99 35.86zm143.05 0-32.78 17.28c-9.5-19.77-25.72-19.93-27.9-19.93-22.14 0-33.22 14.61-33.22 43.84 0 23.55 9.23 43.84 33.22 43.84 14.45 0 24.65-7.09 30.54-21.26l31 15.5c-2.1 3.75-21.39 38.98-65.09 38.98-22.69 0-73.96-9.87-73.96-77.05 0-58.67 42.97-77.06 72.63-77.06 30.71-.01 52.58 11.95 65.56 35.86zM247.56 8.05C104.74 8.05 0 123.11 0 256.05c0 138.49 113.6 248 247.56 248 129.93 0 248.44-100.87 248.44-248 0-137.87-106.62-248-248.44-248zm.87 450.81c-112.54 0-203.7-93.04-203.7-202.81 0-105.42 85.43-203.27 203.72-203.27 112.53 0 202.82 89.46 202.82 203.26-.01 121.69-99.68 202.82-202.84 202.82z"></path></svg></span><span class="twemoji"><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 496 512"><!--! Font Awesome Free 6.2.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License) Copyright 2022 Fonticons, Inc.--><path d="M314.9 194.4v101.4h-28.3v120.5h-77.1V295.9h-28.3V194.4c0-4.4 1.6-8.2 4.6-11.3 3.1-3.1 6.9-4.7 11.3-4.7H299c4.1 0 7.8 1.6 11.1 4.7 3.1 3.2 4.8 6.9 4.8 11.3zm-101.5-63.7c0-23.3 11.5-35 34.5-35s34.5 11.7 34.5 35c0 23-11.5 34.5-34.5 34.5s-34.5-11.5-34.5-34.5zM247.6 8C389.4 8 496 118.1 496 256c0 147.1-118.5 248-248.4 248C113.6 504 0 394.5 0 256 0 123.1 104.7 8 247.6 8zm.8 44.7C130.2 52.7 44.7 150.6 44.7 256c0 109.8 91.2 202.8 203.7 202.8 103.2 0 202.8-81.1 202.8-202.8.1-113.8-90.2-203.3-202.8-203.3z"></path></svg></span><span class="twemoji"><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 496 512"><!--! Font Awesome Free 6.2.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License) Copyright 2022 Fonticons, Inc.--><path d="M247.6 8C389.4 8 496 118.1 496 256c0 147.1-118.5 248-248.4 248C113.6 504 0 394.5 0 256 0 123.1 104.7 8 247.6 8zm.8 44.7C130.2 52.7 44.7 150.6 44.7 256c0 109.8 91.2 202.8 203.7 202.8 103.2 0 202.8-81.1 202.8-202.8.1-113.8-90.2-203.3-202.8-203.3zm94 144.3v42.5H162.1V197h180.3zm0 79.8v42.5H162.1v-42.5h180.3z"></path></svg></span> 
-  Contenu sous licence <a href="/license"><strong>CC BY-ND 4.0</strong></a>.
+  Content licensed under <a href="/about/"><strong>CC BY-ND 4.0</strong></a>.
 edit_uri: edit/main/i18n/fr/

 extra:
@@ -49,10 +49,11 @@ extra:
        - icon: material/robot-confused
          name: "Cette page pourrait être améliorée"
          data: Needs Improvement
-          note: "Merci pour vos commentaires ! Aidez-nous à améliorer cette page en ouvrant une <a href='https://discuss.privacyguides.net/'>discussion sur notre forum</a>."
+          note: "Thanks for your feedback! Help us improve this page by opening a <a href='https://discuss.privacyguides.net/'>discussion on our forum</a>."

 theme:
  language: fr
+  logo: ../../theme/assets/brand/SVG/Logo/privacy-guides-logo-notext-colorbg.svg
  font:
    text: Public Sans
    code: DM Mono
@@ -76,6 +77,16 @@ theme:
        icon: material/brightness-5
        name: "Basculer vers le thème du système"

+plugins:
+  social:
+    cards: !ENV [NETLIFY, false]
+    cards_color:
+      fill: "#FFD06F"
+      text: "#2d2d2d"
+    cards_dir: assets/img/social
+    cards_font: Public Sans
+    cache_dir: .cache/plugin/social-fr
+
 markdown_extensions:
  pymdownx.snippets:
    auto_append: 
@@ -84,7 +95,6 @@ markdown_extensions:
 nav:
  - Accueil: 'index.md'
  - Base de connaissances:
-    - 'basics/why-privacy-matters.md'
    - 'basics/threat-modeling.md'
    - 'basics/common-threats.md'
    - 'basics/common-misconceptions.md'
@@ -95,15 +105,15 @@ nav:
      - 'basics/multi-factor-authentication.md'
      - 'basics/email-security.md'
      - 'basics/vpn-overview.md'
+    - "Systèmes d'exploitation":
+      - 'os/android-overview.md'
+      - 'os/linux-overview.md'
+      - 'os/qubes-overview.md'
    - "Sujets avancés":
      - 'advanced/dns-overview.md'
      - 'advanced/tor-overview.md'
      - 'advanced/payments.md'
      - 'advanced/communication-network-types.md'
-    - "Systèmes d'exploitation":
-      - 'os/android-overview.md'
-      - 'os/linux-overview.md'
-      - 'os/qubes-overview.md'
    - kb-archive.md
  - Recommandations:
    - 'tools.md'
@@ -111,12 +121,17 @@ nav:
      - 'tor.md'
      - 'desktop-browsers.md'
      - 'mobile-browsers.md'
+    - "Systèmes d'exploitation":
+      - 'android.md'
+      - 'desktop.md'
+      - 'router.md'
    - "Fournisseurs":
      - 'cloud.md'
      - 'dns.md'
      - 'email.md'
      - 'financial-services.md'
      - 'search-engines.md'
+      - 'phone.md'
      - 'vpn.md'
    - "Logiciels":
      - 'calendar.md'
@@ -133,26 +148,22 @@ nav:
      - 'productivity.md'
      - 'real-time-communication.md'
      - 'video-streaming.md'
-    - "Systèmes d'exploitation":
-      - 'android.md'
-      - 'desktop.md'
-      - 'router.md'
  - "À propos":
    - 'about/index.md'
    - 'about/criteria.md'
    - 'about/statistics.md'
    - 'about/notices.md'
    - 'about/privacy-policy.md'
-    - "Communauté":
+    - Community:
      - 'about/donate.md'
-      - "Services en ligne": 'about/services.md'
-      - "Code de conduite": 'CODE_OF_CONDUCT.md'
+      - Online Services: 'about/services.md'
+      - Code of Conduct: 'CODE_OF_CONDUCT.md'
      - 'about/privacytools.md'
-    - "Contribuer":
-      - "Guide de rédaction":
+    - Contributing:
+      - Writing Guide:
        - 'meta/writing-style.md'
        - 'meta/brand.md'
-      - "Guides techniques":
+      - Technical Guides:
        - 'meta/uploading-images.md'
        - 'meta/git-recommendations.md'
  - Journal des modifications: 'https://github.com/privacyguides/privacyguides.org/releases'
--- a/config/mkdocs.he.yml
+++ b/config/mkdocs.he.yml
@@ -18,7 +18,7 @@
 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 # IN THE SOFTWARE.

-INHERIT: mkdocs-common.yml
+INHERIT: mkdocs.common.yml
 docs_dir: '../i18n/he'
 site_url: "https://www.privacyguides.org/he/"
 site_dir: '../site/he'
@@ -29,9 +29,9 @@ site_description: |
 copyright: |
  <b>Privacy Guides</b> is a non-profit, socially motivated website that provides information for protecting your data security and privacy.<br>
  We do not make money from recommending certain products, and we do not use affiliate links.<br>
-  &copy; 2019 - 2023 Privacy Guides and contributors.
+  &copy; 2022 Privacy Guides and contributors.
  <span class="twemoji"><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 496 512"><!--! Font Awesome Free 6.2.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License) Copyright 2022 Fonticons, Inc.--><path d="m245.83 214.87-33.22 17.28c-9.43-19.58-25.24-19.93-27.46-19.93-22.13 0-33.22 14.61-33.22 43.84 0 23.57 9.21 43.84 33.22 43.84 14.47 0 24.65-7.09 30.57-21.26l30.55 15.5c-6.17 11.51-25.69 38.98-65.1 38.98-22.6 0-73.96-10.32-73.96-77.05 0-58.69 43-77.06 72.63-77.06 30.72-.01 52.7 11.95 65.99 35.86zm143.05 0-32.78 17.28c-9.5-19.77-25.72-19.93-27.9-19.93-22.14 0-33.22 14.61-33.22 43.84 0 23.55 9.23 43.84 33.22 43.84 14.45 0 24.65-7.09 30.54-21.26l31 15.5c-2.1 3.75-21.39 38.98-65.09 38.98-22.69 0-73.96-9.87-73.96-77.05 0-58.67 42.97-77.06 72.63-77.06 30.71-.01 52.58 11.95 65.56 35.86zM247.56 8.05C104.74 8.05 0 123.11 0 256.05c0 138.49 113.6 248 247.56 248 129.93 0 248.44-100.87 248.44-248 0-137.87-106.62-248-248.44-248zm.87 450.81c-112.54 0-203.7-93.04-203.7-202.81 0-105.42 85.43-203.27 203.72-203.27 112.53 0 202.82 89.46 202.82 203.26-.01 121.69-99.68 202.82-202.84 202.82z"></path></svg></span><span class="twemoji"><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 496 512"><!--! Font Awesome Free 6.2.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License) Copyright 2022 Fonticons, Inc.--><path d="M314.9 194.4v101.4h-28.3v120.5h-77.1V295.9h-28.3V194.4c0-4.4 1.6-8.2 4.6-11.3 3.1-3.1 6.9-4.7 11.3-4.7H299c4.1 0 7.8 1.6 11.1 4.7 3.1 3.2 4.8 6.9 4.8 11.3zm-101.5-63.7c0-23.3 11.5-35 34.5-35s34.5 11.7 34.5 35c0 23-11.5 34.5-34.5 34.5s-34.5-11.5-34.5-34.5zM247.6 8C389.4 8 496 118.1 496 256c0 147.1-118.5 248-248.4 248C113.6 504 0 394.5 0 256 0 123.1 104.7 8 247.6 8zm.8 44.7C130.2 52.7 44.7 150.6 44.7 256c0 109.8 91.2 202.8 203.7 202.8 103.2 0 202.8-81.1 202.8-202.8.1-113.8-90.2-203.3-202.8-203.3z"></path></svg></span><span class="twemoji"><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 496 512"><!--! Font Awesome Free 6.2.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License) Copyright 2022 Fonticons, Inc.--><path d="M247.6 8C389.4 8 496 118.1 496 256c0 147.1-118.5 248-248.4 248C113.6 504 0 394.5 0 256 0 123.1 104.7 8 247.6 8zm.8 44.7C130.2 52.7 44.7 150.6 44.7 256c0 109.8 91.2 202.8 203.7 202.8 103.2 0 202.8-81.1 202.8-202.8.1-113.8-90.2-203.3-202.8-203.3zm94 144.3v42.5H162.1V197h180.3zm0 79.8v42.5H162.1v-42.5h180.3z"></path></svg></span>
-  Content licensed under <a href="/license"><strong>CC BY-ND 4.0</strong></a>.
+  Content licensed under <a href="/about/"><strong>CC BY-ND 4.0</strong></a>.
 edit_uri: edit/main/i18n/he/

 extra:
@@ -57,6 +57,7 @@ extra_css:

 theme:
  language: he
+  logo: ../../theme/assets/brand/SVG/Logo/privacy-guides-logo-notext-colorbg.svg
  font:
    text: Open Sans
    code: Cousine
@@ -80,6 +81,16 @@ theme:
        icon: material/brightness-5
        name: "עבור לערכת הנושא של המערכת"

+plugins:
+  social:
+    cards: !ENV [NETLIFY, false]
+    cards_color:
+      fill: "#FFD06F"
+      text: "#2d2d2d"
+    cards_dir: assets/img/social
+    cards_font: Suez One
+    cache_dir: .cache/plugin/social-he
+
 markdown_extensions:
  pymdownx.snippets:
    auto_append: 
@@ -88,7 +99,6 @@ markdown_extensions:
 nav:
  - "דף הבית": 'index.md'
  - "ידע בסיסי":
-    - 'basics/why-privacy-matters.md'
    - 'basics/threat-modeling.md'
    - 'basics/common-threats.md'
    - 'basics/common-misconceptions.md'
@@ -99,15 +109,15 @@ nav:
      - 'basics/multi-factor-authentication.md'
      - 'basics/email-security.md'
      - 'basics/vpn-overview.md'
+    - "מערכות הפעלה":
+      - 'os/android-overview.md'
+      - 'os/linux-overview.md'
+      - 'os/qubes-overview.md'
    - "נושאים מתקדמים":
      - 'advanced/dns-overview.md'
      - 'advanced/tor-overview.md'
      - 'advanced/payments.md'
      - 'advanced/communication-network-types.md'
-    - "מערכות הפעלה":
-      - 'os/android-overview.md'
-      - 'os/linux-overview.md'
-      - 'os/qubes-overview.md'
    - kb-archive.md
  - "המלצות":
    - 'tools.md'
@@ -115,12 +125,17 @@ nav:
      - 'tor.md'
      - 'desktop-browsers.md'
      - 'mobile-browsers.md'
+    - "מערכות הפעלה":
+      - 'android.md'
+      - 'desktop.md'
+      - 'router.md'
    - "ספקים":
      - 'cloud.md'
      - 'dns.md'
      - 'email.md'
      - 'financial-services.md'
      - 'search-engines.md'
+      - 'phone.md'
      - 'vpn.md'
    - "תוכנה":
      - 'calendar.md'
@@ -137,10 +152,6 @@ nav:
      - 'productivity.md'
      - 'real-time-communication.md'
      - 'video-streaming.md'
-    - "מערכות הפעלה":
-      - 'android.md'
-      - 'desktop.md'
-      - 'router.md'
  - "על אודות":
    - 'about/index.md'
    - 'about/criteria.md'
--- a/config/mkdocs.it.yml
+++ b/config/mkdocs.it.yml
@@ -1,160 +0,0 @@
-# Copyright (c) 2022-2023 Jonah Aragon <jonah@triplebit.net>
-
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to
-# deal in the Software without restriction, including without limitation the
-# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-# sell copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-# IN THE SOFTWARE.
-
-INHERIT: mkdocs-common.yml
-docs_dir: '../i18n/it'
-site_url: "https://www.privacyguides.org/it/"
-site_dir: '../site/it'
-
-site_name: Privacy Guides
-site_description: |
-  Privacy Guides è la risorsa centrale per la privacy e la sicurezza per proteggersi online.
-copyright: |
-  <b>Privacy Guides</b> è un sito web senza fini di lucro e a sfondo sociale che fornisce informazioni per proteggere la sicurezza e la privacy dei dati.<br>
-   Non guadagniamo denaro consigliando determinati prodotti e non utilizziamo link di affiliazione.<br>
-  &copy; 2019 - 2023 Privacy Guides e collaboratori.
-  <span class="twemoji"><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 496 512"><!--! Font Awesome Free 6.2.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License) Copyright 2022 Fonticons, Inc.--><path d="m245.83 214.87-33.22 17.28c-9.43-19.58-25.24-19.93-27.46-19.93-22.13 0-33.22 14.61-33.22 43.84 0 23.57 9.21 43.84 33.22 43.84 14.47 0 24.65-7.09 30.57-21.26l30.55 15.5c-6.17 11.51-25.69 38.98-65.1 38.98-22.6 0-73.96-10.32-73.96-77.05 0-58.69 43-77.06 72.63-77.06 30.72-.01 52.7 11.95 65.99 35.86zm143.05 0-32.78 17.28c-9.5-19.77-25.72-19.93-27.9-19.93-22.14 0-33.22 14.61-33.22 43.84 0 23.55 9.23 43.84 33.22 43.84 14.45 0 24.65-7.09 30.54-21.26l31 15.5c-2.1 3.75-21.39 38.98-65.09 38.98-22.69 0-73.96-9.87-73.96-77.05 0-58.67 42.97-77.06 72.63-77.06 30.71-.01 52.58 11.95 65.56 35.86zM247.56 8.05C104.74 8.05 0 123.11 0 256.05c0 138.49 113.6 248 247.56 248 129.93 0 248.44-100.87 248.44-248 0-137.87-106.62-248-248.44-248zm.87 450.81c-112.54 0-203.7-93.04-203.7-202.81 0-105.42 85.43-203.27 203.72-203.27 112.53 0 202.82 89.46 202.82 203.26-.01 121.69-99.68 202.82-202.84 202.82z"></path></svg></span><span class="twemoji"><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 496 512"><!--! Font Awesome Free 6.2.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License) Copyright 2022 Fonticons, Inc.--><path d="M314.9 194.4v101.4h-28.3v120.5h-77.1V295.9h-28.3V194.4c0-4.4 1.6-8.2 4.6-11.3 3.1-3.1 6.9-4.7 11.3-4.7H299c4.1 0 7.8 1.6 11.1 4.7 3.1 3.2 4.8 6.9 4.8 11.3zm-101.5-63.7c0-23.3 11.5-35 34.5-35s34.5 11.7 34.5 35c0 23-11.5 34.5-34.5 34.5s-34.5-11.5-34.5-34.5zM247.6 8C389.4 8 496 118.1 496 256c0 147.1-118.5 248-248.4 248C113.6 504 0 394.5 0 256 0 123.1 104.7 8 247.6 8zm.8 44.7C130.2 52.7 44.7 150.6 44.7 256c0 109.8 91.2 202.8 203.7 202.8 103.2 0 202.8-81.1 202.8-202.8.1-113.8-90.2-203.3-202.8-203.3z"></path></svg></span><span class="twemoji"><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 496 512"><!--! Font Awesome Free 6.2.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License) Copyright 2022 Fonticons, Inc.--><path d="M247.6 8C389.4 8 496 118.1 496 256c0 147.1-118.5 248-248.4 248C113.6 504 0 394.5 0 256 0 123.1 104.7 8 247.6 8zm.8 44.7C130.2 52.7 44.7 150.6 44.7 256c0 109.8 91.2 202.8 203.7 202.8 103.2 0 202.8-81.1 202.8-202.8.1-113.8-90.2-203.3-202.8-203.3zm94 144.3v42.5H162.1V197h180.3zm0 79.8v42.5H162.1v-42.5h180.3z"></path></svg></span>
-   Contenuto sotto licenza <a href="/license"><strong>CC BY-ND 4.0</strong></a>.
-edit_uri: edit/main/i18n/it/
-
-extra:
-  generator: false
-  analytics:
-    provider: plausible
-    property: privacyguides.org
-    feedback:
-      title: "Questa pagina è stata utile?"
-      ratings:
-        - icon: material/robot-happy-outline
-          name: "Questa pagina è stata utile"
-          data: Helpful
-          note: "Grazie per il tuo feedback!"
-        - icon: material/robot-confused
-          name: "Questa pagina può essere migliorata"
-          data: Needs Improvement
-          note: "Grazie per il tuo feedback! Aiutaci a migliorare questa pagina aprendo una discussione sul <a href='https://discuss.privacyguides.net/'>nostro forum</a>."
-
-theme:
-  language: it
-  font:
-    text: Public Sans
-    code: DM Mono
-  palette:
-    - media: "(prefers-color-scheme)"
-      scheme: default
-      accent: deep purple
-      toggle:
-        icon: material/brightness-auto
-        name: "Passa al tema scuro"
-    - media: "(prefers-color-scheme: dark)"
-      scheme: slate
-      accent: amber
-      toggle:
-        icon: material/brightness-2
-        name: "Passa al tema chiaro"
-    - media: "(prefers-color-scheme: light)"
-      scheme: default
-      accent: deep purple
-      toggle:
-        icon: material/brightness-5
-        name: "Passa al tema di sistema"
-
-markdown_extensions:
-  pymdownx.snippets:
-    auto_append: 
-      - includes/abbreviations.it.txt
-
-nav:
-  - Pagina iniziale: 'index.md'
-  - Conoscenze di base:
-    - 'basics/why-privacy-matters.md'
-    - 'basics/threat-modeling.md'
-    - 'basics/common-threats.md'
-    - 'basics/common-misconceptions.md'
-    - 'basics/account-creation.md'
-    - 'basics/account-deletion.md'
-    - Elementi essenziali della tecnologia:
-      - 'basics/passwords-overview.md'
-      - 'basics/multi-factor-authentication.md'
-      - 'basics/email-security.md'
-      - 'basics/vpn-overview.md'
-    - Argomenti avanzati:
-      - 'advanced/dns-overview.md'
-      - 'advanced/tor-overview.md'
-      - 'advanced/payments.md'
-      - 'advanced/communication-network-types.md'
-    - Sistemi operativi:
-      - 'os/android-overview.md'
-      - 'os/linux-overview.md'
-      - 'os/qubes-overview.md'
-    - kb-archive.md
-  - Raccomandazioni:
-    - 'tools.md'
-    - Navigazione su Internet:
-      - 'tor.md'
-      - 'desktop-browsers.md'
-      - 'mobile-browsers.md'
-    - Fornitori:
-      - 'cloud.md'
-      - 'dns.md'
-      - 'email.md'
-      - 'financial-services.md'
-      - 'search-engines.md'
-      - 'vpn.md'
-    - Software:
-      - 'calendar.md'
-      - 'cryptocurrency.md'
-      - 'data-redaction.md'
-      - 'email-clients.md'
-      - 'encryption.md'
-      - 'file-sharing.md'
-      - 'frontends.md'
-      - 'multi-factor-authentication.md'
-      - 'news-aggregators.md'
-      - 'notebooks.md'
-      - 'passwords.md'
-      - 'productivity.md'
-      - 'real-time-communication.md'
-      - 'video-streaming.md'
-    - Sistemi operativi:
-      - 'android.md'
-      - 'desktop.md'
-      - 'router.md'
-  - Informazioni:
-    - 'about/index.md'
-    - 'about/criteria.md'
-    - 'about/statistics.md'
-    - 'about/notices.md'
-    - 'about/privacy-policy.md'
-    - Comunità:
-      - 'about/donate.md'
-      - Servizi online: 'about/services.md'
-      - Codice di condotta: 'CODE_OF_CONDUCT.md'
-      - 'about/privacytools.md'
-    - Contribuisci:
-      - Guida alla scrittura:
-        - 'meta/writing-style.md'
-        - 'meta/brand.md'
-      - Guide tecniche:
-        - 'meta/uploading-images.md'
-        - 'meta/git-recommendations.md'
-  - Registro delle modifiche: 'https://github.com/privacyguides/privacyguides.org/releases'
-  - Forum: 'https://discuss.privacyguides.net/'
-  - Blog: 'https://blog.privacyguides.org/'
--- a/config/mkdocs.nl.yml
+++ b/config/mkdocs.nl.yml
@@ -18,7 +18,7 @@
 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 # IN THE SOFTWARE.

-INHERIT: mkdocs-common.yml
+INHERIT: mkdocs.common.yml
 docs_dir: '../i18n/nl'
 site_url: "https://www.privacyguides.org/nl/"
 site_dir: '../site/nl'
@@ -29,10 +29,10 @@ site_description: |
 copyright: |
  <b>Privacy Guides</b> is een non-profit, sociaal gemotiveerde website die informatie biedt voor de bescherming van jouw gegevensbeveiliging en privacy.<br>
  Wij verdienen geen geld met het aanbevelen van bepaalde producten, en wij maken geen gebruik van affiliate links.<br>
-  &copy; 2019 - 2023 Privacy Guides en medewerkers.
+  &copy; 2022 Privacy Guides en medewerkers.
  <span class="twemoji"><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 496 512"><!--! Font Awesome Free 6.2.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License) Copyright 2022 Fonticons, Inc.--><path d="m245.83 214.87-33.22 17.28c-9.43-19.58-25.24-19.93-27.46-19.93-22.13 0-33.22 14.61-33.22 43.84 0 23.57 9.21 43.84 33.22 43.84 14.47 0 24.65-7.09 30.57-21.26l30.55 15.5c-6.17 11.51-25.69 38.98-65.1 38.98-22.6 0-73.96-10.32-73.96-77.05 0-58.69 43-77.06 72.63-77.06 30.72-.01 52.7 11.95 65.99 35.86zm143.05 0-32.78 17.28c-9.5-19.77-25.72-19.93-27.9-19.93-22.14 0-33.22 14.61-33.22 43.84 0 23.55 9.23 43.84 33.22 43.84 14.45 0 24.65-7.09 30.54-21.26l31 15.5c-2.1 3.75-21.39 38.98-65.09 38.98-22.69 0-73.96-9.87-73.96-77.05 0-58.67 42.97-77.06 72.63-77.06 30.71-.01 52.58 11.95 65.56 35.86zM247.56 8.05C104.74 8.05 0 123.11 0 256.05c0 138.49 113.6 248 247.56 248 129.93 0 248.44-100.87 248.44-248 0-137.87-106.62-248-248.44-248zm.87 450.81c-112.54 0-203.7-93.04-203.7-202.81 0-105.42 85.43-203.27 203.72-203.27 112.53 0 202.82 89.46 202.82 203.26-.01 121.69-99.68 202.82-202.84 202.82z"></path></svg></span><span class="twemoji"><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 496 512"><!--! Font Awesome Free 6.2.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License) Copyright 2022 Fonticons, Inc.--><path d="M314.9 194.4v101.4h-28.3v120.5h-77.1V295.9h-28.3V194.4c0-4.4 1.6-8.2 4.6-11.3 3.1-3.1 6.9-4.7 11.3-4.7H299c4.1 0 7.8 1.6 11.1 4.7 3.1 3.2 4.8 6.9 4.8 11.3zm-101.5-63.7c0-23.3 11.5-35 34.5-35s34.5 11.7 34.5 35c0 23-11.5 34.5-34.5 34.5s-34.5-11.5-34.5-34.5zM247.6 8C389.4 8 496 118.1 496 256c0 147.1-118.5 248-248.4 248C113.6 504 0 394.5 0 256 0 123.1 104.7 8 247.6 8zm.8 44.7C130.2 52.7 44.7 150.6 44.7 256c0 109.8 91.2 202.8 203.7 202.8 103.2 0 202.8-81.1 202.8-202.8.1-113.8-90.2-203.3-202.8-203.3z"></path></svg></span><span class="twemoji"><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 496 512"><!--! Font Awesome Free 6.2.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License) Copyright 2022 Fonticons, Inc.--><path d="M247.6 8C389.4 8 496 118.1 496 256c0 147.1-118.5 248-248.4 248C113.6 504 0 394.5 0 256 0 123.1 104.7 8 247.6 8zm.8 44.7C130.2 52.7 44.7 150.6 44.7 256c0 109.8 91.2 202.8 203.7 202.8 103.2 0 202.8-81.1 202.8-202.8.1-113.8-90.2-203.3-202.8-203.3zm94 144.3v42.5H162.1V197h180.3zm0 79.8v42.5H162.1v-42.5h180.3z"></path></svg></span>
-  Inhoud gelicentieerd onder <a href="/license"><strong>CC BY-ND 4.0</strong></a>.
-edit_uri: edit/main/i18n/nl/
+  Inhoud gelicentieerd onder <a href="/about/"><strong>CC BY-ND 4.0</strong></a>.
+edit_uri: edit/main/docs/

 extra:
  generator: false
@@ -53,6 +53,7 @@ extra:

 theme:
  language: nl
+  logo: ../../theme/assets/brand/SVG/Logo/privacy-guides-logo-notext-colorbg.svg
  font:
    text: Public Sans
    code: DM Mono
@@ -76,6 +77,16 @@ theme:
        icon: material/brightness-5
        name: "Verander naar systeem thema"

+plugins:
+  social:
+    cards: !ENV [NETLIFY, false]
+    cards_color:
+      fill: "#FFD06F"
+      text: "#2d2d2d"
+    cards_dir: assets/img/social
+    cards_font: Public Sans
+    cache_dir: .cache/plugin/social-nl
+
 markdown_extensions:
  pymdownx.snippets:
    auto_append: 
@@ -84,7 +95,6 @@ markdown_extensions:
 nav:
  - Home: 'index.md'
  - Kennisbank:
-    - 'basics/why-privacy-matters.md'
    - 'basics/threat-modeling.md'
    - 'basics/common-threats.md'
    - 'basics/common-misconceptions.md'
@@ -95,15 +105,15 @@ nav:
      - 'basics/multi-factor-authentication.md'
      - 'basics/email-security.md'
      - 'basics/vpn-overview.md'
+    - Besturings systemen:
+      - 'os/android-overview.md'
+      - 'os/linux-overview.md'
+      - 'os/qubes-overview.md'
    - Gevorderde onderwerpen:
      - 'advanced/dns-overview.md'
      - 'advanced/tor-overview.md'
      - 'advanced/payments.md'
      - 'advanced/communication-network-types.md'
-    - Besturings systemen:
-      - 'os/android-overview.md'
-      - 'os/linux-overview.md'
-      - 'os/qubes-overview.md'
    - kb-archive.md
  - Recommendaties:
    - 'tools.md'
@@ -111,12 +121,17 @@ nav:
      - 'tor.md'
      - 'desktop-browsers.md'
      - 'mobile-browsers.md'
+    - Besturings systemen:
+      - 'android.md'
+      - 'desktop.md'
+      - 'router.md'
    - Providers:
      - 'cloud.md'
      - 'dns.md'
      - 'email.md'
      - 'financial-services.md'
      - 'search-engines.md'
+      - 'phone.md'
      - 'vpn.md'
    - Software:
      - 'calendar.md'
@@ -133,28 +148,24 @@ nav:
      - 'productivity.md'
      - 'real-time-communication.md'
      - 'video-streaming.md'
-    - Besturings systemen:
-      - 'android.md'
-      - 'desktop.md'
-      - 'router.md'
  - Over ons:
    - 'about/index.md'
    - 'about/criteria.md'
    - 'about/statistics.md'
    - 'about/notices.md'
    - 'about/privacy-policy.md'
-    - Gemeenschap:
+    - Community:
      - 'about/donate.md'
-      - Online diensten: 'about/services.md'
-      - Gedragscode: 'CODE_OF_CONDUCT.md'
+      - Online Services: 'about/services.md'
+      - Code of Conduct: 'CODE_OF_CONDUCT.md'
      - 'about/privacytools.md'
-    - Bijdragen:
-      - Schrijfgids:
+    - Contributing:
+      - Writing Guide:
        - 'meta/writing-style.md'
        - 'meta/brand.md'
-      - Technische gids:
+      - Technical Guides:
        - 'meta/uploading-images.md'
        - 'meta/git-recommendations.md'
-  - Wijzigingslogboek: 'https://github.com/privacyguides/privacyguides.org/releases'
+  - Changelog: 'https://github.com/privacyguides/privacyguides.org/releases'
  - Forum: 'https://discuss.privacyguides.net/'
  - Blog: 'https://blog.privacyguides.org/'
--- a/config/mkdocs.offline.yml
+++ b/config/mkdocs.offline.yml
@@ -18,7 +18,7 @@
 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 # IN THE SOFTWARE.

-INHERIT: mkdocs-common.yml
+INHERIT: mkdocs.common.yml
 docs_dir: '../docs'
 site_url: "https://www.privacyguides.org/"
 site_dir: '../site'
@@ -29,9 +29,9 @@ site_description: |
 copyright: |
  <b>Privacy Guides</b> is a non-profit, socially motivated website that provides information for protecting your data security and privacy.<br>
  We do not make money from recommending certain products, and we do not use affiliate links.<br>
-  &copy; 2019 - 2023 Privacy Guides and contributors.
+  &copy; 2022 Privacy Guides and contributors.
  <span class="twemoji"><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 496 512"><!--! Font Awesome Free 6.2.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License) Copyright 2022 Fonticons, Inc.--><path d="m245.83 214.87-33.22 17.28c-9.43-19.58-25.24-19.93-27.46-19.93-22.13 0-33.22 14.61-33.22 43.84 0 23.57 9.21 43.84 33.22 43.84 14.47 0 24.65-7.09 30.57-21.26l30.55 15.5c-6.17 11.51-25.69 38.98-65.1 38.98-22.6 0-73.96-10.32-73.96-77.05 0-58.69 43-77.06 72.63-77.06 30.72-.01 52.7 11.95 65.99 35.86zm143.05 0-32.78 17.28c-9.5-19.77-25.72-19.93-27.9-19.93-22.14 0-33.22 14.61-33.22 43.84 0 23.55 9.23 43.84 33.22 43.84 14.45 0 24.65-7.09 30.54-21.26l31 15.5c-2.1 3.75-21.39 38.98-65.09 38.98-22.69 0-73.96-9.87-73.96-77.05 0-58.67 42.97-77.06 72.63-77.06 30.71-.01 52.58 11.95 65.56 35.86zM247.56 8.05C104.74 8.05 0 123.11 0 256.05c0 138.49 113.6 248 247.56 248 129.93 0 248.44-100.87 248.44-248 0-137.87-106.62-248-248.44-248zm.87 450.81c-112.54 0-203.7-93.04-203.7-202.81 0-105.42 85.43-203.27 203.72-203.27 112.53 0 202.82 89.46 202.82 203.26-.01 121.69-99.68 202.82-202.84 202.82z"></path></svg></span><span class="twemoji"><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 496 512"><!--! Font Awesome Free 6.2.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License) Copyright 2022 Fonticons, Inc.--><path d="M314.9 194.4v101.4h-28.3v120.5h-77.1V295.9h-28.3V194.4c0-4.4 1.6-8.2 4.6-11.3 3.1-3.1 6.9-4.7 11.3-4.7H299c4.1 0 7.8 1.6 11.1 4.7 3.1 3.2 4.8 6.9 4.8 11.3zm-101.5-63.7c0-23.3 11.5-35 34.5-35s34.5 11.7 34.5 35c0 23-11.5 34.5-34.5 34.5s-34.5-11.5-34.5-34.5zM247.6 8C389.4 8 496 118.1 496 256c0 147.1-118.5 248-248.4 248C113.6 504 0 394.5 0 256 0 123.1 104.7 8 247.6 8zm.8 44.7C130.2 52.7 44.7 150.6 44.7 256c0 109.8 91.2 202.8 203.7 202.8 103.2 0 202.8-81.1 202.8-202.8.1-113.8-90.2-203.3-202.8-203.3z"></path></svg></span><span class="twemoji"><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 496 512"><!--! Font Awesome Free 6.2.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License) Copyright 2022 Fonticons, Inc.--><path d="M247.6 8C389.4 8 496 118.1 496 256c0 147.1-118.5 248-248.4 248C113.6 504 0 394.5 0 256 0 123.1 104.7 8 247.6 8zm.8 44.7C130.2 52.7 44.7 150.6 44.7 256c0 109.8 91.2 202.8 203.7 202.8 103.2 0 202.8-81.1 202.8-202.8.1-113.8-90.2-203.3-202.8-203.3zm94 144.3v42.5H162.1V197h180.3zm0 79.8v42.5H162.1v-42.5h180.3z"></path></svg></span>
-  Content licensed under <a href="https://www.privacyguides.org/license"><strong>CC BY-ND 4.0</strong></a>.
+  Content licensed under <a href="/about/"><strong>CC BY-ND 4.0</strong></a>.
 repo_url: ""

 extra:
@@ -42,7 +42,6 @@ extra:

 theme:
  language: en
-  # this logo needs to be set separately because the relative path is different
  logo: ../theme/assets/brand/SVG/Logo/privacy-guides-logo-notext-colorbg.svg
  font:
    text: Public Sans
@@ -76,8 +75,6 @@ theme:
 plugins:
  offline:
    enabled: true
-  social:
-    enabled: false

 markdown_extensions:
  pymdownx.snippets:
@@ -87,7 +84,6 @@ markdown_extensions:
 nav:
  - Home: 'index.md'
  - Knowledge Base:
-    - 'basics/why-privacy-matters.md'
    - 'basics/threat-modeling.md'
    - 'basics/common-threats.md'
    - 'basics/common-misconceptions.md'
@@ -98,15 +94,15 @@ nav:
      - 'basics/multi-factor-authentication.md'
      - 'basics/email-security.md'
      - 'basics/vpn-overview.md'
+    - Operating Systems:
+      - 'os/android-overview.md'
+      - 'os/linux-overview.md'
+      - 'os/qubes-overview.md'
    - Advanced Topics:
      - 'advanced/dns-overview.md'
      - 'advanced/tor-overview.md'
      - 'advanced/payments.md'
      - 'advanced/communication-network-types.md'
-    - Operating Systems:
-      - 'os/android-overview.md'
-      - 'os/linux-overview.md'
-      - 'os/qubes-overview.md'
    - kb-archive.md
  - Recommendations:
    - 'tools.md'
@@ -114,12 +110,17 @@ nav:
      - 'tor.md'
      - 'desktop-browsers.md'
      - 'mobile-browsers.md'
+    - Operating Systems:
+      - 'android.md'
+      - 'desktop.md'
+      - 'router.md'
    - Providers:
      - 'cloud.md'
      - 'dns.md'
      - 'email.md'
      - 'financial-services.md'
      - 'search-engines.md'
+      - 'phone.md'
      - 'vpn.md'
    - Software:
      - 'calendar.md'
@@ -136,10 +137,6 @@ nav:
      - 'productivity.md'
      - 'real-time-communication.md'
      - 'video-streaming.md'
-    - Operating Systems:
-      - 'android.md'
-      - 'desktop.md'
-      - 'router.md'
  - About:
    - 'about/index.md'
    - 'about/criteria.md'
--- a/crowdin.yml
+++ b/crowdin.yml
@@ -35,8 +35,3 @@ files:
  translation_replace:
    "en.": ""
  skip_untranslated_files: false
- source: "/static/i18n/*.en.*"
-  translation: "/static/i18n/%file_name%.%two_letters_code%.%file_extension%"
-  translation_replace:
-    "en.": ""
-  skip_untranslated_files: false
--- a/docs/404.md
+++ b/docs/404.md
@@ -0,0 +1,18 @@
+---
+hide:
+  - feedback
+meta:
+  - property: "robots"
+    content: "noindex, nofollow"
+---
+
+# 404 - Not Found
+
+We couldn't find the page you were looking for! Maybe you were looking for one of these?
+
+- [Introduction to Threat Modeling](basics/threat-modeling.md)
+- [Recommended DNS Providers](dns.md)
+- [Best Desktop Web Browsers](desktop-browsers.md)
+- [Best VPN Providers](vpn.md)
+- [Privacy Guides Forum](https://discuss.privacyguides.net)
+- [Our Blog](https://blog.privacyguides.org)
--- a/docs/about/criteria.md
+++ b/docs/about/criteria.md
@@ -29,7 +29,7 @@ We have these requirements in regard to developers which wish to submit their pr

 - Must disclose affiliation, i.e. your position within the project being submitted.

- Must have a security whitepaper if it is a project that involves handling of sensitive information like a messenger, password manager, encrypted cloud storage, etc.
+- Must have a security whitepaper if it is a project that involves handling of sensitive information like a messenger, password manager, encrypted cloud storage etc.
    - Third party audit status. We want to know if you have one, or have one planned. If possible please mention who will be conducting the audit.

 - Must explain what the project brings to the table in regard to privacy.
--- a/docs/about/donate.md
+++ b/docs/about/donate.md
@@ -6,7 +6,7 @@ It takes a lot of [people](https://github.com/privacyguides/privacyguides.org/gr

 If you want to support us financially, the most convenient method for us is contributing via Open Collective, a website operated by our fiscal host. Open Collective accepts payments via credit/debit card, PayPal, and bank transfers.

-[Donate on OpenCollective.com](https://opencollective.com/privacyguides/donate){ class="md-button md-button--primary" }
+[Donate on OpenCollective.com](https://opencollective.com/privacyguides/donate){ .md-button .md-button--primary }

 Donations made directly to us on Open Collective are generally tax-deductible in the US, because our fiscal host (the Open Collective Foundation) is a registered 501(c)3 organization. You will receive a receipt from the Open Collective Foundation after donating. Privacy Guides does not provide financial advice, and you should contact your tax advisor to find out whether this is applicable to you.

@@ -14,10 +14,6 @@ If you already make use of GitHub sponsorships, you can also sponsor our organiz

 [Sponsor us on GitHub](https://github.com/sponsors/privacyguides){ .md-button }

-Another option to support us is by buying our merchandise from HelloTux. We get roughly $4 for every shirt sold, and you get a quality product to show for it.
-
-[Buy on HelloTux.com](https://hellotux.com/privacyguides){ class="md-button" }
-
 ## Backers

 A special thanks to all those who support our mission! :heart:
--- a/docs/about/index.md
+++ b/docs/about/index.md
@@ -1,29 +1,18 @@
 ---
+template: schema.html
 title: "About Privacy Guides"
 description: Privacy Guides is a socially motivated website that provides information for protecting your data security and privacy.
-schema:
-  "@context": https://schema.org
-  "@type": Organization
-  "@id": https://www.privacyguides.org/
-  name: Privacy Guides
-  url: https://www.privacyguides.org/en/about/
-  logo: https://www.privacyguides.org/en/assets/brand/png/square/pg-yellow.png
-  sameAs:
-    - https://twitter.com/privacy_guides
-    - https://github.com/privacyguides
-    - https://www.wikidata.org/wiki/Q111710163
-    - https://opencollective.com/privacyguides
-    - https://www.youtube.com/@privacyguides
-    - https://mastodon.neat.computer/@privacyguides
 ---
 ![Privacy Guides logo](../assets/brand/PNG/Square/pg-yellow.png){ align=right }

-**Privacy Guides** is a socially motivated website that provides [information](/kb) for protecting your data security and privacy. Our mission is to inform the public about the value of digital privacy, and global government initiatives which aim to monitor your online activity. We are a non-profit collective operated entirely by volunteer [team members](https://discuss.privacyguides.net/g/team) and contributors. Our website is free of advertisements and not affiliated with any of the listed providers.
+**Privacy Guides** is a socially motivated website that provides [information](/kb) for protecting your data security and privacy. We are a non-profit collective operated entirely by volunteer [team members](https://discuss.privacyguides.net/g/team) and contributors. Our website is free of advertisements and not affiliated with any listed providers.

 [:octicons-home-16:](https://www.privacyguides.org/){ .card-link title=Homepage }
 [:octicons-code-16:](https://github.com/privacyguides/privacyguides.org){ .card-link title="Source Code" }
 [:octicons-heart-16:](donate.md){ .card-link title=Contribute }

+The purpose of Privacy Guides is to educate our community on the importance of privacy online and government programs internationally that are designed to monitor all of your online activities.
+
 > To find [privacy-focused alternative] apps, check out sites like Good Reports and **Privacy Guides**, which list privacy-focused apps in a variety of categories, notably including email providers (usually on paid plans) that aren’t run by the big tech companies.

 — [New York Times](https://www.nytimes.com/wirecutter/guides/online-security-social-media-privacy/)
@@ -32,7 +21,7 @@ schema:

 — [Tweakers.net](https://tweakers.net/reviews/10568/op-zoek-naar-privacyvriendelijke-tools-niek-de-wilde-van-privacy-guides.html) [Translated from Dutch]

-Also featured on: [Ars Technica](https://arstechnica.com/gadgets/2022/02/is-firefox-ok/), [Wirecutter](https://www.nytimes.com/wirecutter/guides/practical-guide-to-securing-windows-pc/) [[2](https://www.nytimes.com/wirecutter/guides/practical-guide-to-securing-your-mac/)], [NPO Radio 1](https://www.nporadio1.nl/nieuws/binnenland/8eaff3a2-8b29-4f63-9b74-36d2b28b1fe1/ooit-online-eens-wat-doms-geplaatst-ga-jezelf-eens-googlen-en-kijk-dan-wat-je-tegenkomt), and [Wired](https://www.wired.com/story/firefox-mozilla-2022/).
+Also featured on: [Ars Technica](https://arstechnica.com/gadgets/2022/02/is-firefox-ok/), [Wirecutter](https://www.nytimes.com/wirecutter/guides/practical-guide-to-securing-windows-pc/) [[2](https://www.nytimes.com/wirecutter/guides/practical-guide-to-securing-your-mac/)], and [Wired](https://www.wired.com/story/firefox-mozilla-2022/).

 ## History

@@ -58,7 +47,6 @@ So far in 2023 we've launched international translations of our website in [Fren
    - [:simple-discourse: Discourse](https://discuss.privacyguides.net/u/Niek-de-Wilde)
    - [:simple-github: GitHub](https://github.com/blacklight447 "@blacklight447")
    - [:simple-mastodon: Mastodon](https://mastodon.social/@blacklight447 "@blacklight447@mastodon.social"){rel=me}
-    - [:fontawesome-solid-envelope: Email](mailto:niekdewilde@privacyguides.org)

 ??? person "@dngray"

@@ -93,9 +81,7 @@ Our team members review all changes made to the website and handle administrativ

 ## Site License

-!!! danger ""
-
-    The following is a human-readable summary of (and not a substitute for) the [license](/license).
+*The following is a human-readable summary of (and not a substitute for) the [license](https://github.com/privacyguides/privacyguides.org/blob/main/LICENSE):*

 :fontawesome-brands-creative-commons: :fontawesome-brands-creative-commons-by: :fontawesome-brands-creative-commons-nd: Unless otherwise noted, the original content on this website is made available under the [Creative Commons Attribution-NoDerivatives 4.0 International Public License](https://github.com/privacyguides/privacyguides.org/blob/main/LICENSE). This means that you are free to copy and redistribute the material in any medium or format for any purpose, even commercially; as long as you give appropriate credit to `Privacy Guides (www.privacyguides.org)` and provide a link to the license. You may do so in any reasonable manner, but not in any way that suggests Privacy Guides endorses you or your use. If you remix, transform, or build upon the content of this website, you may not distribute the modified material.

--- a/docs/about/notices.md
+++ b/docs/about/notices.md
@@ -1,5 +1,7 @@
 ---
 title: "Notices and Disclaimers"
+hide:
+    - toc
 ---

 ## Legal Disclaimer
@@ -12,26 +14,21 @@ Privacy Guides is an open source project contributed to under licenses that incl

 Privacy Guides additionally does not warrant that this website will be constantly available, or available at all.

-## Licensing Overview
+## Licenses

-!!! danger ""
-
-    The following is a human-readable summary of (and not a substitute for) the [license](/license).
-
-Unless otherwise noted, all **content** on this website is made available under the terms of the [Creative Commons Attribution-NoDerivatives 4.0 International Public License](https://github.com/privacyguides/privacyguides.org/blob/main/LICENSE). The underlying **source code** used to generate this website and display that content is released under the [MIT License](https://github.com/privacyguides/privacyguides.org/tree/main/LICENSE-CODE).
+Unless otherwise noted, all content on this website is made available under the terms of the [Creative Commons Attribution-NoDerivatives 4.0 International Public License](https://github.com/privacyguides/privacyguides.org/blob/main/LICENSE).

 This does not include third-party code embedded in this repository, or code where a superseding license is otherwise noted. The following are notable examples, but this list may not be all-inclusive:

-* [MathJax](https://github.com/privacyguides/privacyguides.org/blob/main/theme/assets/javascripts/mathjax.js) is licensed under the [Apache License 2.0](https://github.com/privacyguides/privacyguides.org/blob/main/docs/assets/javascripts/LICENSE.mathjax.txt).
-* The [Bagnard](https://github.com/privacyguides/brand/tree/main/WOFF/bagnard) heading font is licensed under the [SIL Open Font License 1.1](https://github.com/privacyguides/brand/blob/main/WOFF/bagnard/LICENSE.txt).
-* The [Public Sans](https://github.com/privacyguides/brand/tree/main/WOFF/public_sans) font used for most text on the site is licensed under the terms detailed [here](https://github.com/privacyguides/brand/blob/main/WOFF/public_sans/LICENSE.txt).
-* The [DM Mono](https://github.com/privacyguides/brand/tree/main/WOFF/dm_mono) font used for monospaced text on the site is licensed under the [SIL Open Font License 1.1](https://github.com/privacyguides/brand/blob/main/WOFF/dm_mono/LICENSE.txt).
+* [MathJax](https://github.com/privacyguides/privacyguides.org/blob/main/docs/assets/javascripts/mathjax.js) is licensed under the [Apache License 2.0](https://github.com/privacyguides/privacyguides.org/blob/main/docs/assets/javascripts/LICENSE.mathjax.txt).
+
+Portions of this notice itself were adopted from [opensource.guide](https://github.com/github/opensource.guide/blob/master/notices.md) on GitHub. That resource and this page itself are released under [CC-BY-4.0](https://github.com/github/opensource.guide/blob/master/LICENSE).

 This means that you can use the human-readable content in this repository for your own project, per the terms outlined in the Creative Commons Attribution-NoDerivatives 4.0 International Public License text. You may do so in any reasonable manner, but not in any way that suggests Privacy Guides endorses you or your use. You **may not** use the Privacy Guides branding in your own project without express approval from this project. Privacy Guides's brand trademarks include the "Privacy Guides" wordmark and shield logo.

 We believe that the logos and other images in `assets` obtained from third-party providers are either in the public domain or **fair use**. In a nutshell, legal [fair use doctrine](https://www.copyright.gov/fair-use/more-info.html) allows the use of copyrighted images in order to identify the subject matter for purposes of public comment. However, these logos and other images may still be subject to trademark laws in one or more jurisdictions. Before using this content, please ensure that it is used to identify the entity or organization that owns the trademark and that you have the right to use it under the laws which apply in the circumstances of your intended use. *When copying content from this website, you are solely responsible for ensuring that you do not infringe someone else's trademark or copyright.*

-When you contribute to our website you are doing so under the above licenses, and you are granting Privacy Guides a perpetual, worldwide, non-exclusive, transferable, royalty-free, irrevocable license with the right to sublicense such rights through multiple tiers of sublicensees, to reproduce, modify, display, perform and distribute your contribution as part of our project.
+When you contribute to this repository you are doing so under the above licenses, and you are granting Privacy Guides a perpetual, worldwide, non-exclusive, transferable, royalty-free, irrevocable license with the right to sublicense such rights through multiple tiers of sublicensees, to reproduce, modify, display, perform and distribute your contribution as part of our project.

 ## Acceptable Use

@@ -44,7 +41,3 @@ You must not conduct any systematic or automated data collection activities on o
 * Scraping
 * Data Mining
 * 'Framing' (IFrames)
-
---
-
-*Portions of this notice itself were adopted from [opensource.guide](https://github.com/github/opensource.guide/blob/master/notices.md) on GitHub. That resource and this page itself are released under [CC-BY-4.0](https://creativecommons.org/licenses/by-sa/4.0/).*
--- a/docs/about/services.md
+++ b/docs/about/services.md
@@ -2,7 +2,7 @@

 We run a number of web services to test out features and promote cool decentralized, federated, and/or open-source projects. Many of these services are available to the public and are detailed below.

-[:material-comment-alert: Report an issue](https://discuss.privacyguides.net/c/services/2){ class="md-button md-button--primary" }
+[:material-comment-alert: Report an issue](https://discuss.privacyguides.net/c/services/2){ .md-button .md-button--primary }

 ## Discourse

--- a/docs/advanced/dns-overview.md
+++ b/docs/advanced/dns-overview.md
@@ -24,7 +24,7 @@ Below, we discuss and provide a tutorial to prove what an outside observer may s
    tshark -w /tmp/dns.pcap udp port 53 and host 1.1.1.1 or host 8.8.8.8
    ```

-2. We can then use [`dig`](https://en.wikipedia.org/wiki/Dig_(command)) (Linux, MacOS, etc.) or [`nslookup`](https://en.wikipedia.org/wiki/Nslookup) (Windows) to send the DNS lookup to both servers. Software such as web browsers do these lookups automatically, unless they are configured to use encrypted DNS.
+2. We can then use [`dig`](https://en.wikipedia.org/wiki/Dig_(command)) (Linux, MacOS etc) or [`nslookup`](https://en.wikipedia.org/wiki/Nslookup) (Windows) to send the DNS lookup to both servers. Software such as web browsers do these lookups automatically, unless they are configured to use encrypted DNS.

    === "Linux, macOS"

@@ -118,7 +118,7 @@ When we do a DNS lookup, it's generally because we want to access a resource. Be

 The simplest way to determine browsing activity might be to look at the IP addresses your devices are accessing. For example, if the observer knows that `privacyguides.org` is at `198.98.54.105`, and your device is requesting data from `198.98.54.105`, there is a good chance you're visiting Privacy Guides.

-This method is only useful when the IP address belongs to a server that only hosts few websites. It's also not very useful if the site is hosted on a shared platform (e.g. Github Pages, Cloudflare Pages, Netlify, WordPress, Blogger, etc.). It also isn't very useful if the server is hosted behind a [reverse proxy](https://en.wikipedia.org/wiki/Reverse_proxy), which is very common on the modern Internet.
+This method is only useful when the IP address belongs to a server that only hosts few websites. It's also not very useful if the site is hosted on a shared platform (e.g. Github Pages, Cloudflare Pages, Netlify, WordPress, Blogger, etc). It also isn't very useful if the server is hosted behind a [reverse proxy](https://en.wikipedia.org/wiki/Reverse_proxy), which is very common on the modern Internet.

 ### Server Name Indication (SNI)

--- a/docs/android.md
+++ b/docs/android.md
@@ -1,82 +1,7 @@
 ---
-meta_title: "Android Recommendations: GrapheneOS and DivestOS - Privacy Guides"
 title: "Android"
 icon: 'simple/android'
 description: You can replace the operating system on your Android phone with these secure and privacy-respecting alternatives.
-cover: android.png
-schema:
-  - 
-    "@context": http://schema.org
-    "@type": WebPage
-    name: Private Android Operating Systems
-    url: "./"
-  - 
-    "@context": http://schema.org
-    "@type": CreativeWork
-    name: Android
-    image: /assets/img/android/android.svg
-    url: https://source.android.com/
-    sameAs: https://en.wikipedia.org/wiki/Android_(operating_system)
-  - 
-    "@context": http://schema.org
-    "@type": CreativeWork
-    name: GrapheneOS
-    image: /assets/img/android/grapheneos.svg
-    url: https://grapheneos.org/
-    sameAs: https://en.wikipedia.org/wiki/GrapheneOS
-    subjectOf:
-      "@context": http://schema.org
-      "@type": WebPage
-      url: "./"
-  - 
-    "@context": http://schema.org
-    "@type": CreativeWork
-    name: Divest
-    image: /assets/img/android/divestos.svg
-    url: https://divestos.org/
-    sameAs: https://en.wikipedia.org/wiki/DivestOS
-    subjectOf:
-      "@context": http://schema.org
-      "@type": WebPage
-      url: "./"
-  - 
-    "@context": http://schema.org
-    "@type": Product
-    name: Pixel
-    brand:
-      "@type": Brand
-      name: Google
-    image: /assets/img/android/google-pixel.png
-    sameAs: https://en.wikipedia.org/wiki/Google_Pixel
-    review:
-      "@type": Review
-      author:
-        "@type": Organization
-        name: Privacy Guides
-  - 
-    "@context": http://schema.org
-    "@type": MobileApplication
-    name: Shelter
-    applicationCategory: Utilities
-    operatingSystem: Android
-  - 
-    "@context": http://schema.org
-    "@type": MobileApplication
-    name: Auditor
-    applicationCategory: Utilities
-    operatingSystem: Android
-  - 
-    "@context": http://schema.org
-    "@type": MobileApplication
-    name: Secure Camera
-    applicationCategory: Utilities
-    operatingSystem: Android
-  - 
-    "@context": http://schema.org
-    "@type": MobileApplication
-    name: Secure PDF Viewer
-    applicationCategory: Utilities
-    operatingSystem: Android
 ---

 ![Android logo](assets/img/android/android.svg){ align=right }
@@ -91,6 +16,8 @@ These are the Android operating systems, devices, and apps we recommend to maxim

 [General Android Overview :material-arrow-right-drop-circle:](os/android-overview.md){ .md-button }

+[Why we recommend GrapheneOS over CalyxOS :material-arrow-right-drop-circle:](https://blog.privacyguides.org/2022/04/21/grapheneos-or-calyxos/){ .md-button }
+
 ## AOSP Derivatives

 We recommend installing one of these custom Android operating systems on your device, listed in order of preference, depending on your device's compatibility with these operating systems.
@@ -120,8 +47,6 @@ GrapheneOS supports [Sandboxed Google Play](https://grapheneos.org/usage#sandbox

 Google Pixel phones are the only devices that currently meet GrapheneOS's [hardware security requirements](https://grapheneos.org/faq#device-support).

-[Why we recommend GrapheneOS over CalyxOS :material-arrow-right-drop-circle:](https://blog.privacyguides.org/2022/04/21/grapheneos-or-calyxos/){ .md-button }
-
 ### DivestOS

 !!! recommendation
@@ -136,7 +61,7 @@ Google Pixel phones are the only devices that currently meet GrapheneOS's [hardw
    [:octicons-eye-16:](https://divestos.org/index.php?page=privacy_policy){ .card-link title="Privacy Policy" }
    [:octicons-info-16:](https://divestos.org/index.php?page=faq){ .card-link title=Documentation}
    [:octicons-code-16:](https://github.com/divested-mobile){ .card-link title="Source Code" }
-    [:octicons-heart-16:](https://divested.dev/pages/donate){ .card-link title=Contribute }
+    [:octicons-heart-16:](https://divested.dev/index.php?page=donate){ .card-link title=Contribute }

 DivestOS has automated kernel vulnerability ([CVE](https://en.wikipedia.org/wiki/Common_Vulnerabilities_and_Exposures)) [patching](https://gitlab.com/divested-mobile/cve_checker), fewer proprietary blobs, and a custom [hosts](https://divested.dev/index.php?page=dnsbl) file. Its hardened WebView, [Mulch](https://gitlab.com/divested-mobile/mulch), enables [CFI](https://en.wikipedia.org/wiki/Control-flow_integrity) for all architectures and [network state partitioning](https://developer.mozilla.org/en-US/docs/Web/Privacy/State_Partitioning), and receives out-of-band updates.
 DivestOS also includes kernel patches from GrapheneOS and enables all available kernel security features via [defconfig hardening](https://github.com/Divested-Mobile/DivestOS-Build/blob/master/Scripts/Common/Functions.sh#L758). All kernels newer than version 3.4 include full page [sanitization](https://lwn.net/Articles/334747/) and all ~22 Clang-compiled kernels have [`-ftrivial-auto-var-init=zero`](https://reviews.llvm.org/D54604?id=174471) enabled.
@@ -210,6 +135,10 @@ We recommend a wide variety of Android apps throughout this site. The apps liste
    [:octicons-code-16:](https://gitea.angry.im/PeterCxy/Shelter){ .card-link title="Source Code" }
    [:octicons-heart-16:](https://www.patreon.com/PeterCxy){ .card-link title=Contribute }

+    ??? downloads
+
+        - [:simple-googleplay: Google Play](https://play.google.com/store/apps/details?id=net.typeblog.shelter)
+
 !!! warning

    Shelter is recommended over [Insular](https://secure-system.gitlab.io/Insular/) and [Island](https://github.com/oasisfeng/island) as it supports [contact search blocking](https://secure-system.gitlab.io/Insular/faq.html).
@@ -223,7 +152,7 @@ We recommend a wide variety of Android apps throughout this site. The apps liste
    ![Auditor logo](assets/img/android/auditor.svg#only-light){ align=right }
    ![Auditor logo](assets/img/android/auditor-dark.svg#only-dark){ align=right }

-    **Auditor** is an app which leverages hardware security features to provide device integrity monitoring by actively validating the identity of a device and the integrity of its operating system. Currently, it only works with GrapheneOS or the stock operating system for [supported devices](https://attestation.app/about#device-support).
+    **Auditor** is an app which leverages hardware security features to provide device integrity monitoring for [supported devices](https://attestation.app/about#device-support). Currently, it only works with GrapheneOS and the device's stock operating system.

    [:octicons-home-16: Homepage](https://attestation.app){ .md-button .md-button--primary }
    [:octicons-eye-16:](https://attestation.app/privacy-policy){ .card-link title="Privacy Policy" }
--- a/docs/basics/account-creation.md
+++ b/docs/basics/account-creation.md
@@ -1,5 +1,4 @@
 ---
-meta_title: "How to Create Internet Accounts Privately - Privacy Guides"
 title: "Account Creation"
 icon: 'material/account-plus'
 description: Creating accounts online is practically an internet necessity, take these steps to make sure you stay private.
@@ -45,11 +44,15 @@ Should a service get hacked, you might start receiving phishing or spam emails t

 [Recommended email aliasing services](../email.md#email-aliasing-services){ .md-button }

-### "Sign in with..." (OAuth)
+### Single sign-on

-OAuth is an authentication protocol that allows you to register for a service without sharing much information with the service provider, if any, by using an existing account you have with another service instead. Whenever you see something along the lines of "Sign in with *provider name*" on a registration form, it's typically using OAuth.
+!!! note
+  
+    We are discussing Single sign-on for personal use, not enterprise users.

-When you sign in with OAuth, it will open a login page with the provider you choose, and your existing account and new account will be connected. Your password won't be shared, but some basic information typically will (you can review it during the login request). This process is needed every time you want to log in to the same account.
+Single sign-on (SSO) is an authentication method that allows you to register for a service without sharing much information, if any. Whenever you see something along the lines of "Sign-in with *provider name*" on a registration form it's SSO.
+
+When you choose single sign-on in a website, it will prompt your SSO provider login page and after that your account will be connected. Your password won't be shared but some basic information will (you can review it during the login request). This process is needed every time you want to log in to the same account.

 The main advantages are:

@@ -58,12 +61,12 @@ The main advantages are:

 But there are disadvantages:

- **Privacy**: the OAuth provider you log in with will know the services you use.
- **Centralization**: if the account you use for OAuth is compromised or you aren't able to login to it, all other accounts connected to it are affected.
+- **Privacy**: a SSO provider will know the services you use.
+- **Centralization**: if your SSO account gets compromised or you aren't able to login to it, all other accounts connected to it are affected.

-OAuth authentication can be especially useful in those situations where you could benefit from deeper integration between services. Our recommendation is to limit using OAuth to only where you need it, and always protect the main account with [MFA](multi-factor-authentication.md).
+SSO can be especially useful in those situations where you could benefit from deeper integration between services. For example, one of those services may offer SSO for the others. Our recommendation is to limit SSO to only where you need it and protect the main account with [MFA](multi-factor-authentication.md).

-All the services that use OAuth will be as secure as your underlying provider's account. For example, if you want to secure an account with a hardware key, but that service doesn't support hardware keys, you can secure the account you use with OAuth with a hardware key instead, and now you essentially have hardware MFA on all your accounts. It is worth noting though that weak authentication on your OAuth provider account means that any account tied to that login will also be weak.
+All services that use SSO will be as secure as your SSO account. For example, if you want to secure an account with a hardware key but that service doesn't support hardware keys, you can secure your SSO account with a hardware key and now you essentially have hardware MFA on all your accounts. It is worth noting though that weak authentication on your SSO account means that any account tied to that login will also be weak.

 ### Phone number

--- a/docs/basics/common-misconceptions.md
+++ b/docs/basics/common-misconceptions.md
@@ -2,40 +2,6 @@
 title: "Common Misconceptions"
 icon: 'material/robot-confused'
 description: Privacy isn't a straightforward topic, and it's easy to get caught up in marketing claims and other disinformation.
-schema:
-  - 
-    "@context": https://schema.org
-    "@type": FAQPage
-    mainEntity:
-    - 
-      "@type": Question
-      name: Is open source software inherently secure?
-      acceptedAnswer:
-          "@type": Answer
-          text: |
-            Whether the source code is available and how software is licensed does not inherently affect its security in any way. Open-source software has the potential to be more secure than proprietary software, but there is absolutely no guarantee this is the case. When you evaluate software, you should look at the reputation and security of each tool on an individual basis.
-    - 
-      "@type": Question
-      name: Can shifting trust to another provider increase privacy?
-      acceptedAnswer:
-          "@type": Answer
-          text: |
-            We talk about "shifting trust" a lot when discussing solutions like VPNs (which shift the trust you place in your ISP to the VPN provider). While this protects your browsing data from your ISP specifically, the VPN provider you choose still has access to your browsing data: Your data isn't completely secured from all parties.
-    - 
-      "@type": Question
-      name: Are privacy-focused solutions inherently trustworthy?
-      acceptedAnswer:
-          "@type": Answer
-          text: |
-            Focusing solely on the privacy policies and marketing of a tool or provider can blind you to its weaknesses. When you're looking for a more private solution, you should determine what the underlying problem is and find technical solutions to that problem. For example, you may want to avoid Google Drive, which gives Google access to all of your data. The underlying problem in this case is lack of E2EE, so you should make sure that the provider you switch to actually implements E2EE, or use a tool (like Cryptomator) which provides E2EE on any cloud provider. Switching to a "privacy-focused" provider (that doesn't implement E2EE) doesn't solve your problem: it just shifts trust from Google to that provider.
-    - 
-      "@type": Question
-      name: How complicated should my threat model be?
-      acceptedAnswer:
-          "@type": Answer
-          text: |
-            We often see people describing privacy threat models that are overly complex. Often, these solutions include problems like many different email accounts or complicated setups with lots of moving parts and conditions. The replies are usually answers to "What is the best way to do X?"
-            Finding the "best" solution for yourself doesn't necessarily mean you are after an infallible solution with dozens of conditions—these solutions are often difficult to work with realistically. As we discussed previously, security often comes at the cost of convenience.
 ---

 ## "Open-source software is always secure" or "Proprietary software is more secure"
--- a/docs/basics/email-security.md
+++ b/docs/basics/email-security.md
@@ -1,5 +1,4 @@
 ---
-meta_title: "Why Email Isn't the Best Choice for Privacy and Security - Privacy Guides"
 title: Email Security
 icon: material/email
 description: Email is inherently insecure in many ways, and these are some of the reasons it isn't our top choice for secure communications.
@@ -23,7 +22,7 @@ Email providers which allow you to use standard access protocols like IMAP and S

 ### How Do I Protect My Private Keys?

-A smartcard (such as a [YubiKey](https://support.yubico.com/hc/en-us/articles/360013790259-Using-Your-YubiKey-with-OpenPGP) or [Nitrokey](https://www.nitrokey.com)) works by receiving an encrypted email message from a device (phone, tablet, computer, etc.) running an email/webmail client. The message is then decrypted by the smartcard and the decrypted content is sent back to the device.
+A smartcard (such as a [Yubikey](https://support.yubico.com/hc/en-us/articles/360013790259-Using-Your-YubiKey-with-OpenPGP) or [Nitrokey](https://www.nitrokey.com)) works by receiving an encrypted email message from a device (phone, tablet, computer, etc) running an email/webmail client. The message is then decrypted by the smartcard and the decrypted content is sent back to the device.

 It is advantageous for the decryption to occur on the smartcard so as to avoid possibly exposing your private key to a compromised device.

--- a/docs/basics/threat-modeling.md
+++ b/docs/basics/threat-modeling.md
@@ -1,5 +1,4 @@
 ---
-meta_title: "Threat Modeling: The First Step on Your Privacy Journey - Privacy Guides"
 title: "Threat Modeling"
 icon: 'material/target-account'
 description: Balancing security, privacy, and usability is one of the first and most difficult tasks you'll face on your privacy journey.
--- a/docs/basics/vpn-overview.md
+++ b/docs/basics/vpn-overview.md
@@ -1,5 +1,4 @@
 ---
-meta_title: "How Do VPNs Protect Your Privacy? Our VPN Overview - Privacy Guides"
 title: VPN Overview
 icon: material/vpn
 description: Virtual Private Networks shift risk away from your ISP to a third-party you trust. You should keep these things in mind.
@@ -49,7 +48,7 @@ VPNs cannot provide anonymity. Your VPN provider will still see your real IP add

 ## What about VPN providers that provide Tor nodes?

-Do not use that feature. The point of using Tor is that you do not trust your VPN provider. Currently Tor only supports the [TCP](https://en.wikipedia.org/wiki/Transmission_Control_Protocol) protocol. [UDP](https://en.wikipedia.org/wiki/User_Datagram_Protocol) (used in [WebRTC](https://en.wikipedia.org/wiki/WebRTC) for voice and video sharing, the new [HTTP3/QUIC](https://en.wikipedia.org/wiki/HTTP/3) protocol, etc.), [ICMP](https://en.wikipedia.org/wiki/Internet_Control_Message_Protocol) and other packets will be dropped. To compensate for this, VPN providers typically will route all non-TCP packets through their VPN server (your first hop). This is the case with [ProtonVPN](https://protonvpn.com/support/tor-vpn/). Additionally, when using this Tor over VPN setup, you do not have control over other important Tor features such as [Isolated Destination Address](https://www.whonix.org/wiki/Stream_Isolation) (using a different Tor circuit for every domain you visit).
+Do not use that feature. The point of using Tor is that you do not trust your VPN provider. Currently Tor only supports the [TCP](https://en.wikipedia.org/wiki/Transmission_Control_Protocol) protocol. [UDP](https://en.wikipedia.org/wiki/User_Datagram_Protocol) (used in [WebRTC](https://en.wikipedia.org/wiki/WebRTC) for voice and video sharing, the new [HTTP3/QUIC](https://en.wikipedia.org/wiki/HTTP/3) protocol, etc), [ICMP](https://en.wikipedia.org/wiki/Internet_Control_Message_Protocol) and other packets will be dropped. To compensate for this, VPN providers typically will route all non-TCP packets through their VPN server (your first hop). This is the case with [ProtonVPN](https://protonvpn.com/support/tor-vpn/). Additionally, when using this Tor over VPN setup, you do not have control over other important Tor features such as [Isolated Destination Address](https://www.whonix.org/wiki/Stream_Isolation) (using a different Tor circuit for every domain you visit).

 The feature should be viewed as a convenient way to access the Tor Network, not to stay anonymous. For proper anonymity, use the Tor Browser, TorSocks, or a Tor gateway.

--- a/docs/basics/why-privacy-matters.md
+++ b/docs/basics/why-privacy-matters.md
@@ -1,53 +0,0 @@
---
-title: "Why Privacy Matters"
-icon: 'material/shield-account'
---
-In the modern age of digital data exploitation, your privacy has never been more critical, and yet many believe it is already a lost cause. It is not. ==Your privacy is up for grabs==, and you need to care about it. Privacy is about power, and it is so important that this power ends up in the right hands.
-
-Privacy is ultimately about human information, and this is important because we know that human information confers power over human beings. If we care about our ability to be authentic, fulfilled, and free humans, we have to care about the rules that apply to information about us. So much of our modern society is structured around **information**. When you shop online, read the news, look something up, vote, seek directions, or really anything else, you are relying on information. If we live in an information society, our information matters, and therefore privacy matters.
-
-## What is Privacy?
-
-Many people get the concepts of **privacy**, **security**, and **anonymity** confused. You'll see people criticize various products as "not private" when really they mean it doesn't provide anonymity, for example. On this website, we cover all three of these topics, but it is important you understand the difference between them, and when each one comes into play.
-
-**Privacy**
-
-:   ==Privacy is the assurance that your data is only seen by the parties you intend to view it.== In the context of an instant messenger, for example, end-to-end encryption provides privacy by keeping your message visible only to yourself and the recipient.
-
-**Security**
-
-:   Security is the ability to trust the applications you use—that the parties involved are who they say they are—and keep those applications safe. In the context of browsing the web, for example, security can be provided by HTTPS certificates.
-
-:   Certificates prove you are talking directly to the website you're visiting, and keep attackers on your network from reading or modifying the data sent to or from the website.
-
-**Anonymity**
-
-:   Anonymity is the ability to act without a persistent identifier. You might achieve this online with [Tor](../tor.md), which allows you to browse the internet with a random IP address and network connection instead of your own.
-
-:   **Pseudonymity** is a similar concept, but it allows you to have a persistent identifier without it being tied to your real identity. If everybody knows you as `@GamerGuy12` online, but nobody knows your real name, that is your pseudonym.
-
-All of these concepts overlap, but it is possible to have any combination of these. The sweet spot for most people is when all three of these concepts overlap. However, it's trickier to achieve than many initially believe. Sometimes, you have to compromise on some of these, and that's okay too. This is where **threat modeling** comes into play, allowing you to make informed decisions about the [software and services](../tools.md) you use.
-
-[:material-book-outline: Learn More About Threat Modeling](threat-modeling.md){ .md-button }
-
-## Privacy vs. Secrecy
-
-A common counter-argument to pro-privacy movements is the notion that one doesn't need privacy if they have **"nothing to hide."** This is a dangerous misconception, because it creates a sense that people who demand privacy must be deviant, criminal, or wrong.
-
-==You shouldn't confuse privacy with secrecy.== We know what happens in the bathroom, but you still close the door. That's because you want privacy, not secrecy. There are always certain facts about us—say, personal health information, or sexual behavior—that we wouldn't want the whole world to know, and that's okay. The need for privacy is legitimate, and that's what makes us human. Privacy is about empowering your rights over your own information, not about hiding secrets.
-
-## Is Privacy About Control?
-
-A common definition of privacy is that it is the ability to *control* who has access to your data. This is an easy trap to fall into, in fact it is the definition of privacy we operated this website on for a long time. It sounds nice, and it appeals to many people, but in practice it just doesn't work.
-
-Take cookie consent forms, for example. You may encounter these dozens of times per day on the various websites you visit, with a nice array of checkboxes and sliders which allow you to "curate" your preferences to exactly fit your needs. In the end, we just hit the "I Agree" button, because we just want to read the article or make a purchase. Nobody wants to complete a personal privacy audit on every single website they visit. This is an exercise in [choice architecture](https://en.wikipedia.org/wiki/Choice_architecture), designed to make you take the easy route out instead of delving into a maze of configuration options that don't need to exist in the first place.
-
-==Control over your privacy inside most apps is an illusion.== It's a shiny dashboard with all sorts of choices you can make about your data, but rarely the choices you're looking for, like "only use my data to help me." This type of control is meant to make you feel guilty about your choices, that you "had the choice" to make the apps you use more private, and you chose not to.
-
-Privacy is something we need to have baked into the [software and services](../tools.md) we use by default, you can't bend most apps into being private on your own.
-
-## Sources
-
- [Why Privacy Matters](https://www.amazon.com/Why-Privacy-Matters-Neil-Richards/dp/0190939044) (2021) by Neil Richards
- [The New Oil: Why Privacy & Security Matter](https://thenewoil.org/en/guides/prologue/why/)
- [@Thorin-Oakenpants on GitHub](https://github.com/privacytools/privacytools.io/issues/1760#issuecomment-597497298)
--- a/docs/calendar.md
+++ b/docs/calendar.md
@@ -2,7 +2,6 @@
 title: "Calendar Sync"
 icon: material/calendar
 description: Calendars contain some of your most sensitive data; use products that implement encryption at rest.
-cover: calendar.png
 ---
 Calendars contain some of your most sensitive data; use products that implement E2EE at rest to prevent a provider from reading them.

@@ -10,8 +9,7 @@ Calendars contain some of your most sensitive data; use products that implement

 !!! recommendation

-    ![Tutanota logo](assets/img/calendar/tutanota.svg#only-light){ align=right }
-    ![Tutanota logo](assets/img/calendar/tutanota-dark.svg#only-dark){ align=right }
+    ![Tutanota logo](assets/img/calendar/tutanota.svg){ align=right }

    **Tutanota** offers a free and encrypted calendar across their supported platforms. Features include: automatic E2EE of all data, sharing features, import/export functionality, multi-factor authentication, and [more](https://tutanota.com/calendar-app-comparison/).

--- a/docs/cloud.md
+++ b/docs/cloud.md
@@ -1,17 +1,15 @@
 ---
-meta_title: "The Best Private and Secure Cloud Storage Providers - Privacy Guides"
 title: "Cloud Storage"
 icon: material/file-cloud
 description: Many cloud storage providers require your trust that they will not look at your files. These are private alternatives!
-cover: cloud.png
 ---
-Many cloud storage providers require your full trust that they will not look at your files. The alternatives listed below eliminate the need for trust by implementing secure E2EE.
+Many cloud storage providers require your full trust that they will not look at your files. The alternatives listed below eliminate the need for trust by either putting you in control of your data or by implementing E2EE.

-If these alternatives do not fit your needs, we suggest you look into using encryption software like [Cryptomator](encryption.md#cryptomator-cloud) with another cloud provider. Using Cryptomator in conjunction with **any** cloud provider (including these) may be a good idea to reduce the risk of encryption flaws in a provider's native clients.
+If these alternatives do not fit your needs, we suggest you look into [Encryption Software](encryption.md).

 ??? question "Looking for Nextcloud?"

-    Nextcloud is [still a recommended tool](productivity.md) for self-hosting a file management suite, however we do not recommend third-party Nextcloud storage providers at the moment, because we do [not recommend](https://discuss.privacyguides.net/t/dont-recommend-nextcloud-e2ee/10352/29) Nextcloud's built-in E2EE functionality for home users.
+    Nextcloud is [still a recommended tool](productivity.md) for self-hosting a file management suite, however we do not recommend third-party Nextcloud storage providers at the moment, because we do not recommend Nextcloud's built-in E2EE functionality for home users.

 ## Proton Drive

@@ -19,9 +17,9 @@ If these alternatives do not fit your needs, we suggest you look into using encr

    ![Proton Drive logo](assets/img/cloud/protondrive.svg){ align=right }

-    **Proton Drive** is a Swiss encrypted cloud storage provider from the popular encrypted email provider [Proton Mail](email.md#proton-mail).
+    **Proton Drive** is an E2EE general file storage service by the popular encrypted email provider [Proton Mail](https://proton.me/mail).

-    [:octicons-home-16: Homepage](https://proton.me/drive){ class="md-button md-button--primary" }
+    [:octicons-home-16: Homepage](https://proton.me/drive){ .md-button .md-button--primary }
    [:octicons-eye-16:](https://proton.me/legal/privacy){ .card-link title="Privacy Policy" }
    [:octicons-info-16:](https://proton.me/support/drive){ .card-link title=Documentation}
    [:octicons-code-16:](https://github.com/ProtonMail/WebClients){ .card-link title="Source Code" }
@@ -31,45 +29,6 @@ If these alternatives do not fit your needs, we suggest you look into using encr
        - [:simple-googleplay: Google Play](https://play.google.com/store/apps/details?id=me.proton.android.drive)
        - [:simple-appstore: App Store](https://apps.apple.com/app/id1509667851)

-The Proton Drive web application has been independently audited by Securitum in [2021](https://proton.me/blog/security-audit-all-proton-apps), full details were not made available, but Securitum's letter of attestation states:
-
-> Auditors identified two low-severity vulnerabilities. Additionally, five general recommendations were reported. At the same time, we confirm that no important security issues were identified during the pentest.
-
-Proton Drive's brand new mobile clients have not yet been publicly audited by a third-party.
-
-## Tresorit
-
-!!! recommendation
-
-    ![Tresorit logo](assets/img/cloud/tresorit.svg){ align=right }
-
-    **Tresorit** is a Swiss-Hungarian encrypted cloud storage provider founded in 2011. Tresorit is owned by the Swiss Post, the national postal service of Switzerland.
-
-    [:octicons-home-16: Homepage](https://tresorit.com/){ class="md-button md-button--primary" }
-    [:octicons-eye-16:](https://tresorit.com/legal/privacy-policy){ .card-link title="Privacy Policy" }
-    [:octicons-info-16:](https://support.tresorit.com/hc/en-us){ .card-link title=Documentation}
-
-    ??? downloads
-
-        - [:simple-googleplay: Google Play](https://play.google.com/store/apps/details?id=com.tresorit.mobile)
-        - [:simple-appstore: App Store](https://apps.apple.com/app/apple-store/id722163232)
-        - [:simple-windows11: Windows](https://tresorit.com/download)
-        - [:simple-apple: macOS](https://tresorit.com/download)
-        - [:simple-linux: Linux](https://tresorit.com/download)
-
-Tresorit has received a number of independent security audits:
-
- [2022](https://tresorit.com/blog/tresorit-receives-iso-27001-certification/): ISO/IEC 27001:2013[^1] Compliance [Certification](https://www.certipedia.com/quality_marks/9108644476) by TÜV Rheinland InterCert Kft
- [2021](https://tresorit.com/blog/fresh-penetration-testing-confirms-tresorit-security/): Penetration Testing by Computest
-    - This review assessed the security of the Tresorit web client, Android app, Windows app, and associated infrastructure.
-    - Computest discovered two vulnerabilities which have been resolved.
- [2019](https://tresorit.com/blog/ernst-young-review-verifies-tresorits-security-architecture/): Penetration Testing by Ernst & Young.
-    - This review analyzed the full source code of Tresorit and validated that the implementation matches the concepts described in Tresorit's [white paper](https://prodfrontendcdn.azureedge.net/202208011608/tresorit-encryption-whitepaper.pdf).
-    - Ernst & Young additionally tested the web, mobile, and desktop clients: "Test results found no deviation from Tresorit’s data confidentiality claims."
-
-[^1]: [ISO/IEC 27001](https://en.wikipedia.org/wiki/ISO/IEC_27001):2013 compliance relates to the company's [information security management system](https://en.wikipedia.org/wiki/Information_security_management) and covers the sales, development, maintenance and support of their cloud services.
-
-They have also received the Digital Trust Label, a certification from the [Swiss Digital Initiative](https://www.swiss-digital-initiative.org/digital-trust-label/) which requires passing [35 criteria](https://digitaltrust-label.swiss/criteria/) related to security, privacy, and reliability.

 ## Criteria

--- a/docs/cryptocurrency.md
+++ b/docs/cryptocurrency.md
@@ -1,8 +1,6 @@
 ---
-meta_title: "Private Cryptocurrency Blockchains - Privacy Guides"
 title: Cryptocurrency
 icon: material/bank-circle
-cover: cryptocurrency.png
 ---

 Making payments online is one of the biggest challenges to privacy. These cryptocurrencies provide transaction privacy by default (something which is **not** guaranteed by the majority of cryptocurrencies), provided you have a strong understanding of how to make private payments effectively. We strongly encourage you first read our payments overview article before making any purchases:
@@ -38,7 +36,7 @@ For optimal privacy, make sure to use a noncustodial wallet where the view key s

 For maximum privacy (even with a noncustodial wallet), you should run your own Monero node. Using another person’s node will expose some information to them, such as the IP address that you connect to it from, the timestamps that you sync your wallet, and the transactions that you send from your wallet (though no other details about those transactions). Alternatively, you can connect to someone else’s Monero node over Tor or i2p.

-In August 2021, CipherTrace [announced](https://ciphertrace.com/enhanced-monero-tracing/) enhanced Monero tracing capabilities for government agencies. Public postings show that the US Department of the Treasury's Financial Crimes Enforcement Network [licensed](https://sam.gov/opp/d12cbe9afbb94ca68006d0f006d355ac/view) CipherTrace's "Monero Module" in late 2022.
+In August 2021, CipherTrace [announced](https://finance.yahoo.com/news/ciphertrace-announces-enhanced-monero-tracing-160000275.html) enhanced Monero tracing capabilities for government agencies. Public postings show that the US Department of the Treasury's Financial Crimes Enforcement Network [licensed](https://sam.gov/opp/d12cbe9afbb94ca68006d0f006d355ac/view) CipherTrace's "Monero Module" in late 2022.

 Monero transaction graph privacy is limited by its relatively small ring signatures, especially against targeted attacks. Monero's privacy features have also been [called into question](https://web.archive.org/web/20180331203053/https://www.wired.com/story/monero-privacy/) by some security researchers, and a number of severe vulnerabilities have been found and patched in the past, so the claims made by organizations like CipherTrace are not out of the question. While it's unlikely that Monero mass surveillance tools exist like they do for Bitcoin and others, it's certain that tracing tools assist with targeted investigations.

--- a/docs/data-redaction.md
+++ b/docs/data-redaction.md
@@ -1,9 +1,7 @@
 ---
-meta_title: "Remove PII with Metadata Scrubbers and Data Redaction Tools - Privacy Guides"
 title: "Data and Metadata Redaction"
 icon: material/tag-remove
 description: Use these tools to remove metadata like GPS location and other identifying information from photos and files you share.
-cover: data-redaction.png
 ---
 When sharing files, be sure to remove associated metadata. Image files commonly include [Exif](https://en.wikipedia.org/wiki/Exif) data. Photos sometimes even include GPS coordinates in the file metadata.

--- a/docs/desktop-browsers.md
+++ b/docs/desktop-browsers.md
@@ -1,105 +1,9 @@
 ---
-meta_title: "Privacy Respecting Web Browsers for PC and Mac - Privacy Guides"
 title: "Desktop Browsers"
 icon: material/laptop
-description: These web browsers provide stronger privacy protections than Google Chrome.
-cover: desktop-browsers.png
-schema:
-  - 
-    "@context": http://schema.org
-    "@type": WebPage
-    name: Private Desktop Browser Recommendations
-    url: "./"
-    relatedLink: "../mobile-browsers/"
-  - 
-    "@context": http://schema.org
-    "@type": SoftwareApplication
-    name: Mullvad Browser
-    image: /assets/img/browsers/mullvad_browser.svg
-    url: https://mullvad.net/en/browser
-    applicationCategory: Web Browser
-    operatingSystem:
-      - Windows
-      - macOS
-      - Linux
-    subjectOf:
-      "@type": WebPage
-      url: "./"
-  - 
-    "@context": http://schema.org
-    "@type": SoftwareApplication
-    name: Firefox
-    image: /assets/img/browsers/firefox.svg
-    url: https://firefox.com
-    sameAs: https://en.wikipedia.org/wiki/Firefox
-    applicationCategory: Web Browser
-    operatingSystem:
-      - Windows
-      - macOS
-      - Linux
-    subjectOf:
-      "@type": WebPage
-      url: "./"
-  - 
-    "@context": http://schema.org
-    "@type": SoftwareApplication
-    name: Brave
-    image: /assets/img/browsers/brave.svg
-    url: https://brave.com
-    sameAs: https://en.wikipedia.org/wiki/Brave_(web_browser)
-    applicationCategory: Web Browser
-    operatingSystem:
-      - Windows
-      - macOS
-      - Linux
-    subjectOf:
-      "@type": WebPage
-      url: "./"
+description: Firefox and Brave are our recommendations for standard/non-anonymous browsing.
 ---
-These are our currently recommended desktop web browsers and configurations for standard/non-anonymous browsing. We recommend [Mullvad Browser](#mullvad-browser) if you are focused on strong privacy protections and anti-fingerprinting out of the box, [Firefox](#firefox) for casual internet browsers looking for a good alternative to Google Chrome, and [Brave](#brave) if you need Chromium browser compatibility.
-
-If you need to browse the internet anonymously, you should use [Tor](tor.md) instead. We make some configuration recommendations on this page, but all browsers other than Tor Browser will be traceable by *somebody* in some manner or another.
-
-## Mullvad Browser
-
-!!! recommendation
-
-    ![Mullvad Browser logo](assets/img/browsers/mullvad_browser.svg){ align=right }
-
-    **Mullvad Browser** is a version of [Tor Browser](tor.md#tor-browser) with Tor network integrations removed, aimed at providing Tor Browser's anti-fingerprinting browser technologies to VPN users. It is developed by the Tor Project and distributed by [Mullvad](vpn.md#mullvad), and does **not** require the use of Mullvad's VPN.
-
-    [:octicons-home-16: Homepage](https://mullvad.net/en/browser){ .md-button .md-button--primary }
-    [:octicons-eye-16:](https://mullvad.net/en/help/privacy-policy/){ .card-link title="Privacy Policy" }
-    [:octicons-info-16:](https://mullvad.net/en/help/tag/mullvad-browser/){ .card-link title=Documentation}
-    [:octicons-code-16:](https://gitlab.torproject.org/tpo/applications/mullvad-browser){ .card-link title="Source Code" }
-
-    ??? downloads
-
-        - [:simple-windows11: Windows](https://mullvad.net/en/download/browser/windows)
-        - [:simple-apple: macOS](https://mullvad.net/en/download/browser/macos)
-        - [:simple-linux: Linux](https://mullvad.net/en/download/browser/linux)
-
-Like [Tor Browser](tor.md), Mullvad Browser is designed to prevent fingerprinting by making your browser fingerprint identical to all other Mullvad Browser users, and it includes default settings and extensions that are automatically configured by the default security levels: *Standard*, *Safer* and *Safest*. Therefore, it is imperative that you do not modify the browser at all outside adjusting the default [security levels](https://tb-manual.torproject.org/security-settings/). Other modifications would make your fingerprint unique, defeating the purpose of using this browser. If you want to configure your browser more heavily and fingerprinting is not a concern for you, we recommend [Firefox](#firefox) instead.
-
-### Anti-Fingerprinting
-
-**Without** using a [VPN](vpn.md), Mullvad Browser provides the same protections against [naive fingerprinting scripts](https://github.com/arkenfox/user.js/wiki/3.3-Overrides-%5BTo-RFP-or-Not%5D#-fingerprinting) as other private browsers like Firefox+[Arkenfox](#arkenfox-advanced) or [Brave](#brave). Mullvad Browser provides these protections out of the box, at the expense of some flexibility and convenience that other private browsers can provide.
-
-==For the strongest anti-fingerprinting protection, we recommend using Mullvad Browser in conjunction **with** a VPN==, whether that is Mullvad or another recommended VPN provider. When using a VPN with Mullvad Browser, you will share a fingerprint and a pool of IP addresses with many other users, giving you a "crowd" to blend in with. This strategy is the only way to thwart advanced tracking scripts, and is the same anti-fingerprinting technique used by Tor Browser.
-
-Note that while you can use Mullvad Browser with any VPN provider, other people on that VPN must also be using Mullvad Browser for this "crowd" to exist, something which is more likely on Mullvad VPN compared to other providers, particularly this close to the launch of Mullvad Browser. Mullvad Browser does not have built-in VPN connectivity, nor does it check whether you are using a VPN before browsing; your VPN connection has to be configured and managed separately.
-
-Mullvad Browser comes with the *uBlock Origin* and *NoScript* browser extensions pre-installed. While we typically [don't recommend](#extensions) adding *additional* browser extensions, these extensions that come pre-installed with the browser should **not** be removed or configured outside their default values, because doing so would noticeably make your browser fingerprint distinct from other Mullvad Browser users. It also comes pre-installed with the Mullvad Browser Extension, which *can* be safely removed without impacting your browser fingerprint if you would like, but is also safe to keep even if you don't use Mullvad VPN.
-
-### Private Browsing Mode
-
-Mullvad Browser operates in permanent private browsing mode, meaning your history, cookies, and other site data will always be cleared every time the browser is closed. Your bookmarks, browser settings, and extension settings will still be preserved.
-
-This is required to prevent advanced forms of tracking, but does come at the cost of convenience and some Firefox features, such as Multi-Account Containers. Remember you can always use multiple browsers, for example, you could consider using Firefox+Arkenfox for a few sites that you want to stay logged in on or otherwise don't work properly in Mullvad Browser, and Mullvad Browser for general browsing.
-
-### Mullvad Leta
-
-Mullvad Browser comes with DuckDuckGo set as the default [search engine](search-engines.md), but it also comes preinstalled with **Mullvad Leta**, a search engine which requires an active Mullvad VPN subscription to access. Mullvad Leta queries Google's paid search API directly (which is why it is limited to paying subscribers), however because of this limitation it is possible for Mullvad to correlate search queries and Mullvad VPN accounts. For this reason we discourage the use of Mullvad Leta, even though Mullvad collects very little information about their VPN subscribers.
+These are our currently recommended desktop web browsers and configurations for standard/non-anonymous browsing. If you need to browse the internet anonymously, you should use [Tor](tor.md) instead. In general, we recommend keeping your browser extensions to a minimum; they have privileged access within your browser, require you to trust the developer, can make you [stand out](https://en.wikipedia.org/wiki/Device_fingerprint#Browser_fingerprint), and [weaken](https://groups.google.com/a/chromium.org/g/chromium-extensions/c/0ei-UCHNm34/m/lDaXwQhzBAAJ) site isolation.

 ## Firefox

@@ -127,17 +31,9 @@ Mullvad Browser comes with DuckDuckGo set as the default [search engine](search-

 ### Recommended Configuration

-These options can be found in :material-menu: → **Settings**
+Tor Browser is the only way to truly browse the internet anonymously. When you use Firefox, we recommend changing the following settings to protect your privacy from certain parties, but all browsers other than [Tor Browser](tor.md#tor-browser) will be traceable by *somebody* in some regard or another.

-#### Search
-
- [ ] Uncheck **Provide search suggestions**
-
-Search suggestion features may not be available in your region.
-
-Search suggestions send everything you type in the address bar to the default search engine, regardless of whether you submit an actual search. Disabling search suggestions allows you to more precisely control what data you send to your search engine provider.
-
-#### Privacy & Security
+These options can be found in :material-menu: → **Settings** → **Privacy & Security**.

 ##### Enhanced Tracking Protection

@@ -145,13 +41,6 @@ Search suggestions send everything you type in the address bar to the default se

 This protects you by blocking social media trackers, fingerprinting scripts (note that this does not protect you from *all* fingerprinting), cryptominers, cross-site tracking cookies, and some other tracking content. ETP protects against many common threats, but it does not block all tracking avenues because it is designed to have minimal to no impact on site usability.

-##### Firefox Suggest (US only)
-
-[Firefox Suggest](https://support.mozilla.org/en-US/kb/firefox-suggest) is a feature similar to search suggestions which is only available in the US. We recommend disabling it for the same reason we recommend disabling search suggestions. If you don't see these options under the **Address Bar** header, you do not have the new experience and can ignore these changes.
-
- [ ] Uncheck **Suggestions from the web**
- [ ] Uncheck **Suggestions from sponsors**
-
 ##### Sanitize on Close

 If you want to stay logged in to particular sites, you can allow exceptions in **Cookies and Site Data** → **Manage Exceptions...**
@@ -160,6 +49,14 @@ If you want to stay logged in to particular sites, you can allow exceptions in *

 This protects you from persistent cookies, but does not protect you against cookies acquired during any one browsing session. When this is enabled, it becomes possible to easily cleanse your browser cookies by simply restarting Firefox. You can set exceptions on a per-site basis, if you wish to stay logged in to a particular site you visit often.

+##### Search Suggestions
+
+- [ ] Uncheck **Provide search suggestions**
+
+Search suggestion features may not be available in your region.
+
+Search suggestions send everything you type in the address bar to the default search engine, regardless of whether you submit an actual search. Disabling search suggestions allows you to more precisely control what data you send to your search engine provider.
+
 ##### Telemetry

 - [ ] Uncheck **Allow Firefox to send technical and interaction data to Mozilla**
@@ -179,20 +76,14 @@ Additionally, the Firefox Accounts service collects [some technical data](https:

 This prevents you from unintentionally connecting to a website in plain-text HTTP. Sites without HTTPS are uncommon nowadays, so this should have little to no impact on your day to day browsing.

-#### Sync
+### Firefox Sync

 [Firefox Sync](https://hacks.mozilla.org/2018/11/firefox-sync-privacy/) allows your browsing data (history, bookmarks, etc.) to be accessible on all your devices and protects it with E2EE.

 ### Arkenfox (advanced)

-!!! tip "Use Mullvad Browser for advanced anti-fingerprinting"
-
-    [Mullvad Browser](#mullvad-browser) provides the same anti-fingerprinting protections as Arkenfox out of the box, and does not require the use of Mullvad's VPN to benefit from these protections. Coupled with a VPN, Mullvad Browser can thwart more advanced tracking scripts which Arkenfox cannot. Arkenfox still has the advantage of being much more flexible, and allowing per-site exceptions for websites which you need to stay logged in to.
-
 The [Arkenfox project](https://github.com/arkenfox/user.js) provides a set of carefully considered options for Firefox. If you [decide](https://github.com/arkenfox/user.js/wiki/1.1-To-Arkenfox-or-Not) to use Arkenfox, a [few options](https://github.com/arkenfox/user.js/wiki/3.2-Overrides-[Common]) are subjectively strict and/or may cause some websites to not work properly - [which you can easily change](https://github.com/arkenfox/user.js/wiki/3.1-Overrides) to suit your needs. We **strongly recommend** reading through their full [wiki](https://github.com/arkenfox/user.js/wiki). Arkenfox also enables [container](https://support.mozilla.org/en-US/kb/containers#w_for-advanced-users) support.

-Arkenfox only aims to thwart basic or naive tracking scripts through canvas randomization and Firefox's built-in fingerprint resistance configuration settings. It does not aim to make your browser blend in with a large crowd of other Arkenfox users in the same way Mullvad Browser or Tor Browser do, which is the only way to thwart advanced fingerprint tracking scripts. Remember you can always use multiple browsers, for example, you could consider using Firefox+Arkenfox for a few sites that you want to stay logged in on or otherwise trust, and Mullvad Browser for general browsing.
-
 ## Brave

 !!! recommendation
@@ -220,9 +111,9 @@ Arkenfox only aims to thwart basic or naive tracking scripts through canvas rand

 ### Recommended Configuration

-These options can be found in :material-menu: → **Settings**.
+Tor Browser is the only way to truly browse the internet anonymously. When you use Brave, we recommend changing the following settings to protect your privacy from certain parties, but all browsers other than the [Tor Browser](tor.md#tor-browser) will be traceable by *somebody* in some regard or another.

-#### Settings
+These options can be found in :material-menu: → **Settings**.

 ##### Shields

@@ -262,7 +153,6 @@ Shields' options can be downgraded on a per-site basis as needed, but by default
 - [ ] Uncheck **Private window with Tor** (1)

    !!! tip "Sanitizing on Close"
-
        - [x] Select **Clear cookies and site data when you close all windows** in the *Cookies and other site data* menu

        If you wish to stay logged in to a particular site you visit often, you can set exceptions on a per-site basis under the *Customized behaviors* section.
@@ -278,15 +168,15 @@ Disable built-in extensions you do not use in **Extensions**
 - [ ] Uncheck **Hangouts**
 - [ ] Uncheck **WebTorrent**

-##### Web3
+##### IPFS

-Brave's Web3 features can potentially add to your browser fingerprint and attack surface. Unless you use any of features, they should be disabled.
+InterPlanetary File System (IPFS) is a decentralized, peer-to-peer network for storing and sharing data in a distributed filesystem. Unless you use the feature, disable it.

-Set **Default Ethereum wallet** to **Extensions (no fallback)**
-Set **Default Solana wallet** to **Extensions (no fallback)**
-Set **Method to resolve IPFS resources** to **Disabled**
+- [x] Select **Disabled** on Method to resolve IPFS resources

-##### System
+##### Additional settings
+
+Under the *System* menu

 <div class="annotate" markdown>

@@ -296,19 +186,13 @@ Set **Method to resolve IPFS resources** to **Disabled**

 1. This option is not present on all platforms.

-#### Sync
+### Brave Sync

 [Brave Sync](https://support.brave.com/hc/en-us/articles/360059793111-Understanding-Brave-Sync) allows your browsing data (history, bookmarks, etc.) to be accessible on all your devices without requiring an account and protects it with E2EE.

-#### Brave Rewards and Wallet
-
-**Brave Rewards** lets you recieve Basic Attention Token (BAT) cryptocurrency for performing certain actions within Brave. It relies on a custodial account and KYC from a select number of providers. We do not recommend BAT as a [private cryptocurrency](cryptocurrency.md), nor do we recommend using a [custodial wallet](advanced/payments.md#other-coins-bitcoin-ethereum-etc), so we would discourage using this feature.
-
-**Brave Wallet** operates locally on your computer, but does not support any private cryptocurrencies, so we would discourage using this feature as well.
-
 ## Additional Resources

-In general, we recommend keeping your browser extensions to a minimum to decrease your attack surface; they have privileged access within your browser, require you to trust the developer, can make you [stand out](https://en.wikipedia.org/wiki/Device_fingerprint#Browser_fingerprint), and [weaken](https://groups.google.com/a/chromium.org/g/chromium-extensions/c/0ei-UCHNm34/m/lDaXwQhzBAAJ) site isolation. However, uBlock Origin may prove useful if you value content blocking functionality.
+We generally do not recommend installing any extensions as they increase your attack surface. However, uBlock Origin may prove useful if you value content blocking functionality.

 ### uBlock Origin

--- a/docs/desktop.md
+++ b/docs/desktop.md
@@ -2,7 +2,6 @@
 title: "Desktop/PC"
 icon: simple/linux
 description: Linux distributions are commonly recommended for privacy protection and software freedom.
-cover: desktop.png
 ---
 Linux distributions are commonly recommended for privacy protection and software freedom. If you don't already use Linux, below are some distributions we suggest trying out, as well as some general privacy and security improvement tips that are applicable to many Linux distributions.

--- a/docs/dns.md
+++ b/docs/dns.md
@@ -2,7 +2,6 @@
 title: "DNS Resolvers"
 icon: material/dns
 description: These are some encrypted DNS providers we recommend switching to, to replace your ISP's default configuration.
-cover: dns.png
 ---

 Encrypted DNS with third-party servers should only be used to get around basic [DNS blocking](https://en.wikipedia.org/wiki/DNS_blocking) when you can be sure there won't be any consequences. Encrypted DNS will not help you hide any of your browsing activity.
@@ -13,12 +12,12 @@ Encrypted DNS with third-party servers should only be used to get around basic [

 | DNS Provider | Privacy Policy | Protocols | Logging | ECS | Filtering |
 | ------------ | -------------- | --------- | ------- | --- | --------- |
-| [**AdGuard**](https://adguard.com/en/adguard-dns/overview.html) | [:octicons-link-external-24:](https://adguard.com/en/privacy/dns.html) | Cleartext <br> DoH/3 <br> DoT <br> DNSCrypt | Some[^1] | No | Based on personal configuration. Filter list being used can be found here. [:octicons-link-external-24:](https://github.com/AdguardTeam/AdGuardDNS)
-| [**Cloudflare**](https://developers.cloudflare.com/1.1.1.1/setting-up-1.1.1.1/) | [:octicons-link-external-24:](https://developers.cloudflare.com/1.1.1.1/privacy/public-dns-resolver/) | Cleartext <br> DoH/3 <br> DoT | Some[^2] | No | Based on personal configuration.|
-| [**Control D**](https://controld.com/free-dns) | [:octicons-link-external-24:](https://controld.com/privacy) | Cleartext <br> DoH/3 <br> DoT <br> DoQ| Optional[^3] | No | Based on personal configuration. |
-| [**Mullvad**](https://mullvad.net/en/help/dns-over-https-and-dns-over-tls) | [:octicons-link-external-24:](https://mullvad.net/en/help/no-logging-data-policy/) | DoH <br> DoT | No[^4] | No | Based on personal configuration. Filter list being used can be found here. [:octicons-link-external-24:](https://github.com/mullvad/dns-adblock)
-| [**NextDNS**](https://www.nextdns.io) | [:octicons-link-external-24:](https://www.nextdns.io/privacy) | Cleartext <br> DoH/3 <br> DoT <br> DoQ | Optional[^5] | Optional | Based on personal configuration. |
-| [**Quad9**](https://quad9.net) | [:octicons-link-external-24:](https://quad9.net/privacy/policy/) | Cleartext <br> DoH <br> DoT <br> DNSCrypt | Some[^6] | Optional |  Based on personal configuration, Malware blocking by default. |
+| [**AdGuard**](https://adguard.com/en/adguard-dns/overview.html) | [:octicons-link-external-24:](https://adguard.com/en/privacy/dns.html) | Cleartext <br> DoH/3 <br> DoT <br> DNSCrypt | Some[^1] | No | Based on server choice. Filter list being used can be found here. [:octicons-link-external-24:](https://github.com/AdguardTeam/AdGuardDNS)
+| [**Cloudflare**](https://developers.cloudflare.com/1.1.1.1/setting-up-1.1.1.1/) | [:octicons-link-external-24:](https://developers.cloudflare.com/1.1.1.1/privacy/public-dns-resolver/) | Cleartext <br> DoH/3 <br> DoT | Some[^2] | No | Based on server choice.|
+| [**Control D**](https://controld.com/free-dns) | [:octicons-link-external-24:](https://controld.com/privacy) | Cleartext <br> DoH/3 <br> DoT <br> DoQ| Optional[^3] | No | Based on server choice. |
+| [**Mullvad**](https://mullvad.net/en/help/dns-over-https-and-dns-over-tls) | [:octicons-link-external-24:](https://mullvad.net/en/help/no-logging-data-policy/) | DoH <br> DoT | No[^4] | No | Based on server choice. Filter list being used can be found here. [:octicons-link-external-24:](https://github.com/mullvad/dns-adblock)
+| [**NextDNS**](https://www.nextdns.io) | [:octicons-link-external-24:](https://www.nextdns.io/privacy) | Cleartext <br> DoH/3 <br> DoT | Optional[^5] | Optional | Based on server choice. |
+| [**Quad9**](https://quad9.net) | [:octicons-link-external-24:](https://quad9.net/privacy/policy/) | Cleartext <br> DoH <br> DoT <br> DNSCrypt | Some[^6] | Optional |  Based on server choice, Malware blocking by default. |

 [^1]: AdGuard stores aggregated performance metrics of their DNS servers, namely the number of complete requests to a particular server, the number of blocked requests, and the speed of processing requests. They also keep and store the database of domains requested in within last 24 hours. "We need this information to identify and block new trackers and threats." "We also log how many times this or that tracker has been blocked. We need this information to remove outdated rules from our filters." [https://adguard.com/en/privacy/dns.html](https://adguard.com/en/privacy/dns.html)
 [^2]: Cloudflare collects and stores only the limited DNS query data that is sent to the 1.1.1.1 resolver. The 1.1.1.1 resolver service does not log personal data, and the bulk of the limited non-personally identifiable query data is stored only for 25 hours. [https://developers.cloudflare.com/1.1.1.1/privacy/public-dns-resolver/](https://developers.cloudflare.com/1.1.1.1/privacy/public-dns-resolver/)
@@ -27,7 +26,7 @@ Encrypted DNS with third-party servers should only be used to get around basic [
 [^5]: NextDNS can provide insights and logging features on an opt-in basis. You can choose retention times and log storage locations for any logs you choose to keep. If it's not specifically requested, no data is logged. [https://nextdns.io/privacy](https://nextdns.io/privacy)
 [^6]: Quad9 collects some data for the purposes of threat monitoring and response. That data may then be remixed and shared, such as for the purpose of security research. Quad9 does not collect or record IP addresses or other data they deem personally identifiable. [https://www.quad9.net/privacy/policy/](https://www.quad9.net/privacy/policy/)

-### Criteria
+## Criteria

 **Please note we are not affiliated with any of the projects we recommend.** In addition to [our standard criteria](about/criteria.md), we have developed a clear set of requirements to allow us to provide objective recommendations. We suggest you familiarize yourself with this list before choosing to use a project, and conduct your own research to ensure it's the right choice for you.

--- a/docs/email-clients.md
+++ b/docs/email-clients.md
@@ -2,7 +2,6 @@
 title: "Email Clients"
 icon: material/email-open
 description: These email clients are privacy-respecting and support OpenPGP email encryption.
-cover: email-clients.png
 ---
 Our recommendation list contains email clients that support both [OpenPGP](encryption.md#openpgp) and strong authentication such as [Open Authorization (OAuth)](https://en.wikipedia.org/wiki/OAuth). OAuth allows you to use [Multi-Factor Authentication](basics/multi-factor-authentication.md) and prevent account theft.

@@ -67,9 +66,7 @@ These options can be found in :material-menu: → **Settings** → **Privacy & S

    [:octicons-home-16: Homepage](https://support.apple.com/guide/mail/welcome/mac){ .md-button .md-button--primary }
    [:octicons-eye-16:](https://www.apple.com/legal/privacy/en-ww/){ .card-link title="Privacy Policy" }
-    [:octicons-info-16:](https://support.apple.com/mail){ .card-link title=Documentation}
-
-Apple Mail has the ability to load remote content in the background or block it entirely and hide your IP address from senders on [macOS](https://support.apple.com/guide/mail/mlhl03be2866/mac) and [iOS](https://support.apple.com/guide/iphone/iphf084865c7/ios).
+    [:octicons-info-16:](https://support.apple.com/guide/mail/toc){ .card-link title=Documentation}

 ### Canary Mail (iOS)

--- a/docs/email.md
+++ b/docs/email.md
@@ -1,13 +1,11 @@
 ---
-meta_title: "Encrypted Private Email Recommendations - Privacy Guides"
 title: "Email Services"
 icon: material/email
 description: These email providers offer a great place to store your emails securely, and many offer interoperable OpenPGP encryption with other providers.
-cover: email.png
 ---
-Email is practically a necessity for using any online service, however we do not recommend it for person-to-person conversations. Rather than using email to contact other people, consider using an instant messaging medium that supports forward secrecy.
+Email is practically a necessity for using any online service, however we do not recommend it for person-to-person conversations. Rather than using email to contact other people, consider using an instant messaging medium that supports forward secrecy:

-[Recommended Instant Messengers](real-time-communication.md){ .md-button }
+[Recommended Instant Messengers :material-arrow-right-drop-circle:](real-time-communication.md){ .md-button }

 For everything else, we recommend a variety of email providers based on sustainable business models and built-in security and privacy features.

@@ -124,7 +122,7 @@ Mailbox.org doesn't accept any cryptocurrencies as a result of their payment pro

 #### :material-check:{ .pg-green } Account Security

-Mailbox.org supports [two factor authentication](https://kb.mailbox.org/display/MBOKBEN/How+to+use+two-factor+authentication+-+2FA) for their webmail only. You can use either TOTP or a [YubiKey](https://en.wikipedia.org/wiki/YubiKey) via the [YubiCloud](https://www.yubico.com/products/services-software/yubicloud). Web standards such as [WebAuthn](https://en.wikipedia.org/wiki/WebAuthn) are not yet supported.
+Mailbox.org supports [two factor authentication](https://kb.mailbox.org/display/MBOKBEN/How+to+use+two-factor+authentication+-+2FA) for their webmail only. You can use either TOTP or a [Yubikey](https://en.wikipedia.org/wiki/YubiKey) via the [Yubicloud](https://www.yubico.com/products/services-software/yubicloud). Web standards such as [WebAuthn](https://en.wikipedia.org/wiki/WebAuthn) are not yet supported.

 #### :material-information-outline:{ .pg-blue } Data Security

@@ -156,10 +154,60 @@ These providers store your emails with zero-knowledge encryption, making them gr

 <div class="grid cards" markdown>

+- ![StartMail logo](assets/img/email/startmail.svg#only-light){ .twemoji }![StartMail logo](assets/img/email/startmail-dark.svg#only-dark){ .twemoji } [StartMail](email.md#startmail)
 - ![Tutanota logo](assets/img/email/tutanota.svg){ .twemoji } [Tutanota](email.md#tutanota)

 </div>

+### StartMail
+
+!!! recommendation
+
+    ![StartMail logo](assets/img/email/startmail.svg#only-light){ align=right }
+    ![StartMail logo](assets/img/email/startmail-dark.svg#only-dark){ align=right }
+
+    **StartMail** is an email service with a focus on security and privacy through the use of standard OpenPGP encryption. StartMail has been in operation since 2014 and is based in Boulevard 11, Zeist Netherlands. Accounts start with 10GB. They offer a 30-day trial.
+
+    [:octicons-home-16: Homepage](https://www.startmail.com/){ .md-button .md-button--primary }
+    [:octicons-eye-16:](https://www.startmail.com/en/privacy/){ .card-link title="Privacy Policy" }
+    [:octicons-info-16:](https://support.startmail.com){ .card-link title=Documentation}
+
+    ??? downloads
+
+        - [:octicons-browser-16: Web](https://mail.startmail.com/login)
+
+#### :material-check:{ .pg-green } Custom Domains and Aliases
+
+Personal accounts can use [Custom or Quick](https://support.startmail.com/hc/en-us/articles/360007297457-Aliases) aliases. [Custom domains](https://support.startmail.com/hc/en-us/articles/4403911432209-Setup-a-custom-domain) are also available.
+
+#### :material-alert-outline:{ .pg-orange } Private Payment Methods
+
+StartMail accepts Visa, MasterCard, American Express and Paypal. StartMail also has other [payment options](https://support.startmail.com/hc/en-us/articles/360006620637-Payment-methods) such as [Bitcoin](advanced/payments.md#other-coins-bitcoin-ethereum-etc) (currently only for Personal accounts) and SEPA Direct Debit for accounts older than a year.
+
+#### :material-check:{ .pg-green } Account Security
+
+StartMail supports TOTP two factor authentication [for webmail only](https://support.startmail.com/hc/en-us/articles/360006682158-Two-factor-authentication-2FA). They do not allow U2F security key authentication.
+
+#### :material-information-outline:{ .pg-blue } Data Security
+
+StartMail has [zero access encryption at rest](https://www.startmail.com/en/whitepaper/#_Toc458527835), using their "user vault" system. When you log in, the vault is opened, and the email is then moved to the vault out of the queue where it is decrypted by the corresponding private key.
+
+StartMail supports importing [contacts](https://support.startmail.com/hc/en-us/articles/360006495557-Import-contacts) however, they are only accessible in the webmail and not through protocols such as [CalDAV](https://en.wikipedia.org/wiki/CalDAV). Contacts are also not stored using zero knowledge encryption.
+
+#### :material-check:{ .pg-green } Email Encryption
+
+StartMail has [integrated encryption](https://support.startmail.com/hc/en-us/sections/360001889078-Encryption) in their webmail, which simplifies sending encrypted messages with public OpenPGP keys. However, they do not support the Web Key Directory standard, making the discovery of a Startmail mailbox's public key more challenging for other email providers or clients.
+
+#### :material-information-outline:{ .pg-blue } Account Termination
+
+On account expiration, StartMail will permanently delete your account after [6 months in 3 phases](https://support.startmail.com/hc/en-us/articles/360006794398-Account-expiration).
+
+#### :material-information-outline:{ .pg-blue } Additional Functionality
+
+StartMail allows for proxying of images within emails. If you allow the remote image to be loaded, the sender won't know what your IP address is.
+
+StartMail does not offer a digital legacy feature.
+
 ### Tutanota

 !!! recommendation
@@ -362,7 +410,7 @@ We regard these features as important in order to provide a safe and optimal ser

 **Best Case:**

- Encrypts all account data (Contacts, Calendars, etc.) at rest with zero-access encryption.
+- Encrypts all account data (Contacts, Calendars, etc) at rest with zero-access encryption.
 - Integrated webmail E2EE/PGP encryption provided as a convenience.
 - Support for [WKD](https://wiki.gnupg.org/WKD) to allow improved discovery of public OpenPGP keys via HTTP.
    GnuPG users can get a key by typing: `gpg --locate-key example_user@example.com`
@@ -380,12 +428,12 @@ We prefer our recommended providers to collect as little data as possible.

 - Protect sender's IP address. Filter it from showing in the `Received` header field.
 - Don't require personally identifiable information (PII) besides a username and a password.
- Privacy policy that meets the requirements defined by the GDPR.
+- Privacy policy that meets the requirements defined by the GDPR
+- Must not be hosted in the US due to [ECPA](https://en.wikipedia.org/wiki/Electronic_Communications_Privacy_Act#Criticism) which has [yet to be reformed](https://epic.org/ecpa/).

 **Best Case:**

 - Accepts [anonymous payment options](advanced/payments.md) ([cryptocurrency](cryptocurrency.md), cash, gift cards, etc.)
- Hosted in a jurisdiction with strong email privacy protection laws.

 ### Security

@@ -438,14 +486,14 @@ With the email providers we recommend we like to see responsible marketing.

 **Minimum to Qualify:**

- Must self-host analytics (no Google Analytics, Adobe Analytics, etc.). The provider's site must also comply with [DNT (Do Not Track)](https://en.wikipedia.org/wiki/Do_Not_Track) for those who wish to opt-out.
+- Must self-host analytics (no Google Analytics, Adobe Analytics, etc). The provider's site must also comply with [DNT (Do Not Track)](https://en.wikipedia.org/wiki/Do_Not_Track) for those who wish to opt-out.

 Must not have any marketing which is irresponsible:

 - Claims of "unbreakable encryption." Encryption should be used with the intention that it may not be secret in the future when the technology exists to crack it.
 - Making guarantees of protecting anonymity 100%. When someone makes a claim that something is 100% it means there is no certainty for failure. We know people can quite easily deanonymize themselves in a number of ways, e.g.:

- Reusing personal information e.g. (email accounts, unique pseudonyms, etc.) that they accessed without anonymity software (Tor, VPN, etc.)
+- Reusing personal information e.g. (email accounts, unique pseudonyms, etc) that they accessed without anonymity software (Tor, VPN, etc)
 - [Browser fingerprinting](https://en.wikipedia.org/wiki/Device_fingerprint#Browser_fingerprint)

 **Best Case:**
--- a/docs/encryption.md
+++ b/docs/encryption.md
@@ -1,9 +1,7 @@
 ---
-meta_title: "Recommended Encryption Software: VeraCrypt, Cryptomator, PicoCrypt, and OpenPGP - Privacy Guides"
 title: "Encryption Software"
 icon: material/file-lock
 description: Encryption of data is the only way to control who can access it. These tools allow you to encrypt your emails and any other files.
-cover: encryption.png
 ---
 Encryption of data is the only way to control who can access it. If you are currently not using encryption software for your hard disk, emails or files, you should pick an option here.

--- a/docs/file-sharing.md
+++ b/docs/file-sharing.md
@@ -2,7 +2,6 @@
 title: "File Sharing and Sync"
 icon: material/share-variant
 description: Discover how to privately share your files between your devices, with your friends and family, or anonymously online.
-cover: file-sharing.png
 ---
 Discover how to privately share your files between your devices, with your friends and family, or anonymously online.

--- a/docs/financial-services.md
+++ b/docs/financial-services.md
@@ -1,7 +1,6 @@
 ---
 title: Financial Services
 icon: material/bank
-cover: financial-services.png
 ---

 Making payments online is one of the biggest challenges to privacy. These services can assist you in protecting your privacy from merchants and other trackers, provided you have a strong understanding of how to make private payments effectively. We strongly encourage you first read our payments overview article before making any purchases:
@@ -35,8 +34,7 @@ Privacy.com gives information about the merchants you purchase from to your bank

 !!! recommendation

-    ![MySudo logo](assets/img/financial-services/mysudo.svg#only-light){ align=right }
-    ![MySudo logo](assets/img/financial-services/mysudo-dark.svg#only-dark){ align=right }
+    ![MySudo logo](assets/img/financial-services/mysudo.svg){ align=right }

    **MySudo** provides up to 9 virtual cards depending on the plan you purchase. Their paid plans additionally include functionality which may be useful for making purchases privately, such as virtual phone numbers and email addresses, although we typically recommend other [email aliasing providers](email.md) for extensive email aliasing use.

@@ -75,9 +73,9 @@ These services allow you to purchase gift cards for a variety of merchants onlin

 !!! recommendation

-    ![CoinCards logo](assets/img/financial-services/coincards.svg){ align=right }
+    ![CakePay logo](assets/img/financial-services/coincards.svg){ align=right }

-    **CoinCards** (available in the US and Canada) allows you to purchase gift cards for a large variety of merchants.
+    **CoinCards** (available in the US, Canada, and UK) allows you to purchase gift cards for a large variety of merchants.

    [:octicons-home-16: Homepage](https://coincards.com/){ .md-button .md-button--primary }
    [:octicons-eye-16:](https://coincards.com/privacy-policy/){ .card-link title="Privacy Policy" }
--- a/docs/frontends.md
+++ b/docs/frontends.md
@@ -2,14 +2,39 @@
 title: "Frontends"
 icon: material/flip-to-front
 description: These open-source frontends for various internet services allow you to access content without JavaScript or other annoyances.
-cover: frontends.png
 ---

 Sometimes services will try to force you to sign up for an account by blocking access to content with annoying popups. They might also break without JavaScript enabled. These frontends can allow you to get around these restrictions.

-If you choose to self-host these frontends, it is important that you have other people using your instance as well in order for you to blend in. You should be careful with where and how you are hosting, as other peoples' usage will be linked to your hosting.
+## LBRY

-When you are using an instance run by someone else, make sure to read the privacy policy of that specific instance. They can be modified by their owners and therefore may not reflect the default policy. Some instances have Tor .onion addresses which may grant some privacy as long as your search queries don't contain PII.
+### Librarian
+
+!!! recommendation
+
+    ![Librarian logo](assets/img/frontends/librarian.svg#only-light){ align=right }
+    ![Librarian logo](assets/img/frontends/librarian-dark.svg#only-dark){ align=right }
+
+    **Librarian** is a free and open-source frontend for [Odysee](https://odysee.com/) (LBRY) that is also self-hostable.
+    
+    There are a number of public instances, with some instances having [Tor](https://www.torproject.org) onion services support.
+
+    [:octicons-repo-16: Repository](https://codeberg.org/librarian/librarian){ .md-button .md-button--primary }
+    [:octicons-server-16:](https://librarian.codeberg.page/){ .card-link title="Public Instances"}
+    [:octicons-info-16:](https://codeberg.org/librarian/librarian/wiki){ .card-link title=Documentation}
+    [:octicons-code-16:](https://codeberg.org/librarian/librarian){ .card-link title="Source Code" }
+
+!!! warning
+
+    Librarian does not proxy video streams by default. Videos watched through Librarian will still make direct connections to Odysee's servers (e.g. `odycdn.com`); however, some instances may enable proxying which would be detailed in the instance's privacy policy.
+
+!!! tip
+
+    Librarian is useful if you want watch LBRY content on mobile without mandatory telemetry and if you want to disable JavaScript in your browser, as is the case with [Tor Browser](https://www.torproject.org/) on the Safest security level.
+
+When self-hosting, it is important that you have other people using your instance as well in order for you to blend in. You should be careful with where and how you are hosting Librarian, as other peoples' usage will be linked to your hosting.
+
+When you are using a Librarian instance, make sure to read the privacy policy of that specific instance. Librarian instances can be modified by their owners and therefore may not reflect the default policy. Librarian instances feature a "privacy nutrition label" to provide an overview of their policy. Some instances have Tor .onion addresses which may grant some privacy as long as your search queries don't contain PII.

 ## Twitter

@@ -33,6 +58,10 @@ When you are using an instance run by someone else, make sure to read the privac

    Nitter is useful if you want to browse Twitter content without having to log in and if you want to disable JavaScript in your browser, as is the case with [Tor Browser](https://www.torproject.org/) on the Safest security level. It also allows you to [create RSS feeds for Twitter](news-aggregators.md#twitter).

+When self-hosting, it is important that you have other people using your instance as well in order for you to blend in. You should be careful with where and how you are hosting Nitter, as other peoples' usage will be linked to your hosting.
+
+When you are using a Nitter instance, make sure to read the privacy policy of that specific instance. Nitter instances can be modified by their owners and therefore may not reflect the default policy. Some instances have Tor .onion addresses which may grant some privacy as long as your search queries don't contain PII.
+
 ## TikTok

 ### ProxiTok
@@ -54,6 +83,10 @@ When you are using an instance run by someone else, make sure to read the privac

    ProxiTok is useful if you want to disable JavaScript in your browser, such as [Tor Browser](https://www.torproject.org/) on the Safest security level.

+When self-hosting, it is important that you have other people using your instance as well in order for you to blend in. You should be careful with where and how you are hosting ProxiTok, as other peoples' usage will be linked to your hosting.
+
+When you are using a ProxiTok instance, make sure to read the privacy policy of that specific instance. ProxiTok instances can be modified by their owners and therefore may not reflect their associated privacy policy. Some instances have Tor .onion addresses which may grant some privacy as long as your search queries don't contain PII.
+
 ## YouTube

 ### FreeTube
@@ -158,7 +191,7 @@ By default, LibreTube blocks all YouTube advertisements. Additionally, Libretube

 1. The default instance is [FramaTube](https://framatube.org/), however more can be added via **Settings** → **Content** → **PeerTube instances**

-!!! warning
+!!! Warning

    When using NewPipe, your IP address will be visible to the video providers used. Consider using a [VPN](vpn.md) or [Tor](https://www.torproject.org) if your [threat model](basics/threat-modeling.md) requires hiding your IP address.

@@ -187,6 +220,10 @@ By default, LibreTube blocks all YouTube advertisements. Additionally, Libretube

    Invidious is useful if you want to disable JavaScript in your browser, such as [Tor Browser](https://www.torproject.org/) on the Safest security level. It does not provide privacy by itself, and we don’t recommend logging into any accounts.

+When self-hosting, it is important that you have other people using your instance as well in order for you to blend in. You should be careful with where and how you are hosting Invidious, as other peoples' usage will be linked to your hosting.
+
+When you are using an Invidious instance, make sure to read the privacy policy of that specific instance. Invidious instances can be modified by their owners and therefore may not reflect their associated privacy policy. Some instances have Tor .onion addresses which may grant some privacy as long as your search queries don't contain PII.
+
 ### Piped

 !!! recommendation
@@ -207,6 +244,10 @@ By default, LibreTube blocks all YouTube advertisements. Additionally, Libretube

    Piped is useful if you want to use [SponsorBlock](https://sponsor.ajay.app) without installing an extension or to access age-restricted content without an account. It does not provide privacy by itself, and we don’t recommend logging into any accounts.

+When self-hosting, it is important that you have other people using your instance as well in order for you to blend in. You should be careful with where and how you are hosting Piped, as other peoples' usage will be linked to your hosting.
+
+When you are using a Piped instance, make sure to read the privacy policy of that specific instance. Piped instances can be modified by their owners and therefore may not reflect their associated privacy policy.
+
 ## Criteria

 **Please note we are not affiliated with any of the projects we recommend.** In addition to [our standard criteria](about/criteria.md), we have developed a clear set of requirements to allow us to provide objective recommendations. We suggest you familiarize yourself with this list before choosing to use a project, and conduct your own research to ensure it's the right choice for you.
--- a/docs/index.md
+++ b/docs/index.md
@@ -1,38 +1,9 @@
 ---
-meta_title: "Privacy Guides: Your Independent Privacy and Security Resource"
 template: overrides/home.en.html
 hide:
  - navigation
  - toc
  - feedback
-schema:
-  - 
-    "@context": https://schema.org
-    "@type": Organization
-    "@id": https://www.privacyguides.org/
-    name: Privacy Guides
-    url: https://www.privacyguides.org/en/about/
-    logo: https://www.privacyguides.org/en/assets/brand/png/square/pg-yellow.png
-    sameAs:
-      - https://twitter.com/privacy_guides
-      - https://github.com/privacyguides
-      - https://www.wikidata.org/wiki/Q111710163
-      - https://opencollective.com/privacyguides
-      - https://www.youtube.com/@privacyguides
-      - https://mastodon.neat.computer/@privacyguides
-  - 
-    "@context": https://schema.org
-    "@type": WebSite
-    name: Privacy Guides
-    url: "https://www.privacyguides.org/"
-    sameAs:
-      - https://www.wikidata.org/wiki/Q111710163
-    potentialAction:
-      "@type": SearchAction
-      target:
-        "@type": EntryPoint
-        urlTemplate: "https://www.privacyguides.org/?q={search_term_string}"
-      query-input: required name=search_term_string
 ---
 <!-- markdownlint-disable-next-line -->
 ## Why should I care?
@@ -43,7 +14,7 @@ Much like the right to interracial marriage, woman's suffrage, freedom of speech

 You shouldn't confuse privacy with secrecy. We know what happens in the bathroom, but you still close the door. That's because you want privacy, not secrecy. **Everyone** has something to protect. Privacy is something that makes us human.

-[:material-book-outline: Why Privacy Matters](basics/why-privacy-matters.md){ class="md-button md-button--primary" }
+[:material-target-account: Common Internet Threats](basics/common-threats.md){ .md-button .md-button--primary }

 ## What should I do?

@@ -53,7 +24,7 @@ Trying to protect all your data from everyone all the time is impractical, expen

 ==This process of identifying threats and defining countermeasures is called **threat modeling**==, and it forms the basis of every good security and privacy plan.

-[:material-book-outline: Learn More About Threat Modeling](basics/threat-modeling.md){ class="md-button md-button--primary" }
+[:material-book-outline: Learn More About Threat Modeling](basics/threat-modeling.md){ .md-button .md-button--primary }

 ---

--- a/docs/mobile-browsers.md
+++ b/docs/mobile-browsers.md
@@ -1,40 +1,7 @@
 ---
-meta_title: "Privacy Respecting Mobile Web Browsers for Android and iOS - Privacy Guides"
 title: "Mobile Browsers"
 icon: material/cellphone-information
 description: These browsers are what we currently recommend for standard/non-anonymous internet browsing on your phone.
-cover: mobile-browsers.png
-schema:
-  - 
-    "@context": http://schema.org
-    "@type": WebPage
-    name: Private Mobile Browser Recommendations
-    url: "./"
-    relatedLink: "../desktop-browsers/"
-  - 
-    "@context": http://schema.org
-    "@type": MobileApplication
-    name: Brave
-    image: /assets/img/browsers/brave.svg
-    url: https://brave.com
-    applicationCategory: Web Browser
-    operatingSystem:
-      - Android
-    subjectOf:
-      "@type": WebPage
-      url: "./"
-  - 
-    "@context": http://schema.org
-    "@type": MobileApplication
-    name: Safari
-    image: /assets/img/browsers/safari.svg
-    url: https://www.apple.com/safari/
-    applicationCategory: Web Browser
-    operatingSystem:
-      - iOS
-    subjectOf:
-      "@type": WebPage
-      url: "./"
 ---
 These are our currently recommended mobile web browsers and configurations for standard/non-anonymous internet browsing. If you need to browse the internet anonymously, you should use [Tor](tor.md) instead. In general, we recommend keeping extensions to a minimum; they have privileged access within your browser, require you to trust the developer, can make you [stand out](https://en.wikipedia.org/wiki/Device_fingerprint#Browser_fingerprint), and [weaken](https://groups.google.com/a/chromium.org/g/chromium-extensions/c/0ei-UCHNm34/m/lDaXwQhzBAAJ) site isolation.

@@ -85,7 +52,6 @@ Shields' options can be downgraded on a per-site basis as needed, but by default
        Brave allows you to select additional content filters within the internal `brave://adblock` page. We advise against using this feature; instead, keep the default filter lists. Using extra lists will make you stand out from other Brave users and may also increase attack surface if there is an exploit in Brave and a malicious rule is added to one of the lists you use.

 - [x] Select **Upgrade connections to HTTPS**
- [x] Select **Always use secure connections**
 - [x] (Optional) Select **Block Scripts** (1)
 - [x] Select **Strict, may break sites** under **Block fingerprinting**

@@ -113,10 +79,10 @@ Shields' options can be downgraded on a per-site basis as needed, but by default
 - [ ] Uncheck **Automatically send diagnostic reports**
 - [ ] Uncheck **Automatically send daily usage ping to Brave**

-</div>
-
 1. InterPlanetary File System (IPFS) is a decentralized, peer-to-peer network for storing and sharing data in a distributed filesystem. Unless you use the feature, disable it.

+</div>
+
 #### Brave Sync

 [Brave Sync](https://support.brave.com/hc/en-us/articles/360059793111-Understanding-Brave-Sync) allows your browsing data (history, bookmarks, etc.) to be accessible on all your devices without requiring an account and protects it with E2EE.
@@ -131,9 +97,7 @@ On iOS, any app that can browse the web is [restricted](https://developer.apple.

    ![Safari logo](assets/img/browsers/safari.svg){ align=right }

-    **Safari** is the default browser in iOS. It includes [privacy features](https://support.apple.com/guide/iphone/browse-the-web-privately-iphb01fc3c85/15.0/ios/15.0) such as [Intelligent Tracking Prevention](https://webkit.org/blog/7675/intelligent-tracking-prevention/), Privacy Report, isolated and ephemeral Private Browsing tabs, iCloud Private Relay, and fingerprinting reduction by presenting a simplified version of the system configuration to websites so more devices look identical.
-    
-    Safari is restricted to Apple devices and is covered by [System Integrity Protection](https://support.apple.com/guide/security/system-integrity-protection-secb7ea06b49/web), a security feature which limits system programs and files to being read-only so they can't be tampered with by you or malware.
+    **Safari** is the default browser in iOS. It includes [privacy features](https://support.apple.com/guide/iphone/browse-the-web-privately-iphb01fc3c85/15.0/ios/15.0) such as Intelligent Tracking Protection, Privacy Report, isolated Private Browsing tabs, iCloud Private Relay, and automatic HTTPS upgrades.

    [:octicons-home-16: Homepage](https://www.apple.com/safari/){ .md-button .md-button--primary }
    [:octicons-eye-16:](https://www.apple.com/legal/privacy/data/en/safari/){ .card-link title="Privacy Policy" }
--- a/docs/multi-factor-authentication.md
+++ b/docs/multi-factor-authentication.md
@@ -2,7 +2,6 @@
 title: "Multi-Factor Authenticators"
 icon: 'material/two-factor-authentication'
 description: These tools assist you with securing your internet accounts with Multi-Factor Authentication without sending your secrets to a third-party.
-cover: multi-factor-authentication.png
 ---
 ## Hardware Security Keys

@@ -29,7 +28,7 @@ For models which support HOTP and TOTP, there are 2 slots in the OTP interface w
 !!! warning
    The firmware of YubiKey is not open-source and is not updatable. If you want features in newer firmware versions, or if there is a vulnerability in the firmware version you are using, you would need to purchase a new key.

-### Nitrokey
+### Nitrokey / Librem Key

 !!! recommendation

@@ -49,16 +48,20 @@ For the models which support HOTP and TOTP, there are 3 slots for HOTP and 15 fo

 !!! warning

-    While Nitrokeys do not release the HOTP/TOTP secrets to the device they are plugged into, the HOTP and TOTP storage is **not** encrypted and is vulnerable to physical attacks. If you are looking to store HOTP or TOTP these secrets, we highly recommend that you use a YubiKey instead.
+    While Nitrokeys do not release the HOTP/TOTP secrets to the device they are plugged into, the HOTP and TOTP storage is **not** encrypted and is vulnerable to physical attacks. If you are looking to store HOTP or TOTP these secrets, we highly recommend that you use a Yubikey instead.

 !!! warning

    Resetting the OpenPGP interface on a Nitrokey will also make the password database [inaccessible](https://docs.nitrokey.com/pro/linux/factory-reset).

-The Nitrokey Pro 2, Nitrokey Storage 2, and the upcoming Nitrokey 3 supports system integrity verification for laptops with the [Coreboot](https://www.coreboot.org/) + [Heads](https://osresearch.net/) firmware.
+ The Nitrokey Pro 2, Nitrokey Storage 2, and the upcoming Nitrokey 3 supports system integrity verification for laptops with the [Coreboot](https://www.coreboot.org/) + [Heads](https://osresearch.net/) firmware. Purism's [Librem Key](https://puri.sm/products/librem-key/) is a rebranded NitroKey Pro 2 with similar firmware and can also be used for the same purposes.

 Nitrokey's firmware is open-source, unlike the YubiKey. The firmware on modern NitroKey models (except the **NitroKey Pro 2**) is updatable.

+!!! tip
+
+    The Nitrokey app, while compatible with Librem Keys, requires `libnitrokey` version 3.6 or above to recognize them. Currently, the package is outdated on Windows, macOS, and most Linux distributions' repository, so you will likely have to compile the Nitrokey app yourself to get it working with the Librem Key. On Linux, you can obtain an up-to-date version from [Flathub](https://flathub.org/apps/details/com.nitrokey.nitrokey-app).
+
 ### Criteria

 **Please note we are not affiliated with any of the projects we recommend.** In addition to [our standard criteria](about/criteria.md), we have developed a clear set of requirements to allow us to provide objective recommendations. We suggest you familiarize yourself with this list before choosing to use a project, and conduct your own research to ensure it's the right choice for you.
@@ -133,7 +136,7 @@ We highly recommend that you use mobile TOTP apps instead of desktop alternative

    We are working on establishing defined criteria for every section of our site, and this may be subject to change. If you have any questions about our criteria, please [ask on our forum](https://discuss.privacyguides.net/latest) and don't assume we didn't consider something when making our recommendations if it is not listed here. There are many factors considered and discussed when we recommend a project, and documenting every single one is a work-in-progress.

- Source code must be publicly available.
+- Must be open-source software.
 - Must not require internet connectivity.
 - Must not sync to a third-party cloud sync/backup service.
    - **Optional** E2EE sync support with OS-native tools is acceptable, e.g. encrypted sync via iCloud.
--- a/docs/news-aggregators.md
+++ b/docs/news-aggregators.md
@@ -2,7 +2,6 @@
 title: "News Aggregators"
 icon: material/rss
 description: These news aggregator clients let you keep up with your favorite blogs and news sites using internet standards like RSS.
-cover: news-aggregators.png
 ---

 A [news aggregator](https://en.wikipedia.org/wiki/News_aggregator) is a way to keep up with your favorite blogs and news sites.
@@ -99,10 +98,10 @@ A [news aggregator](https://en.wikipedia.org/wiki/News_aggregator) is a way to k

    ![NetNewsWire logo](assets/img/news-aggregators/netnewswire.png){ align=right }

-    **NetNewsWire** a free and open-source feed reader for macOS and iOS with a focus on a native design and feature set. It supports the typical feed formats alongside built-in support for Reddit feeds.
+    **NetNewsWire** a free and open-source feed reader for macOS and iOS with a focus on a native design and feature set. It supports the typical feed formats alongside built-in support for Twitter and Reddit feeds.

    [:octicons-home-16: Homepage](https://netnewswire.com/){ .md-button .md-button--primary }
-    [:octicons-eye-16:](https://netnewswire.com/privacypolicy.html){ .card-link title="Privacy Policy" }
+    [:octicons-eye-16:](https://netnewswire.com/privacypolicy){ .card-link title="Privacy Policy" }
    [:octicons-info-16:](https://netnewswire.com/help/){ .card-link title=Documentation}
    [:octicons-code-16:](https://github.com/Ranchero-Software/NetNewsWire){ .card-link title="Source Code" }

--- a/docs/notebooks.md
+++ b/docs/notebooks.md
@@ -2,7 +2,6 @@
 title: "Notebooks"
 icon: material/notebook-edit-outline
 description: These encrypted note-taking apps let you keep track of your notes without giving them to a third-party.
-cover: notebooks.png
 ---

 Keep track of your notes and journalings without giving them to a third-party.
@@ -11,57 +10,6 @@ If you are currently using an application like Evernote, Google Keep, or Microso

 ## Cloud-based

-### Standard Notes
-
-!!! recommendation
-
-    ![Standard Notes logo](assets/img/notebooks/standard-notes.svg){ align=right }
-
-    **Standard Notes** is a simple and private notes app that makes your notes easy and available everywhere you are. It features E2EE on every platform, and a powerful desktop experience with themes and custom editors. It has also been [independently audited](https://standardnotes.com/help/2/has-standard-notes-completed-a-third-party-security-audit).
-
-    [:octicons-home-16: Homepage](https://standardnotes.com){ .md-button .md-button--primary }
-    [:octicons-eye-16:](https://standardnotes.com/privacy){ .card-link title="Privacy Policy" }
-    [:octicons-info-16:](https://standardnotes.com/help){ .card-link title=Documentation}
-    [:octicons-code-16:](https://github.com/standardnotes){ .card-link title="Source Code" }
-    [:octicons-heart-16:](https://standardnotes.com/donate){ .card-link title=Contribute }
-
-    ??? downloads
-
-        - [:simple-googleplay: Google Play](https://play.google.com/store/apps/details?id=com.standardnotes)
-        - [:simple-appstore: App Store](https://apps.apple.com/app/id1285392450)
-        - [:simple-github: GitHub](https://github.com/standardnotes/app/releases)
-        - [:simple-windows11: Windows](https://standardnotes.com)
-        - [:simple-apple: macOS](https://standardnotes.com)
-        - [:simple-linux: Linux](https://standardnotes.com)
-        - [:octicons-globe-16: Web](https://app.standardnotes.com/)
-
-### Notesnook
-
-!!! recommendation
-
-    ![Notesnook logo](assets/img/notebooks/notesnook.svg){ align=right }
-
-    **Notesnook** is a free (as in speech) & open-source note-taking app focused on user privacy & ease of use. It features end-to-end encryption on all platforms with a powerful sync to take your notes on the go. You can easily import your notes from Evernote, OneNote & a lot of other apps using their [official importer](https://importer.notesnook.com/).
-
-    [:octicons-home-16: Homepage](https://notesnook.com/){ .md-button .md-button--primary }
-    [:octicons-eye-16:](https://notesnook.com/privacy){ .card-link title="Privacy Policy" }
-    [:octicons-info-16:](https://help.notesnook.com/){ .card-link title=Documentation}
-    [:octicons-code-16:](https://github.com/streetwriters/notesnook){ .card-link title="Source Code" }
-    [:octicons-heart-16:](https://github.com/streetwriters/notesnook/blob/master/CONTRIBUTING.md){ .card-link title=Contribute }
-
-    ??? downloads
-
-        - [:simple-googleplay: Google Play](https://play.google.com/store/apps/details?id=com.streetwriters.notesnook)
-        - [:simple-appstore: App Store](https://apps.apple.com/us/app/notesnook-take-private-notes/id1544027013)
-        - [:simple-github: GitHub](https://github.com/streetwriters/notesnook/releases)
-        - [:simple-windows11: Windows](https://notesnook.com/downloads)
-        - [:simple-apple: macOS](https://notesnook.com/downloads)
-        - [:simple-linux: Linux](https://notesnook.com/downloads)
-        - [:simple-firefoxbrowser: Firefox](https://notesnook.com/notesnook-web-clipper/)
-        - [:simple-googlechrome: Chrome](https://chrome.google.com/webstore/detail/notesnook-web-clipper/kljhpemdlcnjohmfmkogahelkcidieaj)
-
-Notesnook does not support password/PIN protection on the web & desktop apps. However, you can still lock individual notes, and your data is always encrypted in transit and on your device using your master key.
-
 ### Joplin

 !!! recommendation
@@ -90,6 +38,30 @@ Notesnook does not support password/PIN protection on the web & desktop apps. Ho
 Joplin does not support password/PIN protection for the [application itself or individual notes and notebooks](https://github.com/laurent22/joplin/issues/289). However, your data is still encrypted in transit and at the sync location using your master key.
 Since January 2023, Joplin supports biometrics app lock for [Android](https://joplinapp.org/changelog_android/#android-v2-10-3-https-github-com-laurent22-joplin-releases-tag-android-v2-10-3-pre-release-2023-01-05t11-29-06z) and [iOS](https://joplinapp.org/changelog_ios/#ios-v12-10-2-https-github-com-laurent22-joplin-releases-tag-ios-v12-10-2-2023-01-20t17-41-13z).

+### Standard Notes
+
+!!! recommendation
+
+    ![Standard Notes logo](assets/img/notebooks/standard-notes.svg){ align=right }
+
+    **Standard Notes** is a simple and private notes app that makes your notes easy and available everywhere you are. It features E2EE on every platform, and a powerful desktop experience with themes and custom editors. It has also been [independently audited (PDF)](https://s3.amazonaws.com/standard-notes/security/Report-SN-Audit.pdf).
+
+    [:octicons-home-16: Homepage](https://standardnotes.com){ .md-button .md-button--primary }
+    [:octicons-eye-16:](https://standardnotes.com/privacy){ .card-link title="Privacy Policy" }
+    [:octicons-info-16:](https://standardnotes.com/help){ .card-link title=Documentation}
+    [:octicons-code-16:](https://github.com/standardnotes){ .card-link title="Source Code" }
+    [:octicons-heart-16:](https://standardnotes.com/donate){ .card-link title=Contribute }
+
+    ??? downloads
+
+        - [:simple-googleplay: Google Play](https://play.google.com/store/apps/details?id=com.standardnotes)
+        - [:simple-appstore: App Store](https://apps.apple.com/app/id1285392450)
+        - [:simple-github: GitHub](https://github.com/standardnotes/app/releases)
+        - [:simple-windows11: Windows](https://standardnotes.com)
+        - [:simple-apple: macOS](https://standardnotes.com)
+        - [:simple-linux: Linux](https://standardnotes.com)
+        - [:octicons-globe-16: Web](https://app.standardnotes.com/)
+
 ### Cryptee

 !!! recommendation
@@ -105,7 +77,7 @@ Since January 2023, Joplin supports biometrics app lock for [Android](https://jo
    [:octicons-code-16:](https://github.com/cryptee){ .card-link title="Source Code" }

    ??? downloads
-
+    
        - [:octicons-globe-16: PWA](https://crypt.ee/download)

 Cryptee offers 100MB of storage for free, with paid options if you need more. Sign-up doesn't require an e-mail or other personally identifiable information.
@@ -118,7 +90,7 @@ Cryptee offers 100MB of storage for free, with paid options if you need more. Si

    ![Org-mode logo](assets/img/notebooks/org-mode.svg){ align=right }

-    **Org-mode** is a [major mode](https://www.gnu.org/software/emacs/manual/html_node/elisp/Major-Modes.html) for GNU Emacs. Org-mode is for keeping notes, maintaining to-do lists, planning projects, and authoring documents with a fast and effective plain-text system. Synchronization is possible with [file synchronization](file-sharing.md#file-sync) tools.
+    **Org-mode** is a [major mode](https://www.gnu.org/software/emacs/manual/html_node/elisp/Major-Modes.html) for GNU Emacs. Org-mode is for keeping notes, maintaining TODO lists, planning projects, and authoring documents with a fast and effective plain-text system. Synchronization is possible with [file synchronization](file-sharing.md#file-sync) tools.

    [:octicons-home-16: Homepage](https://orgmode.org){ .md-button .md-button--primary }
    [:octicons-info-16:](https://orgmode.org/manuals.html){ .card-link title=Documentation}
--- a/docs/os/android-overview.md
+++ b/docs/os/android-overview.md
@@ -106,7 +106,7 @@ With user profiles, you can impose restrictions on a specific profile, such as:

 [Work Profiles](https://support.google.com/work/android/answer/6191949) are another way to isolate individual apps and may be more convenient than separate user profiles.

-A **device controller** app such as [Shelter](../android.md#shelter) is required to create a Work Profile without an enterprise MDM, unless you're using a custom Android OS which includes one.
+A **device controller** app such as [Shelter](#recommended-apps) is required to create a Work Profile without an enterprise MDM, unless you're using a custom Android OS which includes one.

 The work profile is dependent on a device controller to function. Features such as *File Shuttle* and *contact search blocking* or any kind of isolation features must be implemented by the controller. You must also fully trust the device controller app, as it has full access to your data inside of the work profile.

--- a/docs/os/linux-overview.md
+++ b/docs/os/linux-overview.md
@@ -114,7 +114,7 @@ Additionally, some distributions will not download firmware updates automaticall

 ### MAC Address Randomization

-Many desktop Linux distributions (Fedora, openSUSE, etc.) will come with [NetworkManager](https://en.wikipedia.org/wiki/NetworkManager), to configure Ethernet and Wi-Fi settings.
+Many desktop Linux distributions (Fedora, openSUSE, etc) will come with [NetworkManager](https://en.wikipedia.org/wiki/NetworkManager), to configure Ethernet and Wi-Fi settings.

 It is possible to [randomize](https://fedoramagazine.org/randomize-mac-address-nm/) the [MAC address](https://en.wikipedia.org/wiki/MAC_address) when using NetworkManager. This provides a bit more privacy on Wi-Fi networks as it makes it harder to track specific devices on the network you’re connected to. It does [**not**](https://papers.mathyvanhoef.com/wisec2016.pdf) make you anonymous.

--- a/docs/passwords.md
+++ b/docs/passwords.md
@@ -1,121 +1,7 @@
 ---
-meta_title: "The Best Password Managers to Protect Your Privacy and Security - Privacy Guides"
 title: "Password Managers"
 icon: material/form-textbox-password
 description: Password managers allow you to securely store and manage passwords and other credentials.
-cover: passwords.png
-schema:
-  - 
-    "@context": http://schema.org
-    "@type": WebPage
-    name: Password Manager Recommendations
-    url: "./"
-  - 
-    "@context": http://schema.org
-    "@type": SoftwareApplication
-    name: Bitwarden
-    image: /assets/img/password-management/bitwarden.svg
-    url: https://bitwarden.com
-    sameAs: https://en.wikipedia.org/wiki/Bitwarden
-    applicationCategory: Password Manager
-    operatingSystem:
-      - Windows
-      - macOS
-      - Linux
-      - Android
-      - iOS
-    subjectOf:
-      "@context": http://schema.org
-      "@type": WebPage
-      url: "./"
-  - 
-    "@context": http://schema.org
-    "@type": SoftwareApplication
-    name: 1Password
-    image: /assets/img/password-management/1password.svg
-    url: https://1password.com
-    sameAs: https://en.wikipedia.org/wiki/1Password
-    applicationCategory: Password Manager
-    operatingSystem:
-      - Windows
-      - macOS
-      - Linux
-      - Android
-      - iOS
-    subjectOf:
-      "@context": http://schema.org
-      "@type": WebPage
-      url: "./"
-  - 
-    "@context": http://schema.org
-    "@type": SoftwareApplication
-    name: Psono
-    image: /assets/img/password-management/psono.svg
-    url: https://psono.com
-    applicationCategory: Password Manager
-    operatingSystem:
-      - Android
-      - iOS
-    subjectOf:
-      "@context": http://schema.org
-      "@type": WebPage
-      url: "./"
-  - 
-    "@context": http://schema.org
-    "@type": SoftwareApplication
-    name: KeePassXC
-    image: /assets/img/password-management/keepassxc.svg
-    url: https://keepassxc.org/
-    sameAs: https://en.wikipedia.org/wiki/KeePassXC
-    applicationCategory: Password Manager
-    operatingSystem:
-      - Windows
-      - macOS
-      - Linux
-    subjectOf:
-      "@context": http://schema.org
-      "@type": WebPage
-      url: "./"
-  - 
-    "@context": http://schema.org
-    "@type": SoftwareApplication
-    name: KeePassDX
-    image: /assets/img/password-management/keepassdx.svg
-    url: https://www.keepassdx.com/
-    applicationCategory: Password Manager
-    operatingSystem: Android
-    subjectOf:
-      "@context": http://schema.org
-      "@type": WebPage
-      url: "./"
-  - 
-    "@context": http://schema.org
-    "@type": SoftwareApplication
-    name: Strongbox
-    image: /assets/img/password-management/strongbox.svg
-    url: https://strongboxsafe.com/
-    applicationCategory: Password Manager
-    operatingSystem: iOS
-    subjectOf:
-      "@context": http://schema.org
-      "@type": WebPage
-      url: "./"
-  - 
-    "@context": http://schema.org
-    "@type": SoftwareApplication
-    name: gopass
-    image: /assets/img/password-management/gopass.svg
-    url: https://www.gopass.pw/
-    applicationCategory: Password Manager
-    operatingSystem:
-      - Windows
-      - macOS
-      - Linux
-      - FreeBSD
-    subjectOf:
-      "@context": http://schema.org
-      "@type": WebPage
-      url: "./"
 ---
 Password managers allow you to securely store and manage passwords and other credentials with the use of a master password.

@@ -178,7 +64,7 @@ Bitwarden's server-side code is [open-source](https://github.com/bitwarden/serve
    **1Password** is a password manager with a strong focus on security and ease-of-use, which allows you to store passwords, credit cards, software licenses, and any other sensitive information in a secure digital vault. Your vault is hosted on 1Password's servers for a [monthly fee](https://1password.com/sign-up/). 1Password is [audited](https://support.1password.com/security-assessments/) on a regular basis and provides exceptional customer support. 1Password is closed source; however, the security of the product is thoroughly documented in their [security white paper](https://1passwordstatic.com/files/security/1password-white-paper.pdf).

    [:octicons-home-16: Homepage](https://1password.com/){ .md-button .md-button--primary }
-    [:octicons-eye-16:](https://1password.com/legal/privacy/){ .card-link title="Privacy Policy" }
+    [:octicons-eye-16:](https://support.1password.com/1password-privacy/){ .card-link title="Privacy Policy" }
    [:octicons-info-16:](https://support.1password.com/){ .card-link title=Documentation}

    ??? downloads
--- a/docs/phone.md
+++ b/docs/phone.md
@@ -0,0 +1,195 @@
+---
+title: Phone Service
+icon: material/phone
+description: These providers allow you to obtain phone service without providing identifying information.
+---
+
+Phone numbers are a fact of life for registering on many internet services, but they can be very difficult to obtain privately. These providers should help you bypass the usual identity verification requirements many large mobile carriers have in place. It is important to note that traditional telephony in general is not anonymous or particularly secure. For sensitive person-to-person communications, we strongly recommend using an instant messaging medium that supports forward secrecy instead:
+
+[Recommended Instant Messengers :material-arrow-right-drop-circle:](real-time-communication.md){ .md-button }
+
+## VoIP Providers
+
+**Voice-over-IP** is the technology which allows phone calls and text messages to be sent over the internet. Consumer VoIP providers are often used as a way to obtain a secondary phone number or multiple phone numbers without providing identifying information. Phone numbers are commonly used by internet services to uniquely identify you, so using the same number between every service is a fingerprinting tactic service providers can use to track you. It is also often more challenging for most people to change their "primary" phone number, so using a secondary VoIP number with less important services and contacts can save you a huge hassle when that secondary phone number is compromised.
+
+These providers offer improved privacy by allowing you to obtain a phone number without providing your personal information, and by allowing you to easily create and dispose of phone numbers as needed, but they do **not** provide encrypted communications, so the service provider will always have full insight into your communications.
+
+### JMP.chat
+
+!!! recommendation
+
+    **JMP.chat** is an advanced service which provides US or Canadian phone numbers which can be accessed with any XMPP client. It also allows you to [port in](https://jmp.chat/faq#existing) your existing phone number.
+
+    [:octicons-home-16: Homepage](https://jmp.chat/){ .md-button .md-button--primary }
+    [:octicons-eye-16:](https://jmp.chat/privacy){ .card-link title="Privacy Policy" }
+    [:octicons-info-16:](https://jmp.chat/faq){ .card-link title=Documentation}
+    [:octicons-code-16:](https://soprani.ca/){ .card-link title="Source Code" }
+
+    ??? downloads
+
+        - [:simple-android: Android](https://git.singpolyma.net/cheogram-android/refs)
+
+JMP.chat has a fork of Conversations.im for Android called [Cheogram](https://cheogram.com/) which has some JMP-specific features, including Android dialer integration and other calling improvements. They otherwise [recommend](https://jmp.chat/faq) [Conversations.im](https://conversations.im/) on Android, [Snikket](https://apps.apple.com/ca/app/snikket/id1545164189) on iOS, [Gajim](https://gajim.org/) for desktop, or [Movim](https://mov.im/?login) on the web, however any XMPP client can be used.
+
+JMP.chat requires you have an existing XMPP account which you can self-host or get for free with many providers. Choosing an XMPP provider is outside the scope of this site, although JMP.chat recommends [Movim](https://mov.im/) or [Snikket Hosting](https://snikket.org/hosting/).
+
+You can also use JMP.chat with a [Matrix](real-time-communication.md#element) account instead of XMPP by choosing "I am a Matrix user" during registration. This is considered alpha as of [March 2022](https://blog.jmp.chat/b/march-newsletter-2022).
+
+JMP.chat is built on top of [Soprani.ca](https://soprani.ca/)'s suite of open-source telephony projects. For more information, see our entry on [Cheogram](#cheogram-sopranica).
+
+### MySudo
+
+!!! recommendation
+
+    ![MySudo logo](assets/img/voip/mysudo.svg){ align=right }
+
+    **MySudo** provides up to 9 phone numbers depending on the plan you purchase. This is the easiest provider to use, only requiring a standard registration with their official apps.
+
+    [:octicons-home-16: Homepage](https://mysudo.com/){ .md-button .md-button--primary }
+    [:octicons-eye-16:](https://anonyome.com/privacy-policy/){ .card-link title="Privacy Policy" }
+    [:octicons-info-16:](https://support.mysudo.com/hc/en-us){ .card-link title=Documentation}
+
+    ??? downloads
+    
+        - [:simple-googleplay: Google Play](https://play.google.com/store/apps/details?id=com.anonyome.mysudo)
+        - [:simple-appstore: App Store](https://apps.apple.com/us/app/mysudo-private-secure/id1237892621)
+        - [:octicons-globe-16: Web (Beta)](https://web.mysudo.com/)
+
+MySudo's paid plans additionally include functionality which may be useful for making purchases privately, such as [virtual card numbers](financial-services.md#payment-masking-services) and email addresses, although we typically recommend other [email aliasing providers](email.md) for extensive email aliasing use.
+
+MySudo requires regisration via their mobile app, and has no desktop client (only a beta [web app](https://web.mysudo.com/)). Some users report issues with MySudo on "de-Googled" [Android operating systems](android.md) like GrapheneOS, particularly with registration. You can test out MySudo with a free account to determine whether it will work for you.
+
+### Hushed
+
+!!! recommendation
+
+    **Hushed** provides prepaid or monthly-subscription phone numbers. You can purchase unlimited numbers on a single account.
+
+    [:octicons-home-16: Homepage](https://hushed.com/){ .md-button .md-button--primary }
+    [:octicons-eye-16:](https://hushed.com/privacy-policy/){ .card-link title="Privacy Policy" }
+    [:octicons-info-16:](https://support.hushed.com/hc/en-us){ .card-link title=Documentation}
+
+    ??? downloads
+    
+        - [:simple-googleplay: Google Play](https://play.google.com/store/apps/details?id=com.hushed.release)
+        - [:simple-appstore: App Store](https://apps.apple.com/us/app/hushed-second-phone-number/id600520752)
+        - [:octicons-globe-16: Web](https://app.hushed.com/signup)
+
+!!! warning
+
+    Hushed's mobile apps and website do have some privacy unfriendly [dependencies](https://reports.exodus-privacy.eu.org/en/reports/com.hushed.release/latest/), including Google Analytics.
+
+Hushed occasionally offers "[lifetime](https://stacksocial.com/sales/hushed-private-phone-1-line-plan-1000-mins-6000-sms)" plans, which makes it a popular affordable option for a single secondary phone number. Remember that lifetime plans last for the lifetime of the service, not your own lifetime.
+
+Hushed allows registrations via their website, making them the easiest VoIP provider choice if you don't have a mobile device.
+
+### Self-Hosted
+
+It is possible to self-host most aspects of a VoIP server, however you will typically still need an account with a commercial VoIP exchange to actually interconnect with the regular telephone network. Most people use accounts with providers like Twilio, Vonage, or Telnyx, but choosing a specific provider is outside the scope of this guide. Self-hosting gives you the advantage of greater control over how your messages are stored and processed, more flexibility about which underlying VoIP provider you utilize, potentially unlimited phone numbers, and cost benefits in some cases.
+
+!!! danger "Advanced Topic"
+
+    These applications may require extensive knowledge and work to configure correctly, which is outside the scope of this site. Proceed at your own risk!
+
+#### Cheogram (Soprani.ca)
+
+!!! recommendation
+
+    **Cheogram** is a platform which bridges the telephony network with XMPP (and Matrix in alpha). This is the backend used by the hosted **JMP.chat** product.
+
+    [:octicons-home-16: Homepage](https://cheogram.com/){ .md-button .md-button--primary }
+    [:octicons-info-16:](https://wiki.soprani.ca/){ .card-link title=Documentation}
+    [:octicons-code-16:](https://soprani.ca/){ .card-link title="Source Code" }
+
+    ??? downloads
+
+        - [:simple-android: Android](https://git.singpolyma.net/cheogram-android/refs)
+
+Cheogram is a project by [Soprani.ca](https://soprani.ca/), an initiative for bridging phone numbers to the internet with open standards, servers, and clients. Cheogram bridges SMS with XMPP with software called an SGX ("Soprani.ca Gateway to XMPP"). You can choose to use Cheogram/Soprani.ca's hosted SGX with your own Vonage or Twilio account, or host your own SGX instance.
+
+- [Using your own instance of the Vonage SGX](https://wiki.soprani.ca/VonageSetup#Using_your_own_instance_of_the_Vonage_SGX)
+- [Using Vonage with Soprani.ca's SGX](https://wiki.soprani.ca/VonageSetup)
+- [Using Twilio with Soprani.ca's SGX](https://wiki.soprani.ca/TwilioSetup)
+
+Twilio or Vonage both require an existing phone number to register. According to Soprani.ca, Vonage is the only VoIP provider they have found which accepts VoIP numbers (such as JMP numbers) for registration.
+
+#### Operation Privacy VoIP
+
+!!! recommendation
+
+    **Operation Privacy** provides an open-source web dashboard for interfacing with Twilio or Telnyx, enabling SMS, MMS, and voice calling via your provider's API.
+
+    [:octicons-repo-16: Repository](https://github.com/0perationPrivacy/VoIP){ .md-button .md-button--primary }
+    [:octicons-info-16:](https://github.com/0perationPrivacy/voip/wiki){ .card-link title=Documentation}
+
+If you have a Twilio or Telnyx account you can use the official hosted online service at [voip.operationprivacy.com](https://voip.operationprivacy.com/) with your own API keys, however this does give the instance provider insight into your messages. You can also [host it for free on Render](https://github.com/0perationPrivacy/voip/wiki/Cloud-Hosting) or [host it on your own Linux server](https://github.com/0perationPrivacy/VoIP/discussions/49).
+
+### Criteria
+
+**Please note we are not affiliated with any of the projects we recommend.** In addition to [our standard criteria](about/criteria.md), we have developed a clear set of requirements to allow us to provide objective recommendations. We suggest you familiarize yourself with this list before choosing to use a project, and conduct your own research to ensure it's the right choice for you.
+
+!!! example "This section is new"
+
+    We are working on establishing defined criteria for every section of our site, and this may be subject to change. If you have any questions about our criteria, please [ask on our forum](https://discuss.privacyguides.net/latest) and don't assume we didn't consider something when making our recommendations if it is not listed here. There are many factors considered and discussed when we recommend a project, and documenting every single one is a work-in-progress.
+
+- Does not require personal phone number for registration.
+- Offers multiple phone numbers.
+- Capable of SMS, MMS, and standard voice calls to non-VoIP phone numbers.
+- Available on iOS and Android.
+
+## Cellular Providers
+
+It is difficult to privately obtain actual cellular network service in most areas, however these newer service operators provide some advantages over alternatives in the space.
+
+### Silent Link
+
+This is our favorite cell service option if you want to pay with [cryptocurrency](cryptocurrency.md).
+
+!!! recommendation
+
+    **Silent Link** allows you to obtain affordable mobile internet data eSIMs with [cryptocurrency](cryptocurrency.md) and no KYC at affordable pricing, which can be paired with any recommended VoIP provider above for voice/SMS service. They additionally offer phone numbers in the US and UK, with some restrictions.
+
+    [:octicons-home-16: Homepage](https://silent.link/){ .md-button .md-button--primary }
+    [:octicons-info-16:](https://silent.link/faq){ .card-link title=Documentation }
+
+Silent Link's US and UK phone numbers support **inbound** call and text **only**, meaning Silent Link cannot be used as a replacement for traditional cell service entirely. However, their phone numbers are considered traditional cell network numbers, meaning that they can be used with many websites which block VoIP phone numbers for text message verification codes.
+
+This service requires an eSIM compatible phone, like the [Google Pixel](android.md#android-devices).
+
+### Pretty Good Phone Privacy
+
+!!! danger
+
+    PGPP makes some claims about how their mobile network does not require trust in Invisv as a network provider, but they are not entirely accurate. Make sure you read this entry entirely before determining whether PGPP makes sense for you.
+
+This is our favorite cell service option if you want to pay with traditional payment methods, or need unlimited mobile data.
+
+!!! recommendation
+
+    **Pretty Good Phone Privacy** (**PGPP**) is a data-only eSIM service from Invisv, which can be paired with any recommended VoIP provider above for voice/SMS service.
+
+    [:octicons-home-16: Homepage](https://invisv.com/pgpp/){ .md-button .md-button--primary }
+    [:octicons-info-16:](https://www.usenix.org/system/files/sec21-schmitt.pdf){ .card-link title=Documentation}
+
+    ??? downloads
+
+        - [:simple-googleplay: Google Play](https://play.google.com/store/apps/details?id=com.invisv.pgpp)
+        - [:simple-android: Android](https://invisv.com/articles/pgpp-updates.html#f-droid-and-apk)
+
+Invisv does collect your billing information through Stripe, their payment processor. However, PGPP's use of [blinded tokens](https://en.wikipedia.org/wiki/Blind_signature) for network authentication mean that Invisv cannot tie that billing information to your device. In other words, Invisv would be able to tell that "John Doe" has a PGPP account, but would not be able to determine which phone on their network belongs to "John Doe."
+
+Invisv additionally claims that your device cannot be tracked by the network because they periodically randomize your IMSI number, the identifier tied to your SIM card used to identify a subscriber. ==Unfortunately, this practice alone does **not** thwart device tracking.== Another identifier sent to networks is the IM**E**I number, the identifier tied to your phone hardware. You can think of an IMEI as your phone's "[MAC Address](os/linux-overview.md#mac-address-randomization)," except unlike with Wi-Fi/Ethernet MAC Addresses, randomizing or spoofing the IMEI is not possible and even illegal in certain countries.
+
+Therefore, unless you *also* physically swap your phone hardware every few days, ==it would be trivial for the network operator to build a location profile of a specific device despite IMSI randomization, because your IMEI is a static identifier visible to the network.== Additionally, PGPP will not even protect against anything but the most basic third-party [IMSI-catchers](https://en.wikipedia.org/wiki/IMSI-catcher), because most modern IMSI-catchers can track IMEI as well.
+
+This service requires an eSIM compatible Android phone, like the [Google Pixel](android.md#android-devices).
+
+### Criteria
+
+**Please note we are not affiliated with any of the projects we recommend.** In addition to [our standard criteria](about/criteria.md), we have developed a clear set of requirements to allow us to provide objective recommendations. We suggest you familiarize yourself with this list before choosing to use a project, and conduct your own research to ensure it's the right choice for you.
+
+!!! example "This section is new"
+
+    We are working on establishing defined criteria for every section of our site, and this may be subject to change. If you have any questions about our criteria, please [ask on our forum](https://discuss.privacyguides.net/latest) and don't assume we didn't consider something when making our recommendations if it is not listed here. There are many factors considered and discussed when we recommend a project, and documenting every single one is a work-in-progress.
+
+- Does not tie billing information to network access.
--- a/docs/productivity.md
+++ b/docs/productivity.md
@@ -2,7 +2,6 @@
 title: "Productivity Tools"
 icon: material/file-sign
 description: Most online office suites do not support E2EE, meaning the cloud provider has access to everything you do.
-cover: productivity.png
 ---
 Most online office suites do not support E2EE, meaning the cloud provider has access to everything you do. The privacy policy may legally protect your rights, but it does not provide technical access constraints.

@@ -153,24 +152,3 @@ In general, we define office suites as applications which could reasonably act a
    [:octicons-server-16:](https://privatebin.info/directory/){ .card-link title="Public Instances"}
    [:octicons-info-16:](https://github.com/PrivateBin/PrivateBin/wiki/FAQ){ .card-link title=Documentation}
    [:octicons-code-16:](https://github.com/PrivateBin/PrivateBin){ .card-link title="Source Code" }
-
-### Criteria
-
-**Please note we are not affiliated with any of the projects we recommend.** In addition to [our standard criteria](about/criteria.md), we have developed a clear set of requirements to allow us to provide objective recommendations. We suggest you familiarize yourself with this list before choosing to use a project, and conduct your own research to ensure it's the right choice for you.
-
-!!! example "This section is new"
-
-    We are working on establishing defined criteria for every section of our site, and this may be subject to change. If you have any questions about our criteria, please [ask on our forum](https://discuss.privacyguides.net/latest) and don't assume we didn't consider something when making our recommendations if it is not listed here. There are many factors considered and discussed when we recommend a project, and documenting every single one is a work-in-progress.
-
-#### Minimum Requirements
-
- Must be open-source.
- Must implement "zero-trust" end-to-end encryption.
- Must support password-protected files.
-
-
-#### Best-Case
-
-Our best-case criteria represents what we would like to see from the perfect project in this category. Our recommendations may not include any or all of this functionality, but those which do may rank higher than others on this page.
-
- Should have a published audit from a reputable, independent third-party.
--- a/docs/real-time-communication.md
+++ b/docs/real-time-communication.md
@@ -1,9 +1,7 @@
 ---
-meta_title: "The Best Private Instant Messengers - Privacy Guides"
 title: "Real-Time Communication"
 icon: material/chat-processing
 description: Other instant messengers make all of your private conversations available to the company that runs them.
-cover: real-time-communication.png
 ---

 These are our recommendations for encrypted real-time communication.
--- a/docs/router.md
+++ b/docs/router.md
@@ -2,7 +2,6 @@
 title: "Router Firmware"
 icon: material/router-wireless
 description: These alternative operating systems can be used to secure your router or Wi-Fi access point.
-cover: router.png
 ---
 Below are a few alternative operating systems, that can be used on routers, Wi-Fi access points, etc.

--- a/docs/search-engines.md
+++ b/docs/search-engines.md
@@ -1,9 +1,7 @@
 ---
-meta_title: "Recommended Search Engines: Anonymous Google Alternatives - Privacy Guides"
 title: "Search Engines"
 icon: material/search-web
 description: These privacy-respecting search engines don't build an advertising profile based on your searches.
-cover: search-engines.png
 ---
 Use a search engine that doesn't build an advertising profile based on your searches.

--- a/docs/tools.md
+++ b/docs/tools.md
@@ -1,5 +1,4 @@
 ---
-meta_title: "The Best Privacy Tools, Services, and Ad-Free Recommendations - Privacy Guides"
 title: "Privacy Tools"
 icon: material/tools
 hide:
@@ -31,7 +30,6 @@ For more details about each project, why they were chosen, and additional tips o

 <div class="grid cards" markdown>

- ![Mullvad Browser logo](assets/img/browsers/mullvad_browser.svg){ .twemoji } [Mullvad Browser](desktop-browsers.md#mullvad-browser)
 - ![Firefox logo](assets/img/browsers/firefox.svg){ .twemoji } [Firefox](desktop-browsers.md#firefox)
 - ![Brave logo](assets/img/browsers/brave.svg){ .twemoji } [Brave](desktop-browsers.md#brave)

@@ -70,6 +68,61 @@ For more details about each project, why they were chosen, and additional tips o

 [Learn more :material-arrow-right-drop-circle:](mobile-browsers.md#adguard)

+## Operating Systems
+
+### Mobile
+
+<div class="grid cards" markdown>
+
+- ![GrapheneOS logo](assets/img/android/grapheneos.svg#only-light){ .twemoji }![GrapheneOS logo](assets/img/android/grapheneos-dark.svg#only-dark){ .twemoji } [GrapheneOS](android.md#grapheneos)
+- ![DivestOS logo](assets/img/android/divestos.svg){ .twemoji } [DivestOS](android.md#divestos)
+
+</div>
+
+[Learn more :material-arrow-right-drop-circle:](android.md)
+
+#### Android Apps
+
+<div class="grid cards" markdown>
+
+- ![Aurora Store logo](assets/img/android/aurora-store.webp){ .twemoji } [Aurora Store (Google Play Client)](android.md#aurora-store)
+- ![Shelter logo](assets/img/android/mini/shelter.svg){ .twemoji } [Shelter (Work Profiles)](android.md#shelter)
+- ![Auditor logo](assets/img/android/auditor.svg#only-light){ .twemoji }![GrapheneOS logo](assets/img/android/auditor-dark.svg#only-dark){ .twemoji } [Auditor (Supported Devices)](android.md#auditor)
+- ![Secure Camera logo](assets/img/android/secure_camera.svg#only-light){ .twemoji }![Secure Camera logo](assets/img/android/secure_camera-dark.svg#only-dark){ .twemoji } [Secure Camera](android.md#secure-camera)
+- ![Secure PDF Viewer logo](assets/img/android/secure_pdf_viewer.svg#only-light){ .twemoji }![GrapheneOS logo](assets/img/android/secure_pdf_viewer-dark.svg#only-dark){ .twemoji } [Secure PDF Viewer](android.md#secure-pdf-viewer)
+
+</div>
+
+[Learn more :material-arrow-right-drop-circle:](android.md#general-apps)
+
+### Desktop/PC
+
+<div class="grid cards" markdown>
+
+- ![Qubes OS logo](assets/img/qubes/qubes_os.svg){ .twemoji } [Qubes OS (Xen VM Distribution)](desktop.md#qubes-os)
+- ![Fedora logo](assets/img/linux-desktop/fedora-workstation.svg){ .twemoji } [Fedora Workstation](desktop.md#fedora-workstation)
+- ![openSUSE Tumbleweed logo](assets/img/linux-desktop/opensuse-tumbleweed.svg){ .twemoji } [OpenSUSE Tumbleweed](desktop.md#opensuse-tumbleweed)
+- ![Arch logo](assets/img/linux-desktop/archlinux.svg){ .twemoji } [Arch Linux](desktop.md#arch-linux)
+- ![Fedora Silverblue logo](assets/img/linux-desktop/fedora-silverblue.svg){ .twemoji } [Fedora Silverblue & Kinoite](desktop.md#fedora-silverblue)
+- ![nixOS logo](assets/img/linux-desktop/nixos.svg){ .twemoji } [NixOS](desktop.md#nixos)
+- ![Whonix logo](assets/img/linux-desktop/whonix.svg){ .twemoji } [Whonix (Tor)](desktop.md#whonix)
+- ![Tails logo](assets/img/linux-desktop/tails.svg){ .twemoji } [Tails (Live Boot)](desktop.md#tails)
+
+</div>
+
+[Learn more :material-arrow-right-drop-circle:](desktop.md)
+
+### Router Firmware
+
+<div class="grid cards" markdown>
+
+- ![OpenWrt logo](assets/img/router/openwrt.svg#only-light){ .twemoji }![OpenWrt logo](assets/img/router/openwrt-dark.svg#only-dark){ .twemoji } [OpenWrt](router.md#openwrt)
+- ![OPNsense logo](assets/img/router/opnsense.svg){ .twemoji } [OPNsense](router.md#opnsense)
+
+</div>
+
+[Learn more :material-arrow-right-drop-circle:](router.md)
+
 ## Service Providers

 ### Cloud Storage
@@ -77,7 +130,6 @@ For more details about each project, why they were chosen, and additional tips o
 <div class="grid cards" markdown>

 - ![Proton Drive logo](assets/img/cloud/protondrive.svg){ .twemoji } [Proton Drive](cloud.md#proton-drive)
- ![Tresorit logo](assets/img/cloud/tresorit.svg){ .twemoji } [Tresorit](cloud.md#tresorit)

 </div>

@@ -119,6 +171,7 @@ We [recommend](dns.md#recommended-providers) a number of encrypted DNS servers b

 - ![Proton Mail logo](assets/img/email/protonmail.svg){ .twemoji } [Proton Mail](email.md#proton-mail)
 - ![Mailbox.org logo](assets/img/email/mailboxorg.svg){ .twemoji } [Mailbox.org](email.md#mailboxorg)
+- ![StartMail logo](assets/img/email/startmail.svg#only-light){ .twemoji }![StartMail logo](assets/img/email/startmail-dark.svg#only-dark){ .twemoji } [StartMail](email.md#startmail)
 - ![Tutanota logo](assets/img/email/tutanota.svg){ .twemoji } [Tutanota](email.md#tutanota)

 </div>
@@ -154,7 +207,7 @@ We [recommend](dns.md#recommended-providers) a number of encrypted DNS servers b
 <div class="grid cards" markdown>

 - ![Privacy.com logo](assets/img/financial-services/privacy_com.svg#only-light){ .twemoji }![Privacy.com logo](assets/img/financial-services/privacy_com-dark.svg#only-dark){ .twemoji } [Privacy.com](financial-services.md#privacycom-us-free)
- ![MySudo logo](assets/img/financial-services/mysudo.svg#only-light){ .twemoji }![MySudo logo](assets/img/financial-services/mysudo-dark.svg#only-dark){ .twemoji } [MySudo](financial-services.md#mysudo-us-paid)
+- ![MySudo logo](assets/img/financial-services/mysudo.svg){ .twemoji } [MySudo](financial-services.md#mysudo-us-paid)
 </div>

 [Learn more :material-arrow-right-drop-circle:](financial-services.md#payment-masking-services)
@@ -183,6 +236,20 @@ We [recommend](dns.md#recommended-providers) a number of encrypted DNS servers b

 [Learn more :material-arrow-right-drop-circle:](search-engines.md)

+### Phone Number (VoIP) Providers
+
+<div class="grid cards" markdown>
+
+- [JMP.chat](phone.md#jmpchat)
+- ![MySudo logo](assets/img/voip/mysudo.svg){ .twemoji } [MySudo](phone.md#mysudo)
+- [Hushed](phone.md#hushed)
+- [Cheogram](phone.md#cheogram-sopranica)
+- [VOIPSuite](phone.md#operation-privacy-voip)
+
+</div>
+
+[Learn more :material-arrow-right-drop-circle:](phone.md)
+
 ### VPN Providers

 ??? danger "VPNs do not provide anonymity"
@@ -222,7 +289,7 @@ We [recommend](dns.md#recommended-providers) a number of encrypted DNS servers b

 <div class="grid cards" markdown>

- ![Monero logo](assets/img/cryptocurrency/monero.svg){ .twemoji } [Monero](cryptocurrency.md#monero)
+- ![Monero logo](assets/img/cryptocurrency/monero.svg){ .twemoji }[Monero](cryptocurrency.md#monero)

 </div>

@@ -301,8 +368,8 @@ We [recommend](dns.md#recommended-providers) a number of encrypted DNS servers b
 - ![Send logo](assets/img/file-sharing-sync/send.svg){ .twemoji } [Send](file-sharing.md#send)
 - ![OnionShare logo](assets/img/file-sharing-sync/onionshare.svg){ .twemoji } [OnionShare](file-sharing.md#onionshare)
 - ![FreedomBox logo](assets/img/file-sharing-sync/freedombox.svg){ .twemoji } [FreedomBox](file-sharing.md#freedombox)
- ![Nextcloud logo](assets/img/productivity/nextcloud.svg){ .twemoji } [Nextcloud (Self-Hostable)](file-sharing.md#nextcloud-client-server)
- ![Syncthing logo](assets/img/file-sharing-sync/syncthing.svg){ .twemoji } [Syncthing](file-sharing.md#syncthing-p2p)
+- ![Nextcloud logo](assets/img/productivity/nextcloud.svg){ .twemoji } [Nextcloud (Self-Hostable)](productivity.md#nextcloud)
+- ![Syncthing logo](assets/img/file-sharing-sync/syncthing.svg){ .twemoji } [Syncthing](file-sharing.md#syncthing)

 </div>

@@ -312,6 +379,7 @@ We [recommend](dns.md#recommended-providers) a number of encrypted DNS servers b

 <div class="grid cards" markdown>

+- ![Librarian logo](assets/img/frontends/librarian.svg#only-light){ .twemoji }![Librarian logo](assets/img/frontends/librarian-dark.svg#only-dark){ .twemoji } [Librarian (LBRY, Web)](frontends.md#librarian)
 - ![Nitter logo](assets/img/frontends/nitter.svg){ .twemoji } [Nitter (Twitter, Web)](frontends.md#nitter)
 - ![FreeTube logo](assets/img/frontends/freetube.svg){ .twemoji } [FreeTube (YouTube, Desktop)](frontends.md#freetube)
 - ![Yattee logo](assets/img/frontends/yattee.svg){ .twemoji } [Yattee (YouTube; iOS, tvOS, macOS)](frontends.md#yattee)
@@ -329,7 +397,7 @@ We [recommend](dns.md#recommended-providers) a number of encrypted DNS servers b
 <div class="grid cards" markdown>

 - ![YubiKeys](assets/img/multi-factor-authentication/mini/yubico.svg){ .twemoji } [YubiKey](multi-factor-authentication.md#yubikey)
- ![Nitrokey](assets/img/multi-factor-authentication/mini/nitrokey.svg){ .twemoji } [Nitrokey](multi-factor-authentication.md#nitrokey)
+- ![Nitrokey](assets/img/multi-factor-authentication/mini/nitrokey.svg){ .twemoji } [Nitrokey](multi-factor-authentication.md#nitrokey-librem-key)
 - ![Aegis logo](assets/img/multi-factor-authentication/aegis.png){ .twemoji } [Aegis Authenticator](multi-factor-authentication.md#aegis-authenticator)
 - ![Raivo OTP logo](assets/img/multi-factor-authentication/raivo-otp.png){ .twemoji } [Raivo OTP](multi-factor-authentication.md#raivo-otp)

@@ -357,9 +425,8 @@ We [recommend](dns.md#recommended-providers) a number of encrypted DNS servers b

 <div class="grid cards" markdown>

- ![Standard Notes logo](assets/img/notebooks/standard-notes.svg){ .twemoji } [Standard Notes](notebooks.md#standard-notes)
- ![Notesnook logo](assets/img/notebooks/notesnook.svg){ .twemoji } [Notesnook](notebooks.md#notesnook)
 - ![Joplin logo](assets/img/notebooks/joplin.svg){ .twemoji } [Joplin](notebooks.md#joplin)
+- ![Standard Notes logo](assets/img/notebooks/standard-notes.svg){ .twemoji } [Standard Notes](notebooks.md#standard-notes)
 - ![Cryptee logo](assets/img/notebooks/cryptee.svg#only-light){ .twemoji }![Cryptee logo](assets/img/notebooks/cryptee-dark.svg#only-dark){ .twemoji } [Cryptee](notebooks.md#cryptee)
 - ![Org-mode logo](assets/img/notebooks/org-mode.svg){ .twemoji } [Org-mode](notebooks.md#org-mode)

@@ -420,58 +487,3 @@ We [recommend](dns.md#recommended-providers) a number of encrypted DNS servers b
 </div>

 [Learn more :material-arrow-right-drop-circle:](video-streaming.md)
-
-## Operating Systems
-
-### Mobile
-
-<div class="grid cards" markdown>
-
- ![GrapheneOS logo](assets/img/android/grapheneos.svg#only-light){ .twemoji }![GrapheneOS logo](assets/img/android/grapheneos-dark.svg#only-dark){ .twemoji } [GrapheneOS](android.md#grapheneos)
- ![DivestOS logo](assets/img/android/divestos.svg){ .twemoji } [DivestOS](android.md#divestos)
-
-</div>
-
-[Learn more :material-arrow-right-drop-circle:](android.md)
-
-#### Android Apps
-
-<div class="grid cards" markdown>
-
- ![Aurora Store logo](assets/img/android/aurora-store.webp){ .twemoji } [Aurora Store (Google Play Client)](android.md#aurora-store)
- ![Shelter logo](assets/img/android/mini/shelter.svg){ .twemoji } [Shelter (Work Profiles)](android.md#shelter)
- ![Auditor logo](assets/img/android/auditor.svg#only-light){ .twemoji }![GrapheneOS logo](assets/img/android/auditor-dark.svg#only-dark){ .twemoji } [Auditor (Supported Devices)](android.md#auditor)
- ![Secure Camera logo](assets/img/android/secure_camera.svg#only-light){ .twemoji }![Secure Camera logo](assets/img/android/secure_camera-dark.svg#only-dark){ .twemoji } [Secure Camera](android.md#secure-camera)
- ![Secure PDF Viewer logo](assets/img/android/secure_pdf_viewer.svg#only-light){ .twemoji }![GrapheneOS logo](assets/img/android/secure_pdf_viewer-dark.svg#only-dark){ .twemoji } [Secure PDF Viewer](android.md#secure-pdf-viewer)
-
-</div>
-
-[Learn more :material-arrow-right-drop-circle:](android.md#general-apps)
-
-### Desktop/PC
-
-<div class="grid cards" markdown>
-
- ![Qubes OS logo](assets/img/qubes/qubes_os.svg){ .twemoji } [Qubes OS (Xen VM Distribution)](desktop.md#qubes-os)
- ![Fedora logo](assets/img/linux-desktop/fedora-workstation.svg){ .twemoji } [Fedora Workstation](desktop.md#fedora-workstation)
- ![openSUSE Tumbleweed logo](assets/img/linux-desktop/opensuse-tumbleweed.svg){ .twemoji } [OpenSUSE Tumbleweed](desktop.md#opensuse-tumbleweed)
- ![Arch logo](assets/img/linux-desktop/archlinux.svg){ .twemoji } [Arch Linux](desktop.md#arch-linux)
- ![Fedora Silverblue logo](assets/img/linux-desktop/fedora-silverblue.svg){ .twemoji } [Fedora Silverblue & Kinoite](desktop.md#fedora-silverblue)
- ![nixOS logo](assets/img/linux-desktop/nixos.svg){ .twemoji } [NixOS](desktop.md#nixos)
- ![Whonix logo](assets/img/linux-desktop/whonix.svg){ .twemoji } [Whonix (Tor)](desktop.md#whonix)
- ![Tails logo](assets/img/linux-desktop/tails.svg){ .twemoji } [Tails (Live Boot)](desktop.md#tails)
-
-</div>
-
-[Learn more :material-arrow-right-drop-circle:](desktop.md)
-
-### Router Firmware
-
-<div class="grid cards" markdown>
-
- ![OpenWrt logo](assets/img/router/openwrt.svg#only-light){ .twemoji }![OpenWrt logo](assets/img/router/openwrt-dark.svg#only-dark){ .twemoji } [OpenWrt](router.md#openwrt)
- ![OPNsense logo](assets/img/router/opnsense.svg){ .twemoji } [OPNsense](router.md#opnsense)
-
-</div>
-
-[Learn more :material-arrow-right-drop-circle:](router.md)
--- a/docs/tor.md
+++ b/docs/tor.md
@@ -1,26 +1,7 @@
 ---
-meta_title: "Tor Browser and Network: Anonymous Web Browsing - Privacy Guides"
 title: "Tor Network"
 icon: simple/torproject
 description: Protect your internet browsing from prying eyes by using the Tor network, a secure network which circumvents censorship.
-cover: tor.png
-schema:
-  - 
-    "@context": http://schema.org
-    "@type": SoftwareApplication
-    name: Tor Browser
-    image: /assets/img/browsers/tor.svg
-    url: https://www.torproject.org
-    sameAs: https://en.wikipedia.org/wiki/Tor_(network)
-    applicationCategory: Web Browser
-    operatingSystem:
-      - Windows
-      - macOS
-      - Linux
-      - Android
-    subjectOf:
-      "@type": WebPage
-      url: "./"
 ---

 ![Tor logo](assets/img/self-contained-networks/tor.svg){ align=right }
@@ -62,6 +43,7 @@ There are a variety of ways to connect to the Tor network from your device, the
        - [:simple-windows11: Windows](https://www.torproject.org/download/)
        - [:simple-apple: macOS](https://www.torproject.org/download/)
        - [:simple-linux: Linux](https://www.torproject.org/download/)
+        - [:simple-freebsd: FreeBSD](https://www.freshports.org/security/tor)

 !!! danger

@@ -89,7 +71,7 @@ The Tor Browser is designed to prevent fingerprinting, or identifying you based
        - [:simple-appstore: App Store](https://apps.apple.com/us/app/orbot/id1609461599)
        - [:simple-github: GitHub](https://github.com/guardianproject/orbot/releases)

-We previously recommended enabling the *Isolate Destination Address* preference in Orbot settings. While this setting can theoretically improve privacy by enforcing the use of a different circuit for each IP address you connect to, it doesn't provide a practical advantage for most applications (especially web browsing), can come with a significant performance penalty, and increases the load on the Tor network. We no longer recommend adjusting this setting from its default value unless you know you need to.[^1]
+For resistance against traffic analysis attacks, consider enabling *Isolate Destination Address* in :material-menu: → **Settings** → **Connectivity**. This will use a completely different Tor Circuit (different middle relay and exit nodes) for every domain you connect to.

 !!! tip "Tips for Android"

@@ -117,12 +99,19 @@ We previously recommended enabling the *Isolate Destination Address* preference
    [:octicons-code-16:](https://gitweb.torproject.org/pluggable-transports/snowflake.git/){ .card-link title="Source Code" }
    [:octicons-heart-16:](https://donate.torproject.org/){ .card-link title=Contribute }

-You can enable Snowflake in your browser by opening it in another tab and turning the switch on. You can leave it running in the background while you browse to contribute your connection. We don't recommend installing Snowflake as a browser extension; adding third-party extensions can increase your attack surface.
+    ??? downloads

-[Run Snowflake in your Browser :material-arrow-right-drop-circle:](https://snowflake.torproject.org/embed.html){ .md-button }
+        - [:simple-firefoxbrowser: Firefox](https://addons.mozilla.org/en-US/firefox/addon/torproject-snowflake/)
+        - [:simple-googlechrome: Chrome](https://chrome.google.com/webstore/detail/snowflake/mafpmfcccpbjnhfhjnllmmalhifmlcie)
+        - [:octicons-browser-16: Web](https://snowflake.torproject.org/embed "Leave this page open to be a Snowflake proxy")
+
+??? tip "Embedded Snowflake"
+
+    You can enable Snowflake in your browser by clicking the switch below and ==leaving this page open==. You can also install Snowflake as a browser extension to have it always run while your browser is open, however adding third-party extensions can increase your attack surface.
+
+    <center><iframe src="https://snowflake.torproject.org/embed.html" width="320" height="240" frameborder="0" scrolling="no"></iframe></center>
+    <small>If the embed does not appear for you, ensure you are not blocking the third-party frame from `torproject.org`. Alternatively, visit [this page](https://snowflake.torproject.org/embed.html).</small>

 Snowflake does not increase your privacy in any way, nor is it used to connect to the Tor network within your personal browser. However, if your internet connection is uncensored, you should consider running it to help people in censored networks achieve better privacy themselves. There is no need to worry about which websites people are accessing through your proxy—their visible browsing IP address will match their Tor exit node, not yours.

 Running a Snowflake proxy is low-risk, even moreso than running a Tor relay or bridge which are already not particularly risky endeavours. However, it does still proxy traffic through your network which can be impactful in some ways, especially if your network is bandwidth-limited. Make sure you understand [how Snowflake works](https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake/-/wikis/home) before deciding whether to run a proxy.
-
-[^1]: The `IsolateDestAddr` setting is discussed on the [Tor mailing list](https://lists.torproject.org/pipermail/tor-talk/2012-May/024403.html) and [Whonix's Stream Isolation documentation](https://www.whonix.org/wiki/Stream_Isolation), where both projects suggest that it is usually not a good approach for most people.
--- a/docs/video-streaming.md
+++ b/docs/video-streaming.md
@@ -2,7 +2,6 @@
 title: "Video Streaming"
 icon: material/video-wireless
 description: These networks allow you to stream internet content without building an advertising profile based on your interests.
-cover: video-streaming.png
 ---
 The primary threat when using a video streaming platform is that your streaming habits and subscription lists could be used to profile you. You should combine these tools with a [VPN](vpn.md) or [Tor](https://www.torproject.org/) to make it harder to profile your usage.

--- a/docs/vpn.md
+++ b/docs/vpn.md
@@ -1,9 +1,7 @@
 ---
-meta_title: "Private VPN Service Recommendations and Comparison, No Sponsors or Ads - Privacy Guides"
 title: "VPN Services"
 icon: material/vpn
 description: These are the best VPN services for protecting your privacy and security online. Find a provider here that isn’t out to spy on you.
-cover: vpn.png
 ---

 If you're looking for additional **privacy** from your ISP, on a public Wi-Fi network, or while torrenting files, a VPN may be the solution for you as long as you understand the risks involved. We think these providers are a cut above the rest:
@@ -47,8 +45,7 @@ Our recommended providers use encryption, accept Monero, support WireGuard & Ope

    ??? downloads
    
-        - [:simple-googleplay: Google Play](https://play.google.com/store/apps/details?id=net.ivpn.client)
-        - [:octicons-moon-16: Accrescent](https://accrescent.app/app/net.ivpn.client)
+        - [:simple-android: Android](https://www.ivpn.net/apps-android/)
        - [:simple-appstore: App Store](https://apps.apple.com/app/ivpn-serious-privacy-protection/id1193122683)
        - [:simple-windows11: Windows](https://www.ivpn.net/apps-windows/)
        - [:simple-apple: macOS](https://www.ivpn.net/apps-macos/)
@@ -153,11 +150,11 @@ Mullvad [recommends](https://mullvad.net/en/help/why-wireguard/) the use of Wire

 #### :material-check:{ .pg-green } IPv6 Support

-Mullvad allows you to [access services hosted on IPv6](https://mullvad.net/en/blog/2014/9/15/ipv6-support/), as opposed to other providers which block IPv6 connections.
+Mullvad supports the future of networking [IPv6](https://en.wikipedia.org/wiki/IPv6). Their network allows you to [access services hosted on IPv6](https://mullvad.net/en/blog/2014/9/15/ipv6-support/) as opposed to other providers who block IPv6 connections.

-#### :material-alert-outline:{ .pg-orange } Remote Port Forwarding
+#### :material-check:{ .pg-green } Remote Port Forwarding

-Mullvad previously supported port forwarding, but removed the option in [May 2023](https://mullvad.net/en/blog/2023/5/29/removing-the-support-for-forwarded-ports/). Missing this feature could negatively impact certain applications, especially peer-to-peer applications like torrent clients.
+Remote [port forwarding](https://en.wikipedia.org/wiki/Port_forwarding) is allowed for people who make one-time payments, but not allowed for accounts with a recurring/subscription-based payment method. This is to prevent Mullvad from being able to identify you based on your port usage and stored subscription information. See [Port forwarding with Mullvad VPN](https://mullvad.net/help/port-forwarding-and-mullvad/) for more information.

 #### :material-check:{ .pg-green } Mobile Clients

@@ -217,7 +214,7 @@ Proton VPN [recommends](https://protonvpn.com/blog/wireguard/) the use of WireGu

 #### :material-alert-outline:{ .pg-orange } Remote Port Forwarding

-Proton VPN currently only supports ephemeral remote [port forwarding](https://protonvpn.com/support/port-forwarding/) via NAT-PMP, with 60 second lease times. The Windows app provides an easy to access option for it, while on other operating systems you'll need to run your own [NAT-PMP client](https://protonvpn.com/support/port-forwarding-manual-setup/). Torrent applications often support NAT-PMP natively.
+Proton VPN currently only supports remote [port forwarding](https://protonvpn.com/support/port-forwarding/) on Windows, which may impact some applications. Especially Peer-to-peer applications like Torrent clients.

 #### :material-check:{ .pg-green } Mobile Clients

@@ -313,7 +310,7 @@ With the VPN providers we recommend we like to see responsible marketing.
 Must not have any marketing which is irresponsible:

 - Making guarantees of protecting anonymity 100%. When someone makes a claim that something is 100% it means there is no certainty for failure. We know people can quite easily deanonymize themselves in a number of ways, e.g.:
-    - Reusing personal information (e.g., email accounts, unique pseudonyms, etc.) that they accessed without anonymity software (Tor, VPN, etc.)
+    - Reusing personal information (e.g., email accounts, unique pseudonyms, etc) that they accessed without anonymity software (Tor, VPN, etc.)
    - [Browser fingerprinting](https://en.wikipedia.org/wiki/Device_fingerprint#Browser_fingerprint)
 - Claim that a single circuit VPN is "more anonymous" than Tor, which is a circuit of three or more hops that regularly changes.
 - Use responsible language: i.e., it is okay to say that a VPN is "disconnected" or "not connected", however claiming that someone is "exposed", "vulnerable" or "compromised" is needless use of alarming language that may be incorrect. For example, that person might simply be on another VPN provider's service or using Tor.
--- a/i18n/ar/404.md
+++ b/i18n/ar/404.md
@@ -0,0 +1,19 @@
+---
+hide:
+  - feedback
+meta:
+  - 
+    property: "robots"
+    content: "noindex, nofollow"
+---
+
+# 404 - غير متوفر
+
+لم نتمكن من العثور على الصفحة التي تبحث عنها! ربما كنت تبحث عن واحد من هؤلاء؟
+
+- [مقدمة إلى نمذجة التهديدات](basics/threat-modeling.md)
+- [خوادِم DNS الموصى بها](dns.md)
+- [أفضل متصفحات الويب للكمبيوتر](desktop-browsers.md)
+- [Best VPN Providers](vpn.md)
+- [Privacy Guides Forum](https://discuss.privacyguides.net)
+- [Our Blog](https://blog.privacyguides.org)
--- a/i18n/ar/CODE_OF_CONDUCT.md
+++ b/i18n/ar/CODE_OF_CONDUCT.md
@@ -0,0 +1,53 @@
+# Community Code of Conduct
+
+**We pledge** to make our community a harassment-free experience for everyone.
+
+**We strive** to create a positive environment, using welcoming and inclusive language, and being respectful of the viewpoints of others.
+
+**We do not allow** inappropriate or otherwise unacceptable behavior, such as sexualized language, trolling and insulting comments, or otherwise promoting intolerance or harassment.
+
+## Community Standards
+
+What we expect from members of our communities:
+
+1. **Don't spread misinformation**
+
+      We are creating an evidence-based educational community around information privacy and security, not a home for conspiracy theories. For example, when making a claim that a certain piece of software is malicious or that certain telemetry data is privacy invasive, explain in detail what is collected and how it collected. Claims of this nature must be backed by technical evidence.
+
+1. **Don't abuse our willingness to help**
+
+      Our community members are not your free tech support. We are happy to help you with specific steps on your privacy journey if you are willing to put in effort on your end. We are not willing to answer endlessly repeated questions about generic computer problems you could have answered yourself with a 30-second internet search. Don't be a [help vampire](https://slash7.com/2006/12/22/vampires/).
+
+1. **Behave in a positive and constructive manner**
+
+      Examples of behavior that contributes to a positive environment for our community include:
+
+      - Demonstrating empathy and kindness toward other people
+      - Being respectful of differing opinions, viewpoints, and experiences
+      - Giving and gracefully accepting constructive feedback
+      - Accepting responsibility and apologizing to those affected by our mistakes, and learning from the experience
+      - Focusing on what is best not just for us as individuals, but for the overall community
+
+### Unacceptable Behavior
+
+The following behaviors are considered harassment and are unacceptable within our community:
+
+- The use of sexualized language or imagery, and sexual attention or advances of any kind
+- Trolling, insulting or derogatory comments, and personal or political attacks
+- Public or private harassment
+- Publishing others' private information, such as a physical or email address, without their explicit permission
+- Other conduct which could reasonably be considered inappropriate in a professional setting
+
+## Scope
+
+Our Code of Conduct applies within all project spaces, as well as when an individual is representing the Privacy Guides project in other communities.
+
+We are responsible for clarifying the standards of our community, and have the right to remove or alter the comments of those participating within our community, as necessary and at our discretion.
+
+### Contact
+
+If you observe a problem on a platform like Matrix or Reddit, please contact our moderators on that platform in chat, via DM, or through any designated "Modmail" system.
+
+If you have a problem elsewhere, or a problem our community moderators are unable to resolve, reach out to `jonah@privacyguides.org` and/or `dngray@privacyguides.org`.
+
+All community leaders are obligated to respect the privacy and security of the reporter of any incident.
--- a/i18n/ar/about/criteria.md
+++ b/i18n/ar/about/criteria.md
@@ -0,0 +1,40 @@
+---
+title: General Criteria
+---
+
+!!! example "Work in Progress"
+
+    The following page is a work in progress, and does not reflect the full criteria for our recommendations at this time. Past discussion on this topic: [#24](https://github.com/privacyguides/privacyguides.org/discussions/24)
+
+Below are some things that must apply to all submissions to Privacy Guides. Each category will have additional requirements for inclusion.
+
+## Financial Disclosure
+
+We do not make money from recommending certain products, we do not use affiliate links, and we do not provide special consideration to project donors.
+
+## General Guidelines
+
+We apply these priorities when considering new recommendations:
+
+- **Secure**: Tools should follow security best-practices wherever applicable.
+- **Source Availability**: Open source projects are generally preferred over equivalent proprietary alternatives.
+- **Cross-Platform**: We typically prefer recommendations to be cross-platform, to avoid vendor lock-in.
+- **Active Development**: The tools that we recommend should be actively developed, unmaintained projects will be removed in most cases.
+- **Usability**: Tools should be accessible to most computer users, an overly technical background should not be required.
+- **Documented**: Tools should have clear and extensive documentation for use.
+
+## Developer Self-Submissions
+
+We have these requirements in regard to developers which wish to submit their project or software for consideration.
+
+- Must disclose affiliation, i.e. your position within the project being submitted.
+
+- Must have a security whitepaper if it is a project that involves handling of sensitive information like a messenger, password manager, encrypted cloud storage etc.
+    - Third party audit status. We want to know if you have one, or have one planned. If possible please mention who will be conducting the audit.
+
+- Must explain what the project brings to the table in regard to privacy.
+    - Does it solve any new problem?
+    - Why should anyone use it over the alternatives?
+
+- Must state what the exact threat model is with their project.
+    - It should be clear to potential users what the project can provide, and what it cannot.
--- a/i18n/ar/about/donate.md
+++ b/i18n/ar/about/donate.md
@@ -0,0 +1,50 @@
+---
+title: قم بدعمنا
+---
+
+<!-- markdownlint-disable MD036 -->
+It takes a lot of [people](https://github.com/privacyguides/privacyguides.org/graphs/contributors) and [work](https://github.com/privacyguides/privacyguides.org/pulse/monthly) to keep Privacy Guides up to date and spreading the word about privacy and mass surveillance. If you like what we do, consider getting involved by [editing the site](https://github.com/privacyguides/privacyguides.org) or [contributing translations](https://crowdin.com/project/privacyguides).
+
+If you want to support us financially, the most convenient method for us is contributing via Open Collective, a website operated by our fiscal host. Open Collective accepts payments via credit/debit card, PayPal, and bank transfers.
+
+[Donate on OpenCollective.com](https://opencollective.com/privacyguides/donate ""){.md-button.md-button--primary}
+
+Donations made directly to us on Open Collective are generally tax-deductible in the US, because our fiscal host (the Open Collective Foundation) is a registered 501(c)3 organization. You will receive a receipt from the Open Collective Foundation after donating. Privacy Guides does not provide financial advice, and you should contact your tax advisor to find out whether this is applicable to you.
+
+If you already make use of GitHub sponsorships, you can also sponsor our organization there.
+
+[Sponsor us on GitHub](https://github.com/sponsors/privacyguides ""){.md-button}
+
+## Backers
+
+A special thanks to all those who support our mission! :heart:
+
+*Please note: This section loads a widget directly from Open Collective. This section does not reflect donations made outside of Open Collective, and we have no control over the specific donors featured in this section.*
+
+<script src="https://opencollective.com/privacyguides/banner.js"></script>
+
+## How We Use Donations
+
+Privacy Guides is a **non-profit** organization. We use donations for a variety of purposes, including:
+
+**Domain Registrations**
+:
+
+We have a few domain names like `privacyguides.org` which cost us around $10 yearly to maintain their registration.
+
+**Web Hosting**
+:
+
+Traffic to this website uses hundreds of gigabytes of data per month, we use a variety of service providers to keep up with this traffic.
+
+**Online Services**
+:
+
+We host [internet services](https://privacyguides.net) for testing and showcasing different privacy-products we like and [recommend](../tools.md). Some of which are made publicly available for our community's use (SearXNG, Tor, etc.), and some are provided for our team members (email, etc.).
+
+**Product Purchases**
+:
+
+We occasionally purchase products and services for the purposes of testing our [recommended tools](../tools.md).
+
+We are still working with our fiscal host (the Open Collective Foundation) to receive cryptocurrency donations, at the moment the accounting is unfeasible for many smaller transactions, but this should change in the future. In the meantime, if you wish to make a sizable (> $100) cryptocurrency donation, please reach out to [jonah@privacyguides.org](mailto:jonah@privacyguides.org).
--- a/i18n/ar/about/index.md
+++ b/i18n/ar/about/index.md
@@ -0,0 +1,89 @@
+---
+template: schema.html
+title: "About Privacy Guides"
+description: Privacy Guides is a socially motivated website that provides information for protecting your data security and privacy.
+---
+
+![Privacy Guides logo](../assets/brand/png/square/pg-yellow.png){ align=right }
+
+**Privacy Guides** is a socially motivated website that provides [information](/kb) for protecting your data security and privacy. We are a non-profit collective operated entirely by volunteer [team members](https://discuss.privacyguides.net/g/team) and contributors. Our website is free of advertisements and not affiliated with any listed providers.
+
+[:octicons-home-16:](https://www.privacyguides.org/){ .card-link title=Homepage }
+[:octicons-code-16:](https://github.com/privacyguides/privacyguides.org){ .card-link title="Source Code" }
+[:octicons-heart-16:](donate.md){ .card-link title=Contribute }
+
+The purpose of Privacy Guides is to educate our community on the importance of privacy online and government programs internationally that are designed to monitor all of your online activities.
+
+> To find [privacy-focused alternative] apps, check out sites like Good Reports and **Privacy Guides**, which list privacy-focused apps in a variety of categories, notably including email providers (usually on paid plans) that aren’t run by the big tech companies.
+
+— [New York Times](https://www.nytimes.com/wirecutter/guides/online-security-social-media-privacy/)
+
+> If you're looking for a new VPN, you can go to the discount code of just about any podcast. If you are looking for a **good** VPN, you need professional help. The same goes for email clients, browsers, operating systems and password managers. How do you know which of these is the best, most privacy-friendly option? For that there is **Privacy Guides**, a platform on which a number of volunteers search day in, day out for the best privacy-friendly tools to use on the internet.
+
+— [Tweakers.net](https://tweakers.net/reviews/10568/op-zoek-naar-privacyvriendelijke-tools-niek-de-wilde-van-privacy-guides.html) [Translated from Dutch]
+
+Also featured on: [Ars Technica](https://arstechnica.com/gadgets/2022/02/is-firefox-ok/), [Wirecutter](https://www.nytimes.com/wirecutter/guides/practical-guide-to-securing-windows-pc/) [[2](https://www.nytimes.com/wirecutter/guides/practical-guide-to-securing-your-mac/)], and [Wired](https://www.wired.com/story/firefox-mozilla-2022/).
+
+## History
+
+Privacy Guides was launched in September 2021 as a continuation of the [defunct](privacytools.md) "PrivacyTools" open-source educational project. We recognized the importance of independent, criteria-focused product recommendations and general knowledge in the privacy space, which is why we needed to preserve the work that had been created by so many contributors since 2015 and make sure that information had a stable home on the web indefinitely.
+
+In 2022, we completed the transition of our main website framework from Jekyll to MkDocs, using the `mkdocs-material` documentation software. This change made open-source contributions to our site significantly easier for outsiders, because instead of needing to know complicated syntax to write posts effectively, contributing is now as easy as writing a standard Markdown document.
+
+We additionally launched our new discussion forum at [discuss.privacyguides.net](https://discuss.privacyguides.net/) as a community platform to share ideas and ask questions about our mission. This augments our existing community on Matrix, and replaced our previous GitHub Discussions platform, decreasing our reliance on proprietary discussion platforms.
+
+So far in 2023 we've launched international translations of our website in [French](/fr/), [Hebrew](/he/), and [Dutch](/nl/), with more languages on the way, made possible by our excellent translation team on [Crowdin](https://crowdin.com/project/privacyguides). We plan to continue carrying forward our mission of outreach and education, and finding ways to more clearly highlight the dangers of a lack of privacy awareness in the modern digital age, and the prevalence and harms of security breaches across the technology industry.
+
+## Our Team
+
+??? person "@jonah"
+
+    - [:simple-discourse: Discourse](https://discuss.privacyguides.net/u/jonah)
+    - [:simple-github: GitHub](https://github.com/jonaharagon "@jonaharagon")
+    - [:simple-mastodon: Mastodon](https://mastodon.neat.computer/@jonah "@jonah@neat.computer"){rel=me}
+    - [:fontawesome-solid-house: Homepage](https://www.jonaharagon.com)
+
+??? person "@niek-de-wilde"
+
+    - [:simple-discourse: Discourse](https://discuss.privacyguides.net/u/Niek-de-Wilde)
+    - [:simple-github: GitHub](https://github.com/blacklight447 "@blacklight447")
+    - [:simple-mastodon: Mastodon](https://mastodon.social/@blacklight447 "@blacklight447@mastodon.social"){rel=me}
+
+??? person "@dngray"
+
+    - [:simple-discourse: Discourse](https://discuss.privacyguides.net/u/dngray)
+    - [:simple-github: GitHub](https://github.com/dngray "@dngray")
+    - [:simple-mastodon: Mastodon](https://mastodon.social/@dngray "@dngray@mastodon.social"){rel=me}
+    - [:fontawesome-solid-envelope: Email](mailto:dngray@privacyguides.org)
+
+??? person "@freddy"
+
+    - [:simple-discourse: Discourse](https://discuss.privacyguides.net/u/freddy)
+    - [:simple-github: GitHub](https://github.com/freddy-m "@freddy-m")
+    - [:simple-mastodon: Mastodon](https://social.lol/@freddy "@freddy@social.lol"){rel=me}
+    - [:fontawesome-solid-envelope: Email](mailto:freddy@privacyguides.org)
+    - [:fontawesome-solid-house: Homepage](https://freddy.omg.lol)
+
+??? person "@mfwmyfacewhen"
+
+    - [:simple-discourse: Discourse](https://discuss.privacyguides.net/u/mfwmyfacewhen)
+    - [:simple-github: GitHub](https://github.com/mfwmyfacewhen "@mfwmyfacewhen")
+    - [:fontawesome-solid-house: Homepage](https://mfw.omg.lol)
+
+??? person "@olivia"
+
+    - [:simple-discourse: Discourse](https://discuss.privacyguides.net/u/olivia)
+    - [:simple-github: GitHub](https://github.com/hook9 "@hook9")
+    - [:simple-mastodon: Mastodon](https://mastodon.neat.computer/@oliviablob "@oliviablob@neat.computer"){rel=me}
+
+Additionally, [many people](https://github.com/privacyguides/privacyguides.org/graphs/contributors) have made contributions to the project. You can too, we're open sourced on GitHub, and accepting translation suggestions on [Crowdin](https://crowdin.com/project/privacyguides).
+
+Our team members review all changes made to the website and handle administrative duties such as web hosting and financials, however they do not personally profit from any contributions made to this site. Our financials are transparently hosted by the Open Collective Foundation 501(c)(3) at [opencollective.com/privacyguides](https://opencollective.com/privacyguides). Donations to Privacy Guides are generally tax-deductible in the United States.
+
+## Site License
+
+*The following is a human-readable summary of (and not a substitute for) the [license](https://github.com/privacyguides/privacyguides.org/blob/main/LICENSE):*
+
+:fontawesome-brands-creative-commons: :fontawesome-brands-creative-commons-by: :fontawesome-brands-creative-commons-nd: Unless otherwise noted, the original content on this website is made available under the [Creative Commons Attribution-NoDerivatives 4.0 International Public License](https://github.com/privacyguides/privacyguides.org/blob/main/LICENSE). This means that you are free to copy and redistribute the material in any medium or format for any purpose, even commercially; as long as you give appropriate credit to `Privacy Guides (www.privacyguides.org)` and provide a link to the license. You may do so in any reasonable manner, but not in any way that suggests Privacy Guides endorses you or your use. If you remix, transform, or build upon the content of this website, you may not distribute the modified material.
+
+This license is in place to prevent people from sharing our work without giving proper credit, and to prevent people from modifying our work in a way that could be used to mislead people. If you find the terms of this license too restrictive for the project you're working on, please reach out to us at `jonah@privacyguides.org`. We are happy to provide alternative licensing options for well-intentioned projects in the privacy space!
--- a/i18n/ar/about/notices.md
+++ b/i18n/ar/about/notices.md
@@ -0,0 +1,43 @@
+---
+title: "Notices and Disclaimers"
+hide:
+  - toc
+---
+
+## Legal Disclaimer
+
+Privacy Guides is not a law firm. As such, the Privacy Guides website and contributors are not providing legal advice. The material and recommendations in our website and guides do not constitute legal advice nor does contributing to the website or communicating with Privacy Guides or other contributors about our website create an attorney-client relationship.
+
+Running this website, like any human endeavor, involves uncertainty and trade-offs. We hope this website helps, but it may include mistakes and can’t address every situation. If you have any questions about your situation, we encourage you to do your own research, seek out other experts, and engage in discussions with the Privacy Guides community. If you have any legal questions, you should consult with your own legal counsel before moving forward.
+
+Privacy Guides is an open source project contributed to under licenses that include terms that, for the protection of the website and its contributors, make clear that the Privacy Guides project and website is offered "as-is", without warranty, and disclaiming liability for damages resulting from using the website or any recommendations contained within. Privacy Guides does not warrant or make any representations concerning the accuracy, likely results, or reliability of the use of the materials on the website or otherwise relating to such materials on the website or on any third-party sites linked on this site.
+
+Privacy Guides additionally does not warrant that this website will be constantly available, or available at all.
+
+## Licenses
+
+Unless otherwise noted, all content on this website is made available under the terms of the [Creative Commons Attribution-NoDerivatives 4.0 International Public License](https://github.com/privacyguides/privacyguides.org/blob/main/LICENSE).
+
+This does not include third-party code embedded in this repository, or code where a superseding license is otherwise noted. The following are notable examples, but this list may not be all-inclusive:
+
+* [MathJax](https://github.com/privacyguides/privacyguides.org/blob/main/docs/assets/javascripts/mathjax.js) is licensed under the [Apache License 2.0](https://github.com/privacyguides/privacyguides.org/blob/main/docs/assets/javascripts/LICENSE.mathjax.txt).
+
+Portions of this notice itself were adopted from [opensource.guide](https://github.com/github/opensource.guide/blob/master/notices.md) on GitHub. That resource and this page itself are released under [CC-BY-4.0](https://github.com/github/opensource.guide/blob/master/LICENSE).
+
+This means that you can use the human-readable content in this repository for your own project, per the terms outlined in the Creative Commons Attribution-NoDerivatives 4.0 International Public License text. You may do so in any reasonable manner, but not in any way that suggests Privacy Guides endorses you or your use. You **may not** use the Privacy Guides branding in your own project without express approval from this project. Privacy Guides's brand trademarks include the "Privacy Guides" wordmark and shield logo.
+
+We believe that the logos and other images in `assets` obtained from third-party providers are either in the public domain or **fair use**. In a nutshell, legal [fair use doctrine](https://www.copyright.gov/fair-use/more-info.html) allows the use of copyrighted images in order to identify the subject matter for purposes of public comment. However, these logos and other images may still be subject to trademark laws in one or more jurisdictions. Before using this content, please ensure that it is used to identify the entity or organization that owns the trademark and that you have the right to use it under the laws which apply in the circumstances of your intended use. *When copying content from this website, you are solely responsible for ensuring that you do not infringe someone else's trademark or copyright.*
+
+When you contribute to this repository you are doing so under the above licenses, and you are granting Privacy Guides a perpetual, worldwide, non-exclusive, transferable, royalty-free, irrevocable license with the right to sublicense such rights through multiple tiers of sublicensees, to reproduce, modify, display, perform and distribute your contribution as part of our project.
+
+## Acceptable Use
+
+You may not use this website in any way that causes or may cause damage to the website or impairment of the availability or accessibility of Privacy Guides, or in any way which is unlawful, illegal, fraudulent, harmful, or in connection with any unlawful, illegal, fraudulent, or harmful purpose or activity.
+
+You must not conduct any systematic or automated data collection activities on or in relation to this website without express written consent, including:
+
+* Excessive Automated Scans
+* Denial of Service Attacks
+* Scraping
+* Data Mining
+* 'Framing' (IFrames)
--- a/i18n/ar/about/privacy-policy.md
+++ b/i18n/ar/about/privacy-policy.md
@@ -0,0 +1,61 @@
+---
+title: "Privacy Policy"
+---
+
+Privacy Guides is a community project operated by a number of active volunteer contributors. The public list of team members [can be found on GitHub](https://github.com/orgs/privacyguides/people).
+
+## Data We Collect From Visitors
+
+The privacy of our website visitors is important to us, so we do not track any individual people. As a visitor to our website:
+
+- No personal information is collected
+- No information such as cookies are stored in the browser
+- No information is shared with, sent to or sold to third-parties
+- No information is shared with advertising companies
+- No information is mined and harvested for personal and behavioral trends
+- No information is monetized
+
+You can view the data we collect on our [statistics](statistics.md) page.
+
+We run a self-hosted installation of [Plausible Analytics](https://plausible.io) to collect some anonymous usage data for statistical purposes. The goal is to track overall trends in our website traffic, it is not to track individual visitors. All the data is in aggregate only. No personal data is collected.
+
+Data collected includes referral sources, top pages, visit duration, information from the devices (device type, operating system, country and browser) used during the visit and more. You can learn more about how Plausible works and collects information in a privacy-respecting manner [here](https://plausible.io/data-policy).
+
+## Data We Collect From Account Holders
+
+On some websites and services we provide, many features may require an account. For example, an account may be required to post and reply to topics on a forum platform.
+
+To sign up for most accounts, we will collect a name, username, email, and password. In the event a website requires more information than just that data, that will be clearly marked and noted in a separate privacy statement per-site.
+
+We use your account data to identify you on the website and to create pages specific to you, such as your profile page. We will also use your account data to publish a public profile for you on our services.
+
+We use your email to:
+
+- Notify you about posts and other activity on the websites or services.
+- Reset your password and help keep your account secure.
+- Contact you in special circumstances related to your account.
+- Contact you about legal requests, such as DMCA takedown requests.
+
+On some websites and services you may provide additional information for your account, such as a short biography, avatar, your location, or your birthday. We make that information available to everyone who can access the website or service in question. This information is not required to use any of our services and can be erased at any time.
+
+We will store your account data as long as your account remains open. After closing an account, we may retain some or all of your account data in the form of backups or archives for up to 90 days.
+
+## Contacting Us
+
+The Privacy Guides team generally does not have access to personal data outside of limited access granted via some moderation panels. Inquiries regarding your personal information should be sent directly to:
+
+```text
+Jonah Aragon
+Services Administrator
+jonah@privacyguides.org
+```
+
+For all other inquiries, you can contact any member of our team.
+
+For complaints under GDPR more generally, you may lodge complaints with your local data protection supervisory authorities. In France it's the Commission Nationale de l'Informatique et des Libertés which take care and handle the complaints. They provide a [template of complaint letter](https://www.cnil.fr/en/plaintes) to use.
+
+## About This Policy
+
+We will post any new versions of this statement [here](privacy-policy.md). We may change how we announce changes in future versions of this document. In the meantime we may update our contact information at any time without announcing a change. Please refer to the [Privacy Policy](privacy-policy.md) for the latest contact information at any time.
+
+A full revision [history](https://github.com/privacyguides/privacyguides.org/commits/main/docs/about/privacy-policy.md) of this page can be found on GitHub.
--- a/i18n/ar/about/privacytools.md
+++ b/i18n/ar/about/privacytools.md
@@ -0,0 +1,118 @@
+---
+title: "PrivacyTools FAQ"
+---
+
+# Why we moved on from PrivacyTools
+
+In September 2021, every active contributor unanimously agreed to move from PrivacyTools to work on this site: Privacy Guides. This decision was made because PrivacyTools’ founder and controller of the domain name had disappeared for an extended period of time and could not be contacted.
+
+Having built a reputable site and set of services on PrivacyTools.io, this caused grave concerns for the future of PrivacyTools, as any future disruption could wipe out the entire organization with no recovery method. This transition was communicated to the PrivacyTools community many months in advance via a variety of channels including its blog, Twitter, Reddit, and Mastodon to ensure the entire process went as smoothly as possible. We did this to ensure nobody was kept in the dark, which has been our modus operandi since our team was created, and to make sure Privacy Guides was recognized as the same reliable organization that PrivacyTools was before the transition.
+
+After the organizational move was completed, the founder of PrivacyTools returned and began to spread misinformation about the Privacy Guides project. They continue to spread misinformation in addition to operating a paid link farm on the PrivacyTools domain. We are creating this page to clear up any misconceptions.
+
+## What is PrivacyTools?
+
+PrivacyTools was created in 2015 by "BurungHantu," who wanted to make a privacy information resource - helpful tools following the Snowden revelations. The site grew into a flourishing open-source project with [many contributors](https://github.com/privacytools/privacytools.io/graphs/contributors), some eventually given various organizational responsibilities, such as operating online services like Matrix and Mastodon, managing and reviewing changes to the site on GitHub, finding sponsors for the project, writing blog posts and operating social media outreach platforms like Twitter, etc.
+
+Beginning in 2019, BurungHantu grew more and more distant from the active development of the website and communities, and began delaying payments he was responsible for related to the servers we operated. To avoid having our system administrator pay server costs out of their own pocket, we changed the donation methods listed on the site from BurungHantu's personal PayPal and crypto accounts to a new OpenCollective page on [October 31, 2019](https://web.archive.org/web/20210729184557/https://blog.privacytools.io/privacytools-io-joins-the-open-collective-foundation/). This had the added benefits of making our finances completely transparent, a value we strongly believe in, and tax-deductible in the United States, because they were being held by the Open Collective Foundation 501(c)3. This change was unanimously agreed upon by the team and went uncontested.
+
+## Why We Moved On
+
+In 2020, BurungHantu's absence grew much more noticeable. At one point, we required the domain's nameservers to be changed to nameservers controlled by our system administrator to avoid future disruption, and this change was not completed for over a month after the initial request. He would disappear from the public chat and private team chat rooms on Matrix for months at a time, occasionally popping in to give some small feedback or promise to be more active before disappearing once again.
+
+In October 2020, the PrivacyTools system administrator (Jonah) [left](https://web.archive.org/web/20210729190742/https://blog.privacytools.io/blacklight447-taking-over/) the project because of these difficulties, handing control to another long-time contributor. Jonah had been operating nearly every PrivacyTools service and acting as the *de facto* project lead for website development in BurungHantu's absence, thus his departure was a significant change to the organization. At the time, because of these significant organizational changes, BurungHantu promised the remaining team he would return to take control of the project going forward. ==The PrivacyTools team reached out via several communication methods over the following months, but did not receive any response.==
+
+## Domain Name Reliance
+
+At the beginning of 2021, the PrivacyTools team grew worried about the future of the project, because the domain name was set to expire on 1st March 2021. The domain was ultimately renewed by BurungHantu with no comment.
+
+The team’s concerns were not addressed, and we realized this would be a problem every year: If the domain expired it would have allowed it to be stolen by squatters or spammers, thus ruining the organization's reputation. We also would have had trouble reaching the community to inform them of what took place.
+
+Without being in any contact with BurungHantu, we decided the best course of action would be to move to a new domain name while we still had guaranteed control over the old domain name, sometime before March 2022. This way, we would be able to cleanly redirect all PrivacyTools resources to the new site without any interruption in service. This decision was made many months in advance and communicated to the entire team in the hopes that BurungHantu would reach out and assure his continued support for the project, because with a recognizable brand name and large communities online, moving away from "PrivacyTools" was the least desirable possible outcome.
+
+In mid-2021 the PrivacyTools team reached out to Jonah, who agreed to rejoin the team to help with the transition.
+
+## Community Call to Action
+
+At the end of July 2021, we [informed](https://web.archive.org/web/20210729184422/https://blog.privacytools.io/the-future-of-privacytools/) the PrivacyTools community of our intention to choose a new name and continue the project on a new domain, to be [chosen](https://web.archive.org/web/20210729190935/https://aragon.cloud/apps/forms/cMPxG9KyopapBbcw) on 2nd August 2022. In the end, "Privacy Guides" was selected, with the `privacyguides.org` domain already owned by Jonah for a side-project from 2020 that went undeveloped.
+
+## Control of r/privacytoolsIO
+
+Simultaneously with the ongoing website issues at privacytools.io, the r/privacytoolsIO moderation team was facing challenges with managing the subreddit. The subreddit had always been operated mostly independently of the website's development, but BurungHantu was the primary moderator of the subreddit as well, and he was the only moderator granted "Full Control" privileges. u/trai_dep was the only active moderator at the time, and [posted](https://www.reddit.com/r/redditrequest/comments/o9tllh/requesting_rprivacytoolsio_im_only_active_mod_top/) a request to Reddit's administrators on June 28, 2021, asking to be granted the primary moderator position and full control privileges, in order to make necessary changes to the Subreddit.
+
+Reddit requires that subreddits have active moderators. If the primary moderator is inactive for a lengthy period of time (such as a year) the primary moderation position can be re-appointed to the next moderator in line. For this request to have been granted, BurungHantu had to have been completely absent from all Reddit activity for a long period of time, which was consistent with his behaviors on other platforms.
+
+> If you were removed as moderator from a subreddit through Reddit request it is because your lack of response and lack of activity qualified the subreddit for an r/redditrequest transfer.
+> 
+> r/redditrequest is Reddit's way of making sure communities have active moderators and is part of the [Moderator Code of Conduct](https://www.redditinc.com/policies/moderator-code-of-conduct).
+
+## Beginning the Transition
+
+On September 14th, 2021, we [announced](https://www.privacyguides.org/blog/2021/09/14/welcome-to-privacy-guides/) the beginning of our migration to this new domain:
+
+> [...] we found it necessary to make this switch sooner rather than later to ensure people would find out about this transition as soon as possible. This gives us adequate time to transition the domain name, which is currently redirecting to www.privacyguides.org, and it hopefully gives everyone enough time to notice the change, update bookmarks and websites, etc.
+
+This change [entailed:](https://www.reddit.com/r/PrivacyGuides/comments/pnhn4a/rprivacyguides_privacyguidesorg_what_you_need_to/)
+
+- Redirecting www.privacytools.io to [www.privacyguides.org](https://www.privacyguides.org).
+- Archiving the source code on GitHub to preserve our past work and issue tracker, which we continued to use for months of future development of this site.
+- Posting announcements to our subreddit and various other communities informing people of the official change.
+- Formally closing privacytools.io services, like Matrix and Mastodon, and encouraging existing users to migrate as soon as possible.
+
+Things appeared to be going smoothly, and most of our active community made the switch to our new project exactly as we hoped.
+
+## Following Events
+
+Roughly a week following the transition, BurungHantu returned online for the first time in nearly a year, however nobody on our team was willing to return to PrivacyTools because of his historic unreliability. Rather than apologize for his prolonged absence, he immediately went on the offensive and positioned the transition to Privacy Guides as an attack against him and his project. He subsequently [deleted](https://www.reddit.com/r/privacytoolsIO/comments/pp9yie/comment/hd49wbn) many of these posts when it was pointed out by the community that he had been absent and abandoned the project.
+
+At this point, BurungHantu claimed he wanted to continue working on privacytools.io on his own and requested that we remove the redirect from www.privacytools.io to [www.privacyguides.org](https://www.privacyguides.org). We obliged and requested that he keep the subdomains for Matrix, Mastodon, and PeerTube active for us to run as a public service to our community for at least a few months, in order to allow users on those platforms to easily migrate to other accounts. Due to the federated nature of the services we provided, they were tied to specific domain names making it very difficult to migrate (and in some cases impossible).
+
+Unfortunately, because control of the r/privacytoolsIO subreddit was not returned to BurungHantu at his demand (further information below), those subdomains were [cut off](https://www.reddit.com/r/PrivacyGuides/comments/pymthv/comment/hexwrps/) at the beginning of October, ending any migration possibilities to any users still using those services.
+
+Following this, BurungHantu made false accusations about Jonah stealing donations from the project. BurungHantu had over a year since the alleged incident occurred, and yet he never made anyone aware of it until after the Privacy Guides migration. BurungHantu has been repeatedly asked for proof and to comment on the reason for his silence by the team [and the community](https://twitter.com/TommyTran732/status/1526153536962281474), and has not done so.
+
+BurungHantu also made a [twitter post](https://twitter.com/privacytoolsIO/status/1510560676967710728) alleging that an "attorney" had reached out to him on Twitter and was providing advice, in another attempt to bully us into giving him control of our subreddit, and as part of his smear campaign to muddy the waters surrounding the launch of Privacy Guides while pretending to be a victim.
+
+## PrivacyTools.io Now
+
+As of September 25th 2022 we are seeing BurungHantu's overall plans come to fruition on privacytools.io, and this is the very reason we decided to create this explainer page today. The website he is operating appears to be a heavily SEO-optimized version of the site which recommends tools in exchange for financial compensation. Very recently, IVPN and Mullvad, two VPN providers near-universally [recommended](../vpn.md) by the privacy community and notable for their stance against affiliate programs were removed from PrivacyTools. In their place? NordVPN, Surfshark, ExpressVPN, and hide.me; Giant VPN corporations with untrustworthy platforms and business practices, notorious for their aggressive marketing and affiliate programs.
+
+==**PrivacyTools has become exactly the type of site we [warned against](https://web.archive.org/web/20210729205249/https://blog.privacytools.io/the-trouble-with-vpn-and-privacy-reviews/) on the PrivacyTools blog in 2019.**== We've tried to keep our distance from PrivacyTools since the transition, but their continued harassment towards our project and now their absurd abuse of the credibility their brand gained over 6 years of open source contributions is extremely troubling to us. Those of us actually fighting for privacy are not fighting against each other, and are not getting our advice from the highest bidder.
+
+## r/privacytoolsIO Now
+
+After the launch of [r/PrivacyGuides](https://www.reddit.com/r/privacyguides), it was impractical for u/trai_dep to continue moderating both subreddits, and with the community on-board with the transition, r/privacytoolsIO was [made](https://www.reddit.com/r/privacytoolsIO/comments/qk7qrj/a_new_era_why_rptio_is_now_a_restricted_sub/) a restricted sub in a post on November 1st, 2021:
+
+> [...] The growth of this Sub was the result of great effort, across several years, by the PrivacyGuides.org team. And by every one of you.
+> 
+> A Subreddit is a great deal of work to administer and moderate. Like a garden, it requires patient tending and daily care. It’s not a task for dilettantes or commitment-challenged people. It can’t thrive under a gardener who abandons it for several years, then shows up demanding this year’s harvest as their tribute. It’s unfair to the team formed years ago. It’s unfair to you. [...]
+
+Subreddits do not belong to anybody, and they especially do not belong to brand-holders. They belong to their communities, and the community and its moderators made the decision to support the move to r/PrivacyGuides.
+
+In the months since, BurungHantu has threatened and begged for returning subreddit control to his account in [violation](https://www.reddit.com/r/redditrequest/wiki/top_mod_removal/) of Reddit rules:
+
+> Retaliation from any moderator with regards to removal requests is disallowed.
+
+For a community with many thousands of remaining subscribers, we feel that it would be incredibly disrespectful to return control of that massive platform to the person who abandoned it for over a year, and who now operates a website that we feel provides very low-quality information. Preserving the years of past discussions in that community is more important to us, and thus u/trai_dep and the rest of the subreddit moderation team has made the decision to keep r/privacytoolsIO as-is.
+
+## OpenCollective Now
+
+Our fundraising platform, OpenCollective, is another source of contention. Our position is that OpenCollective was put in place by our team and managed by our team to fund services we currently operate and which PrivacyTools no longer does. We [reached out](https://opencollective.com/privacyguides/updates/transitioning-to-privacy-guides) to all of our donors regarding our move to Privacy Guides, and we were unanimously supported by our sponsors and community.
+
+Thus, the funds in OpenCollective belong to Privacy Guides, they were given to our project, and not the owner of a well known domain name. In the announcement made to donors on September 17th, 2021, we offered refunds to any donor who disagrees with the stance we took, but nobody has taken us up on this offer:
+
+> If any sponsors or backers disagree with or feel misled by these recent events and would like to request a refund given these highly unusual circumstances, please get in touch with our project admin by emailing jonah@triplebit.net.
+
+## Further Reading
+
+This topic has been discussed extensively within our communities in various locations, and it seems likely that most people reading this page will already be familiar with the events leading up to the move to Privacy Guides. Some of our previous posts on the matter may have extra detail we omitted here for brevity. They have been linked below for the sake of completion.
+
+- [June 28, 2021 request for control of r/privacytoolsIO](https://www.reddit.com/r/redditrequest/comments/o9tllh/requesting_rprivacytoolsio_im_only_active_mod_top/)
+- [July 27, 2021 announcement of our intentions to move on the PrivacyTools blog, written by the team](https://web.archive.org/web/20210729184422/https://blog.privacytools.io/the-future-of-privacytools/)
+- [Sept 13, 2021 announcement of the beginning of our transition to Privacy Guides on r/privacytoolsIO](https://www.reddit.com/r/privacytoolsIO/comments/pnql46/rprivacyguides_privacyguidesorg_what_you_need_to/)
+- [Sept 17, 2021 announcement on OpenCollective from Jonah](https://opencollective.com/privacyguides/updates/transitioning-to-privacy-guides)
+- [Sept 30, 2021 Twitter thread detailing most of the events now described on this page](https://twitter.com/privacy_guides/status/1443633412800225280)
+- [Oct 1, 2021 post by u/dng99 noting subdomain failure](https://www.reddit.com/r/PrivacyGuides/comments/pymthv/comment/hexwrps/)
+- [Apr 2, 2022 response by u/dng99 to PrivacyTools' accusatory blog post](https://www.reddit.com/comments/tuo7mm/comment/i35kw5a/)
+- [May 16, 2022 response by @TommyTran732 on Twitter](https://twitter.com/TommyTran732/status/1526153497984618496)
+- [Sep 3, 2022 post on Techlore's forum by @dngray](https://discuss.techlore.tech/t/has-anyone-seen-this-video-wondering-your-thoughts/792/20)
--- a/i18n/ar/about/services.md
+++ b/i18n/ar/about/services.md
@@ -0,0 +1,38 @@
+# Privacy Guides Services
+
+We run a number of web services to test out features and promote cool decentralized, federated, and/or open-source projects. Many of these services are available to the public and are detailed below.
+
+[:material-comment-alert: Report an issue](https://discuss.privacyguides.net/c/services/2 ""){.md-button.md-button--primary}
+
+## Discourse
+
+- Domain: [discuss.privacyguides.net](https://discuss.privacyguides.net)
+- Availability: Public
+- Source: [github.com/discourse/discourse](https://github.com/discourse/discourse)
+
+## Gitea
+
+- Domain: [code.privacyguides.dev](https://code.privacyguides.dev)
+- Availability: Invite-Only  
+  Access may be granted upon request to any team working on *Privacy Guides*-related development or content.
+- Source: [snapcraft.io/gitea](https://snapcraft.io/gitea)
+
+## Matrix
+
+- Domain: [matrix.privacyguides.org](https://matrix.privacyguides.org)
+- Availability: Invite-Only  
+  Access may be granted upon request to Privacy Guides team members, Matrix moderators, third-party Matrix community administrators, Matrix bot operators, and other individuals in need of a reliable Matrix presence.
+- Source: [github.com/spantaleev/matrix-docker-ansible-deploy](https://github.com/spantaleev/matrix-docker-ansible-deploy)
+
+## SearXNG
+
+- Domain: [search.privacyguides.net](https://search.privacyguides.net)
+- Availability: Public
+- Source: [github.com/searxng/searxng-docker](https://github.com/searxng/searxng-docker)
+
+## Invidious
+
+- Domain: [invidious.privacyguides.net](https://invidious.privacyguides.net)
+- Availability: Semi-Public  
+  We host Invidious primarily to serve embedded YouTube videos on our website, this instance is not intended for general-purpose use and may be limited at any time.
+- Source: [github.com/iv-org/invidious](https://github.com/iv-org/invidious)
--- a/i18n/ar/about/statistics.md
+++ b/i18n/ar/about/statistics.md
@@ -0,0 +1,61 @@
+---
+title: Traffic Statistics
+---
+
+## Website Statistics
+
+<iframe plausible-embed src="https://stats.privacyguides.net/share/privacyguides.org?auth=IxTl2wRhi3uxF09rd1NSn&embed=true&theme=system&background=transparent" scrolling="no" frameborder="0" loading="lazy" style="width: 1px; min-width: 100%; height: 1600px;" id="plausibleFrame"></iframe>
+<div style="font-size: 14px; padding-bottom: 14px;">Stats powered by <a target="_blank" style="color: #4F46E5; text-decoration: underline;" href="https://plausible.io">Plausible Analytics</a></div>
+<script async src="https://stats.privacyguides.net/js/embed.host.js"></script>
+
+<script>
+
+    /* Set palette on initial load */
+    var palette = __md_get("__palette")
+    if (palette && typeof palette.color === "object") {
+        var theme = palette.color.scheme === "slate" ? "dark" : "light"
+        document.getElementById('plausibleFrame').src = 'https://stats.privacyguides.net/share/privacyguides.org?auth=IxTl2wRhi3uxF09rd1NSn&embed=true&theme=' + theme + '&background=transparent';
+    }
+
+    /* Register event handlers after documented loaded */
+    document.addEventListener("DOMContentLoaded", function() {
+        var ref = document.querySelector("[data-md-component=palette]")
+        ref.addEventListener("change", function() {
+        var palette = __md_get("__palette")
+        if (palette && typeof palette.color === "object") {
+            var theme = palette.color.scheme === "slate" ? "dark" : "light"
+
+            document.getElementById('plausibleFrame').src = 'https://stats.privacyguides.net/share/privacyguides.org?auth=IxTl2wRhi3uxF09rd1NSn&embed=true&theme=' + theme + '&background=transparent';
+        }
+        })
+    })
+</script>
+
+## Blog Statistics
+
+<iframe plausible-embed src="https://stats.privacyguides.net/share/blog.privacyguides.org?auth=onWV76WWcsDifUqlaHEAg&embed=true&theme=system&background=transparent" scrolling="no" frameborder="0" loading="lazy" style="width: 1px; min-width: 100%; height: 1600px;" id="blogFrame"></iframe>
+<div style="font-size: 14px; padding-bottom: 14px;">Stats powered by <a target="_blank" style="color: #4F46E5; text-decoration: underline;" href="https://plausible.io">Plausible Analytics</a></div>
+<script async src="https://stats.privacyguides.net/js/embed.host.js"></script>
+
+<script>
+
+    /* Set palette on initial load */
+    var palette = __md_get("__palette")
+    if (palette && typeof palette.color === "object") {
+        var theme = palette.color.scheme === "slate" ? "dark" : "light"
+        document.getElementById('blogFrame').src = 'https://stats.privacyguides.net/share/blog.privacyguides.org?auth=onWV76WWcsDifUqlaHEAg&embed=true&theme=' + theme + '&background=transparent';
+    }
+
+    /* Register event handlers after documented loaded */
+    document.addEventListener("DOMContentLoaded", function() {
+        var ref = document.querySelector("[data-md-component=palette]")
+        ref.addEventListener("change", function() {
+        var palette = __md_get("__palette")
+        if (palette && typeof palette.color === "object") {
+            var theme = palette.color.scheme === "slate" ? "dark" : "light"
+
+            document.getElementById('blogFrame').src = 'https://stats.privacyguides.net/share/blog.privacyguides.org?auth=onWV76WWcsDifUqlaHEAg&embed=true&theme=' + theme + '&background=transparent';
+        }
+        })
+    })
+</script>
--- a/i18n/ar/advanced/communication-network-types.md
+++ b/i18n/ar/advanced/communication-network-types.md
@@ -0,0 +1,103 @@
+---
+title: "Types of Communication Networks"
+icon: 'material/transit-connection-variant'
+description: An overview of several network architectures commonly used by instant messaging applications.
+---
+
+There are several network architectures commonly used to relay messages between people. These networks can provide different privacy guarantees, which is why it's worth considering your [threat model](../basics/threat-modeling.md) when deciding which app to use.
+
+[Recommended Instant Messengers](../real-time-communication.md ""){.md-button}
+
+## Centralized Networks
+
+![Centralized networks diagram](../assets/img/layout/network-centralized.svg){ align=left }
+
+Centralized messengers are those where all participants are on the same server or network of servers controlled by the same organization.
+
+Some self-hosted messengers allow you to set up your own server. Self-hosting can provide additional privacy guarantees, such as no usage logs or limited access to metadata (data about who is talking to whom). Self-hosted centralized messengers are isolated and everyone must be on the same server to communicate.
+
+**Advantages:**
+
+- New features and changes can be implemented more quickly.
+- Easier to get started with and to find contacts.
+- Most mature and stable features ecosystems, as they are easier to program in a centralized software.
+- Privacy issues may be reduced when you trust a server that you're self-hosting.
+
+**Disadvantages:**
+
+- Can include [restricted control or access](https://drewdevault.com/2018/08/08/Signal.html). This can include things like:
+- Being [forbidden from connecting third-party clients](https://github.com/LibreSignal/LibreSignal/issues/37#issuecomment-217211165) to the centralized network that might provide for greater customization or a better experience. Often defined in Terms and Conditions of usage.
+- Poor or no documentation for third-party developers.
+- The [ownership](https://web.archive.org/web/20210729191953/https://blog.privacytools.io/delisting-wire/), privacy policy, and operations of the service can change easily when a single entity controls it, potentially compromising the service later on.
+- Self-hosting requires effort and knowledge of how to set up a service.
+
+## Federated Networks
+
+![Federated networks diagram](../assets/img/layout/network-decentralized.svg){ align=left }
+
+Federated messengers use multiple, independent, decentralized servers that are able to talk to each other (email is one example of a federated service). Federation allows system administrators to control their own server and still be a part of the larger communications network.
+
+When self-hosted, members of a federated server can discover and communicate with members of other servers, although some servers may choose to remain private by being non-federated (e.g., work team server).
+
+**Advantages:**
+
+- Allows for greater control over your own data when running your own server.
+- Allows you to choose whom to trust your data with by choosing between multiple "public" servers.
+- Often allows for third-party clients which can provide a more native, customized, or accessible experience.
+- Server software can be verified that it matches public source code, assuming you have access to the server or you trust the person who does (e.g., a family member).
+
+**Disadvantages:**
+
+- Adding new features is more complex because these features need to be standardized and tested to ensure they work with all servers on the network.
+- Due to the previous point, features can be lacking, or incomplete or working in unexpected ways compared to centralized platforms, such as message relay when offline or message deletion.
+- Some metadata may be available (e.g., information like "who is talking to whom," but not actual message content if E2EE is used).
+- Federated servers generally require trusting your server's administrator. They may be a hobbyist or otherwise not a "security professional," and may not serve standard documents like a privacy policy or terms of service detailing how your data is used.
+- Server administrators sometimes choose to block other servers, which are a source of unmoderated abuse or break general rules of accepted behavior. This will hinder your ability to communicate with members of those servers.
+
+## Peer-to-Peer Networks
+
+![P2P diagram](../assets/img/layout/network-distributed.svg){ align=left }
+
+P2P messengers connect to a [distributed network](https://en.wikipedia.org/wiki/Distributed_networking) of nodes to relay a message to the recipient without a third-party server.
+
+Clients (peers) usually find each other through the use of a [distributed computing](https://en.wikipedia.org/wiki/Distributed_computing) network. Examples of this include [Distributed Hash Tables](https://en.wikipedia.org/wiki/Distributed_hash_table) (DHT), used by [torrents](https://en.wikipedia.org/wiki/BitTorrent_(protocol)) and [IPFS](https://en.wikipedia.org/wiki/InterPlanetary_File_System) for example. Another approach is proximity based networks, where a connection is established over WiFi or Bluetooth (for example, Briar or the [Scuttlebutt](https://www.scuttlebutt.nz) social network protocol).
+
+Once a peer has found a route to its contact via any of these methods, a direct connection between them is made. Although messages are usually encrypted, an observer can still deduce the location and identity of the sender and recipient.
+
+P2P networks do not use servers, as peers communicate directly between each other and hence cannot be self-hosted. However, some additional services may rely on centralized servers, such as user discovery or relaying offline messages, which can benefit from self-hosting.
+
+**Advantages:**
+
+- Minimal information is exposed to third-parties.
+- Modern P2P platforms implement E2EE by default. There are no servers that could potentially intercept and decrypt your transmissions, unlike centralized and federated models.
+
+**Disadvantages:**
+
+- Reduced feature set:
+- Messages can only be sent when both peers are online, however, your client may store messages locally to wait for the contact to return online.
+- Generally increases battery usage on mobile devices, because the client must stay connected to the distributed network to learn about who is online.
+- Some common messenger features may not be implemented or incompletely, such as message deletion.
+- Your IP address and that of the contacts you're communicating with may be exposed if you do not use the software in conjunction with a [VPN](../vpn.md) or [Tor](../tor.md). Many countries have some form of mass surveillance and/or metadata retention.
+
+## Anonymous Routing
+
+![Anonymous routing diagram](../assets/img/layout/network-anonymous-routing.svg){ align=left }
+
+A messenger using [anonymous routing](https://doi.org/10.1007/978-1-4419-5906-5_628) hides either the identity of the sender, the receiver, or evidence that they have been communicating. Ideally, a messenger should hide all three.
+
+There are [many](https://doi.org/10.1145/3182658) different ways to implement anonymous routing. One of the most famous is [onion routing](https://en.wikipedia.org/wiki/Onion_routing) (i.e. [Tor](tor-overview.md)), which communicates encrypted messages through a virtual [overlay network](https://en.wikipedia.org/wiki/Overlay_network) that hides the location of each node as well as the recipient and sender of each message. The sender and recipient never interact directly and only meet through a secret rendezvous node so that there is no leak of IP addresses nor physical location. Nodes cannot decrypt messages, nor the final destination; only the recipient can. Each intermediary node can only decrypt a part that indicates where to send the still encrypted message next, until it arrives at the recipient who can fully decrypt it, hence the "onion layers."
+
+Self-hosting a node in an anonymous routing network does not provide the hoster with additional privacy benefits, but rather contributes to the whole network's resilience against identification attacks for everyone's benefit.
+
+**Advantages:**
+
+- Minimal to no information is exposed to other parties.
+- Messages can be relayed in a decentralized manner even if one of the parties is offline.
+
+**Disadvantages:**
+
+- Slow message propagation.
+- Often limited to fewer media types, mostly text, since the network is slow.
+- Less reliable if nodes are selected by randomized routing, some nodes may be very far from the sender and receiver, adding latency or even failing to transmit messages if one of the nodes goes offline.
+- More complex to get started, as the creation and secured backup of a cryptographic private key is required.
+- Just like other decentralized platforms, adding features is more complex for developers than on a centralized platform. Hence, features may be lacking or incompletely implemented, such as offline message relaying or message deletion.
--- a/i18n/ar/advanced/dns-overview.md
+++ b/i18n/ar/advanced/dns-overview.md
@@ -0,0 +1,306 @@
+---
+title: "DNS Overview"
+icon: material/dns
+description: The Domain Name System is the "phonebook of the internet," helping your browser find the website it's looking for.
+---
+
+The [Domain Name System](https://en.wikipedia.org/wiki/Domain_Name_System) is the 'phonebook of the Internet'. DNS translates domain names to IP addresses so browsers and other services can load Internet resources, through a decentralized network of servers.
+
+## What is DNS?
+
+When you visit a website, a numerical address is returned. For example, when you visit `privacyguides.org`, the address `192.98.54.105` is returned.
+
+DNS has existed since the [early days](https://en.wikipedia.org/wiki/Domain_Name_System#History) of the Internet. DNS requests made to and from DNS servers are **not** generally encrypted. In a residential setting, a customer is given servers by the ISP via [DHCP](https://en.wikipedia.org/wiki/Dynamic_Host_Configuration_Protocol).
+
+Unencrypted DNS requests are able to be easily **surveilled** and **modified** in transit. In some parts of the world, ISPs are ordered to do primitive [DNS filtering](https://en.wikipedia.org/wiki/DNS_blocking). When you request the IP address of a domain that is blocked, the server may not respond or may respond with a different IP address. As the DNS protocol is not encrypted, the ISP (or any network operator) can use [DPI](https://en.wikipedia.org/wiki/Deep_packet_inspection) to monitor requests. ISPs can also block requests based on common characteristics, regardless of which DNS server is used. Unencrypted DNS always uses [port](https://en.wikipedia.org/wiki/Port_(computer_networking)) 53 and always uses UDP.
+
+Below, we discuss and provide a tutorial to prove what an outside observer may see using regular unencrypted DNS and [encrypted DNS](#what-is-encrypted-dns).
+
+### Unencrypted DNS
+
+1. Using [`tshark`](https://www.wireshark.org/docs/man-pages/tshark.html) (part of the [Wireshark](https://en.wikipedia.org/wiki/Wireshark) project) we can monitor and record internet packet flow. This command records packets that meet the rules specified:
+
+    ```bash
+    tshark -w /tmp/dns.pcap udp port 53 and host 1.1.1.1 or host 8.8.8.8
+    ```
+
+2. We can then use [`dig`](https://en.wikipedia.org/wiki/Dig_(command)) (Linux, MacOS etc) or [`nslookup`](https://en.wikipedia.org/wiki/Nslookup) (Windows) to send the DNS lookup to both servers. Software such as web browsers do these lookups automatically, unless they are configured to use encrypted DNS.
+
+    === "Linux, macOS"
+
+        ```
+        dig +noall +answer privacyguides.org @1.1.1.1
+        dig +noall +answer privacyguides.org @8.8.8.8
+        ```
+    === "Windows"
+
+        ```
+        nslookup privacyguides.org 1.1.1.1
+        nslookup privacyguides.org 8.8.8.8
+        ```
+
+3. Next, we want to [analyse](https://www.wireshark.org/docs/wsug_html_chunked/ChapterIntroduction.html#ChIntroWhatIs) the results:
+
+    === "Wireshark"
+
+        ```
+        wireshark -r /tmp/dns.pcap
+        ```
+
+    === "tshark"
+
+        ```
+        tshark -r /tmp/dns.pcap
+        ```
+
+If you run the Wireshark command above, the top pane shows the "[frames](https://en.wikipedia.org/wiki/Ethernet_frame)", and the bottom pane shows all the data about the selected frame. Enterprise filtering and monitoring solutions (such as those purchased by governments) can do the process automatically, without human interaction, and can aggregate those frames to produce statistical data useful to the network observer.
+
+| No. | Time     | Source    | Destination | Protocol | Length | Info                                                                   |
+| --- | -------- | --------- | ----------- | -------- | ------ | ---------------------------------------------------------------------- |
+| 1   | 0.000000 | 192.0.2.1 | 1.1.1.1     | DNS      | 104    | Standard query 0x58ba A privacyguides.org OPT                          |
+| 2   | 0.293395 | 1.1.1.1   | 192.0.2.1   | DNS      | 108    | Standard query response 0x58ba A privacyguides.org A 198.98.54.105 OPT |
+| 3   | 1.682109 | 192.0.2.1 | 8.8.8.8     | DNS      | 104    | Standard query 0xf1a9 A privacyguides.org OPT                          |
+| 4   | 2.154698 | 8.8.8.8   | 192.0.2.1   | DNS      | 108    | Standard query response 0xf1a9 A privacyguides.org A 198.98.54.105 OPT |
+
+An observer could modify any of these packets.
+
+## What is "encrypted DNS"?
+
+Encrypted DNS can refer to one of a number of protocols, the most common ones being:
+
+### DNSCrypt
+
+[**DNSCrypt**](https://en.wikipedia.org/wiki/DNSCrypt) was one of the first methods of encrypting DNS queries. DNSCrypt operates on port 443 and works with both the TCP or UDP transport protocols. DNSCrypt has never been submitted to the [Internet Engineering Task Force (IETF)](https://en.wikipedia.org/wiki/Internet_Engineering_Task_Force) nor has it gone through the [Request for Comments (RFC)](https://en.wikipedia.org/wiki/Request_for_Comments) process, so it has not been used widely outside of a few [implementations](https://dnscrypt.info/implementations). As a result, it has been largely replaced by the more popular [DNS over HTTPS](#dns-over-https-doh).
+
+### DNS over TLS (DoT)
+
+[**DNS over TLS**](https://en.wikipedia.org/wiki/DNS_over_TLS) is another method for encrypting DNS communication that is defined in [RFC 7858](https://datatracker.ietf.org/doc/html/rfc7858). Support was first implemented in Android 9, iOS 14, and on Linux in [systemd-resolved](https://www.freedesktop.org/software/systemd/man/resolved.conf.html#DNSOverTLS=) in version 237. Preference in the industry has been moving away from DoT to DoH in recent years, as DoT is a [complex protocol](https://dnscrypt.info/faq/) and has varying compliance to the RFC across the implementations that exist. DoT also operates on a dedicated port 853 which can be blocked easily by restrictive firewalls.
+
+### DNS over HTTPS (DoH)
+
+[**DNS over HTTPS**](https://en.wikipedia.org/wiki/DNS_over_HTTPS) as defined in [RFC 8484](https://datatracker.ietf.org/doc/html/rfc8484) packages queries in the [HTTP/2](https://en.wikipedia.org/wiki/HTTP/2) protocol and provides security with HTTPS. Support was first added in web browsers such as Firefox 60 and Chrome 83.
+
+Native implementation of DoH showed up in iOS 14, macOS 11, Microsoft Windows, and Android 13 (however, it won't be enabled [by default](https://android-review.googlesource.com/c/platform/packages/modules/DnsResolver/+/1833144)). General Linux desktop support is waiting on the systemd [implementation](https://github.com/systemd/systemd/issues/8639) so [installing third-party software is still required](../dns.md#encrypted-dns-proxies).
+
+## What can an outside party see?
+
+In this example we will record what happens when we make a DoH request:
+
+1. First, start `tshark`:
+
+    ```bash
+    tshark -w /tmp/dns_doh.pcap -f "tcp port https and host 1.1.1.1"
+    ```
+
+2. Second, make a request with `curl`:
+
+    ```bash
+    curl -vI --doh-url https://1.1.1.1/dns-query https://privacyguides.org
+    ```
+
+3. After making the request, we can stop the packet capture with <kbd>CTRL</kbd> + <kbd>C</kbd>.
+
+4. Analyse the results in Wireshark:
+
+    ```bash
+    wireshark -r /tmp/dns_doh.pcap
+    ```
+
+We can see the [connection establishment](https://en.wikipedia.org/wiki/Transmission_Control_Protocol#Connection_establishment) and [TLS handshake](https://www.cloudflare.com/learning/ssl/what-happens-in-a-tls-handshake/) that occurs with any encrypted connection. When looking at the "application data" packets that follow, none of them contain the domain we requested or the IP address returned.
+
+## Why **shouldn't** I use encrypted DNS?
+
+In locations where there is internet filtering (or censorship), visiting forbidden resources may have its own consequences which you should consider in your [threat model](../basics/threat-modeling.md). We do **not** suggest the use of encrypted DNS for this purpose. Use [Tor](https://torproject.org) or a [VPN](../vpn.md) instead. If you're using a VPN, you should use your VPN's DNS servers. When using a VPN, you are already trusting them with all your network activity.
+
+When we do a DNS lookup, it's generally because we want to access a resource. Below, we will discuss some of the methods that may disclose your browsing activities even when using encrypted DNS:
+
+### IP Address
+
+The simplest way to determine browsing activity might be to look at the IP addresses your devices are accessing. For example, if the observer knows that `privacyguides.org` is at `198.98.54.105`, and your device is requesting data from `198.98.54.105`, there is a good chance you're visiting Privacy Guides.
+
+This method is only useful when the IP address belongs to a server that only hosts few websites. It's also not very useful if the site is hosted on a shared platform (e.g. Github Pages, Cloudflare Pages, Netlify, WordPress, Blogger, etc). It also isn't very useful if the server is hosted behind a [reverse proxy](https://en.wikipedia.org/wiki/Reverse_proxy), which is very common on the modern Internet.
+
+### Server Name Indication (SNI)
+
+Server Name Indication is typically used when a IP address hosts many websites. This could be a service like Cloudflare, or some other [Denial-of-service attack](https://en.wikipedia.org/wiki/Denial-of-service_attack) protection.
+
+1. Start capturing again with `tshark`. We've added a filter with our IP address so you don't capture many packets:
+
+    ```bash
+    tshark -w /tmp/pg.pcap port 443 and host 198.98.54.105
+    ```
+
+2. Then we visit [https://privacyguides.org](https://privacyguides.org).
+
+3. After visiting the website, we want to stop the packet capture with <kbd>CTRL</kbd> + <kbd>C</kbd>.
+
+4. Next we want to analyze the results:
+
+    ```bash
+    wireshark -r /tmp/pg.pcap
+    ```
+
+    We will see the connection establishment, followed by the TLS handshake for the Privacy Guides website. Around frame 5. you'll see a "Client Hello".
+
+5. Expand the triangle &#9656; next to each field:
+
+    ```text
+    ▸ Transport Layer Security
+      ▸ TLSv1.3 Record Layer: Handshake Protocol: Client Hello
+        ▸ Handshake Protocol: Client Hello
+          ▸ Extension: server_name (len=22)
+            ▸ Server Name Indication extension
+    ```
+
+6. We can see the SNI value which discloses the website we are visiting. The `tshark` command can give you the value directly for all packets containing a SNI value:
+
+    ```bash
+    tshark -r /tmp/pg.pcap -Tfields -Y tls.handshake.extensions_server_name -e tls.handshake.extensions_server_name
+    ```
+
+This means even if we are using "Encrypted DNS" servers, the domain will likely be disclosed through SNI. The [TLS v1.3](https://en.wikipedia.org/wiki/Transport_Layer_Security#TLS_1.3) protocol brings with it [Encrypted Client Hello](https://blog.cloudflare.com/encrypted-client-hello/), which prevents this kind of leak.
+
+Governments, in particular [China](https://www.zdnet.com/article/china-is-now-blocking-all-encrypted-https-traffic-using-tls-1-3-and-esni/) and [Russia](https://www.zdnet.com/article/russia-wants-to-ban-the-use-of-secure-protocols-such-as-tls-1-3-doh-dot-esni/), have either already [started blocking](https://en.wikipedia.org/wiki/Server_Name_Indication#Encrypted_Client_Hello) it or expressed a desire to do so. Recently, Russia has [started blocking foreign websites](https://github.com/net4people/bbs/issues/108) that use the [HTTP/3](https://en.wikipedia.org/wiki/HTTP/3) standard. This is because the [QUIC](https://en.wikipedia.org/wiki/QUIC) protocol that is a part of HTTP/3 requires that `ClientHello` also be encrypted.
+
+### Online Certificate Status Protocol (OCSP)
+
+Another way your browser can disclose your browsing activities is with the [Online Certificate Status Protocol](https://en.wikipedia.org/wiki/Online_Certificate_Status_Protocol). When visiting an HTTPS website, the browser might check to see if the website's [certificate](https://en.wikipedia.org/wiki/Public_key_certificate) has been revoked. This is generally done through the HTTP protocol, meaning it is **not** encrypted.
+
+The OCSP request contains the certificate "[serial number](https://en.wikipedia.org/wiki/Public_key_certificate#Common_fields)", which is unique. It is sent to the "OCSP responder" in order to check its status.
+
+We can simulate what a browser would do using the [`openssl`](https://en.wikipedia.org/wiki/OpenSSL) command.
+
+1. Get the server certificate and use [`sed`](https://en.wikipedia.org/wiki/Sed) to keep just the important part and write it out to a file:
+
+    ```bash
+    openssl s_client -connect privacyguides.org:443 < /dev/null 2>&1 |
+        sed -n '/^-*BEGIN/,/^-*END/p' > /tmp/pg_server.cert
+    ```
+
+2. Get the intermediate certificate. [Certificate Authorities (CA)](https://en.wikipedia.org/wiki/Certificate_authority) normally don't sign a certificate directly; they use what is known as an "intermediate" certificate.
+
+    ```bash
+    openssl s_client -showcerts -connect privacyguides.org:443 < /dev/null 2>&1 |
+        sed -n '/^-*BEGIN/,/^-*END/p' > /tmp/pg_and_intermediate.cert
+    ```
+
+3. The first certificate in `pg_and_intermediate.cert` is actually the server certificate from step 1. We can use `sed` again to delete until the first instance of END:
+
+    ```bash
+    sed -n '/^-*END CERTIFICATE-*$/!d;:a n;p;ba' \
+        /tmp/pg_and_intermediate.cert > /tmp/intermediate_chain.cert
+    ```
+
+4. Get the OCSP responder for the server certificate:
+
+    ```bash
+    openssl x509 -noout -ocsp_uri -in /tmp/pg_server.cert
+    ```
+
+    Our certificate shows the Lets Encrypt certificate responder. If we want to see all the details of the certificate we can use:
+
+    ```bash
+    openssl x509 -text -noout -in /tmp/pg_server.cert
+    ```
+
+5. Start the packet capture:
+
+    ```bash
+    tshark -w /tmp/pg_ocsp.pcap -f "tcp port http"
+    ```
+
+6. Make the OCSP request:
+
+    ```bash
+    openssl ocsp -issuer /tmp/intermediate_chain.cert \
+                 -cert /tmp/pg_server.cert \
+                 -text \
+                 -url http://r3.o.lencr.org
+    ```
+
+7. Open the capture:
+
+    ```bash
+    wireshark -r /tmp/pg_ocsp.pcap
+    ```
+
+    There will be two packets with the "OCSP" protocol: a "Request" and a "Response". For the "Request" we can see the "serial number" by expanding the triangle &#9656; next to each field:
+
+    ```bash
+    ▸ Online Certificate Status Protocol
+      ▸ tbsRequest
+        ▸ requestList: 1 item
+          ▸ Request
+            ▸ reqCert
+              serialNumber
+    ```
+
+    For the "Response" we can also see the "serial number":
+
+    ```bash
+    ▸ Online Certificate Status Protocol
+      ▸ responseBytes
+        ▸ BasicOCSPResponse
+          ▸ tbsResponseData
+            ▸ responses: 1 item
+              ▸ SingleResponse
+                ▸ certID
+                  serialNumber
+    ```
+
+8. Or use `tshark` to filter the packets for the Serial Number:
+
+    ```bash
+    tshark -r /tmp/pg_ocsp.pcap -Tfields -Y ocsp.serialNumber -e ocsp.serialNumber
+    ```
+
+If the network observer has the public certificate, which is publicly available, they can match the serial number with that certificate and therefore determine the site you're visiting from that. The process can be automated and can associate IP addresses with serial numbers. It is also possible to check [Certificate Transparency](https://en.wikipedia.org/wiki/Certificate_Transparency) logs for the serial number.
+
+## Should I use encrypted DNS?
+
+We made this flow chart to describe when you *should* use encrypted DNS:
+
+``` mermaid
+graph TB
+    Start[Start] --> anonymous{Trying to be<br> anonymous?}
+    anonymous--> | Yes | tor(Use Tor)
+    anonymous --> | No | censorship{Avoiding<br> censorship?}
+    censorship --> | Yes | vpnOrTor(Use<br> VPN or Tor)
+    censorship --> | No | privacy{Want privacy<br> from ISP?}
+    privacy --> | Yes | vpnOrTor
+    privacy --> | No | obnoxious{ISP makes<br> obnoxious<br> redirects?}
+    obnoxious --> | Yes | encryptedDNS(Use<br> encrypted DNS<br> with 3rd party)
+    obnoxious --> | No | ispDNS{Does ISP support<br> encrypted DNS?}
+    ispDNS --> | Yes | useISP(Use<br> encrypted DNS<br> with ISP)
+    ispDNS --> | No | nothing(Do nothing)
+```
+
+Encrypted DNS with a third-party should only be used to get around redirects and basic [DNS blocking](https://en.wikipedia.org/wiki/DNS_blocking) when you can be sure there won't be any consequences or you're interested in a provider that does some rudimentary filtering.
+
+[List of recommended DNS servers](../dns.md ""){.md-button}
+
+## What is DNSSEC?
+
+[Domain Name System Security Extensions](https://en.wikipedia.org/wiki/Domain_Name_System_Security_Extensions) (DNSSEC) is a feature of DNS that authenticates responses to domain name lookups. It does not provide privacy protections for those lookups, but rather prevents attackers from manipulating or poisoning the responses to DNS requests.
+
+In other words, DNSSEC digitally signs data to help ensure its validity. In order to ensure a secure lookup, the signing occurs at every level in the DNS lookup process. As a result, all answers from DNS can be trusted.
+
+The DNSSEC signing process is similar to someone signing a legal document with a pen; that person signs with a unique signature that no one else can create, and a court expert can look at that signature and verify that the document was signed by that person. These digital signatures ensure that data has not been tampered with.
+
+DNSSEC implements a hierarchical digital signing policy across all layers of DNS. For example, in the case of a `privacyguides.org` lookup, a root DNS server would sign a key for the `.org` nameserver, and the `.org` nameserver would then sign a key for `privacyguides.org`’s authoritative nameserver.
+
+<small>Adapted from [DNS Security Extensions (DNSSEC) overview](https://cloud.google.com/dns/docs/dnssec) by Google and [DNSSEC: An Introduction](https://blog.cloudflare.com/dnssec-an-introduction/) by Cloudflare, both licensed under [CC BY 4.0](https://creativecommons.org/licenses/by/4.0/).</small>
+
+## What is QNAME minimization?
+
+A QNAME is a "qualified name", for example `privacyguides.org`. QNAME minimisation reduces the amount of information sent from the DNS server to the [authoritative name server](https://en.wikipedia.org/wiki/Name_server#Authoritative_name_server).
+
+Instead of sending the whole domain `privacyguides.org`, QNAME minimization means the DNS server will ask for all the records that end in `.org`. Further technical description is defined in [RFC 7816](https://datatracker.ietf.org/doc/html/rfc7816).
+
+## What is EDNS Client Subnet (ECS)?
+
+The [EDNS Client Subnet](https://en.wikipedia.org/wiki/EDNS_Client_Subnet) is a method for a recursive DNS resolver to specify a [subnetwork](https://en.wikipedia.org/wiki/Subnetwork) for the [host or client](https://en.wikipedia.org/wiki/Client_(computing)) which is making the DNS query.
+
+It's intended to "speed up" delivery of data by giving the client an answer that belongs to a server that is close to them such as a [content delivery network](https://en.wikipedia.org/wiki/Content_delivery_network), which are often used in video streaming and serving JavaScript web apps.
+
+This feature does come at a privacy cost, as it tells the DNS server some information about the client's location.
--- a/i18n/ar/advanced/payments.md
+++ b/i18n/ar/advanced/payments.md
@@ -0,0 +1,84 @@
+---
+title: Private Payments
+icon: material/hand-coin
+---
+
+There's a reason data about your buying habits is considered the holy grail of ad targeting: your purchases can leak a veritable treasure trove of data about you. Unfortunately, the current financial system is anti-privacy by design, enabling banks, other companies, and governments to easily trace transactions. Nevertheless, you have plenty of options when it comes to making payments privately.
+
+## Cash
+
+For centuries, **cash** has functioned as the primary form of private payment. Cash has excellent privacy properties in most cases, is widely accepted in most countries, and is **fungible**, meaning it is non-unique and completely interchangable.
+
+Cash payment laws vary by country. In the United States, special disclosure is required for cash payments over $10,000 to the IRS on [Form 8300](https://www.irs.gov/businesses/small-businesses-self-employed/form-8300-and-reporting-cash-payments-of-over-10000). The receiving business is required to ID verify the payee’s name, address, occupation, date of birth, and Social Security Number or other TIN (with some exceptions). Lower limits without ID such as $3,000 or less exist for exchanges and money transmission. Cash also contains serial numbers. These are almost never tracked by merchants, but they can be used by law enforcement in targeted investigations.
+
+Despite this, it’s typically the best option.
+
+## Prepaid Cards & Gift Cards
+
+It’s relatively simple to purchase gift cards and prepaid cards at most grocery stores and convenience stores with cash. Gift cards usually don’t have a fee, though prepaid cards often do, so pay close attention to these fees and expiry dates. Some stores may ask to see your ID at checkout to reduce fraud.
+
+Gift cards usually have limits of up to $200 per card, but some offer limits of up to $2,000 per card. Prepaid cards (eg: from Visa or Mastercard) usually have limits of up to $1,000 per card.
+
+Gift cards have the downside of being subject to merchant policies, which can have terrible terms and restrictions. For example, some merchants don’t accept payment in gift cards exclusively, or they may cancel the value of the card if they consider you to be a high-risk user. Once you have merchant credit, the merchant has a strong degree of control over this credit.
+
+Prepaid cards don’t allow cash withdrawals from ATMs or “peer-to-peer” payments in Venmo and similar apps.
+
+Cash remains the best option for in-person purchases for most people. Gift cards can be useful for the savings they bring. Prepaid cards can be useful for places that don’t accept cash. Gift cards and prepaid cards are easier to use online than cash, and they are easier to acquire with cryptocurrencies than cash.
+
+### Online Marketplaces
+
+If you have [cryptocurrency](../cryptocurrency.md), you can purchase gift cards with an online gift card marketplace. Some of these services offer ID verification options for higher limits, but they also allow accounts with just an email address. Basic limits start at $5,000-10,000 a day for basic accounts, and significantly higher limits for ID verified accounts (if offered).
+
+When buying gift cards online, there is usually a slight discount. Prepaid cards are usually sold online at face value or with a fee. If you buy prepaid cards and gift cards with cryptocurrencies, you should strongly prefer to pay with Monero which provides strong privacy, more on this below. Paying for a gift card with a traceable payment method negates the benefits a gift card can provide when purchased with cash or Monero.
+
+- [Online Gift Card Marketplaces :material-arrow-right-drop-circle:](../financial-services.md#gift-card-marketplaces)
+
+## Virtual Cards
+
+Another way to protect your information from merchants online is to use virtual, single-use cards which mask your actual banking or billing information. This is primarily useful for protecting you from merchant data breaches, less sophisticated tracking or purchase correlation by marketing agencies, and online data theft. They do **not** assist you in making a purchase completely anonymously, nor do they hide any information from the banking institution themselves. Regular financial institutions which offer virtual cards are subject to "Know Your Customer" (KYC) laws, meaning they may require your ID or other identifying information.
+
+- [Recommended Payment Masking Services :material-arrow-right-drop-circle:](../financial-services.md#payment-masking-services)
+
+These tend to be good options for recurring/subscription payments online, while prepaid gift cards are preferred for one-time transactions.
+
+## Cryptocurrency
+
+Cryptocurrencies are a digital form of currency designed to work without central authorities such as a government or bank. While *some* cryptocurrency projects can allow you to make private transactions online, many use a public blockchain which does not provide any transaction privacy. Cryptocurrencies also tend to be very volatile assets, meaning their value can change rapidly and significantly at any time. As such, we generally don't recommend using cryptocurrency as a long-term store of value. If you decide to use cryptocurrency online, make sure you have a full understanding of its privacy aspects beforehand, and only invest amounts which would not be disastrous to lose.
+
+!!! danger
+
+    The vast majority of cryptocurrencies operate on a **public** blockchain, meaning that every transaction is public knowledge. This includes even most well-known cryptocurrencies like Bitcoin and Ethereum. Transactions with these cryptocurrencies should not be considered private and will not protect your anonymity.
+    
+    Additionally, many if not most cryptocurrencies are scams. Make transactions carefully with only projects you trust.
+
+### Privacy Coins
+
+There are a number of cryptocurrency projects which purport to provide privacy by making transactions anonymous. We recommend using one which provides transaction anonymity **by default** to avoid operational errors.
+
+- [Recommended Cryptocurrency :material-arrow-right-drop-circle:](../cryptocurrency.md#coins)
+
+Privacy coins have been subject to increasing scrutiny by government agencies. In 2020, [the IRS published a $625,000 bounty](https://www.forbes.com/sites/kellyphillipserb/2020/09/14/irs-will-pay-up-to-625000-if-you-can-crack-monero-other-privacy-coins/?sh=2e9808a085cc) for tools which can break Bitcoin Lightning Network and/or Monero's transaction privacy. They ultimately [paid two companies](https://sam.gov/opp/5ab94eae1a8d422e88945b64181c6018/view) (Chainalysis and Integra Fec) a combined $1.25 million for tools which purport to do so (it is unknown which cryptocurrency network these tools target). Due to the secrecy surrounding tools like these, ==none of these methods of tracing cryptocurrencies have been independently confirmed.== However, it is quite likely that tools which assist targeted investigations into private coin transactions exist, and that privacy coins only succeed in thwarting mass surveillance.
+
+### Other Coins (Bitcoin, Ethereum, etc.)
+
+The vast majority of cryptocurrency projects use a public blockchain, meaning that all transactions are both easily traceable and permanent. As such, we strongly discourage the use of most cryptocurrency for privacy-related reasons.
+
+Anonymous transactions on a public blockchain are *theoretically* possible, and the Bitcoin wiki [gives one example of a "completely anonymous" transaction](https://en.bitcoin.it/wiki/Privacy#Example_-_A_perfectly_private_donation). However, doing so requires a complicated setup involving Tor and "solo-mining" a block to generate completely independent cryptocurrency, a practice which has not been practical for nearly any enthusiast for many years.
+
+==Your best option is to avoid these cryptocurrencies entirely and stick with one which provides privacy by default.== Attempting to use other cryptocurrency is outside the scope of this site and strongly discouraged.
+
+### Wallet Custody
+
+With cryptocurrency there are two forms of wallets: custodial wallets and noncustodial wallets. Custodial wallets are operated by centralized companies/exchanges, where the private key for your wallet is held by that company, and you can access them anywhere typically with a regular username and password. Noncustodial wallets are wallets where you control and manage the private keys to access it. Assuming you keep your wallet's private keys secured and backed up, noncustodial wallets provide greater security and censorship-resistance over custodial wallets, because your cryptocurrency can't be stolen or frozen by a company with custody over your private keys. Key custody is especially important when it comes to privacy coins: Custodial wallets grant the operating company the ability to view your transactions, negating the privacy benefits of those cryptocurrencies.
+
+### Acquisition
+
+Acquiring [cryptocurrencies](../cryptocurrency.md) like Monero privately can be difficult. P2P marketplaces like [LocalMonero](https://localmonero.co/), a platform which facilitates trades between people, are one option that can be used. If using an exchange which requires KYC is an acceptable risk for you as long as subsequent transactions can't be traced, a much easier option is to purchase Monero on an exchange like [Kraken](https://kraken.com/), or purchase Bitcoin/Litecoin from a KYC exchange which can then be swapped for Monero. Then, you can withdraw the purchased Monero to your own noncustodial wallet to use privately from that point forward.
+
+If you go this route, make sure to purchase Monero at different times and in different amounts than where you will spend it. If you purchase $5000 of Monero at an exchange and make a $5000 purchase in Monero an hour later, those actions could potentially be correlated by an outside observer regardless of which path the Monero took. Staggering purchases and purchasing larger amounts of Monero in advance to later spend on multiple smaller transactions can avoid this pitfall.
+
+## Additional Considerations
+
+When you're making a payment in-person with cash, make sure to keep your in-person privacy in mind. Security cameras are ubiquitous. Consider wearing non-distinct clothing and a face mask (such as a surgical mask or N95). Don’t sign up for rewards programs or provide any other information about yourself.
+
+When purchasing online, ideally you should do so over [Tor](tor-overview.md). However, many merchants don’t allow purchases with Tor. You can consider using a [recommended VPN](../vpn.md) (paid for with cash, gift card, or Monero), or making the purchase from a coffee shop or library with free Wi-Fi. If you are ordering a physical item that needs to be delivered, you will need to provide a delivery address. You should consider using a PO box, private mailbox, or work address.
--- a/i18n/ar/advanced/tor-overview.md
+++ b/i18n/ar/advanced/tor-overview.md
@@ -0,0 +1,80 @@
+---
+title: "Tor Overview"
+icon: 'simple/torproject'
+description: Tor is a free to use, decentralized network designed for using the internet with as much privacy as possible.
+---
+
+Tor is a free to use, decentralized network designed for using the internet with as much privacy as possible. If used properly, the network enables private and anonymous browsing and communications.
+
+## Path Building
+
+Tor works by routing your traffic through a network comprised of thousands of volunteer-run servers called nodes (or relays).
+
+Every time you connect to Tor, it will choose three nodes to build a path to the internet—this path is called a "circuit." Each of these nodes has its own function:
+
+### The Entry Node
+
+The entry node, often called the guard node, is the first node to which your Tor client connects. The entry node is able to see your IP address, however it is unable to see what you are connecting to.
+
+Unlike the other nodes, the Tor client will randomly select an entry node and stick with it for two to three months to protect you from certain attacks.[^1]
+
+### The Middle Node
+
+The middle node is the second node to which your Tor client connects. It can see which node the traffic came from—the entry node—and to which node it goes to next. The middle node cannot, see your IP address or the domain you are connecting to.
+
+For each new circuit, the middle node is randomly selected out of all available Tor nodes.
+
+### The Exit Node
+
+The exit node is the point in which your web traffic leaves the Tor network and is forwarded to your desired destination. The exit node is unable to see your IP address, but it does know what site it's connecting to.
+
+The exit node will be chosen at random from all available Tor nodes ran with an exit relay flag.[^2]
+
+<figure markdown>
+  ![Tor path](../assets/img/how-tor-works/tor-path.svg#only-light)
+  ![Tor path](../assets/img/how-tor-works/tor-path-dark.svg#only-dark)
+  <figcaption>Tor circuit pathway</figcaption>
+</figure>
+
+## Encryption
+
+Tor encrypts each packet (a block of transmitted data) three times with the keys from the exit, middle, and entry node—in that order.
+
+Once Tor has built a circuit, data transmission is done as follows:
+
+1. Firstly: when the packet arrives at the entry node, the first layer of encryption is removed. In this encrypted packet, the entry node will find another encrypted packet with the middle node’s address. The entry node will then forward the packet to the middle node.
+
+2. Secondly: when the middle node receives the packet from the entry node, it too will remove a layer of encryption with its key, and this time finds an encrypted packet with the exit node's address. The middle node will then forward the packet to the exit node.
+
+3. Lastly: when the exit node receives its packet, it will remove the last layer of encryption with its key. The exit node will see the destination address and forward the packet to that address.
+
+Below is an alternative diagram showing the process. Each node removes its own layer of encryption, and when the destination server returns data, the same process happens entirely in reverse. For example, the exit node does not know who you are, but it does know which node it came from, and so it adds its own layer of encryption and sends it back.
+
+<figure markdown>
+  ![Tor encryption](../assets/img/how-tor-works/tor-encryption.svg#only-light)
+  ![Tor encryption](../assets/img/how-tor-works/tor-encryption-dark.svg#only-dark)
+  <figcaption>Sending and receiving data through the Tor Network</figcaption>
+</figure>
+
+Tor allows us to connect to a server without any single party knowing the entire path. The entry node knows who you are, but not where you are going; the middle node doesn’t know who you are or where you are going; and the exit node knows where you are going, but not who you are. Because the exit node is what makes the final connection, the destination server will never know your IP address.
+
+## Caveats
+
+Though Tor does provide strong privacy guarantees, one must be aware that Tor is not perfect:
+
+- Well-funded adversaries with the capability to passively watch most network traffic over the globe have a chance of deanonymizing Tor users by means of advanced traffic analysis. Nor does Tor protect you from exposing yourself by mistake, such as if you share too much information about your real identity.
+- Tor exit nodes can also monitor traffic that passes through them. This means traffic which is not encrypted, such as plain HTTP traffic, can be recorded and monitored. If such traffic contains personally identifiable information, then it can deanonymize you to that exit node. Thus, we recommend using HTTPS over Tor where possible.
+
+If you wish to use Tor for browsing the web, we only recommend the **official** Tor Browser—it is designed to prevent fingerprinting.
+
+- [Tor Browser :material-arrow-right-drop-circle:](../tor.md#tor-browser)
+
+## Additional Resources
+
+- [Tor Browser User Manual](https://tb-manual.torproject.org)
+- [How Tor Works - Computerphile](https://invidious.privacyguides.net/embed/QRYzre4bf7I?local=true) <small>(YouTube)</small>
+- [Tor Onion Services - Computerphile](https://invidious.privacyguides.net/embed/lVcbq_a5N9I?local=true) <small>(YouTube)</small>
+
+[^1]: The first relay in your circuit is called an "entry guard" or "guard". It is a fast and stable relay that remains the first one in your circuit for 2-3 months in order to protect against a known anonymity-breaking attack. The rest of your circuit changes with every new website you visit, and all together these relays provide the full privacy protections of Tor. For more information on how guard relays work, see this [blog post](https://blog.torproject.org/improving-tors-anonymity-changing-guard-parameters) and [paper](https://www-users.cs.umn.edu/~hoppernj/single_guard.pdf) on entry guards. ([https://support.torproject.org/tbb/tbb-2/](https://support.torproject.org/tbb/tbb-2/))
+
+[^2]: Relay flag: a special (dis-)qualification of relays for circuit positions (for example, "Guard", "Exit", "BadExit"), circuit properties (for example, "Fast", "Stable"), or roles (for example, "Authority", "HSDir"), as assigned by the directory authorities and further defined in the directory protocol specification. ([https://metrics.torproject.org/glossary.html](https://metrics.torproject.org/glossary.html))
--- a/i18n/ar/android.md
+++ b/i18n/ar/android.md
@@ -0,0 +1,353 @@
+---
+title: "Android"
+icon: 'simple/android'
+description: You can replace the operating system on your Android phone with these secure and privacy-respecting alternatives.
+---
+
+![Android logo](assets/img/android/android.svg){ align=right }
+
+The **Android Open Source Project** is an open-source mobile operating system led by Google which powers the majority of the world's mobile devices. Most phones sold with Android are modified to include invasive integrations and apps such as Google Play Services, so you can significantly improve your privacy on your mobile device by replacing your phone's default installation with a version of Android without these invasive features.
+
+[:octicons-home-16:](https://source.android.com/){ .card-link title=Homepage }
+[:octicons-info-16:](https://source.android.com/docs){ .card-link title=Documentation}
+[:octicons-code-16:](https://cs.android.com/android/platform/superproject/){ .card-link title="Source Code" }
+
+These are the Android operating systems, devices, and apps we recommend to maximize your mobile device's security and privacy. To learn more about Android:
+
+[General Android Overview :material-arrow-right-drop-circle:](os/android-overview.md ""){.md-button}
+
+[Why we recommend GrapheneOS over CalyxOS :material-arrow-right-drop-circle:](https://blog.privacyguides.org/2022/04/21/grapheneos-or-calyxos/ ""){.md-button}
+
+## AOSP Derivatives
+
+We recommend installing one of these custom Android operating systems on your device, listed in order of preference, depending on your device's compatibility with these operating systems.
+
+!!! note
+
+    End-of-life devices (such as GrapheneOS or CalyxOS's "extended support" devices) do not have full security patches (firmware updates) due to the OEM discontinuing support. These devices cannot be considered completely secure regardless of installed software.
+
+### GrapheneOS
+
+!!! recommendation
+
+    ![GrapheneOS logo](assets/img/android/grapheneos.svg#only-light){ align=right }
+    ![GrapheneOS logo](assets/img/android/grapheneos-dark.svg#only-dark){ align=right }
+    
+    **GrapheneOS** is the best choice when it comes to privacy and security.
+    
+    GrapheneOS provides additional [security hardening](https://en.wikipedia.org/wiki/Hardening_(computing)) and privacy improvements. It has a [hardened memory allocator](https://github.com/GrapheneOS/hardened_malloc), network and sensor permissions, and various other [security features](https://grapheneos.org/features). GrapheneOS also comes with full firmware updates and signed builds, so verified boot is fully supported.
+    
+    [:octicons-home-16: Homepage](https://grapheneos.org/){ .md-button .md-button--primary }
+    [:octicons-eye-16:](https://grapheneos.org/faq#privacy-policy){ .card-link title="Privacy Policy" }
+    [:octicons-info-16:](https://grapheneos.org/faq){ .card-link title=Documentation}
+    [:octicons-code-16:](https://grapheneos.org/source){ .card-link title="Source Code" }
+    [:octicons-heart-16:](https://grapheneos.org/donate){ .card-link title=Contribute }
+
+GrapheneOS supports [Sandboxed Google Play](https://grapheneos.org/usage#sandboxed-google-play), which runs [Google Play Services](https://en.wikipedia.org/wiki/Google_Play_Services) fully sandboxed like any other regular app. This means you can take advantage of most Google Play Services, such as [push notifications](https://firebase.google.com/docs/cloud-messaging/), while giving you full control over their permissions and access, and while containing them to a specific [work profile](os/android-overview.md#work-profile) or [user profile](os/android-overview.md#user-profiles) of your choice.
+
+Google Pixel phones are the only devices that currently meet GrapheneOS's [hardware security requirements](https://grapheneos.org/faq#device-support).
+
+### DivestOS
+
+!!! recommendation
+
+    ![DivestOS logo](assets/img/android/divestos.svg){ align=right }
+    
+    **DivestOS** is a soft-fork of [LineageOS](https://lineageos.org/).
+    DivestOS inherits many [supported devices](https://divestos.org/index.php?page=devices&base=LineageOS) from LineageOS. It has signed builds, making it possible to have [verified boot](https://source.android.com/security/verifiedboot) on some non-Pixel devices.
+    
+    [:octicons-home-16: Homepage](https://divestos.org){ .md-button .md-button--primary }
+    [:simple-torbrowser:](http://divestoseb5nncsydt7zzf5hrfg44md4bxqjs5ifcv4t7gt7u6ohjyyd.onion){ .card-link title="Onion Service" }
+    [:octicons-eye-16:](https://divestos.org/index.php?page=privacy_policy){ .card-link title="Privacy Policy" }
+    [:octicons-info-16:](https://divestos.org/index.php?page=faq){ .card-link title=Documentation}
+    [:octicons-code-16:](https://github.com/divested-mobile){ .card-link title="Source Code" }
+    [:octicons-heart-16:](https://divested.dev/index.php?page=donate){ .card-link title=Contribute }
+
+DivestOS has automated kernel vulnerability ([CVE](https://en.wikipedia.org/wiki/Common_Vulnerabilities_and_Exposures)) [patching](https://gitlab.com/divested-mobile/cve_checker), fewer proprietary blobs, and a custom [hosts](https://divested.dev/index.php?page=dnsbl) file. Its hardened WebView, [Mulch](https://gitlab.com/divested-mobile/mulch), enables [CFI](https://en.wikipedia.org/wiki/Control-flow_integrity) for all architectures and [network state partitioning](https://developer.mozilla.org/en-US/docs/Web/Privacy/State_Partitioning), and receives out-of-band updates. DivestOS also includes kernel patches from GrapheneOS and enables all available kernel security features via [defconfig hardening](https://github.com/Divested-Mobile/DivestOS-Build/blob/master/Scripts/Common/Functions.sh#L758). All kernels newer than version 3.4 include full page [sanitization](https://lwn.net/Articles/334747/) and all ~22 Clang-compiled kernels have [`-ftrivial-auto-var-init=zero`](https://reviews.llvm.org/D54604?id=174471) enabled.
+
+DivestOS implements some system hardening patches originally developed for GrapheneOS. DivestOS 16.0 and higher implements GrapheneOS's [`INTERNET`](https://developer.android.com/training/basics/network-ops/connecting) and SENSORS permission toggle, [hardened memory allocator](https://github.com/GrapheneOS/hardened_malloc), [exec-spawning](https://blog.privacyguides.org/2022/04/21/grapheneos-or-calyxos/#additional-hardening), [JNI](https://en.wikipedia.org/wiki/Java_Native_Interface) [constification](https://en.wikipedia.org/wiki/Const_(computer_programming)), and partial [bionic](https://en.wikipedia.org/wiki/Bionic_(software)) hardening patchsets. 17.1 and higher features GrapheneOS's per-network full [MAC randomization](https://en.wikipedia.org/wiki/MAC_address#Randomization) option, [`ptrace_scope`](https://www.kernel.org/doc/html/latest/admin-guide/LSM/Yama.html) control, and automatic reboot/Wi-Fi/Bluetooth [timeout options](https://grapheneos.org/features).
+
+DivestOS uses F-Droid as its default app store. Normally, we would recommend avoiding F-Droid due to its numerous [security issues](#f-droid). However, doing so on DivestOS isn't viable; the developers update their apps via their own F-Droid repositories ([DivestOS Official](https://divestos.org/fdroid/official/?fingerprint=E4BE8D6ABFA4D9D4FEEF03CDDA7FF62A73FD64B75566F6DD4E5E577550BE8467) and [DivestOS WebView](https://divestos.org/fdroid/webview/?fingerprint=FB426DA1750A53D7724C8A582B4D34174E64A84B38940E5D5A802E1DFF9A40D2)). We recommend disabling the official F-Droid app and using [Neo Store](https://github.com/NeoApplications/Neo-Store/) with the DivestOS repositories enabled to keep those components up to date. For other apps, our recommended methods of obtaining them still apply.
+
+!!! warning
+
+    DivestOS firmware update [status](https://gitlab.com/divested-mobile/firmware-empty/-/blob/master/STATUS) and quality control varies across the devices it supports. We still recommend GrapheneOS depending on your device's compatibility. For other devices, DivestOS is a good alternative.
+    
+    Not all of the supported devices have verified boot, and some perform it better than others.
+
+## Android Devices
+
+When purchasing a device, we recommend getting one as new as possible. The software and firmware of mobile devices are only supported for a limited time, so buying new extends that lifespan as much as possible.
+
+Avoid buying phones from mobile network operators. These often have a **locked bootloader** and do not support [OEM unlocking](https://source.android.com/devices/bootloader/locking_unlocking). These phone variants will prevent you from installing any kind of alternative Android distribution.
+
+Be very **careful** about buying second hand phones from online marketplaces. Always check the reputation of the seller. If the device is stolen, there's a possibility of [IMEI blacklisting](https://www.gsma.com/security/resources/imei-blacklisting/). There is also a risk involved with you being associated with the activity of the previous owner.
+
+A few more tips regarding Android devices and operating system compatibility:
+
+- Do not buy devices that have reached or are near their end-of-life, additional firmware updates must be provided by the manufacturer.
+- Do not buy preloaded LineageOS or /e/ OS phones or any Android phones without proper [Verified Boot](https://source.android.com/security/verifiedboot) support and firmware updates. These devices also have no way for you to check whether they've been tampered with.
+- In short, if a device or Android distribution is not listed here, there is probably a good reason. Check out our [forum](https://discuss.privacyguides.net/) to find details!
+
+### Google Pixel
+
+Google Pixel phones are the **only** devices we recommend for purchase. Pixel phones have stronger hardware security than any other Android devices currently on the market, due to proper AVB support for third-party operating systems and Google's custom [Titan](https://security.googleblog.com/2021/10/pixel-6-setting-new-standard-for-mobile.html) security chips acting as the Secure Element.
+
+!!! recommendation
+
+    ![Google Pixel 6](assets/img/android/google-pixel.png){ align=right }
+    
+    **Google Pixel** devices are known to have good security and properly support [Verified Boot](https://source.android.com/security/verifiedboot), even when installing custom operating systems.
+    
+    Beginning with the **Pixel 6** and **6 Pro**, Pixel devices receive a minimum of 5 years of guaranteed security updates, ensuring a much longer lifespan compared to the 2-4 years competing OEMs typically offer.
+    
+    [:material-shopping: Store](https://store.google.com/category/phones){ .md-button .md-button--primary }
+
+Secure Elements like the Titan M2 are more limited than the processor's Trusted Execution Environment used by most other phones as they are only used for secrets storage, hardware attestation, and rate limiting, not for running "trusted" programs. Phones without a Secure Element have to use the TEE for *all* of those functions, resulting in a larger attack surface.
+
+Google Pixel phones use a TEE OS called Trusty which is [open-source](https://source.android.com/security/trusty#whyTrusty), unlike many other phones.
+
+The installation of GrapheneOS on a Pixel phone is easy with their [web installer](https://grapheneos.org/install/web). If you don't feel comfortable doing it yourself and are willing to spend a bit of extra money, check out the [NitroPhone](https://shop.nitrokey.com/shop) as they come preloaded with GrapheneOS from the reputable [Nitrokey](https://www.nitrokey.com/about) company.
+
+A few more tips for purchasing a Google Pixel:
+
+- If you're after a bargain on a Pixel device, we suggest buying an "**a**" model, just after the next flagship is released. Discounts are usually available because Google will be trying to clear their stock.
+- Consider price beating options and specials offered at physical stores.
+- Look at online community bargain sites in your country. These can alert you to good sales.
+- Google provides a list showing the [support cycle](https://support.google.com/nexus/answer/4457705) for each one of their devices. The price per day for a device can be calculated as: $\text{Cost} \over \text {EOL Date}-\text{Current Date}$, meaning that the longer use of the device the lower cost per day.
+
+## General Apps
+
+We recommend a wide variety of Android apps throughout this site. The apps listed here are Android-exclusive and specifically enhance or replace key system functionality.
+
+### Shelter
+
+!!! recommendation
+
+    ![Shelter logo](assets/img/android/shelter.svg){ align=right }
+    
+    **Shelter** is an app that helps you leverage Android's Work Profile functionality to isolate or duplicate apps on your device.
+    
+    Shelter supports blocking contact search cross profiles and sharing files across profiles via the default file manager ([DocumentsUI](https://source.android.com/devices/architecture/modular-system/documentsui)).
+    
+    [:octicons-repo-16: Repository](https://gitea.angry.im/PeterCxy/Shelter#shelter){ .md-button .md-button--primary }
+    [:octicons-code-16:](https://gitea.angry.im/PeterCxy/Shelter){ .card-link title="Source Code" }
+    [:octicons-heart-16:](https://www.patreon.com/PeterCxy){ .card-link title=Contribute }
+    
+    ??? downloads
+    
+        - [:simple-googleplay: Google Play](https://play.google.com/store/apps/details?id=net.typeblog.shelter)
+
+!!! warning
+
+    Shelter is recommended over [Insular](https://secure-system.gitlab.io/Insular/) and [Island](https://github.com/oasisfeng/island) as it supports [contact search blocking](https://secure-system.gitlab.io/Insular/faq.html).
+    
+    When using Shelter, you are placing complete trust in its developer, as Shelter acts as a [Device Admin](https://developer.android.com/guide/topics/admin/device-admin) to create the Work Profile, and it has extensive access to the data stored within the Work Profile.
+
+### Auditor
+
+!!! recommendation
+
+    ![Auditor logo](assets/img/android/auditor.svg#only-light){ align=right }
+    ![Auditor logo](assets/img/android/auditor-dark.svg#only-dark){ align=right }
+    
+    **Auditor** is an app which leverages hardware security features to provide device integrity monitoring for [supported devices](https://attestation.app/about#device-support). Currently, it only works with GrapheneOS and the device's stock operating system.
+    
+    [:octicons-home-16: Homepage](https://attestation.app){ .md-button .md-button--primary }
+    [:octicons-eye-16:](https://attestation.app/privacy-policy){ .card-link title="Privacy Policy" }
+    [:octicons-info-16:](https://attestation.app/about){ .card-link title=Documentation}
+    [:octicons-code-16:](https://attestation.app/source){ .card-link title="Source Code" }
+    [:octicons-heart-16:](https://attestation.app/donate){ .card-link title=Contribute }
+    
+    ??? downloads
+    
+        - [:simple-googleplay: Google Play](https://play.google.com/store/apps/details?id=app.attestation.auditor.play)
+        - [:simple-github: GitHub](https://github.com/GrapheneOS/Auditor/releases)
+        - [:material-cube-outline: GrapheneOS App Store](https://github.com/GrapheneOS/Apps/releases)
+
+Auditor performs attestation and intrusion detection by:
+
+- Using a [Trust On First Use (TOFU)](https://en.wikipedia.org/wiki/Trust_on_first_use) model between an *auditor* and *auditee*, the pair establish a private key in the [hardware-backed keystore](https://source.android.com/security/keystore/) of the *Auditor*.
+- The *auditor* can either be another instance of the Auditor app or the [Remote Attestation Service](https://attestation.app).
+- The *auditor* records the current state and configuration of the *auditee*.
+- Should tampering with the operating system of the *auditee* happen after the pairing is complete, the auditor will be aware of the change in the device state and configurations.
+- You will be alerted to the change.
+
+No personally identifiable information is submitted to the attestation service. We recommend that you sign up with an anonymous account and enable remote attestation for continuous monitoring.
+
+If your [threat model](basics/threat-modeling.md) requires privacy, you could consider using [Orbot](tor.md#orbot) or a VPN to hide your IP address from the attestation service. To make sure that your hardware and operating system is genuine, [perform local attestation](https://grapheneos.org/install/web#verifying-installation) immediately after the device has been installed and prior to any internet connection.
+
+### Secure Camera
+
+!!! recommendation
+
+    ![Secure camera logo](assets/img/android/secure_camera.svg#only-light){ align=right }
+    ![Secure camera logo](assets/img/android/secure_camera-dark.svg#only-dark){ align=right }
+    
+    **Secure Camera** is a camera app focused on privacy and security which can capture images, videos and QR codes. CameraX vendor extensions (Portrait, HDR, Night Sight, Face Retouch, and Auto) are also supported on available devices.
+    
+    [:octicons-repo-16: Repository](https://github.com/GrapheneOS/Camera){ .md-button .md-button--primary }
+    [:octicons-info-16:](https://grapheneos.org/usage#camera){ .card-link title=Documentation}
+    [:octicons-code-16:](https://github.com/GrapheneOS/Camera){ .card-link title="Source Code" }
+    [:octicons-heart-16:](https://grapheneos.org/donate){ .card-link title=Contribute }
+    
+    ??? downloads
+    
+        - [:simple-googleplay: Google Play](https://play.google.com/store/apps/details?id=app.grapheneos.camera.play)
+        - [:simple-github: GitHub](https://github.com/GrapheneOS/Camera/releases)
+        - [:material-cube-outline: GrapheneOS App Store](https://github.com/GrapheneOS/Apps/releases)
+
+Main privacy features include:
+
+- Auto removal of [Exif](https://en.wikipedia.org/wiki/Exif) metadata (enabled by default)
+- Use of the new [Media](https://developer.android.com/training/data-storage/shared/media) API, therefore [storage permissions](https://developer.android.com/training/data-storage) are not required
+- Microphone permission not required unless you want to record sound
+
+!!! note
+
+    Metadata is not currently deleted from video files but that is planned.
+    
+    The image orientation metadata is not deleted. If you enable location (in Secure Camera) that **won't** be deleted either. If you want to delete that later you will need to use an external app such as [ExifEraser](data-redaction.md#exiferaser).
+
+### Secure PDF Viewer
+
+!!! recommendation
+
+    ![Secure PDF Viewer logo](assets/img/android/secure_pdf_viewer.svg#only-light){ align=right }
+    ![Secure PDF Viewer logo](assets/img/android/secure_pdf_viewer-dark.svg#only-dark){ align=right }
+    
+    **Secure PDF Viewer** is a PDF viewer based on [pdf.js](https://en.wikipedia.org/wiki/PDF.js) that doesn't require any permissions. The PDF is fed into a [sandboxed](https://en.wikipedia.org/wiki/Sandbox_(software_development)) [webview](https://developer.android.com/guide/webapps/webview). This means that it doesn't require permission directly to access content or files.
+    
+    [Content-Security-Policy](https://en.wikipedia.org/wiki/Content_Security_Policy) is used to enforce that the JavaScript and styling properties within the WebView are entirely static content.
+    
+    [:octicons-repo-16: Repository](https://github.com/GrapheneOS/PdfViewer){ .md-button .md-button--primary }
+    [:octicons-code-16:](https://github.com/GrapheneOS/PdfViewer){ .card-link title="Source Code" }
+    [:octicons-heart-16:](https://grapheneos.org/donate){ .card-link title=Contribute }
+    
+    ??? downloads
+    
+        - [:simple-googleplay: Google Play](https://play.google.com/store/apps/details?id=app.grapheneos.pdfviewer.play)
+        - [:simple-github: GitHub](https://github.com/GrapheneOS/PdfViewer/releases)
+        - [:material-cube-outline: GrapheneOS App Store](https://github.com/GrapheneOS/Apps/releases)
+
+## Obtaining Applications
+
+### GrapheneOS App Store
+
+GrapheneOS's app store is available on [GitHub](https://github.com/GrapheneOS/Apps/releases). It supports Android 12 and above and is capable of updating itself. The app store has standalone applications built by the GrapheneOS project such as the [Auditor](https://attestation.app/), [Camera](https://github.com/GrapheneOS/Camera), and [PDF Viewer](https://github.com/GrapheneOS/PdfViewer). If you are looking for these applications, we highly recommend that you get them from GrapheneOS's app store instead of the Play Store, as the apps on their store are signed by the GrapheneOS's project own signature that Google does not have access to.
+
+### Aurora Store
+
+The Google Play Store requires a Google account to login which is not great for privacy. You can get around this by using an alternative client, such as Aurora Store.
+
+!!! recommendation
+
+    ![Aurora Store logo](assets/img/android/aurora-store.webp){ align=right }
+    
+    **Aurora Store** is a Google Play Store client which does not require a Google Account, Google Play Services, or microG to download apps.
+    
+    [:octicons-home-16: Homepage](https://auroraoss.com/){ .md-button .md-button--primary }
+    [:octicons-code-16:](https://gitlab.com/AuroraOSS/AuroraStore){ .card-link title="Source Code" }
+    
+    ??? downloads
+    
+        - [:simple-gitlab: GitLab](https://gitlab.com/AuroraOSS/AuroraStore/-/releases)
+
+Aurora Store does not allow you to download paid apps with their anonymous account feature. You can optionally log in with your Google account with Aurora Store to download apps you have purchased, which does give access to the list of apps you've installed to Google, however you still benefit from not requiring the full Google Play client and Google Play Services or microG on your device.
+
+### Manually with RSS Notifications
+
+For apps that are released on platforms like GitHub and GitLab, you may be able to add an RSS feed to your [news aggregator](/news-aggregators) that will help you keep track of new releases.
+
+![RSS APK](./assets/img/android/rss-apk-light.png#only-light) ![RSS APK](./assets/img/android/rss-apk-dark.png#only-dark) ![APK Changes](./assets/img/android/rss-changes-light.png#only-light) ![APK Changes](./assets/img/android/rss-changes-dark.png#only-dark)
+
+#### GitHub
+
+On GitHub, using [Secure Camera](#secure-camera) as an example, you would navigate to its [releases page](https://github.com/GrapheneOS/Camera/releases) and append `.atom` to the URL:
+
+`https://github.com/GrapheneOS/Camera/releases.atom`
+
+#### GitLab
+
+On GitLab, using [Aurora Store](#aurora-store) as an example, you would navigate to its [project repository](https://gitlab.com/AuroraOSS/AuroraStore) and append `/-/tags?format=atom` to the URL:
+
+`https://gitlab.com/AuroraOSS/AuroraStore/-/tags?format=atom`
+
+#### Verifying APK Fingerprints
+
+If you download APK files to install manually, you can verify their signature with the [`apksigner`](https://developer.android.com/studio/command-line/apksigner) tool, which is a part of Android [build-tools](https://developer.android.com/studio/releases/build-tools).
+
+1. Install [Java JDK](https://www.oracle.com/java/technologies/downloads/).
+
+2. Download the [Android Studio command line tools](https://developer.android.com/studio#command-tools).
+
+3. Extract the downloaded archive:
+
+    ```bash
+    unzip commandlinetools-*.zip
+    cd cmdline-tools
+    ./bin/sdkmanager --sdk_root=./ "build-tools;29.0.3"
+    ```
+
+4. Run the signature verification command:
+
+    ```bash
+    ./build-tools/29.0.3/apksigner verify --print-certs ../Camera-37.apk
+    ```
+
+5. The resulting hashes can then be compared with another source. Some developers such as Signal [show the fingerprints](https://signal.org/android/apk/) on their website.
+
+    ```bash
+    Signer #1 certificate DN: CN=GrapheneOS
+    Signer #1 certificate SHA-256 digest: 6436b155b917c2f9a9ed1d15c4993a5968ffabc94947c13f2aeee14b7b27ed59
+    Signer #1 certificate SHA-1 digest: 23e108677a2e1b1d6e6b056f3bb951df7ad5570c
+    Signer #1 certificate MD5 digest: dbbcd0cac71bd6fa2102a0297c6e0dd3
+    ```
+
+### F-Droid
+
+![F-Droid logo](assets/img/android/f-droid.svg){ align=right width=120px }
+
+==We do **not** currently recommend F-Droid as a way to obtain apps.== F-Droid is often recommended as an alternative to Google Play, particularly in the privacy community. The option to add third-party repositories and not be confined to Google's walled garden has led to its popularity. F-Droid additionally has [reproducible builds](https://f-droid.org/en/docs/Reproducible_Builds/) for some applications and is dedicated to free and open-source software. However, there are [notable problems](https://privsec.dev/posts/android/f-droid-security-issues/) with the official F-Droid client, their quality control, and how they build, sign, and deliver packages.
+
+Due to their process of building apps, apps in the official F-Droid repository often fall behind on updates. F-Droid maintainers also reuse package IDs while signing apps with their own keys, which is not ideal as it gives the F-Droid team ultimate trust.
+
+Other popular third-party repositories such as [IzzyOnDroid](https://apt.izzysoft.de/fdroid/) alleviate some of these concerns. The IzzyOnDroid repository pulls builds directly from GitHub and is the next best thing to the developers' own repositories. However, it is not something that we can recommend, as apps are typically [removed](https://github.com/vfsfitvnm/ViMusic/issues/240#issuecomment-1225564446) from that respository when they make it to the main F-Droid repository. While that makes sense (since the goal of that particular repository is to host apps before they're accepted into the main F-Droid repository), it can leave you with installed apps which no longer receive updates.
+
+That said, the [F-Droid](https://f-droid.org/en/packages/) and [IzzyOnDroid](https://apt.izzysoft.de/fdroid/) repositories are home to countless apps, so they can be a useful tool to search for and discover open-source apps that you can then download through Play Store, Aurora Store, or by getting the APK directly from the developer. It is important to keep in mind that some apps in these repositories have not been updated in years and may rely on unsupported libraries, among other things, posing a potential security risk. You should use your best judgement when looking for new apps via this method.
+
+!!! note
+
+    In some rare cases, the developer of an app will only distribute it through F-Droid ([Gadgetbridge](https://gadgetbridge.org/) is one example of this). If you really need an app like that, we recommend using [Neo Store](https://github.com/NeoApplications/Neo-Store/) instead of the official F-Droid app to obtain it.
+
+## Criteria
+
+**Please note we are not affiliated with any of the projects we recommend.** In addition to [our standard criteria](about/criteria.md), we have developed a clear set of requirements to allow us to provide objective recommendations. We suggest you familiarize yourself with this list before choosing to use a project, and conduct your own research to ensure it's the right choice for you.
+
+!!! example "This section is new"
+
+    We are working on establishing defined criteria for every section of our site, and this may be subject to change. If you have any questions about our criteria, please [ask on our forum](https://discuss.privacyguides.net/latest) and don't assume we didn't consider something when making our recommendations if it is not listed here. There are many factors considered and discussed when we recommend a project, and documenting every single one is a work-in-progress.
+
+### Operating Systems
+
+- Must be open-source software.
+- Must support bootloader locking with custom AVB key support.
+- Must receive major Android updates within 0-1 months of release.
+- Must receive Android feature updates (minor version) within 0-14 days of release.
+- Must receive regular security patches within 0-5 days of release.
+- Must **not** be "rooted" out of the box.
+- Must **not** enable Google Play Services by default.
+- Must **not** require system modification to support Google Play Services.
+
+### Devices
+
+- Must support at least one of our recommended custom operating systems.
+- Must be currently sold new in stores.
+- Must receive a minimum of 5 years of security updates.
+- Must have dedicated secure element hardware.
+
+### Applications
+
+- Applications on this page must not be applicable to any other software category on the site.
+- General applications should extend or replace core system functionality.
+- Applications should receive regular updates and maintenance.
--- a/i18n/ar/assets/img/account-deletion/exposed_passwords.png
+++ b/i18n/ar/assets/img/account-deletion/exposed_passwords.png
--- a/i18n/ar/assets/img/android/rss-apk-dark.png
+++ b/i18n/ar/assets/img/android/rss-apk-dark.png
--- a/i18n/ar/assets/img/android/rss-apk-light.png
+++ b/i18n/ar/assets/img/android/rss-apk-light.png
--- a/i18n/ar/assets/img/android/rss-changes-dark.png
+++ b/i18n/ar/assets/img/android/rss-changes-dark.png
--- a/i18n/ar/assets/img/android/rss-changes-light.png
+++ b/i18n/ar/assets/img/android/rss-changes-light.png
--- a/i18n/ar/assets/img/how-tor-works/tor-encryption-dark.svg
+++ b/i18n/ar/assets/img/how-tor-works/tor-encryption-dark.svg
@@ -0,0 +1,131 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="1600" height="1100" version="1.1" viewBox="0 0 423.33 291.04">
+  <g transform="translate(-27.597 12.24)">
+    <path d="m51.708 62.175h-10.029v-21.505h20.057v21.505z" fill="#729fcf" fill-rule="evenodd"/>
+    <path d="m51.708 62.175h-10.029v-21.505h20.057v21.505h-10.029" fill="none" stroke="#3465a4" stroke-linecap="round" stroke-linejoin="round" stroke-width=".016353px"/>
+    <path d="m111.88 78.278h-30.086v-53.763h60.172v53.763z" fill="#81d41a" fill-rule="evenodd"/>
+    <path d="m111.88 78.278h-30.086v-53.763h60.172v53.763h-30.086" fill="none" stroke="#3465a4" stroke-linecap="round" stroke-linejoin="round" stroke-width=".016353px"/>
+    <path d="m111.88 67.526h-30.086v-32.258h60.172v32.258z" fill="#55308d" fill-rule="evenodd"/>
+    <path d="m111.88 67.526h-30.086v-32.258h60.172v32.258h-30.086" fill="none" stroke="#3465a4" stroke-linecap="round" stroke-linejoin="round" stroke-width=".016353px"/>
+    <path d="m111.88 56.773h-30.086v-10.753h60.172v10.753z" fill="#ff8000" fill-rule="evenodd"/>
+    <path d="m111.88 56.773h-30.086v-10.753h60.172v10.753h-30.086" fill="none" stroke="#3465a4" stroke-linecap="round" stroke-linejoin="round" stroke-width=".016353px"/>
+    <path d="m192.11 218.06h-30.086v-32.258h60.172v32.258z" fill="#55308d" fill-rule="evenodd"/>
+    <path d="m192.11 218.06h-30.086v-32.258h60.172v32.258h-30.086" fill="none" stroke="#3465a4" stroke-linecap="round" stroke-linejoin="round" stroke-width=".016353px"/>
+    <path d="m111.88 228.81h-30.086v-53.763h60.172v53.763z" fill="#81d41a" fill-rule="evenodd"/>
+    <path d="m111.88 228.81h-30.086v-53.763h60.172v53.763h-30.086" fill="none" stroke="#3465a4" stroke-linecap="round" stroke-linejoin="round" stroke-width=".016353px"/>
+    <path d="m111.88 218.06h-30.086v-32.258h60.172v32.258z" fill="#55308d" fill-rule="evenodd"/>
+    <path d="m111.88 218.06h-30.086v-32.258h60.172v32.258h-30.086" fill="none" stroke="#3465a4" stroke-linecap="round" stroke-linejoin="round" stroke-width=".016353px"/>
+    <path d="m111.88 207.31h-30.086v-10.753h60.172v10.753z" fill="#ff8000" fill-rule="evenodd"/>
+    <path d="m111.88 207.31h-30.086v-10.753h60.172v10.753h-30.086" fill="none" stroke="#3465a4" stroke-linecap="round" stroke-linejoin="round" stroke-width=".016353px"/>
+    <path d="m192.11 67.526h-30.086v-32.258h60.172v32.258z" fill="#55308d" fill-rule="evenodd"/>
+    <path d="m192.11 67.526h-30.086v-32.258h60.172v32.258h-30.086" fill="none" stroke="#3465a4" stroke-linecap="round" stroke-linejoin="round" stroke-width=".016353px"/>
+    <path d="m192.11 207.31h-30.086v-10.753h60.172v10.753z" fill="#ff8000" fill-rule="evenodd"/>
+    <path d="m192.11 207.31h-30.086v-10.753h60.172v10.753h-30.086" fill="none" stroke="#3465a4" stroke-linecap="round" stroke-linejoin="round" stroke-width=".016353px"/>
+    <path d="m192.11 56.773h-30.086v-10.753h60.172v10.753z" fill="#ff8000" fill-rule="evenodd"/>
+    <path d="m192.11 56.773h-30.086v-10.753h60.172v10.753h-30.086" fill="none" stroke="#3465a4" stroke-linecap="round" stroke-linejoin="round" stroke-width=".016353px"/>
+    <path d="m272.34 56.773h-30.086v-10.753h60.172v10.753z" fill="#ff8000" fill-rule="evenodd"/>
+    <path d="m272.34 56.773h-30.086v-10.753h60.172v10.753h-30.086" fill="none" stroke="#3465a4" stroke-linecap="round" stroke-linejoin="round" stroke-width=".016353px"/>
+    <path d="m272.34 207.31h-30.086v-10.753h60.172v10.753z" fill="#ff8000" fill-rule="evenodd"/>
+    <path d="m272.34 207.31h-30.086v-10.753h60.172v10.753h-30.086" fill="none" stroke="#3465a4" stroke-linecap="round" stroke-linejoin="round" stroke-width=".016353px"/>
+    <path d="m51.708 212.71h-10.029v-21.505h20.057v21.505z" fill="#729fcf" fill-rule="evenodd"/>
+    <path d="m51.708 212.71h-10.029v-21.505h20.057v21.505h-10.029" fill="none" stroke="#3465a4" stroke-linecap="round" stroke-linejoin="round" stroke-width=".016353px"/>
+    <path d="m162.01 51.439c0 1.8796-0.458 3.7423-1.3424 5.3679-0.88442 1.6425-2.1479 2.9972-3.664 3.9455-1.532 0.94826-3.2692 1.4393-5.0222 1.4393s-3.4903-0.49106-5.0064-1.4393c-1.5319-0.94826-2.7954-2.3029-3.6798-3.9455-0.88442-1.6256-1.3424-3.4883-1.3424-5.3679 0-1.8965 0.45801-3.7592 1.3424-5.3848 0.88441-1.6425 2.1479-2.9972 3.6798-3.9455 1.5162-0.94826 3.2534-1.4393 5.0064-1.4393s3.4903 0.49107 5.0222 1.4393c1.5162 0.94827 2.7796 2.3029 3.664 3.9455 0.88442 1.6256 1.3424 3.4883 1.3424 5.3679z" fill="#81d41a" fill-rule="evenodd"/>
+    <path d="m162.01 51.439c0 1.8796-0.458 3.7423-1.3424 5.3679-0.88442 1.6425-2.1479 2.9972-3.664 3.9455-1.532 0.94826-3.2692 1.4393-5.0222 1.4393s-3.4903-0.49106-5.0064-1.4393c-1.5319-0.94826-2.7954-2.3029-3.6798-3.9455-0.88442-1.6256-1.3424-3.4883-1.3424-5.3679 0-1.8965 0.45801-3.7592 1.3424-5.3848 0.88441-1.6425 2.1479-2.9972 3.6798-3.9455 1.5162-0.94826 3.2534-1.4393 5.0064-1.4393s3.4903 0.49107 5.0222 1.4393c1.5162 0.94827 2.7796 2.3029 3.664 3.9455 0.88442 1.6256 1.3424 3.4883 1.3424 5.3679v0.0169" fill="none" stroke="#3465a4" stroke-linecap="round" stroke-linejoin="round" stroke-width=".016353px"/>
+    <path d="m242.25 51.439c0 1.8796-0.458 3.7423-1.3424 5.3679-0.88442 1.6425-2.1479 2.9972-3.664 3.9455-1.5319 0.94826-3.2692 1.4393-5.0222 1.4393s-3.4903-0.49106-5.0064-1.4393c-1.5319-0.94826-2.7954-2.3029-3.6798-3.9455-0.88442-1.6256-1.3424-3.4883-1.3424-5.3679 0-1.8965 0.458-3.7592 1.3424-5.3848 0.88442-1.6425 2.1479-2.9972 3.6798-3.9455 1.5162-0.94826 3.2534-1.4393 5.0064-1.4393s3.4903 0.49107 5.0222 1.4393c1.5162 0.94827 2.7796 2.3029 3.664 3.9455 0.88442 1.6256 1.3424 3.4883 1.3424 5.3679z" fill="#55308d" fill-rule="evenodd"/>
+    <path d="m242.25 51.439c0 1.8796-0.458 3.7423-1.3424 5.3679-0.88442 1.6425-2.1479 2.9972-3.664 3.9455-1.5319 0.94826-3.2692 1.4393-5.0222 1.4393s-3.4903-0.49106-5.0064-1.4393c-1.5319-0.94826-2.7954-2.3029-3.6798-3.9455-0.88442-1.6256-1.3424-3.4883-1.3424-5.3679 0-1.8965 0.458-3.7592 1.3424-5.3848 0.88442-1.6425 2.1479-2.9972 3.6798-3.9455 1.5162-0.94826 3.2534-1.4393 5.0064-1.4393s3.4903 0.49107 5.0222 1.4393c1.5162 0.94827 2.7796 2.3029 3.664 3.9455 0.88442 1.6256 1.3424 3.4883 1.3424 5.3679v0.0169" fill="none" stroke="#3465a4" stroke-linecap="round" stroke-linejoin="round" stroke-width=".016353px"/>
+    <path d="m322.47 51.439c0 1.8796-0.45802 3.7423-1.3424 5.3679-0.88443 1.6425-2.1479 2.9972-3.664 3.9455-1.532 0.94826-3.2692 1.4393-5.0222 1.4393s-3.4903-0.49106-5.0064-1.4393c-1.532-0.94826-2.7954-2.3029-3.6798-3.9455-0.8844-1.6256-1.3424-3.4883-1.3424-5.3679 0-1.8965 0.45802-3.7592 1.3424-5.3848 0.88443-1.6425 2.1479-2.9972 3.6798-3.9455 1.5161-0.94826 3.2534-1.4393 5.0064-1.4393s3.4903 0.49107 5.0222 1.4393c1.5162 0.94827 2.7796 2.3029 3.664 3.9455 0.8844 1.6256 1.3424 3.4883 1.3424 5.3679z" fill="#ff8000" fill-rule="evenodd"/>
+    <path d="m322.47 51.439c0 1.8796-0.45802 3.7423-1.3424 5.3679-0.88443 1.6425-2.1479 2.9972-3.664 3.9455-1.532 0.94826-3.2692 1.4393-5.0222 1.4393s-3.4903-0.49106-5.0064-1.4393c-1.532-0.94826-2.7954-2.3029-3.6798-3.9455-0.8844-1.6256-1.3424-3.4883-1.3424-5.3679 0-1.8965 0.45802-3.7592 1.3424-5.3848 0.88443-1.6425 2.1479-2.9972 3.6798-3.9455 1.5161-0.94826 3.2534-1.4393 5.0064-1.4393s3.4903 0.49107 5.0222 1.4393c1.5162 0.94827 2.7796 2.3029 3.664 3.9455 0.8844 1.6256 1.3424 3.4883 1.3424 5.3679v0.0169" fill="none" stroke="#3465a4" stroke-linecap="round" stroke-linejoin="round" stroke-width=".016353px"/>
+    <path d="m162.02 201.97c0 1.8796-0.45801 3.7422-1.3424 5.3678-0.88442 1.6425-2.1479 2.9972-3.664 3.9455-1.5319 0.94826-3.2692 1.4393-5.0222 1.4393s-3.4903-0.49107-5.0064-1.4393c-1.532-0.94826-2.7954-2.3029-3.6798-3.9455-0.88441-1.6256-1.3424-3.4882-1.3424-5.3678 0-1.8965 0.45801-3.7592 1.3424-5.3848 0.88443-1.6425 2.1479-2.9972 3.6798-3.9454 1.5161-0.94827 3.2534-1.4393 5.0064-1.4393s3.4903 0.49106 5.0222 1.4393c1.5162 0.94826 2.7796 2.3029 3.664 3.9454 0.88441 1.6256 1.3424 3.4883 1.3424 5.3848z" fill="#81d41a" fill-rule="evenodd"/>
+    <path d="m162.02 201.97c0 1.8796-0.45801 3.7422-1.3424 5.3678-0.88442 1.6425-2.1479 2.9972-3.664 3.9455-1.5319 0.94826-3.2692 1.4393-5.0222 1.4393s-3.4903-0.49107-5.0064-1.4393c-1.532-0.94826-2.7954-2.3029-3.6798-3.9455-0.88441-1.6256-1.3424-3.4882-1.3424-5.3678 0-1.8965 0.45801-3.7592 1.3424-5.3848 0.88443-1.6425 2.1479-2.9972 3.6798-3.9454 1.5161-0.94827 3.2534-1.4393 5.0064-1.4393s3.4903 0.49106 5.0222 1.4393c1.5162 0.94826 2.7796 2.3029 3.664 3.9454 0.88441 1.6256 1.3424 3.4883 1.3424 5.3848" fill="none" stroke="#3465a4" stroke-linecap="round" stroke-linejoin="round" stroke-width=".016353px"/>
+    <path d="m242.24 201.97c0 1.8796-0.45801 3.7422-1.3424 5.3678-0.88442 1.6425-2.1479 2.9972-3.664 3.9455-1.5319 0.94826-3.2692 1.4393-5.0222 1.4393s-3.4903-0.49107-5.0064-1.4393c-1.5319-0.94826-2.7954-2.3029-3.6798-3.9455-0.88442-1.6256-1.3424-3.4882-1.3424-5.3678 0-1.8965 0.458-3.7592 1.3424-5.3848 0.88442-1.6425 2.1479-2.9972 3.6798-3.9454 1.5162-0.94827 3.2534-1.4393 5.0064-1.4393s3.4903 0.49106 5.0222 1.4393c1.5162 0.94826 2.7796 2.3029 3.664 3.9454 0.88442 1.6256 1.3424 3.4883 1.3424 5.3848z" fill="#55308d" fill-rule="evenodd"/>
+    <path d="m242.24 201.97c0 1.8796-0.45801 3.7422-1.3424 5.3678-0.88442 1.6425-2.1479 2.9972-3.664 3.9455-1.5319 0.94826-3.2692 1.4393-5.0222 1.4393s-3.4903-0.49107-5.0064-1.4393c-1.5319-0.94826-2.7954-2.3029-3.6798-3.9455-0.88442-1.6256-1.3424-3.4882-1.3424-5.3678 0-1.8965 0.458-3.7592 1.3424-5.3848 0.88442-1.6425 2.1479-2.9972 3.6798-3.9454 1.5162-0.94827 3.2534-1.4393 5.0064-1.4393s3.4903 0.49106 5.0222 1.4393c1.5162 0.94826 2.7796 2.3029 3.664 3.9454 0.88442 1.6256 1.3424 3.4883 1.3424 5.3848" fill="none" stroke="#3465a4" stroke-linecap="round" stroke-linejoin="round" stroke-width=".016353px"/>
+    <path d="m322.48 201.97c0 1.8796-0.45802 3.7422-1.3424 5.3678-0.88443 1.6425-2.1479 2.9972-3.664 3.9455-1.5319 0.94826-3.2692 1.4393-5.0222 1.4393s-3.4903-0.49107-5.0064-1.4393c-1.5319-0.94826-2.7954-2.3029-3.6798-3.9455-0.88443-1.6256-1.3424-3.4882-1.3424-5.3678 0-1.8965 0.45799-3.7592 1.3424-5.3848 0.8844-1.6425 2.1479-2.9972 3.6798-3.9454 1.5161-0.94827 3.2534-1.4393 5.0064-1.4393s3.4903 0.49106 5.0222 1.4393c1.5161 0.94826 2.7796 2.3029 3.664 3.9454 0.8844 1.6256 1.3424 3.4883 1.3424 5.3848z" fill="#ff8000" fill-rule="evenodd"/>
+    <path d="m322.48 201.97c0 1.8796-0.45802 3.7422-1.3424 5.3678-0.88443 1.6425-2.1479 2.9972-3.664 3.9455-1.5319 0.94826-3.2692 1.4393-5.0222 1.4393s-3.4903-0.49107-5.0064-1.4393c-1.5319-0.94826-2.7954-2.3029-3.6798-3.9455-0.88443-1.6256-1.3424-3.4882-1.3424-5.3678 0-1.8965 0.45799-3.7592 1.3424-5.3848 0.8844-1.6425 2.1479-2.9972 3.6798-3.9454 1.5161-0.94827 3.2534-1.4393 5.0064-1.4393s3.4903 0.49106 5.0222 1.4393c1.5161 0.94826 2.7796 2.3029 3.664 3.9454 0.8844 1.6256 1.3424 3.4883 1.3424 5.3848" fill="none" stroke="#3465a4" stroke-linecap="round" stroke-linejoin="round" stroke-width=".016353px"/>
+    <path d="m390.16 40.67 12.54 21.522h-25.08z" fill="#729fcf" fill-rule="evenodd"/>
+    <path d="m390.16 40.67 12.54 21.522h-25.08l12.54-21.522" fill="none" stroke="#3465a4" stroke-linecap="round" stroke-linejoin="round" stroke-width=".016353px"/>
+    <path d="m390.17 191.2 12.54 21.522h-25.08z" fill="#729fcf" fill-rule="evenodd"/>
+    <path d="m390.17 191.2 12.54 21.522h-25.08l12.54-21.522" fill="none" stroke="#3465a4" stroke-linecap="round" stroke-linejoin="round" stroke-width=".016353px"/>
+    <g transform="translate(1.454e-4,7.6627)" fill="#ffffff" font-family="'Liberation Sans'" font-size="10.373px" font-weight="400" letter-spacing="0px" stroke-width=".43334" word-spacing="0px">
+      <text transform="scale(.96575 1.0355)" x="42.045822" y="83.470764" style="line-height:125%" xml:space="preserve">
+        <tspan x="42.045822" y="83.470764">
+          <tspan x="42.045822" y="83.470764" fill="#ffffff" stroke-width=".43334">Your</tspan>
+        </tspan>
+        <tspan x="42.045822" y="96.437141">Device</tspan>
+      </text>
+      <text transform="scale(.96575 1.0355)" x="68.014885" y="6.9863148" style="line-height:125%" xml:space="preserve">
+        <tspan x="68.014885" y="6.9863148" fill="#ffffff" stroke-width=".43334">
+          <tspan dx="0" dy="0" fill="#ffffff" font-family="'Liberation Sans'" font-size="10.373px" font-weight="400" stroke-width=".43334">Sending data to a website</tspan>
+        </tspan>
+      </text>
+      <text transform="scale(.96575 1.0355)" x="78.399231" y="152.36726" style="line-height:125%" xml:space="preserve">
+        <tspan x="78.399231" y="152.36726" fill="#ffffff" stroke-width=".43334">
+          <tspan dx="0" dy="0" fill="#ffffff" font-family="'Liberation Sans'" font-size="10.373px" font-weight="400" stroke-width=".43334">Receiving data from a website</tspan>
+        </tspan>
+      </text>
+      <text transform="scale(.96575 1.0355)" x="42.06218" y="230.09454" style="line-height:125%" xml:space="preserve">
+        <tspan x="42.06218" y="230.09454">
+          <tspan x="42.06218" y="230.09454" fill="#ffffff" stroke-width=".43334">Your<tspan fill="#ffffff" font-family="'Liberation Sans'" font-size="10.373px" font-weight="400" stroke-width=".43334"/></tspan>
+        </tspan>
+        <tspan x="42.06218" y="243.06091">Device</tspan>
+      </text>
+      <text transform="scale(.96575 1.0355)" x="145.88936" y="230.25807" style="line-height:125%" xml:space="preserve">
+        <tspan x="145.88936" y="230.25807" fill="#ffffff" stroke-width=".43334">
+          <tspan dx="0" dy="0" fill="#ffffff" font-family="'Liberation Sans'" font-size="10.373px" font-weight="400" stroke-width=".43334">Entry</tspan>
+        </tspan>
+      </text>
+      <text transform="scale(.96575 1.0355)" x="223.78017" y="230.25807" style="line-height:125%" xml:space="preserve">
+        <tspan x="223.78017" y="230.25807" fill="#ffffff" stroke-width=".43334">
+          <tspan dx="0" dy="0" fill="#ffffff" font-family="'Liberation Sans'" font-size="10.373px" font-weight="400" stroke-width=".43334">Middle</tspan>
+        </tspan>
+      </text>
+      <text transform="scale(.96575 1.0355)" x="312.03897" y="230.24173" style="line-height:125%" xml:space="preserve">
+        <tspan x="312.03897" y="230.24173" fill="#ffffff" stroke-width=".43334">
+          <tspan dx="0" dy="0" fill="#ffffff" font-family="'Liberation Sans'" font-size="10.373px" font-weight="400" stroke-width=".43334">Exit</tspan>
+        </tspan>
+      </text>
+      <text transform="scale(.96575 1.0355)" x="363.96078" y="228.85168" style="line-height:125%" xml:space="preserve">
+        <tspan x="363.96078" y="228.85168" fill="#ffffff" stroke-width=".43334">
+          <tspan dx="0" dy="0" fill="#ffffff" font-family="'Liberation Sans'" font-size="10.373px" font-weight="400" stroke-width=".43334">PrivacyGuides.org</tspan>
+        </tspan>
+      </text>
+      <text transform="scale(.96575 1.0355)" x="369.14478" y="83.850639" style="line-height:125%" xml:space="preserve">
+        <tspan x="369.14478" y="83.850639" fill="#ffffff" stroke-width=".43334">
+          <tspan dx="0" dy="0" fill="#ffffff" font-family="'Liberation Sans'" font-size="10.373px" font-weight="400" stroke-width=".43334">PrivacyGuides.org</tspan>
+        </tspan>
+      </text>
+      <text transform="scale(.96575 1.0355)" x="145.88936" y="85.257019" style="line-height:125%" xml:space="preserve">
+        <tspan x="145.88936" y="85.257019" fill="#ffffff" stroke-width=".43334">
+          <tspan dx="0" dy="0" fill="#ffffff" font-family="'Liberation Sans'" font-size="10.373px" font-weight="400" stroke-width=".43334">Entry</tspan>
+        </tspan>
+      </text>
+      <text transform="scale(.96575 1.0355)" x="226.64198" y="85.257019" style="line-height:125%" xml:space="preserve">
+        <tspan x="226.64198" y="85.257019" fill="#ffffff" stroke-width=".43334">
+          <tspan dx="0" dy="0" fill="#ffffff" font-family="'Liberation Sans'" font-size="10.373px" font-weight="400" stroke-width=".43334">Middle</tspan>
+        </tspan>
+      </text>
+      <text transform="scale(.96575 1.0355)" x="312.49686" y="85.077118" style="line-height:125%" xml:space="preserve">
+        <tspan x="312.49686" y="85.077118" fill="#ffffff" stroke-width=".43334">
+          <tspan dx="0" dy="0" fill="#ffffff" font-family="'Liberation Sans'" font-size="10.373px" font-weight="400" stroke-width=".43334">Exit</tspan>
+        </tspan>
+      </text>
+    </g>
+    <g transform="translate(1.454e-4,7.6627)" fill="#fff" fill-rule="evenodd">
+      <path d="m61.737 44.199v-0.88053h74.686v0.88053z"/>
+      <path d="m136.03 40.576 5.9382 3.1835-5.9382 3.1835z"/>
+      <path d="m162.02 44.199v-0.88053h54.629v0.88053z"/>
+      <path d="m216.26 40.576 5.9382 3.1835-5.9382 3.1835z"/>
+      <path d="m242.25 44.199v-0.88053h54.629v0.88053z"/>
+      <path d="m296.49 40.576 5.9382 3.1835-5.9382 3.1835z"/>
+      <path d="m322.48 44.199v-0.88053h54.629v0.88053z"/>
+      <path d="m376.72 40.576 5.9382 3.1835-5.9382 3.1835z"/>
+      <path d="m382.65 193.86v0.88052h-54.629v-0.88052z"/>
+      <path d="m328.42 197.48-5.9382-3.1834 5.9382-3.1835z"/>
+      <path d="m302.43 193.86v0.88052h-54.629v-0.88052z"/>
+      <path d="m248.19 197.48-5.9382-3.1834 5.9382-3.1835z"/>
+      <path d="m222.2 193.86v0.88052h-54.629v-0.88052z"/>
+      <path d="m167.96 197.48-5.9382-3.1834 5.9382-3.1835z"/>
+      <path d="m141.97 193.86v0.88052h-74.686v-0.88052z"/>
+      <path d="m67.675 197.48-5.9382-3.1834 5.9382-3.1835z"/>
+    </g>
+  </g>
+</svg>
--- a/i18n/ar/assets/img/how-tor-works/tor-encryption.svg
+++ b/i18n/ar/assets/img/how-tor-works/tor-encryption.svg
@@ -0,0 +1,131 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="1600" height="1100" version="1.1" viewBox="0 0 423.33 291.04">
+  <g transform="translate(-27.597 12.24)">
+    <path d="m51.708 62.175h-10.029v-21.505h20.057v21.505z" fill="#729fcf" fill-rule="evenodd"/>
+    <path d="m51.708 62.175h-10.029v-21.505h20.057v21.505h-10.029" fill="none" stroke="#3465a4" stroke-linecap="round" stroke-linejoin="round" stroke-width=".016353px"/>
+    <path d="m111.88 78.278h-30.086v-53.763h60.172v53.763z" fill="#81d41a" fill-rule="evenodd"/>
+    <path d="m111.88 78.278h-30.086v-53.763h60.172v53.763h-30.086" fill="none" stroke="#3465a4" stroke-linecap="round" stroke-linejoin="round" stroke-width=".016353px"/>
+    <path d="m111.88 67.526h-30.086v-32.258h60.172v32.258z" fill="#55308d" fill-rule="evenodd"/>
+    <path d="m111.88 67.526h-30.086v-32.258h60.172v32.258h-30.086" fill="none" stroke="#3465a4" stroke-linecap="round" stroke-linejoin="round" stroke-width=".016353px"/>
+    <path d="m111.88 56.773h-30.086v-10.753h60.172v10.753z" fill="#ff8000" fill-rule="evenodd"/>
+    <path d="m111.88 56.773h-30.086v-10.753h60.172v10.753h-30.086" fill="none" stroke="#3465a4" stroke-linecap="round" stroke-linejoin="round" stroke-width=".016353px"/>
+    <path d="m192.11 218.06h-30.086v-32.258h60.172v32.258z" fill="#55308d" fill-rule="evenodd"/>
+    <path d="m192.11 218.06h-30.086v-32.258h60.172v32.258h-30.086" fill="none" stroke="#3465a4" stroke-linecap="round" stroke-linejoin="round" stroke-width=".016353px"/>
+    <path d="m111.88 228.81h-30.086v-53.763h60.172v53.763z" fill="#81d41a" fill-rule="evenodd"/>
+    <path d="m111.88 228.81h-30.086v-53.763h60.172v53.763h-30.086" fill="none" stroke="#3465a4" stroke-linecap="round" stroke-linejoin="round" stroke-width=".016353px"/>
+    <path d="m111.88 218.06h-30.086v-32.258h60.172v32.258z" fill="#55308d" fill-rule="evenodd"/>
+    <path d="m111.88 218.06h-30.086v-32.258h60.172v32.258h-30.086" fill="none" stroke="#3465a4" stroke-linecap="round" stroke-linejoin="round" stroke-width=".016353px"/>
+    <path d="m111.88 207.31h-30.086v-10.753h60.172v10.753z" fill="#ff8000" fill-rule="evenodd"/>
+    <path d="m111.88 207.31h-30.086v-10.753h60.172v10.753h-30.086" fill="none" stroke="#3465a4" stroke-linecap="round" stroke-linejoin="round" stroke-width=".016353px"/>
+    <path d="m192.11 67.526h-30.086v-32.258h60.172v32.258z" fill="#55308d" fill-rule="evenodd"/>
+    <path d="m192.11 67.526h-30.086v-32.258h60.172v32.258h-30.086" fill="none" stroke="#3465a4" stroke-linecap="round" stroke-linejoin="round" stroke-width=".016353px"/>
+    <path d="m192.11 207.31h-30.086v-10.753h60.172v10.753z" fill="#ff8000" fill-rule="evenodd"/>
+    <path d="m192.11 207.31h-30.086v-10.753h60.172v10.753h-30.086" fill="none" stroke="#3465a4" stroke-linecap="round" stroke-linejoin="round" stroke-width=".016353px"/>
+    <path d="m192.11 56.773h-30.086v-10.753h60.172v10.753z" fill="#ff8000" fill-rule="evenodd"/>
+    <path d="m192.11 56.773h-30.086v-10.753h60.172v10.753h-30.086" fill="none" stroke="#3465a4" stroke-linecap="round" stroke-linejoin="round" stroke-width=".016353px"/>
+    <path d="m272.34 56.773h-30.086v-10.753h60.172v10.753z" fill="#ff8000" fill-rule="evenodd"/>
+    <path d="m272.34 56.773h-30.086v-10.753h60.172v10.753h-30.086" fill="none" stroke="#3465a4" stroke-linecap="round" stroke-linejoin="round" stroke-width=".016353px"/>
+    <path d="m272.34 207.31h-30.086v-10.753h60.172v10.753z" fill="#ff8000" fill-rule="evenodd"/>
+    <path d="m272.34 207.31h-30.086v-10.753h60.172v10.753h-30.086" fill="none" stroke="#3465a4" stroke-linecap="round" stroke-linejoin="round" stroke-width=".016353px"/>
+    <path d="m51.708 212.71h-10.029v-21.505h20.057v21.505z" fill="#729fcf" fill-rule="evenodd"/>
+    <path d="m51.708 212.71h-10.029v-21.505h20.057v21.505h-10.029" fill="none" stroke="#3465a4" stroke-linecap="round" stroke-linejoin="round" stroke-width=".016353px"/>
+    <path d="m162.01 51.439c0 1.8796-0.458 3.7423-1.3424 5.3679-0.88442 1.6425-2.1479 2.9972-3.664 3.9455-1.532 0.94826-3.2692 1.4393-5.0222 1.4393s-3.4903-0.49106-5.0064-1.4393c-1.5319-0.94826-2.7954-2.3029-3.6798-3.9455-0.88442-1.6256-1.3424-3.4883-1.3424-5.3679 0-1.8965 0.45801-3.7592 1.3424-5.3848 0.88441-1.6425 2.1479-2.9972 3.6798-3.9455 1.5162-0.94826 3.2534-1.4393 5.0064-1.4393s3.4903 0.49107 5.0222 1.4393c1.5162 0.94827 2.7796 2.3029 3.664 3.9455 0.88442 1.6256 1.3424 3.4883 1.3424 5.3679z" fill="#81d41a" fill-rule="evenodd"/>
+    <path d="m162.01 51.439c0 1.8796-0.458 3.7423-1.3424 5.3679-0.88442 1.6425-2.1479 2.9972-3.664 3.9455-1.532 0.94826-3.2692 1.4393-5.0222 1.4393s-3.4903-0.49106-5.0064-1.4393c-1.5319-0.94826-2.7954-2.3029-3.6798-3.9455-0.88442-1.6256-1.3424-3.4883-1.3424-5.3679 0-1.8965 0.45801-3.7592 1.3424-5.3848 0.88441-1.6425 2.1479-2.9972 3.6798-3.9455 1.5162-0.94826 3.2534-1.4393 5.0064-1.4393s3.4903 0.49107 5.0222 1.4393c1.5162 0.94827 2.7796 2.3029 3.664 3.9455 0.88442 1.6256 1.3424 3.4883 1.3424 5.3679v0.0169" fill="none" stroke="#3465a4" stroke-linecap="round" stroke-linejoin="round" stroke-width=".016353px"/>
+    <path d="m242.25 51.439c0 1.8796-0.458 3.7423-1.3424 5.3679-0.88442 1.6425-2.1479 2.9972-3.664 3.9455-1.5319 0.94826-3.2692 1.4393-5.0222 1.4393s-3.4903-0.49106-5.0064-1.4393c-1.5319-0.94826-2.7954-2.3029-3.6798-3.9455-0.88442-1.6256-1.3424-3.4883-1.3424-5.3679 0-1.8965 0.458-3.7592 1.3424-5.3848 0.88442-1.6425 2.1479-2.9972 3.6798-3.9455 1.5162-0.94826 3.2534-1.4393 5.0064-1.4393s3.4903 0.49107 5.0222 1.4393c1.5162 0.94827 2.7796 2.3029 3.664 3.9455 0.88442 1.6256 1.3424 3.4883 1.3424 5.3679z" fill="#55308d" fill-rule="evenodd"/>
+    <path d="m242.25 51.439c0 1.8796-0.458 3.7423-1.3424 5.3679-0.88442 1.6425-2.1479 2.9972-3.664 3.9455-1.5319 0.94826-3.2692 1.4393-5.0222 1.4393s-3.4903-0.49106-5.0064-1.4393c-1.5319-0.94826-2.7954-2.3029-3.6798-3.9455-0.88442-1.6256-1.3424-3.4883-1.3424-5.3679 0-1.8965 0.458-3.7592 1.3424-5.3848 0.88442-1.6425 2.1479-2.9972 3.6798-3.9455 1.5162-0.94826 3.2534-1.4393 5.0064-1.4393s3.4903 0.49107 5.0222 1.4393c1.5162 0.94827 2.7796 2.3029 3.664 3.9455 0.88442 1.6256 1.3424 3.4883 1.3424 5.3679v0.0169" fill="none" stroke="#3465a4" stroke-linecap="round" stroke-linejoin="round" stroke-width=".016353px"/>
+    <path d="m322.47 51.439c0 1.8796-0.45802 3.7423-1.3424 5.3679-0.88443 1.6425-2.1479 2.9972-3.664 3.9455-1.532 0.94826-3.2692 1.4393-5.0222 1.4393s-3.4903-0.49106-5.0064-1.4393c-1.532-0.94826-2.7954-2.3029-3.6798-3.9455-0.8844-1.6256-1.3424-3.4883-1.3424-5.3679 0-1.8965 0.45802-3.7592 1.3424-5.3848 0.88443-1.6425 2.1479-2.9972 3.6798-3.9455 1.5161-0.94826 3.2534-1.4393 5.0064-1.4393s3.4903 0.49107 5.0222 1.4393c1.5162 0.94827 2.7796 2.3029 3.664 3.9455 0.8844 1.6256 1.3424 3.4883 1.3424 5.3679z" fill="#ff8000" fill-rule="evenodd"/>
+    <path d="m322.47 51.439c0 1.8796-0.45802 3.7423-1.3424 5.3679-0.88443 1.6425-2.1479 2.9972-3.664 3.9455-1.532 0.94826-3.2692 1.4393-5.0222 1.4393s-3.4903-0.49106-5.0064-1.4393c-1.532-0.94826-2.7954-2.3029-3.6798-3.9455-0.8844-1.6256-1.3424-3.4883-1.3424-5.3679 0-1.8965 0.45802-3.7592 1.3424-5.3848 0.88443-1.6425 2.1479-2.9972 3.6798-3.9455 1.5161-0.94826 3.2534-1.4393 5.0064-1.4393s3.4903 0.49107 5.0222 1.4393c1.5162 0.94827 2.7796 2.3029 3.664 3.9455 0.8844 1.6256 1.3424 3.4883 1.3424 5.3679v0.0169" fill="none" stroke="#3465a4" stroke-linecap="round" stroke-linejoin="round" stroke-width=".016353px"/>
+    <path d="m162.02 201.97c0 1.8796-0.45801 3.7422-1.3424 5.3678-0.88442 1.6425-2.1479 2.9972-3.664 3.9455-1.5319 0.94826-3.2692 1.4393-5.0222 1.4393s-3.4903-0.49107-5.0064-1.4393c-1.532-0.94826-2.7954-2.3029-3.6798-3.9455-0.88441-1.6256-1.3424-3.4882-1.3424-5.3678 0-1.8965 0.45801-3.7592 1.3424-5.3848 0.88443-1.6425 2.1479-2.9972 3.6798-3.9454 1.5161-0.94827 3.2534-1.4393 5.0064-1.4393s3.4903 0.49106 5.0222 1.4393c1.5162 0.94826 2.7796 2.3029 3.664 3.9454 0.88441 1.6256 1.3424 3.4883 1.3424 5.3848z" fill="#81d41a" fill-rule="evenodd"/>
+    <path d="m162.02 201.97c0 1.8796-0.45801 3.7422-1.3424 5.3678-0.88442 1.6425-2.1479 2.9972-3.664 3.9455-1.5319 0.94826-3.2692 1.4393-5.0222 1.4393s-3.4903-0.49107-5.0064-1.4393c-1.532-0.94826-2.7954-2.3029-3.6798-3.9455-0.88441-1.6256-1.3424-3.4882-1.3424-5.3678 0-1.8965 0.45801-3.7592 1.3424-5.3848 0.88443-1.6425 2.1479-2.9972 3.6798-3.9454 1.5161-0.94827 3.2534-1.4393 5.0064-1.4393s3.4903 0.49106 5.0222 1.4393c1.5162 0.94826 2.7796 2.3029 3.664 3.9454 0.88441 1.6256 1.3424 3.4883 1.3424 5.3848" fill="none" stroke="#3465a4" stroke-linecap="round" stroke-linejoin="round" stroke-width=".016353px"/>
+    <path d="m242.24 201.97c0 1.8796-0.45801 3.7422-1.3424 5.3678-0.88442 1.6425-2.1479 2.9972-3.664 3.9455-1.5319 0.94826-3.2692 1.4393-5.0222 1.4393s-3.4903-0.49107-5.0064-1.4393c-1.5319-0.94826-2.7954-2.3029-3.6798-3.9455-0.88442-1.6256-1.3424-3.4882-1.3424-5.3678 0-1.8965 0.458-3.7592 1.3424-5.3848 0.88442-1.6425 2.1479-2.9972 3.6798-3.9454 1.5162-0.94827 3.2534-1.4393 5.0064-1.4393s3.4903 0.49106 5.0222 1.4393c1.5162 0.94826 2.7796 2.3029 3.664 3.9454 0.88442 1.6256 1.3424 3.4883 1.3424 5.3848z" fill="#55308d" fill-rule="evenodd"/>
+    <path d="m242.24 201.97c0 1.8796-0.45801 3.7422-1.3424 5.3678-0.88442 1.6425-2.1479 2.9972-3.664 3.9455-1.5319 0.94826-3.2692 1.4393-5.0222 1.4393s-3.4903-0.49107-5.0064-1.4393c-1.5319-0.94826-2.7954-2.3029-3.6798-3.9455-0.88442-1.6256-1.3424-3.4882-1.3424-5.3678 0-1.8965 0.458-3.7592 1.3424-5.3848 0.88442-1.6425 2.1479-2.9972 3.6798-3.9454 1.5162-0.94827 3.2534-1.4393 5.0064-1.4393s3.4903 0.49106 5.0222 1.4393c1.5162 0.94826 2.7796 2.3029 3.664 3.9454 0.88442 1.6256 1.3424 3.4883 1.3424 5.3848" fill="none" stroke="#3465a4" stroke-linecap="round" stroke-linejoin="round" stroke-width=".016353px"/>
+    <path d="m322.48 201.97c0 1.8796-0.45802 3.7422-1.3424 5.3678-0.88443 1.6425-2.1479 2.9972-3.664 3.9455-1.5319 0.94826-3.2692 1.4393-5.0222 1.4393s-3.4903-0.49107-5.0064-1.4393c-1.5319-0.94826-2.7954-2.3029-3.6798-3.9455-0.88443-1.6256-1.3424-3.4882-1.3424-5.3678 0-1.8965 0.45799-3.7592 1.3424-5.3848 0.8844-1.6425 2.1479-2.9972 3.6798-3.9454 1.5161-0.94827 3.2534-1.4393 5.0064-1.4393s3.4903 0.49106 5.0222 1.4393c1.5161 0.94826 2.7796 2.3029 3.664 3.9454 0.8844 1.6256 1.3424 3.4883 1.3424 5.3848z" fill="#ff8000" fill-rule="evenodd"/>
+    <path d="m322.48 201.97c0 1.8796-0.45802 3.7422-1.3424 5.3678-0.88443 1.6425-2.1479 2.9972-3.664 3.9455-1.5319 0.94826-3.2692 1.4393-5.0222 1.4393s-3.4903-0.49107-5.0064-1.4393c-1.5319-0.94826-2.7954-2.3029-3.6798-3.9455-0.88443-1.6256-1.3424-3.4882-1.3424-5.3678 0-1.8965 0.45799-3.7592 1.3424-5.3848 0.8844-1.6425 2.1479-2.9972 3.6798-3.9454 1.5161-0.94827 3.2534-1.4393 5.0064-1.4393s3.4903 0.49106 5.0222 1.4393c1.5161 0.94826 2.7796 2.3029 3.664 3.9454 0.8844 1.6256 1.3424 3.4883 1.3424 5.3848" fill="none" stroke="#3465a4" stroke-linecap="round" stroke-linejoin="round" stroke-width=".016353px"/>
+    <path d="m390.16 40.67 12.54 21.522h-25.08z" fill="#729fcf" fill-rule="evenodd"/>
+    <path d="m390.16 40.67 12.54 21.522h-25.08l12.54-21.522" fill="none" stroke="#3465a4" stroke-linecap="round" stroke-linejoin="round" stroke-width=".016353px"/>
+    <path d="m390.17 191.2 12.54 21.522h-25.08z" fill="#729fcf" fill-rule="evenodd"/>
+    <path d="m390.17 191.2 12.54 21.522h-25.08l12.54-21.522" fill="none" stroke="#3465a4" stroke-linecap="round" stroke-linejoin="round" stroke-width=".016353px"/>
+    <g transform="translate(1.454e-4,7.6627)" font-family="'Liberation Sans'" font-size="10.373px" font-weight="400" letter-spacing="0px" stroke-width=".43334" word-spacing="0px">
+      <text transform="scale(.96575 1.0355)" x="42.045822" y="83.470764" style="line-height:125%" xml:space="preserve">
+        <tspan x="42.045822" y="83.470764">
+          <tspan x="42.045822" y="83.470764" stroke-width=".43334">Your</tspan>
+        </tspan>
+        <tspan x="42.045822" y="96.437141">Device</tspan>
+      </text>
+      <text transform="scale(.96575 1.0355)" x="68.014885" y="6.9863148" style="line-height:125%" xml:space="preserve">
+        <tspan x="68.014885" y="6.9863148" stroke-width=".43334">
+          <tspan dx="0" dy="0" fill="#000000" font-family="'Liberation Sans'" font-size="10.373px" font-weight="400" stroke-width=".43334">Sending data to a website</tspan>
+        </tspan>
+      </text>
+      <text transform="scale(.96575 1.0355)" x="78.399231" y="152.36726" style="line-height:125%" xml:space="preserve">
+        <tspan x="78.399231" y="152.36726" stroke-width=".43334">
+          <tspan dx="0" dy="0" fill="#000000" font-family="'Liberation Sans'" font-size="10.373px" font-weight="400" stroke-width=".43334">Receiving data from a website</tspan>
+        </tspan>
+      </text>
+      <text transform="scale(.96575 1.0355)" x="42.06218" y="230.09454" style="line-height:125%" xml:space="preserve">
+        <tspan x="42.06218" y="230.09454">
+          <tspan x="42.06218" y="230.09454" stroke-width=".43334">Your<tspan fill="#000000" font-family="'Liberation Sans'" font-size="10.373px" font-weight="400" stroke-width=".43334"/></tspan>
+        </tspan>
+        <tspan x="42.06218" y="243.06091">Device</tspan>
+      </text>
+      <text transform="scale(.96575 1.0355)" x="145.88936" y="230.25807" style="line-height:125%" xml:space="preserve">
+        <tspan x="145.88936" y="230.25807" stroke-width=".43334">
+          <tspan dx="0" dy="0" fill="#000000" font-family="'Liberation Sans'" font-size="10.373px" font-weight="400" stroke-width=".43334">Entry</tspan>
+        </tspan>
+      </text>
+      <text transform="scale(.96575 1.0355)" x="223.78017" y="230.25807" style="line-height:125%" xml:space="preserve">
+        <tspan x="223.78017" y="230.25807" stroke-width=".43334">
+          <tspan dx="0" dy="0" fill="#000000" font-family="'Liberation Sans'" font-size="10.373px" font-weight="400" stroke-width=".43334">Middle</tspan>
+        </tspan>
+      </text>
+      <text transform="scale(.96575 1.0355)" x="312.03897" y="230.24173" style="line-height:125%" xml:space="preserve">
+        <tspan x="312.03897" y="230.24173" stroke-width=".43334">
+          <tspan dx="0" dy="0" fill="#000000" font-family="'Liberation Sans'" font-size="10.373px" font-weight="400" stroke-width=".43334">Exit</tspan>
+        </tspan>
+      </text>
+      <text transform="scale(.96575 1.0355)" x="363.96078" y="228.85168" style="line-height:125%" xml:space="preserve">
+        <tspan x="363.96078" y="228.85168" stroke-width=".43334">
+          <tspan dx="0" dy="0" fill="#000000" font-family="'Liberation Sans'" font-size="10.373px" font-weight="400" stroke-width=".43334">PrivacyGuides.org</tspan>
+        </tspan>
+      </text>
+      <text transform="scale(.96575 1.0355)" x="369.14478" y="83.850639" style="line-height:125%" xml:space="preserve">
+        <tspan x="369.14478" y="83.850639" stroke-width=".43334">
+          <tspan dx="0" dy="0" fill="#000000" font-family="'Liberation Sans'" font-size="10.373px" font-weight="400" stroke-width=".43334">PrivacyGuides.org</tspan>
+        </tspan>
+      </text>
+      <text transform="scale(.96575 1.0355)" x="145.88936" y="85.257019" style="line-height:125%" xml:space="preserve">
+        <tspan x="145.88936" y="85.257019" stroke-width=".43334">
+          <tspan dx="0" dy="0" fill="#000000" font-family="'Liberation Sans'" font-size="10.373px" font-weight="400" stroke-width=".43334">Entry</tspan>
+        </tspan>
+      </text>
+      <text transform="scale(.96575 1.0355)" x="226.64198" y="85.257019" style="line-height:125%" xml:space="preserve">
+        <tspan x="226.64198" y="85.257019" stroke-width=".43334">
+          <tspan dx="0" dy="0" fill="#000000" font-family="'Liberation Sans'" font-size="10.373px" font-weight="400" stroke-width=".43334">Middle</tspan>
+        </tspan>
+      </text>
+      <text transform="scale(.96575 1.0355)" x="312.49686" y="85.077118" style="line-height:125%" xml:space="preserve">
+        <tspan x="312.49686" y="85.077118" stroke-width=".43334">
+          <tspan dx="0" dy="0" fill="#000000" font-family="'Liberation Sans'" font-size="10.373px" font-weight="400" stroke-width=".43334">Exit</tspan>
+        </tspan>
+      </text>
+    </g>
+    <g transform="translate(1.454e-4,7.6627)" fill-rule="evenodd">
+      <path d="m61.737 44.199v-0.88053h74.686v0.88053z"/>
+      <path d="m136.03 40.576 5.9382 3.1835-5.9382 3.1835z"/>
+      <path d="m162.02 44.199v-0.88053h54.629v0.88053z"/>
+      <path d="m216.26 40.576 5.9382 3.1835-5.9382 3.1835z"/>
+      <path d="m242.25 44.199v-0.88053h54.629v0.88053z"/>
+      <path d="m296.49 40.576 5.9382 3.1835-5.9382 3.1835z"/>
+      <path d="m322.48 44.199v-0.88053h54.629v0.88053z"/>
+      <path d="m376.72 40.576 5.9382 3.1835-5.9382 3.1835z"/>
+      <path d="m382.65 193.86v0.88052h-54.629v-0.88052z"/>
+      <path d="m328.42 197.48-5.9382-3.1834 5.9382-3.1835z"/>
+      <path d="m302.43 193.86v0.88052h-54.629v-0.88052z"/>
+      <path d="m248.19 197.48-5.9382-3.1834 5.9382-3.1835z"/>
+      <path d="m222.2 193.86v0.88052h-54.629v-0.88052z"/>
+      <path d="m167.96 197.48-5.9382-3.1834 5.9382-3.1835z"/>
+      <path d="m141.97 193.86v0.88052h-74.686v-0.88052z"/>
+      <path d="m67.675 197.48-5.9382-3.1834 5.9382-3.1835z"/>
+    </g>
+  </g>
+</svg>
--- a/i18n/ar/assets/img/how-tor-works/tor-path-dark.svg
+++ b/i18n/ar/assets/img/how-tor-works/tor-path-dark.svg
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="1530" height="850" version="1.1" viewBox="0 0 404.81 224.9">
+  <path d="m43.472 137.96h-20.432v-43.788h40.842v43.788z" fill="#729fcf" fill-rule="evenodd"/>
+  <path d="m43.472 137.96h-20.432v-43.788h40.842v43.788h-20.41" fill="none" stroke="#3465a4" stroke-linecap="round" stroke-linejoin="round" stroke-width=".022199px"/>
+  <path d="m127.51 24.896c0 3.8387-0.94333 7.6314-2.7442 10.964-1.7795 3.31-4.3736 6.0913-7.4609 7.9991-3.1087 1.9308-6.6462 2.9422-10.227 2.9422-3.5804 0-7.1178-1.0114-10.205-2.9422-3.1087-1.9078-5.7028-4.6892-7.4823-7.9991-1.8009-3.333-2.7442-7.1257-2.7442-10.964 0-3.8387 0.94333-7.6314 2.7442-10.941 1.7795-3.333 4.3736-6.1143 7.4609-8.0221 3.1087-1.9308 6.6462-2.9422 10.227-2.9422 3.5804 0 7.1178 1.0114 10.205 2.9422 3.1087 1.9078 5.7028 4.6892 7.4823 8.0221 1.8009 3.31 2.7442 7.1027 2.7442 10.941z" fill="#81d41a" fill-rule="evenodd"/>
+  <path d="m127.51 24.862c0 3.8387-0.94333 7.6314-2.7442 10.964-1.7795 3.31-4.3736 6.0913-7.4609 7.9991-3.1087 1.9308-6.6462 2.9422-10.227 2.9422-3.5804 0-7.1178-1.0114-10.205-2.9422-3.1087-1.9078-5.7028-4.6892-7.4823-7.9991-1.8009-3.333-2.7442-7.1257-2.7442-10.964 0-3.8387 0.94333-7.6314 2.7442-10.941 1.7795-3.333 4.3736-6.1143 7.4609-8.0221 3.1087-1.9308 6.6462-2.9422 10.227-2.9422 3.5804 0 7.1178 1.0114 10.205 2.9422 3.1087 1.9078 5.7028 4.6892 7.4823 8.0221 1.8009 3.31 2.7442 7.1027 2.7442 10.941v0" fill="none" stroke="#3465a4" stroke-linecap="round" stroke-linejoin="round" stroke-width=".022199px"/>
+  <path d="m209.2 24.919c0 3.8387-0.94332 7.6084-2.7442 10.941-1.7795 3.333-4.3736 6.0913-7.4609 7.9991-3.1087 1.9308-6.6462 2.9422-10.227 2.9422-3.5804 0-7.1178-1.0114-10.205-2.9422-3.1087-1.9078-5.7028-4.6662-7.4823-7.9991-1.8009-3.333-2.7442-7.1027-2.7442-10.941 0-3.8617 0.94333-7.6314 2.7442-10.964 1.7794-3.333 4.3736-6.0913 7.4823-7.9991 3.0872-1.9308 6.6247-2.9422 10.205-2.9422 3.5804 0 7.1178 1.0114 10.227 2.9422 3.0873 1.9078 5.6814 4.6662 7.4609 7.9991 1.8009 3.333 2.7442 7.1027 2.7442 10.964z" fill="#800080" fill-rule="evenodd"/>
+  <path d="m209.2 24.885c0 3.8387-0.94332 7.6084-2.7442 10.941-1.7795 3.333-4.3736 6.0913-7.4609 7.9991-3.1087 1.9308-6.6462 2.9422-10.227 2.9422-3.5804 0-7.1178-1.0114-10.205-2.9422-3.1087-1.9078-5.7028-4.6662-7.4823-7.9991-1.8009-3.333-2.7442-7.1027-2.7442-10.941 0-3.8617 0.94333-7.6314 2.7442-10.964 1.7794-3.333 4.3736-6.0913 7.4823-7.9991 3.0872-1.9308 6.6247-2.9422 10.205-2.9422 3.5804 0 7.1178 1.0114 10.227 2.9422 3.0873 1.9078 5.6814 4.6662 7.4609 7.9991 1.8009 3.333 2.7442 7.1027 2.7442 10.964" fill="none" stroke="#3465a4" stroke-linecap="round" stroke-linejoin="round" stroke-width=".022199px"/>
+  <path d="m290.88 24.908c0 3.8387-0.94331 7.6084-2.7442 10.941-1.7795 3.333-4.3736 6.0913-7.4609 7.9991-3.1087 1.9308-6.6461 2.9422-10.227 2.9422-3.5803 0-7.1178-1.0114-10.205-2.9422-3.1087-1.9078-5.7028-4.6662-7.4823-7.9991-1.8009-3.333-2.7442-7.1027-2.7442-10.941 0-3.8617 0.94333-7.6314 2.7442-10.964 1.7794-3.333 4.3736-6.0913 7.4823-7.9992 3.0872-1.9308 6.6247-2.9422 10.205-2.9422 3.5804 0 7.1178 1.0114 10.227 2.9422 3.0873 1.9078 5.6814 4.6662 7.4609 7.9992 1.8009 3.333 2.7442 7.1027 2.7442 10.964z" fill="#ff8000" fill-rule="evenodd"/>
+  <path d="m290.88 24.908c0 3.8387-0.94331 7.6084-2.7442 10.941-1.7795 3.333-4.3736 6.0913-7.4609 7.9991-3.1087 1.9308-6.6461 2.9422-10.227 2.9422-3.5803 0-7.1178-1.0114-10.205-2.9422-3.1087-1.9078-5.7028-4.6662-7.4823-7.9991-1.8009-3.333-2.7442-7.1027-2.7442-10.941 0-3.8617 0.94333-7.6314 2.7442-10.964 1.7794-3.333 4.3736-6.0913 7.4823-7.9992 3.0872-1.9308 6.6247-2.9422 10.205-2.9422 3.5804 0 7.1178 1.0114 10.227 2.9422 3.0873 1.9078 5.6814 4.6662 7.4609 7.9992 1.8009 3.333 2.7442 7.1027 2.7442 10.964" fill="none" stroke="#3465a4" stroke-linecap="round" stroke-linejoin="round" stroke-width=".022199px"/>
+  <path d="m127.51 114.54c0 3.8387-0.94333 7.6084-2.7442 10.941-1.7795 3.333-4.3736 6.0913-7.4609 7.9991-3.1087 1.9308-6.6462 2.9422-10.227 2.9422-3.5804 0-7.1178-1.0114-10.205-2.9422-3.1087-1.9078-5.7028-4.6662-7.4823-7.9991-1.8009-3.333-2.7442-7.1027-2.7442-10.941 0-3.8617 0.94333-7.6314 2.7442-10.964 1.7795-3.333 4.3736-6.0913 7.4609-7.9991 3.1087-1.9308 6.6462-2.9422 10.227-2.9422 3.5804 0 7.1178 1.0114 10.205 2.9422 3.1087 1.9078 5.7028 4.6662 7.4823 7.9991 1.8009 3.333 2.7442 7.1027 2.7442 10.964z" fill="#81d41a" fill-rule="evenodd"/>
+  <path d="m127.51 116.1c0 3.8387-0.94333 7.6084-2.7442 10.941-1.7795 3.333-4.3736 6.0913-7.4609 7.9991-3.1087 1.9308-6.6462 2.9422-10.227 2.9422-3.5804 0-7.1178-1.0114-10.205-2.9422-3.1087-1.9078-5.7028-4.6662-7.4823-7.9991-1.8009-3.333-2.7442-7.1027-2.7442-10.941 0-3.8617 0.94333-7.6314 2.7442-10.964 1.7795-3.333 4.3736-6.0913 7.4609-7.9991 3.1087-1.9308 6.6462-2.9422 10.227-2.9422 3.5804 0 7.1178 1.0114 10.205 2.9422 3.1087 1.9078 5.7028 4.6662 7.4823 7.9991 1.8009 3.333 2.7442 7.1027 2.7442 10.964" fill="none" stroke="#3465a4" stroke-linecap="round" stroke-linejoin="round" stroke-width=".022199px"/>
+  <path d="m209.2 114.54c0 3.8387-0.94332 7.6084-2.7442 10.941-1.7795 3.333-4.3736 6.0913-7.4609 7.9991-3.1087 1.9308-6.6462 2.9422-10.227 2.9422-3.5804 0-7.1178-1.0114-10.205-2.9422-3.1087-1.9078-5.7028-4.6662-7.4823-7.9991-1.8009-3.333-2.7442-7.1027-2.7442-10.941 0-3.8617 0.94333-7.6314 2.7442-10.964 1.7794-3.333 4.3736-6.0913 7.4823-7.9991 3.0872-1.9308 6.6247-2.9422 10.205-2.9422 3.5804 0 7.1178 1.0114 10.227 2.9422 3.0873 1.9078 5.6814 4.6662 7.4609 7.9991 1.8009 3.333 2.7442 7.1027 2.7442 10.964z" fill="#800080" fill-rule="evenodd"/>
+  <path d="m209.2 116.1c0 3.8387-0.94332 7.6084-2.7442 10.941-1.7795 3.333-4.3736 6.0913-7.4609 7.9991-3.1087 1.9308-6.6462 2.9422-10.227 2.9422-3.5804 0-7.1178-1.0114-10.205-2.9422-3.1087-1.9078-5.7028-4.6662-7.4823-7.9991-1.8009-3.333-2.7442-7.1027-2.7442-10.941 0-3.8617 0.94333-7.6314 2.7442-10.964 1.7794-3.333 4.3736-6.0913 7.4823-7.9991 3.0872-1.9308 6.6247-2.9422 10.205-2.9422 3.5804 0 7.1178 1.0114 10.227 2.9422 3.0873 1.9078 5.6814 4.6662 7.4609 7.9991 1.8009 3.333 2.7442 7.1027 2.7442 10.964" fill="none" stroke="#3465a4" stroke-linecap="round" stroke-linejoin="round" stroke-width=".022199px"/>
+  <path d="m290.88 114.54c0 3.8387-0.94331 7.6084-2.7442 10.941-1.7795 3.333-4.3736 6.0913-7.4609 7.9991-3.1087 1.9308-6.6461 2.9422-10.227 2.9422-3.5803 0-7.1178-1.0114-10.205-2.9422-3.1087-1.9078-5.7028-4.6662-7.4823-7.9991-1.8009-3.333-2.7442-7.1027-2.7442-10.941 0-3.8617 0.94333-7.6314 2.7442-10.964 1.7794-3.333 4.3736-6.0913 7.4823-7.9991 3.0872-1.9308 6.6247-2.9422 10.205-2.9422 3.5804 0 7.1178 1.0114 10.227 2.9422 3.0873 1.9078 5.6814 4.6662 7.4609 7.9991 1.8009 3.333 2.7442 7.1027 2.7442 10.964z" fill="#ff8000" fill-rule="evenodd"/>
+  <path d="m290.88 114.54c0 3.8387-0.94331 7.6084-2.7442 10.941-1.7795 3.333-4.3736 6.0913-7.4609 7.9991-3.1087 1.9308-6.6461 2.9422-10.227 2.9422-3.5803 0-7.1178-1.0114-10.205-2.9422-3.1087-1.9078-5.7028-4.6662-7.4823-7.9991-1.8009-3.333-2.7442-7.1027-2.7442-10.941 0-3.8617 0.94333-7.6314 2.7442-10.964 1.7794-3.333 4.3736-6.0913 7.4823-7.9991 3.0872-1.9308 6.6247-2.9422 10.205-2.9422 3.5804 0 7.1178 1.0114 10.227 2.9422 3.0873 1.9078 5.6814 4.6662 7.4609 7.9991 1.8009 3.333 2.7442 7.1027 2.7442 10.964" fill="none" stroke="#3465a4" stroke-linecap="round" stroke-linejoin="round" stroke-width=".022199px"/>
+  <path d="m127.51 200.04c0 3.8387-0.94333 7.6084-2.7442 10.941-1.7795 3.333-4.3736 6.0913-7.4609 7.9992-3.1087 1.9308-6.6462 2.9422-10.227 2.9422-3.5804 0-7.1178-1.0114-10.205-2.9422-3.1087-1.9078-5.7028-4.6662-7.4823-7.9992-1.8009-3.333-2.7442-7.1027-2.7442-10.941 0-3.8617 0.94333-7.6314 2.7442-10.964 1.7795-3.333 4.3736-6.0913 7.4609-7.9991 3.1087-1.9308 6.6462-2.9422 10.227-2.9422 3.5804 0 7.1178 1.0114 10.205 2.9422 3.1087 1.9078 5.7028 4.6662 7.4823 7.9991 1.8009 3.333 2.7442 7.1027 2.7442 10.964z" fill="#81d41a" fill-rule="evenodd"/>
+  <path d="m127.51 200.04c0 3.8387-0.94333 7.6084-2.7442 10.941-1.7795 3.333-4.3736 6.0913-7.4609 7.9992-3.1087 1.9308-6.6462 2.9422-10.227 2.9422-3.5804 0-7.1178-1.0114-10.205-2.9422-3.1087-1.9078-5.7028-4.6662-7.4823-7.9992-1.8009-3.333-2.7442-7.1027-2.7442-10.941 0-3.8617 0.94333-7.6314 2.7442-10.964 1.7795-3.333 4.3736-6.0913 7.4609-7.9991 3.1087-1.9308 6.6462-2.9422 10.227-2.9422 3.5804 0 7.1178 1.0114 10.205 2.9422 3.1087 1.9078 5.7028 4.6662 7.4823 7.9991 1.8009 3.333 2.7442 7.1027 2.7442 10.964" fill="none" stroke="#3465a4" stroke-linecap="round" stroke-linejoin="round" stroke-width=".022199px"/>
+  <path d="m209.2 200.06c0 3.8387-0.94332 7.6084-2.7442 10.941-1.7795 3.333-4.3736 6.0913-7.4609 7.9992-3.1087 1.9308-6.6462 2.9422-10.227 2.9422-3.5804 0-7.1178-1.0114-10.205-2.9422-3.1087-1.9078-5.7028-4.6662-7.4823-7.9992-1.8009-3.333-2.7442-7.1027-2.7442-10.941 0-3.8617 0.94333-7.6314 2.7442-10.964 1.7794-3.333 4.3736-6.0913 7.4823-7.9992 3.0872-1.9308 6.6247-2.9422 10.205-2.9422 3.5804 0 7.1178 1.0114 10.227 2.9422 3.0873 1.9078 5.6814 4.6662 7.4609 7.9992 1.8009 3.333 2.7442 7.1027 2.7442 10.964z" fill="#800080" fill-rule="evenodd"/>
+  <path d="m209.2 200.06c0 3.8387-0.94332 7.6084-2.7442 10.941-1.7795 3.333-4.3736 6.0913-7.4609 7.9992-3.1087 1.9308-6.6462 2.9422-10.227 2.9422-3.5804 0-7.1178-1.0114-10.205-2.9422-3.1087-1.9078-5.7028-4.6662-7.4823-7.9992-1.8009-3.333-2.7442-7.1027-2.7442-10.941 0-3.8617 0.94333-7.6314 2.7442-10.964 1.7794-3.333 4.3736-6.0913 7.4823-7.9992 3.0872-1.9308 6.6247-2.9422 10.205-2.9422 3.5804 0 7.1178 1.0114 10.227 2.9422 3.0873 1.9078 5.6814 4.6662 7.4609 7.9992 1.8009 3.333 2.7442 7.1027 2.7442 10.964" fill="none" stroke="#3465a4" stroke-linecap="round" stroke-linejoin="round" stroke-width=".022199px"/>
+  <path d="m290.88 200.06c0 3.8387-0.94331 7.6084-2.7442 10.941-1.7795 3.333-4.3736 6.0913-7.4609 7.9992-3.1087 1.9308-6.6461 2.9422-10.227 2.9422-3.5803 0-7.1178-1.0114-10.205-2.9422-3.1087-1.9078-5.7028-4.6662-7.4823-7.9992-1.8009-3.333-2.7442-7.1027-2.7442-10.941 0-3.8617 0.94333-7.6314 2.7442-10.964 1.7794-3.333 4.3736-6.0913 7.4823-7.9992 3.0872-1.9308 6.6247-2.9422 10.205-2.9422 3.5804 0 7.1178 1.0114 10.227 2.9422 3.0873 1.9078 5.6814 4.6662 7.4609 7.9992 1.8009 3.333 2.7442 7.1027 2.7442 10.964z" fill="#ff8000" fill-rule="evenodd"/>
+  <path d="m290.88 200.06c0 3.8387-0.94331 7.6084-2.7442 10.941-1.7795 3.333-4.3736 6.0913-7.4609 7.9992-3.1087 1.9308-6.6461 2.9422-10.227 2.9422-3.5803 0-7.1178-1.0114-10.205-2.9422-3.1087-1.9078-5.7028-4.6662-7.4823-7.9992-1.8009-3.333-2.7442-7.1027-2.7442-10.941 0-3.8617 0.94333-7.6314 2.7442-10.964 1.7794-3.333 4.3736-6.0913 7.4823-7.9992 3.0872-1.9308 6.6247-2.9422 10.205-2.9422 3.5804 0 7.1178 1.0114 10.227 2.9422 3.0873 1.9078 5.6814 4.6662 7.4609 7.9992 1.8009 3.333 2.7442 7.1027 2.7442 10.964" fill="none" stroke="#3465a4" stroke-linecap="round" stroke-linejoin="round" stroke-width=".022199px"/>
+  <path d="m354.66 86.912 24.741 46.225h-49.46z" fill="#729fcf" fill-rule="evenodd"/>
+  <path d="m354.66 86.912 24.741 46.225h-49.46l24.719-46.225" fill="none" stroke="#3465a4" stroke-linecap="round" stroke-linejoin="round" stroke-width=".022199px"/>
+  <g fill="#ffffff" font-family="'Liberation Sans'" font-size="14.105px" font-weight="400" letter-spacing="0px" stroke-width=".58923" word-spacing="0px">
+    <text transform="scale(.96579 1.0354)" x="23.469173" y="145.54295" style="line-height:125%" xml:space="preserve">
+      <tspan x="23.469173" y="145.54295">Your</tspan>
+      <tspan x="23.469173" y="163.17372">Device</tspan>
+    </text>
+    <text transform="scale(.96579 1.0354)" x="94.823898" y="62.191856" style="line-height:125%" xml:space="preserve">
+      <tspan x="94.823898" y="62.191856" fill="#ffffff" stroke-width=".58923">
+        <tspan dx="0" dy="0" fill="#ffffff" font-family="'Liberation Sans'" font-size="14.105px" font-weight="400" stroke-width=".58923">Entry</tspan>
+      </tspan>
+    </text>
+    <text transform="scale(.96579 1.0354)" x="174.41086" y="148.45462" style="line-height:125%" xml:space="preserve">
+      <tspan x="174.41086" y="148.45462" fill="#ffffff" stroke-width=".58923">
+        <tspan dx="0" dy="0" fill="#ffffff" font-family="'Liberation Sans'" font-size="14.105px" font-weight="400" stroke-width=".58923">Middle</tspan>
+      </tspan>
+    </text>
+    <text transform="scale(.96579 1.0354)" x="264.44427" y="60.726738" style="line-height:125%" xml:space="preserve">
+      <tspan x="264.44427" y="60.726738" fill="#ffffff" stroke-width=".58923">
+        <tspan dx="0" dy="0" fill="#ffffff" font-family="'Liberation Sans'" font-size="14.105px" font-weight="400" stroke-width=".58923">Exit</tspan>
+      </tspan>
+    </text>
+    <text transform="scale(.96579 1.0354)" x="300.70557" y="145.66537" style="line-height:125%" xml:space="preserve">
+      <tspan x="300.70557" y="145.66537" fill="#ffffff" stroke-width=".58923">
+        <tspan dx="0" dy="0" fill="#ffffff" font-family="'Liberation Sans'" font-size="14.105px" font-weight="400" stroke-width=".58923">PrivacyGuides.org</tspan>
+      </tspan>
+    </text>
+  </g>
+  <g transform="matrix(1,0,0,-1,78.4,132.26)" fill="#fff">
+    <path d="m87.371 43.93-36.295 48.232 1.0273 0.77344 36.295-48.232z" color="#000000" style="-inkscape-stroke:none"/>
+    <g fill-rule="evenodd">
+      <path d="m90.114 41.352-0.77515 6.3758-5.1366-3.8653z" color="#000000" stroke-width=".64285pt" style="-inkscape-stroke:none"/>
+      <path d="m90.629 40.668-0.68164 0.28906-6.5957 2.8008 6.3242 4.7598zm-1.0293 1.3672-0.5957 4.9023-3.9492-2.9707z" color="#000000" style="-inkscape-stroke:none"/>
+    </g>
+  </g>
+  <g transform="translate(158.59,1.3477)" fill="#fff">
+    <path d="m87.371 43.93-36.295 48.232 1.0273 0.77344 36.295-48.232z" color="#000000" style="-inkscape-stroke:none"/>
+    <g fill-rule="evenodd">
+      <path d="m90.114 41.352-0.77515 6.3758-5.1366-3.8653z" color="#000000" stroke-width=".64285pt" style="-inkscape-stroke:none"/>
+      <path d="m90.629 40.668-0.68164 0.28906-6.5957 2.8008 6.3242 4.7598zm-1.0293 1.3672-0.5957 4.9023-3.9492-2.9707z" color="#000000" style="-inkscape-stroke:none"/>
+    </g>
+  </g>
+  <g transform="matrix(1,0,0,-1,245.51,139.58)" fill="#fff">
+    <path d="m87.371 43.93-36.295 48.232 1.0273 0.77344 36.295-48.232z" color="#000000" style="-inkscape-stroke:none"/>
+    <g fill-rule="evenodd">
+      <path d="m90.114 41.352-0.77515 6.3758-5.1366-3.8653z" color="#000000" stroke-width=".64285pt" style="-inkscape-stroke:none"/>
+      <path d="m90.629 40.668-0.68164 0.28906-6.5957 2.8008 6.3242 4.7598zm-1.0293 1.3672-0.5957 4.9023-3.9492-2.9707z" color="#000000" style="-inkscape-stroke:none"/>
+    </g>
+  </g>
+  <g transform="translate(-3.4347 -1.3434)" fill="#fff">
+    <path d="m87.371 43.93-36.295 48.232 1.0273 0.77344 36.295-48.232z" color="#000000" style="-inkscape-stroke:none"/>
+    <g fill-rule="evenodd">
+      <path d="m90.114 41.352-0.77515 6.3758-5.1366-3.8653z" color="#000000" stroke-width=".64285pt" style="-inkscape-stroke:none"/>
+      <path d="m90.629 40.668-0.68164 0.28906-6.5957 2.8008 6.3242 4.7598zm-1.0293 1.3672-0.5957 4.9023-3.9492-2.9707z" color="#000000" style="-inkscape-stroke:none"/>
+    </g>
+  </g>
+</svg>
--- a/i18n/ar/assets/img/how-tor-works/tor-path.svg
+++ b/i18n/ar/assets/img/how-tor-works/tor-path.svg
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="1530" height="850" version="1.1" viewBox="0 0 404.81 224.9">
+  <path d="m43.472 137.96h-20.432v-43.788h40.842v43.788z" fill="#729fcf" fill-rule="evenodd"/>
+  <path d="m43.472 137.96h-20.432v-43.788h40.842v43.788h-20.41" fill="none" stroke="#3465a4" stroke-linecap="round" stroke-linejoin="round" stroke-width=".022199px"/>
+  <path d="m127.51 24.896c0 3.8387-0.94333 7.6314-2.7442 10.964-1.7795 3.31-4.3736 6.0913-7.4609 7.9991-3.1087 1.9308-6.6462 2.9422-10.227 2.9422-3.5804 0-7.1178-1.0114-10.205-2.9422-3.1087-1.9078-5.7028-4.6892-7.4823-7.9991-1.8009-3.333-2.7442-7.1257-2.7442-10.964 0-3.8387 0.94333-7.6314 2.7442-10.941 1.7795-3.333 4.3736-6.1143 7.4609-8.0221 3.1087-1.9308 6.6462-2.9422 10.227-2.9422 3.5804 0 7.1178 1.0114 10.205 2.9422 3.1087 1.9078 5.7028 4.6892 7.4823 8.0221 1.8009 3.31 2.7442 7.1027 2.7442 10.941z" fill="#81d41a" fill-rule="evenodd"/>
+  <path d="m127.51 24.862c0 3.8387-0.94333 7.6314-2.7442 10.964-1.7795 3.31-4.3736 6.0913-7.4609 7.9991-3.1087 1.9308-6.6462 2.9422-10.227 2.9422-3.5804 0-7.1178-1.0114-10.205-2.9422-3.1087-1.9078-5.7028-4.6892-7.4823-7.9991-1.8009-3.333-2.7442-7.1257-2.7442-10.964 0-3.8387 0.94333-7.6314 2.7442-10.941 1.7795-3.333 4.3736-6.1143 7.4609-8.0221 3.1087-1.9308 6.6462-2.9422 10.227-2.9422 3.5804 0 7.1178 1.0114 10.205 2.9422 3.1087 1.9078 5.7028 4.6892 7.4823 8.0221 1.8009 3.31 2.7442 7.1027 2.7442 10.941v0" fill="none" stroke="#3465a4" stroke-linecap="round" stroke-linejoin="round" stroke-width=".022199px"/>
+  <path d="m209.2 24.919c0 3.8387-0.94332 7.6084-2.7442 10.941-1.7795 3.333-4.3736 6.0913-7.4609 7.9991-3.1087 1.9308-6.6462 2.9422-10.227 2.9422-3.5804 0-7.1178-1.0114-10.205-2.9422-3.1087-1.9078-5.7028-4.6662-7.4823-7.9991-1.8009-3.333-2.7442-7.1027-2.7442-10.941 0-3.8617 0.94333-7.6314 2.7442-10.964 1.7794-3.333 4.3736-6.0913 7.4823-7.9991 3.0872-1.9308 6.6247-2.9422 10.205-2.9422 3.5804 0 7.1178 1.0114 10.227 2.9422 3.0873 1.9078 5.6814 4.6662 7.4609 7.9991 1.8009 3.333 2.7442 7.1027 2.7442 10.964z" fill="#800080" fill-rule="evenodd"/>
+  <path d="m209.2 24.885c0 3.8387-0.94332 7.6084-2.7442 10.941-1.7795 3.333-4.3736 6.0913-7.4609 7.9991-3.1087 1.9308-6.6462 2.9422-10.227 2.9422-3.5804 0-7.1178-1.0114-10.205-2.9422-3.1087-1.9078-5.7028-4.6662-7.4823-7.9991-1.8009-3.333-2.7442-7.1027-2.7442-10.941 0-3.8617 0.94333-7.6314 2.7442-10.964 1.7794-3.333 4.3736-6.0913 7.4823-7.9991 3.0872-1.9308 6.6247-2.9422 10.205-2.9422 3.5804 0 7.1178 1.0114 10.227 2.9422 3.0873 1.9078 5.6814 4.6662 7.4609 7.9991 1.8009 3.333 2.7442 7.1027 2.7442 10.964" fill="none" stroke="#3465a4" stroke-linecap="round" stroke-linejoin="round" stroke-width=".022199px"/>
+  <path d="m290.88 24.908c0 3.8387-0.94331 7.6084-2.7442 10.941-1.7795 3.333-4.3736 6.0913-7.4609 7.9991-3.1087 1.9308-6.6461 2.9422-10.227 2.9422-3.5803 0-7.1178-1.0114-10.205-2.9422-3.1087-1.9078-5.7028-4.6662-7.4823-7.9991-1.8009-3.333-2.7442-7.1027-2.7442-10.941 0-3.8617 0.94333-7.6314 2.7442-10.964 1.7794-3.333 4.3736-6.0913 7.4823-7.9992 3.0872-1.9308 6.6247-2.9422 10.205-2.9422 3.5804 0 7.1178 1.0114 10.227 2.9422 3.0873 1.9078 5.6814 4.6662 7.4609 7.9992 1.8009 3.333 2.7442 7.1027 2.7442 10.964z" fill="#ff8000" fill-rule="evenodd"/>
+  <path d="m290.88 24.908c0 3.8387-0.94331 7.6084-2.7442 10.941-1.7795 3.333-4.3736 6.0913-7.4609 7.9991-3.1087 1.9308-6.6461 2.9422-10.227 2.9422-3.5803 0-7.1178-1.0114-10.205-2.9422-3.1087-1.9078-5.7028-4.6662-7.4823-7.9991-1.8009-3.333-2.7442-7.1027-2.7442-10.941 0-3.8617 0.94333-7.6314 2.7442-10.964 1.7794-3.333 4.3736-6.0913 7.4823-7.9992 3.0872-1.9308 6.6247-2.9422 10.205-2.9422 3.5804 0 7.1178 1.0114 10.227 2.9422 3.0873 1.9078 5.6814 4.6662 7.4609 7.9992 1.8009 3.333 2.7442 7.1027 2.7442 10.964" fill="none" stroke="#3465a4" stroke-linecap="round" stroke-linejoin="round" stroke-width=".022199px"/>
+  <path d="m127.51 114.54c0 3.8387-0.94333 7.6084-2.7442 10.941-1.7795 3.333-4.3736 6.0913-7.4609 7.9991-3.1087 1.9308-6.6462 2.9422-10.227 2.9422-3.5804 0-7.1178-1.0114-10.205-2.9422-3.1087-1.9078-5.7028-4.6662-7.4823-7.9991-1.8009-3.333-2.7442-7.1027-2.7442-10.941 0-3.8617 0.94333-7.6314 2.7442-10.964 1.7795-3.333 4.3736-6.0913 7.4609-7.9991 3.1087-1.9308 6.6462-2.9422 10.227-2.9422 3.5804 0 7.1178 1.0114 10.205 2.9422 3.1087 1.9078 5.7028 4.6662 7.4823 7.9991 1.8009 3.333 2.7442 7.1027 2.7442 10.964z" fill="#81d41a" fill-rule="evenodd"/>
+  <path d="m127.51 116.1c0 3.8387-0.94333 7.6084-2.7442 10.941-1.7795 3.333-4.3736 6.0913-7.4609 7.9991-3.1087 1.9308-6.6462 2.9422-10.227 2.9422-3.5804 0-7.1178-1.0114-10.205-2.9422-3.1087-1.9078-5.7028-4.6662-7.4823-7.9991-1.8009-3.333-2.7442-7.1027-2.7442-10.941 0-3.8617 0.94333-7.6314 2.7442-10.964 1.7795-3.333 4.3736-6.0913 7.4609-7.9991 3.1087-1.9308 6.6462-2.9422 10.227-2.9422 3.5804 0 7.1178 1.0114 10.205 2.9422 3.1087 1.9078 5.7028 4.6662 7.4823 7.9991 1.8009 3.333 2.7442 7.1027 2.7442 10.964" fill="none" stroke="#3465a4" stroke-linecap="round" stroke-linejoin="round" stroke-width=".022199px"/>
+  <path d="m209.2 114.54c0 3.8387-0.94332 7.6084-2.7442 10.941-1.7795 3.333-4.3736 6.0913-7.4609 7.9991-3.1087 1.9308-6.6462 2.9422-10.227 2.9422-3.5804 0-7.1178-1.0114-10.205-2.9422-3.1087-1.9078-5.7028-4.6662-7.4823-7.9991-1.8009-3.333-2.7442-7.1027-2.7442-10.941 0-3.8617 0.94333-7.6314 2.7442-10.964 1.7794-3.333 4.3736-6.0913 7.4823-7.9991 3.0872-1.9308 6.6247-2.9422 10.205-2.9422 3.5804 0 7.1178 1.0114 10.227 2.9422 3.0873 1.9078 5.6814 4.6662 7.4609 7.9991 1.8009 3.333 2.7442 7.1027 2.7442 10.964z" fill="#800080" fill-rule="evenodd"/>
+  <path d="m209.2 116.1c0 3.8387-0.94332 7.6084-2.7442 10.941-1.7795 3.333-4.3736 6.0913-7.4609 7.9991-3.1087 1.9308-6.6462 2.9422-10.227 2.9422-3.5804 0-7.1178-1.0114-10.205-2.9422-3.1087-1.9078-5.7028-4.6662-7.4823-7.9991-1.8009-3.333-2.7442-7.1027-2.7442-10.941 0-3.8617 0.94333-7.6314 2.7442-10.964 1.7794-3.333 4.3736-6.0913 7.4823-7.9991 3.0872-1.9308 6.6247-2.9422 10.205-2.9422 3.5804 0 7.1178 1.0114 10.227 2.9422 3.0873 1.9078 5.6814 4.6662 7.4609 7.9991 1.8009 3.333 2.7442 7.1027 2.7442 10.964" fill="none" stroke="#3465a4" stroke-linecap="round" stroke-linejoin="round" stroke-width=".022199px"/>
+  <path d="m290.88 114.54c0 3.8387-0.94331 7.6084-2.7442 10.941-1.7795 3.333-4.3736 6.0913-7.4609 7.9991-3.1087 1.9308-6.6461 2.9422-10.227 2.9422-3.5803 0-7.1178-1.0114-10.205-2.9422-3.1087-1.9078-5.7028-4.6662-7.4823-7.9991-1.8009-3.333-2.7442-7.1027-2.7442-10.941 0-3.8617 0.94333-7.6314 2.7442-10.964 1.7794-3.333 4.3736-6.0913 7.4823-7.9991 3.0872-1.9308 6.6247-2.9422 10.205-2.9422 3.5804 0 7.1178 1.0114 10.227 2.9422 3.0873 1.9078 5.6814 4.6662 7.4609 7.9991 1.8009 3.333 2.7442 7.1027 2.7442 10.964z" fill="#ff8000" fill-rule="evenodd"/>
+  <path d="m290.88 114.54c0 3.8387-0.94331 7.6084-2.7442 10.941-1.7795 3.333-4.3736 6.0913-7.4609 7.9991-3.1087 1.9308-6.6461 2.9422-10.227 2.9422-3.5803 0-7.1178-1.0114-10.205-2.9422-3.1087-1.9078-5.7028-4.6662-7.4823-7.9991-1.8009-3.333-2.7442-7.1027-2.7442-10.941 0-3.8617 0.94333-7.6314 2.7442-10.964 1.7794-3.333 4.3736-6.0913 7.4823-7.9991 3.0872-1.9308 6.6247-2.9422 10.205-2.9422 3.5804 0 7.1178 1.0114 10.227 2.9422 3.0873 1.9078 5.6814 4.6662 7.4609 7.9991 1.8009 3.333 2.7442 7.1027 2.7442 10.964" fill="none" stroke="#3465a4" stroke-linecap="round" stroke-linejoin="round" stroke-width=".022199px"/>
+  <path d="m127.51 200.04c0 3.8387-0.94333 7.6084-2.7442 10.941-1.7795 3.333-4.3736 6.0913-7.4609 7.9992-3.1087 1.9308-6.6462 2.9422-10.227 2.9422-3.5804 0-7.1178-1.0114-10.205-2.9422-3.1087-1.9078-5.7028-4.6662-7.4823-7.9992-1.8009-3.333-2.7442-7.1027-2.7442-10.941 0-3.8617 0.94333-7.6314 2.7442-10.964 1.7795-3.333 4.3736-6.0913 7.4609-7.9991 3.1087-1.9308 6.6462-2.9422 10.227-2.9422 3.5804 0 7.1178 1.0114 10.205 2.9422 3.1087 1.9078 5.7028 4.6662 7.4823 7.9991 1.8009 3.333 2.7442 7.1027 2.7442 10.964z" fill="#81d41a" fill-rule="evenodd"/>
+  <path d="m127.51 200.04c0 3.8387-0.94333 7.6084-2.7442 10.941-1.7795 3.333-4.3736 6.0913-7.4609 7.9992-3.1087 1.9308-6.6462 2.9422-10.227 2.9422-3.5804 0-7.1178-1.0114-10.205-2.9422-3.1087-1.9078-5.7028-4.6662-7.4823-7.9992-1.8009-3.333-2.7442-7.1027-2.7442-10.941 0-3.8617 0.94333-7.6314 2.7442-10.964 1.7795-3.333 4.3736-6.0913 7.4609-7.9991 3.1087-1.9308 6.6462-2.9422 10.227-2.9422 3.5804 0 7.1178 1.0114 10.205 2.9422 3.1087 1.9078 5.7028 4.6662 7.4823 7.9991 1.8009 3.333 2.7442 7.1027 2.7442 10.964" fill="none" stroke="#3465a4" stroke-linecap="round" stroke-linejoin="round" stroke-width=".022199px"/>
+  <path d="m209.2 200.06c0 3.8387-0.94332 7.6084-2.7442 10.941-1.7795 3.333-4.3736 6.0913-7.4609 7.9992-3.1087 1.9308-6.6462 2.9422-10.227 2.9422-3.5804 0-7.1178-1.0114-10.205-2.9422-3.1087-1.9078-5.7028-4.6662-7.4823-7.9992-1.8009-3.333-2.7442-7.1027-2.7442-10.941 0-3.8617 0.94333-7.6314 2.7442-10.964 1.7794-3.333 4.3736-6.0913 7.4823-7.9992 3.0872-1.9308 6.6247-2.9422 10.205-2.9422 3.5804 0 7.1178 1.0114 10.227 2.9422 3.0873 1.9078 5.6814 4.6662 7.4609 7.9992 1.8009 3.333 2.7442 7.1027 2.7442 10.964z" fill="#800080" fill-rule="evenodd"/>
+  <path d="m209.2 200.06c0 3.8387-0.94332 7.6084-2.7442 10.941-1.7795 3.333-4.3736 6.0913-7.4609 7.9992-3.1087 1.9308-6.6462 2.9422-10.227 2.9422-3.5804 0-7.1178-1.0114-10.205-2.9422-3.1087-1.9078-5.7028-4.6662-7.4823-7.9992-1.8009-3.333-2.7442-7.1027-2.7442-10.941 0-3.8617 0.94333-7.6314 2.7442-10.964 1.7794-3.333 4.3736-6.0913 7.4823-7.9992 3.0872-1.9308 6.6247-2.9422 10.205-2.9422 3.5804 0 7.1178 1.0114 10.227 2.9422 3.0873 1.9078 5.6814 4.6662 7.4609 7.9992 1.8009 3.333 2.7442 7.1027 2.7442 10.964" fill="none" stroke="#3465a4" stroke-linecap="round" stroke-linejoin="round" stroke-width=".022199px"/>
+  <path d="m290.88 200.06c0 3.8387-0.94331 7.6084-2.7442 10.941-1.7795 3.333-4.3736 6.0913-7.4609 7.9992-3.1087 1.9308-6.6461 2.9422-10.227 2.9422-3.5803 0-7.1178-1.0114-10.205-2.9422-3.1087-1.9078-5.7028-4.6662-7.4823-7.9992-1.8009-3.333-2.7442-7.1027-2.7442-10.941 0-3.8617 0.94333-7.6314 2.7442-10.964 1.7794-3.333 4.3736-6.0913 7.4823-7.9992 3.0872-1.9308 6.6247-2.9422 10.205-2.9422 3.5804 0 7.1178 1.0114 10.227 2.9422 3.0873 1.9078 5.6814 4.6662 7.4609 7.9992 1.8009 3.333 2.7442 7.1027 2.7442 10.964z" fill="#ff8000" fill-rule="evenodd"/>
+  <path d="m290.88 200.06c0 3.8387-0.94331 7.6084-2.7442 10.941-1.7795 3.333-4.3736 6.0913-7.4609 7.9992-3.1087 1.9308-6.6461 2.9422-10.227 2.9422-3.5803 0-7.1178-1.0114-10.205-2.9422-3.1087-1.9078-5.7028-4.6662-7.4823-7.9992-1.8009-3.333-2.7442-7.1027-2.7442-10.941 0-3.8617 0.94333-7.6314 2.7442-10.964 1.7794-3.333 4.3736-6.0913 7.4823-7.9992 3.0872-1.9308 6.6247-2.9422 10.205-2.9422 3.5804 0 7.1178 1.0114 10.227 2.9422 3.0873 1.9078 5.6814 4.6662 7.4609 7.9992 1.8009 3.333 2.7442 7.1027 2.7442 10.964" fill="none" stroke="#3465a4" stroke-linecap="round" stroke-linejoin="round" stroke-width=".022199px"/>
+  <path d="m354.66 86.912 24.741 46.225h-49.46z" fill="#729fcf" fill-rule="evenodd"/>
+  <path d="m354.66 86.912 24.741 46.225h-49.46l24.719-46.225" fill="none" stroke="#3465a4" stroke-linecap="round" stroke-linejoin="round" stroke-width=".022199px"/>
+  <g font-family="'Liberation Sans'" font-size="14.105px" font-weight="400" letter-spacing="0px" stroke-width=".58923" word-spacing="0px">
+    <text transform="scale(.96579 1.0354)" x="23.469173" y="145.54295" style="line-height:125%" xml:space="preserve">
+      <tspan x="23.469173" y="145.54295">Your</tspan>
+      <tspan x="23.469173" y="163.17372">Device</tspan>
+    </text>
+    <text transform="scale(.96579 1.0354)" x="94.823898" y="62.191856" style="line-height:125%" xml:space="preserve">
+      <tspan x="94.823898" y="62.191856" fill="#000000" stroke-width=".58923">
+        <tspan dx="0" dy="0" fill="#000000" font-family="'Liberation Sans'" font-size="14.105px" font-weight="400" stroke-width=".58923">Entry</tspan>
+      </tspan>
+    </text>
+    <text transform="scale(.96579 1.0354)" x="174.41086" y="148.45462" style="line-height:125%" xml:space="preserve">
+      <tspan x="174.41086" y="148.45462" fill="#000000" stroke-width=".58923">
+        <tspan dx="0" dy="0" fill="#000000" font-family="'Liberation Sans'" font-size="14.105px" font-weight="400" stroke-width=".58923">Middle</tspan>
+      </tspan>
+    </text>
+    <text transform="scale(.96579 1.0354)" x="264.44427" y="60.726738" style="line-height:125%" xml:space="preserve">
+      <tspan x="264.44427" y="60.726738" fill="#000000" stroke-width=".58923">
+        <tspan dx="0" dy="0" fill="#000000" font-family="'Liberation Sans'" font-size="14.105px" font-weight="400" stroke-width=".58923">Exit</tspan>
+      </tspan>
+    </text>
+    <text transform="scale(.96579 1.0354)" x="300.70557" y="145.66537" style="line-height:125%" xml:space="preserve">
+      <tspan x="300.70557" y="145.66537" fill="#000000" stroke-width=".58923">
+        <tspan dx="0" dy="0" fill="#000000" font-family="'Liberation Sans'" font-size="14.105px" font-weight="400" stroke-width=".58923">PrivacyGuides.org</tspan>
+      </tspan>
+    </text>
+  </g>
+  <g transform="matrix(1,0,0,-1,78.4,132.26)">
+    <path d="m87.371 43.93-36.295 48.232 1.0273 0.77344 36.295-48.232z" color="#000000" style="-inkscape-stroke:none"/>
+    <g fill-rule="evenodd">
+      <path d="m90.114 41.352-0.77515 6.3758-5.1366-3.8653z" color="#000000" stroke-width=".64285pt" style="-inkscape-stroke:none"/>
+      <path d="m90.629 40.668-0.68164 0.28906-6.5957 2.8008 6.3242 4.7598zm-1.0293 1.3672-0.5957 4.9023-3.9492-2.9707z" color="#000000" style="-inkscape-stroke:none"/>
+    </g>
+  </g>
+  <g transform="translate(158.59,1.3477)">
+    <path d="m87.371 43.93-36.295 48.232 1.0273 0.77344 36.295-48.232z" color="#000000" style="-inkscape-stroke:none"/>
+    <g fill-rule="evenodd">
+      <path d="m90.114 41.352-0.77515 6.3758-5.1366-3.8653z" color="#000000" stroke-width=".64285pt" style="-inkscape-stroke:none"/>
+      <path d="m90.629 40.668-0.68164 0.28906-6.5957 2.8008 6.3242 4.7598zm-1.0293 1.3672-0.5957 4.9023-3.9492-2.9707z" color="#000000" style="-inkscape-stroke:none"/>
+    </g>
+  </g>
+  <g transform="matrix(1,0,0,-1,245.51,139.58)">
+    <path d="m87.371 43.93-36.295 48.232 1.0273 0.77344 36.295-48.232z" color="#000000" style="-inkscape-stroke:none"/>
+    <g fill-rule="evenodd">
+      <path d="m90.114 41.352-0.77515 6.3758-5.1366-3.8653z" color="#000000" stroke-width=".64285pt" style="-inkscape-stroke:none"/>
+      <path d="m90.629 40.668-0.68164 0.28906-6.5957 2.8008 6.3242 4.7598zm-1.0293 1.3672-0.5957 4.9023-3.9492-2.9707z" color="#000000" style="-inkscape-stroke:none"/>
+    </g>
+  </g>
+  <g transform="translate(-3.4347 -1.3434)">
+    <path d="m87.371 43.93-36.295 48.232 1.0273 0.77344 36.295-48.232z" color="#000000" style="-inkscape-stroke:none"/>
+    <g fill-rule="evenodd">
+      <path d="m90.114 41.352-0.77515 6.3758-5.1366-3.8653z" color="#000000" stroke-width=".64285pt" style="-inkscape-stroke:none"/>
+      <path d="m90.629 40.668-0.68164 0.28906-6.5957 2.8008 6.3242 4.7598zm-1.0293 1.3672-0.5957 4.9023-3.9492-2.9707z" color="#000000" style="-inkscape-stroke:none"/>
+    </g>
+  </g>
+</svg>
--- a/i18n/ar/assets/img/multi-factor-authentication/fido.png
+++ b/i18n/ar/assets/img/multi-factor-authentication/fido.png
--- a/i18n/ar/assets/img/multi-factor-authentication/yubico-otp.png
+++ b/i18n/ar/assets/img/multi-factor-authentication/yubico-otp.png
--- a/i18n/ar/assets/img/qubes/qubes-trust-level-architecture.png
+++ b/i18n/ar/assets/img/qubes/qubes-trust-level-architecture.png
--- a/i18n/ar/assets/img/qubes/r4.0-xfce-three-domains-at-work.png
+++ b/i18n/ar/assets/img/qubes/r4.0-xfce-three-domains-at-work.png
--- a/i18n/ar/basics/account-creation.md
+++ b/i18n/ar/basics/account-creation.md
@@ -0,0 +1,81 @@
+---
+title: "Account Creation"
+icon: 'material/account-plus'
+description: Creating accounts online is practically an internet necessity, take these steps to make sure you stay private.
+---
+
+Often people sign up for services without thinking. Maybe it's a streaming service so you can watch that new show everyone's talking about, or an account that gives you a discount for your favorite fast food place. Whatever the case may be, you should consider the implications for your data now and later on down the line.
+
+There are risks associated with every new service that you use. Data breaches; disclosure of customer information to third parties; rogue employees accessing data; all are possibilities that must be considered when giving your information out. You need to be confident that you can trust the service, which is why we don't recommend storing valuable data on anything but the most mature and battle-tested products. That usually means services which provide E2EE and have undergone a cryptographic audit. An audit increases assurance that the product was designed without glaring security issues caused by an inexperienced developer.
+
+It can also be difficult to delete the accounts on some services. Sometimes [overwriting data](account-deletion.md#overwriting-account-information) associated with an account can be possible, but in other cases the service will keep an entire history of changes to the account.
+
+## Terms of Service & Privacy Policy
+
+The ToS are the rules that you agree to follow when using the service. With larger services these rules are often enforced by automated systems. Sometimes these automated systems can make mistakes. For example, you may be banned or locked out of your account on some services for using a VPN or VOIP number. Appealing such bans is often difficult, and involves an automated process too, which isn't always successful. This would be one of the reasons why we wouldn't suggest using Gmail for email as an example. Email is crucial for access to other services you might have signed up for.
+
+The Privacy Policy is how the service says they will use your data and it is worth reading so that you understand how your data will be used. A company or organization might not be legally obligated to follow everything contained in the policy (it depends on the jurisdiction). We would recommend having some idea what your local laws are and what they permit a provider to collect.
+
+We recommend looking for particular terms such as "data collection", "data analysis", "cookies", "ads" or "3rd-party" services. Sometimes you will be able to opt-out from data collection or from sharing your data, but it is best to choose a service that respects your privacy from the start.
+
+Keep in mind you're also placing your trust in the company or organization and that they will comply with their own privacy policy.
+
+## Authentication methods
+
+There are usually multiple ways to sign up for an account, each with their own benefits and drawbacks.
+
+### Email and password
+
+The most common way to create a new account is by an email address and password. When using this method, you should use a password manager and follow [best practices](passwords-overview.md) regarding passwords.
+
+!!! tip
+
+    You can use your password manager to organize other authentication methods too! Just add the new entry and fill the appropriate fields, you can add notes for things like security questions or a backup key.
+
+You will be responsible for managing your login credentials. For added security, you can set up [MFA](multi-factor-authentication.md) on your accounts.
+
+[Recommended password managers](../passwords.md ""){.md-button}
+
+#### Email aliases
+
+If you don't want to give your real email address to a service, you have the option to use an alias. We described them in more detail on our email services recommendation page. Essentially, alias services allow you to generate new email addresses that forward all emails to your main address. This can help prevent tracking across services and help you manage the marketing emails that sometimes come with the sign up process. Those can be filtered automatically based on the alias they are sent to.
+
+Should a service get hacked, you might start receiving phishing or spam emails to the address you used to sign up. Using unique aliases for each service can assist in identifying exactly what service was hacked.
+
+[Recommended email aliasing services](../email.md#email-aliasing-services ""){.md-button}
+
+### Single sign-on
+
+!!! note
+
+    We are discussing Single sign-on for personal use, not enterprise users.
+
+Single sign-on (SSO) is an authentication method that allows you to register for a service without sharing much information, if any. Whenever you see something along the lines of "Sign-in with *provider name*" on a registration form it's SSO.
+
+When you choose single sign-on in a website, it will prompt your SSO provider login page and after that your account will be connected. Your password won't be shared but some basic information will (you can review it during the login request). This process is needed every time you want to log in to the same account.
+
+The main advantages are:
+
+- **Security**: no risk of being involved in a [data breach](https://en.wikipedia.org/wiki/Data_breach) because the website does not store your credentials.
+- **Ease of use**: multiple accounts are managed by a single login.
+
+But there are disadvantages:
+
+- **Privacy**: a SSO provider will know the services you use.
+- **Centralization**: if your SSO account gets compromised or you aren't able to login to it, all other accounts connected to it are affected.
+
+SSO can be especially useful in those situations where you could benefit from deeper integration between services. For example, one of those services may offer SSO for the others. Our recommendation is to limit SSO to only where you need it and protect the main account with [MFA](multi-factor-authentication.md).
+
+All services that use SSO will be as secure as your SSO account. For example, if you want to secure an account with a hardware key but that service doesn't support hardware keys, you can secure your SSO account with a hardware key and now you essentially have hardware MFA on all your accounts. It is worth noting though that weak authentication on your SSO account means that any account tied to that login will also be weak.
+
+### Phone number
+
+We recommend avoiding services that require a phone number for sign up. A phone number can identity you across multiple services and depending on data sharing agreements this will make your usage easier to track, particularly if one of those services is breached as the phone number is often **not** encrypted.
+
+You should avoid giving out your real phone number if you can. Some services will allow the use of VOIP numbers, however these often trigger fraud detection systems, causing an account to be locked down, so we don't recommend that for important accounts.
+
+In many cases you will need to provide a number that you can receive SMS or calls from, particularly when shopping internationally, in case there is a problem with your order at border screening. It's common for services to use your number as a verification method; don't let yourself get locked out of an important account because you wanted to be clever and give a fake number!
+
+### Username and password
+
+Some services allow you to register without using an email address and only require you to set a username and password. These services may provide increased anonymity when combined with a VPN or Tor. Keep in mind that for these accounts there will most likely be **no way to recover your account** in the event you forget your username or password.
--- a/i18n/ar/basics/account-deletion.md
+++ b/i18n/ar/basics/account-deletion.md
@@ -0,0 +1,62 @@
+---
+title: "Account Deletion"
+icon: 'material/account-remove'
+description: It's easy to accumulate a large number of internet accounts, here are some tips on how to prune your collection.
+---
+
+Over time, it can be easy to accumulate a number of online accounts, many of which you may no longer use. Deleting these unused accounts is an important step in reclaiming your privacy, as dormant accounts are vulnerable to data breaches. A data breach is when a service's security is compromised and protected information is viewed, transmitted, or stolen by unauthorized actors. Data breaches are unfortunately all [too common](https://haveibeenpwned.com/PwnedWebsites) these days, and so practicing good digital hygiene is the best way to minimize the impact they have on your life. The goal of this guide then is to help navigate you through the irksome process of account deletion, often made difficult by [deceptive design](https://www.deceptive.design/), for the betterment of your online presence.
+
+## Finding Old Accounts
+
+### Password Manager
+
+If you have a password manager that you've used for your entire digital life, this part will be very easy. Oftentimes, they include built-in functionality for detecting if your credentials were exposed in a data breach—such as Bitwarden's [Data Breach Report](https://bitwarden.com/blog/have-you-been-pwned/).
+
+<figure markdown>
+  ![Bitwarden's Data Breach Report feature](../assets/img/account-deletion/exposed_passwords.png)
+</figure>
+
+Even if you haven't explicitly used a password manager before, there's a chance you've used the one in your browser or your phone without even realizing it. For example: [Firefox Password Manager](https://support.mozilla.org/kb/password-manager-remember-delete-edit-logins), [Google Password Manager](https://passwords.google.com/intro) and [Edge Password Manager](https://support.microsoft.com/en-us/microsoft-edge/save-or-forget-passwords-in-microsoft-edge-b4beecb0-f2a8-1ca0-f26f-9ec247a3f336).
+
+Desktop platforms also often have a password manager which may help you recover passwords you've forgotten about:
+
+- Windows [Credential Manager](https://support.microsoft.com/en-us/windows/accessing-credential-manager-1b5c916a-6a16-889f-8581-fc16e8165ac0)
+- macOS [Passwords](https://support.apple.com/en-us/HT211145)
+- iOS [Passwords](https://support.apple.com/en-us/HT211146)
+- Linux, Gnome Keyring, which can be accessed through [Seahorse](https://help.gnome.org/users/seahorse/stable/passwords-view.html.en) or [KDE Wallet Manager](https://userbase.kde.org/KDE_Wallet_Manager)
+
+### Email
+
+If you didn't use a password manager in the past or you think you have accounts that were never added to your password manager, another option is to search the email account(s) that you believe you signed up on. On your email client, search for keywords such as "verify" or "welcome." Almost every time you make an online account, the service will send a verification link or an introductory message to your email. This can be a good way to find old, forgotten accounts.
+
+## Deleting Old Accounts
+
+### Log In
+
+In order to delete your old accounts, you'll need to first make sure you can log in to them. Again, if the account was in your password manager, this step is easy. If not, you can try to guess your password. Failing that, there are typically options to regain access to your account, commonly available through a "forgot password" link on the login page. It may also be possible that accounts you've abandoned have already been deleted—sometimes services prune all old accounts.
+
+When attempting to regain access, if the site returns an error message saying that email is not associated with an account, or you never receive a reset link after multiple attempts, then you do not have an account under that email address and should try a different one. If you can't figure out which email address you used, or you no longer have access to that email, you can try contacting the service's customer support. Unfortunately, there is no guarantee that you will be able to reclaim access your account.
+
+### GDPR (EEA residents only)
+
+Residents of the EEA have additional rights regarding data erasure specified in [Article 17](https://www.gdpr.org/regulation/article-17.html) of the GDPR. If it's applicable to you, read the privacy policy for any given service to find information on how to exercise your right to erasure. Reading the privacy policy can prove important, as some services have a "Delete Account" option that only disables your account and for real deletion you have to take additional action. Sometimes actual deletion may involve filling out surveys, emailing the data protection officer of the service or even proving your residence in the EEA. If you plan to go this way, do **not** overwrite account information—your identity as an EEA resident may be required. Note that the location of the service does not matter; GDPR applies to anyone serving European users. If the service does not respect your right to erasure, you can contact your national [Data Protection Authority](https://ec.europa.eu/info/law/law-topic/data-protection/reform/rights-citizens/redress/what-should-i-do-if-i-think-my-personal-data-protection-rights-havent-been-respected_en) and you may be entitled to monetary compensation.
+
+### Overwriting Account information
+
+In some situations where you plan to abandon an account, it may make sense to overwrite the account information with fake data. Once you've made sure you can log in, change all the information in your account to falsified information. The reason for this is that many sites will retain information you previously had even after account deletion. The hope is that they will overwrite the previous information with the newest data you entered. However, there is no guarantee that there won't be backups with the prior information.
+
+For the account email, either create a new alternate email account via your provider of choice or create an alias using an [email aliasing service](../email.md#email-aliasing-services). You can then delete your alternate email address once you are done. We recommend against using temporary email providers, as oftentimes it is possible to reactivate temporary emails.
+
+### Delete
+
+You can check [JustDeleteMe](https://justdeleteme.xyz) for instructions on deleting the account for a specific service. Some sites will graciously have a "Delete Account" option, while others will go as far as to force you to speak with a support agent. The deletion process can vary from site to site, with account deletion being impossible on some.
+
+For services that don't allow account deletion, the best thing to do is falsify all your information as previously mentioned and strengthen account security. To do so, enable [MFA](multi-factor-authentication.md) and any extra security features offered. As well, change the password to a randomly-generated one that is the maximum allowed size (a [password manager](../passwords.md) can be useful for this).
+
+If you're satisfied that all information you care about is removed, you can safely forget about this account. If not, it might be a good idea to keep the credentials stored with your other passwords and occasionally re-login to reset the password.
+
+Even when you are able to delete an account, there is no guarantee that all your information will be removed. In fact, some companies are required by law to keep certain information, particularly when related to financial transactions. It's mostly out of your control what happens to your data when it comes to websites and cloud services.
+
+## Avoid New Accounts
+
+As the old saying goes, "an ounce of prevention is worth a pound of cure." Whenever you feel tempted to sign up for a new account, ask yourself, "Do I really need this? Can I accomplish what I need to without an account?" It can often be much harder to delete an account than to create one. And even after deleting or changing the info on your account, there might be a cached version from a third-party—like the [Internet Archive](https://archive.org/). Avoid the temptation when you're able to—your future self will thank you!
--- a/i18n/ar/basics/common-misconceptions.md
+++ b/i18n/ar/basics/common-misconceptions.md
@@ -0,0 +1,60 @@
+---
+title: "Common Misconceptions"
+icon: 'material/robot-confused'
+description: Privacy isn't a straightforward topic, and it's easy to get caught up in marketing claims and other disinformation.
+---
+
+## "Open-source software is always secure" or "Proprietary software is more secure"
+
+These myths stem from a number of prejudices, but whether the source code is available and how software is licensed does not inherently affect its security in any way. ==Open-source software has the *potential* to be more secure than proprietary software, but there is absolutely no guarantee this is the case.== When you evaluate software, you should look at the reputation and security of each tool on an individual basis.
+
+Open-source software *can* be audited by third-parties, and is often more transparent about potential vulnerabilities than proprietary counterparts. It also allows you to review the code and disable any suspicious functionality you find yourself. However, *unless you do so*, there is no guarantee that code has ever been evaluated, especially with smaller software projects. The open development process has also sometimes been exploited to introduce new vulnerabilities into even large projects.[^1]
+
+On the flip side, proprietary software is less transparent, but that doesn't imply that it's not secure. Major proprietary software projects can be audited internally and by third-party agencies, and independent security researchers can still find vulnerabilities with techniques like reverse engineering.
+
+To avoid biased decisions, it's *vital* that you evaluate the privacy and security standards of the software you use.
+
+## "Shifting trust can increase privacy"
+
+We talk about "shifting trust" a lot when discussing solutions like VPNs (which shift the trust you place in your ISP to the VPN provider). While this protects your browsing data from your ISP *specifically*, the VPN provider you choose still has access to your browsing data: Your data isn't completely secured from all parties. This means that:
+
+1. You must exercise caution when choosing a provider to shift trust to.
+2. You should still use other techniques, like E2EE, to protect your data completely. Merely distrusting one provider to trust another is not securing your data.
+
+## "Privacy-focused solutions are inherently trustworthy"
+
+Focusing solely on the privacy policies and marketing of a tool or provider can blind you to its weaknesses. When you're looking for a more private solution, you should determine what the underlying problem is and find technical solutions to that problem. For example, you may want to avoid Google Drive, which gives Google access to all of your data. The underlying problem in this case is lack of E2EE, so you should make sure that the provider you switch to actually implements E2EE, or use a tool (like [Cryptomator](../encryption.md#cryptomator-cloud)) which provides E2EE on any cloud provider. Switching to a "privacy-focused" provider (that doesn't implement E2EE) doesn't solve your problem: it just shifts trust from Google to that provider.
+
+The privacy policies and business practices of providers you choose are very important, but should be considered secondary to technical guarantees of your privacy: You shouldn't shift trust to another provider when trusting a provider isn't a requirement at all.
+
+## "Complicated is better"
+
+We often see people describing privacy threat models that are overly complex. Often, these solutions include problems like many different email accounts or complicated setups with lots of moving parts and conditions. The replies are usually answers to "What is the best way to do *X*?"
+
+Finding the "best" solution for yourself doesn't necessarily mean you are after an infallible solution with dozens of conditions—these solutions are often difficult to work with realistically. As we discussed previously, security often comes at the cost of convenience. Below, we provide some tips:
+
+1. ==Actions need to serve a particular purpose:== think about how to do what you want with the fewest actions.
+2. ==Remove human failure points:== We fail, get tired, and forget things. To maintain security, avoid relying on manual conditions and processes that you have to remember.
+3. ==Use the right level of protection for what you intend.== We often see recommendations of so-called law-enforcement or subpoena-proof solutions. These often require specialist knowledge and generally aren't what people want. There's no point in building an intricate threat model for anonymity if you can be easily de-anonymized by a simple oversight.
+
+So, how might this look?
+
+One of the clearest threat models is one where people *know who you are* and one where they do not. There will always be situations where you must declare your legal name and there are others where you don't need to.
+
+1. **Known identity** - A known identity is used for things where you must declare your name. There are many legal documents and contracts where a legal identity is required. This could range from opening a bank account, signing a property lease, obtaining a passport, customs declarations when importing items, or otherwise dealing with your government. These things will usually lead to credentials such as credit cards, credit rating checks, account numbers, and possibly physical addresses.
+
+    We don't suggest using a VPN or Tor for any of these things, as your identity is already known through other means.
+
+    !!! tip
+   
+        When shopping online, the use of a [parcel locker](https://en.wikipedia.org/wiki/Parcel_locker) can help keep your physical address private.
+
+2. **Unknown identity** - An unknown identity could be a stable pseudonym that you regularly use. It is not anonymous because it doesn't change. If you're part of an online community, you may wish to retain a persona that others know. This pseudonym isn't anonymous because—if monitored for long enough—details about the owner can reveal further information, such as the way they write, their general knowledge about topics of interest, etc.
+
+    You may wish to use a VPN for this, to mask your IP address. Financial transactions are more difficult to mask: You could consider using anonymous cryptocurrencies, such as [Monero](https://www.getmonero.org/). Employing altcoin shifting may also help to disguise where your currency originated. Typically, exchanges require KYC (know your customer) to be completed before they'll allow you to exchange fiat currency into any kind of cryptocurrency. Local meet-up options may also be a solution; however, those are often more expensive and sometimes also require KYC.
+
+3. **Anonymous identity** - Even with experience, anonymous identities are difficult to maintain over long periods of time. They should be short-term and short-lived identities which are rotated regularly.
+
+    Using Tor can help with this. It is also worth noting that greater anonymity is possible through asynchronous communication: Real-time communication is vulnerable to analysis of typing patterns (i.e. more than a paragraph of text, distributed on a forum, via email, etc.)
+
+[^1]: One notable example of this is the [2021 incident in which University of Minnesota researchers introduced three vulnerabilities into the Linux kernel development project](https://cse.umn.edu/cs/linux-incident).
--- a/i18n/ar/basics/common-threats.md
+++ b/i18n/ar/basics/common-threats.md
@@ -0,0 +1,148 @@
+---
+title: "Common Threats"
+icon: 'material/eye-outline'
+description: Your threat model is personal to you, but these are some of the things many visitors to this site care about.
+---
+
+Broadly speaking, we categorize our recommendations into the [threats](threat-modeling.md) or goals that apply to most people. ==You may be concerned with none, one, a few, or all of these possibilities==, and the tools and services you use depend on what your goals are. You may have specific threats outside of these categories as well, which is perfectly fine! The important part is developing an understanding of the benefits and shortcomings of the tools you choose to use, because virtually none of them will protect you from every threat.
+
+- <span class="pg-purple">:material-incognito: Anonymity</span> - Shielding your online activity from your real identity, protecting you from people who are trying to uncover *your* identity specifically.
+- <span class="pg-red">:material-target-account: Targeted Attacks</span> - Being protected from hackers or other malicious actors who are trying to gain access to *your* data or devices specifically.
+- <span class="pg-orange">:material-bug-outline: Passive Attacks</span> - Being protected from things like malware, data breaches, and other attacks that are made against many people at once.
+- <span class="pg-teal">:material-server-network: Service Providers</span> - Protecting your data from service providers (e.g. with E2EE, which renders your data unreadable to the server).
+- <span class="pg-blue">:material-eye-outline: Mass Surveillance</span> - Protection from government agencies, organizations, websites, and services which work together to track your activities.
+- <span class="pg-brown">:material-account-cash: Surveillance Capitalism</span> - Protecting yourself from big advertising networks, like Google and Facebook, as well as a myriad of other third-party data collectors.
+- <span class="pg-green">:material-account-search: Public Exposure</span> - Limiting the information about you that is accessible online—to search engines or the general public.
+- <span class="pg-blue-gray">:material-close-outline: Censorship</span> - Avoiding censored access to information or being censored yourself when speaking online.
+
+Some of these threats may be more important to you than others, depending on your specific concerns. For example, a software developer with access to valuable or critical data may be primarily concerned with <span class="pg-red">:material-target-account: Targeted Attacks</span>, but they probably still want to protect their personal data from being swept up in <span class="pg-blue">:material-eye-outline: Mass Surveillance</span> programs. Similarly, many people may be primarily concerned with <span class="pg-green">:material-account-search: Public Exposure</span> of their personal data, but they should still be wary of security-focused issues, such as <span class="pg-orange">:material-bug-outline: Passive Attacks</span>—like malware affecting their devices.
+
+## Anonymity vs. Privacy
+
+<span class="pg-purple">:material-incognito: Anonymity</span>
+
+Anonymity is often confused with privacy, but they're distinct concepts. While privacy is a set of choices you make about how your data is used and shared, anonymity is the complete disassociation of your online activities from your real identity.
+
+Whistleblowers and journalists, for example, can have a much more extreme threat model which requires total anonymity. That's not only hiding what they do, what data they have, and not getting hacked by malicious actors or governments, but also hiding who they are entirely. They will often sacrifice any kind of convenience if it means protecting their anonymity, privacy, or security, because their lives could depend on it. Most people don't need to go so far.
+
+## Security and Privacy
+
+<span class="pg-orange">:material-bug-outline: Passive Attacks</span>
+
+Security and privacy are also often confused, because you need security to obtain any semblance of privacy: Using tools—even if they're private by design—is futile if they could be easily exploited by attackers who later release your data. However, the inverse isn't necessarily true: The most secure service in the world *isn't necessarily* private. The best example of this is trusting data to Google who, given their scale, have had few security incidents by employing industry-leading security experts to secure their infrastructure. Even though Google provides very secure services, very few people would consider their data private in Google's free consumer products (Gmail, YouTube, etc.)
+
+When it comes to application security, we generally don't (and sometimes can't) know if the software we use is malicious, or might one day become malicious. Even with the most trustworthy developers, there's generally no guarantee that their software doesn't have a serious vulnerability that could later be exploited.
+
+To minimize the damage that a malicious piece of software *could* do, you should employ security by compartmentalization. For example, this could come in the form of using different computers for different jobs, using virtual machines to separate different groups of related applications, or using a secure operating system with a strong focus on application sandboxing and mandatory access control.
+
+!!! tip
+
+    Mobile operating systems generally have better application sandboxing than desktop operating systems: Apps can't obtain root access, and require permission for access to system resources.
+    
+    Desktop operating systems generally lag behind on proper sandboxing. ChromeOS has similar sandboxing capabilities to Android, and macOS has full system permission control (and developers can opt-in to sandboxing for applications). However, these operating systems do transmit identifying information to their respective OEMs. Linux tends to not submit information to system vendors, but it has poor protection against exploits and malicious apps. This can be mitigated somewhat with specialized distributions which make significant use of virtual machines or containers, such as [Qubes OS](../../desktop/#qubes-os).
+
+<span class="pg-red">:material-target-account: Targeted Attacks</span>
+
+Targeted attacks against a specific person are more problematic to deal with. Common attacks include sending malicious documents via email, exploiting vulnerabilities (e.g. in browsers and operating systems), and physical attacks. If this is a concern for you, you should employ more advanced threat mitigation strategies.
+
+!!! tip
+
+    By design, **web browsers**, **email clients**, and **office applications** typically run untrusted code, sent to you from third parties. Running multiple virtual machines—to separate applications like these from your host system, as well as each other—is one technique you can use to mitigate the chance of an exploit in these applications compromising the rest of your system. For example, technologies like Qubes OS or Microsoft Defender Application Guard on Windows provide convenient methods to do this.
+
+If you are concerned about **physical attacks** you should use an operating system with a secure verified boot implementation, such as Android, iOS, macOS, or [Windows (with TPM)](https://docs.microsoft.com/en-us/windows/security/information-protection/secure-the-windows-10-boot-process). You should also make sure that your drive is encrypted, and that the operating system uses a TPM or Secure [Enclave](https://support.apple.com/guide/security/secure-enclave-sec59b0b31ff/1/web/1) or [Element](https://developers.google.com/android/security/android-ready-se) to rate limit attempts to enter the encryption passphrase. You should avoid sharing your computer with people you don't trust, because most desktop operating systems don't encrypt data separately per-user.
+
+## Privacy From Service Providers
+
+<span class="pg-teal">:material-server-network: Service Providers</span>
+
+We live in a world where almost everything is connected to the internet. Our "private" messages, emails, and social interactions are typically stored on a server, somewhere. Generally, when you send someone a message it's stored on a server, and when your friend wants to read the message the server will show it to them.
+
+The obvious problem with this is that the service provider (or a hacker who has compromised the server) can access your conversations whenever and however they want, without you ever knowing. This applies to many common services, like SMS messaging, Telegram, and Discord.
+
+Thankfully, E2EE can alleviate this issue by encrypting communications between you and your desired recipients before they are even sent to the server. The confidentiality of your messages is guaranteed, assuming the service provider doesn't have access to the private keys of either party.
+
+!!! note "Note on Web-based Encryption"
+
+    In practice, the effectiveness of different E2EE implementations varies. Applications, such as [Signal](../real-time-communication.md#signal), run natively on your device, and every copy of the application is the same across different installations. If the service provider were to introduce a [backdoor](https://en.wikipedia.org/wiki/Backdoor_(computing)) in their application—in an attempt to steal your private keys—it could later be detected with [reverse engineering](https://en.wikipedia.org/wiki/Reverse_engineering).
+    
+    On the other hand, web-based E2EE implementations, such as Proton Mail's webmail or Bitwarden's *Web Vault*, rely on the server dynamically serving JavaScript code to the browser to handle cryptography. A malicious server can target you and send you malicious JavaScript code to steal your encryption key (and it would be extremely hard to notice). Because the server can choose to serve different web clients to different people—even if you noticed the attack—it would be incredibly hard to prove the provider's guilt.
+    
+    Therefore, you should use native applications over web clients whenever possible.
+
+Even with E2EE, service providers can still profile you based on **metadata**, which typically isn't protected. While the service provider can't read your messages, they can still observe important things, such as who you're talking to, how often you message them, and when you're typically active. Protection of metadata is fairly uncommon, and—if it's within your [threat model](threat-modeling.md)—you should pay close attention to the technical documentation of the software you're using to see if there's any metadata minimization or protection at all.
+
+## Mass Surveillance Programs
+
+<span class="pg-blue">:material-eye-outline: Mass Surveillance</span>
+
+Mass surveillance is the intricate effort to monitor the "behavior, many activities, or information" of an entire (or substantial fraction of a) population.[^1] It often refers to government programs, such as the ones [disclosed by Edward Snowden in 2013](https://en.wikipedia.org/wiki/Global_surveillance_disclosures_(2013%E2%80%93present)). However, it can also be carried out by corporations, either on behalf of government agencies or by their own initiative.
+
+!!! abstract "Atlas of Surveillance"
+
+    If you want to learn more about surveillance methods and how they're implemented in your city you can also take a look at the [Atlas of Surveillance](https://atlasofsurveillance.org/) by the [Electronic Frontier Foundation](https://www.eff.org/).
+    
+    In France you can take a look at the [Technolopolice website](https://technopolice.fr/villes/) maintained by the non-profit association La Quadrature du Net.
+
+Governments often justify mass surveillance programs as necessary means to combat terrorism and prevent crime. However, breaching human rights, it's most often used to disproportionately target minority groups and political dissidents, among others.
+
+!!! quote "ACLU: [*The Privacy Lesson of 9/11: Mass Surveillance is Not the Way Forward*](https://www.aclu.org/news/national-security/the-privacy-lesson-of-9-11-mass-surveillance-is-not-the-way-forward)"
+
+    In the face of [Edward Snowden's disclosures of government programs such as [PRISM](https://en.wikipedia.org/wiki/PRISM) and [Upstream](https://en.wikipedia.org/wiki/Upstream_collection)], intelligence officials also admitted that the NSA had for years been secretly collecting records about virtually every American’s phone calls — who’s calling whom, when those calls are made, and how long they last. This kind of information, when amassed by the NSA day after day, can reveal incredibly sensitive details about people’s lives and associations, such as whether they have called a pastor, an abortion provider, an addiction counselor, or a suicide hotline.
+
+Despite growing mass surveillance in the United States, the government has found that mass surveillance programs like Section 215 have had "little unique value" with respect to stopping actual crimes or terrorist plots, with efforts largely duplicating the FBI's own targeted surveillance programs.[^2]
+
+Online, you can be tracked via a variety of methods:
+
+- Your IP address
+- Browser cookies
+- The data you submit to websites
+- Your browser or device fingerprint
+- Payment method correlation
+
+\[This list isn't exhaustive].
+
+If you're concerned about mass surveillance programs, you can use strategues like compartmentalizing your online identities, blending in with other users, or, whenever possible, simply avoiding giving out identifying information.
+
+<span class="pg-brown">:material-account-cash: Surveillance Capitalism</span>
+
+> Surveillance capitalism is an economic system centered around the capture and commodification of personal data for the core purpose of profit-making.[^3]
+
+For many people, tracking and surveillance by private corporations is a growing concern. Pervasive ad networks, such as those operated by Google and Facebook, span the internet far beyond just the sites they control, tracking your actions along the way. Using tools like content blockers to limit network requests to their servers, and reading the privacy policies of the services you use can help you avoid many basic adversaries (although it can't completely prevent tracking).[^4]
+
+Additionally, even companies outside of the *AdTech* or tracking industry can share your information with [data brokers](https://en.wikipedia.org/wiki/Information_broker) (such as Cambridge Analytica, Experian, or Datalogix) or other parties. You can't automatically assume your data is safe just because the service you're using doesn't fall within the typical AdTech or tracking business model. The strongest protection against corporate data collection is to encrypt or obfuscate your data whenever possible, making it difficult for different providers to correlate data with each other and build a profile on you.
+
+## Limiting Public Information
+
+<span class="pg-green">:material-account-search: Public Exposure</span>
+
+The best way to keep your data private is simply not making it public in the first place. Deleting unwanted information you find about yourself online is one of the best first steps you can take to regain your privacy.
+
+- [View our guide on account deletion :material-arrow-right-drop-circle:](account-deletion.md)
+
+On sites where you do share information, checking the privacy settings of your account to limit how widely that data is spread is very important. For example, enable "private mode" on your accounts if given the option: This ensures that your account isn't being indexed by search engines, and that it can't be viewed without your permission.
+
+If you've already submitted your real information to sites which shouldn't have it, consider using disinformation tactics, like submitting fictitious information related to that online identity. This makes your real information indistinguishable from the false information.
+
+## Avoiding Censorship
+
+<span class="pg-blue-gray">:material-close-outline: Censorship</span>
+
+Censorship online can be carried out (to varying degrees) by actors including totalitarian governments, network administrators, and service providers. These efforts to control communication and restrict access to information will always be incompatible with the human right to Freedom of Expression.[^5]
+
+Censorship on corporate platforms is increasingly common, as platforms like Twitter and Facebook give in to public demand, market pressures, and pressures from government agencies. Government pressures can be covert requests to businesses, such as the White House [requesting the takedown](https://www.nytimes.com/2012/09/17/technology/on-the-web-a-fine-line-on-free-speech-across-globe.html) of a provocative YouTube video, or overt, such as the Chinese government requiring companies to adhere to a strict regime of censorship.
+
+People concerned with the threat of censorship can use technologies like [Tor](../advanced/tor-overview.md) to circumvent it, and support censorship-resistant communication platforms like [Matrix](../real-time-communication.md#element), which doesn't have a centralized account authority that can close accounts arbitrarily.
+
+!!! tip
+
+    While evading censorship itself can be easy, hiding the fact that you are doing it can be very problematic.
+    
+    You should consider which aspects of the network your adversary can observe, and whether you have plausible deniability for your actions. For example, using [encrypted DNS](../advanced/dns-overview.md#what-is-encrypted-dns) can help you bypass rudimentary, DNS-based censorship systems, but it can't truly hide what you are visiting from your ISP. A VPN or Tor can help hide what you are visiting from network administrators, but can't hide that you're using those networks in the first place. Pluggable transports (such as Obfs4proxy, Meek, or Shadowsocks) can help you evade firewalls that block common VPN protocols or Tor, but your circumvention attempts can still be detected by methods like probing or [deep packet inspection](https://en.wikipedia.org/wiki/Deep_packet_inspection).
+
+You must always consider the risks of trying to bypass censorship, the potential consequences, and how sophisticated your adversary may be. You should be cautious with your software selection, and have a backup plan in case you are caught.
+
+[^1]: Wikipedia: [*Mass Surveillance*](https://en.wikipedia.org/wiki/Mass_surveillance) and [*Surveillance*](https://en.wikipedia.org/wiki/Surveillance).
+[^2]: United States Privacy and Civil Liberties Oversight Board: [*Report on the Telephone Records Program Conducted under Section 215*](https://documents.pclob.gov/prod/Documents/OversightReport/ec542143-1079-424a-84b3-acc354698560/215-Report_on_the_Telephone_Records_Program.pdf)
+[^3]: Wikipedia: [*Surveillance capitalism*](https://en.wikipedia.org/wiki/Surveillance_capitalism)
+[^4]: "[Enumerating badness](https://www.ranum.com/security/computer_security/editorials/dumb/)" (or, "listing all the bad things that we know about"), as many adblockers and antivirus programs do, fails to adequately protect you from new and unknown threats because they have not yet been added to the filter list. You should also employ other mitigation techniques.
+[^5]: United Nations: [*Universal Declaration of Human Rights*](https://www.un.org/en/about-us/universal-declaration-of-human-rights).
--- a/Show More
+++ b/Show More
				`@@ -1 +0,0 @@`
				`../../../../../theme/assets/brand/WOFF/bagnard/Bagnard.woff`