Update sponsors.html

https://github.com/privacytoolsIO/privacytools.io/pull/1451#issuecomment-553954762

.github/CODEOWNERS

@@ -2,18 +2,22 @@
 *.md @privacytoolsIO/editorial
 /assets/ @privacytoolsIO/editorial
 /pages/ @privacytoolsIO/editorial
+/_includes/ @JonahAragon @privacytoolsIO/editorial
 /_includes/sections/ @privacytoolsIO/editorial
-/index.html @privacytoolsIO/editorial
 /font/ @dawidpotocki
 
 # Administration Related Files
+/index.html @JonahAragon @privacytoolsIO/editorial
+/_includes/sections/header.html @JonahAragon @privacytoolsIO/editorial
+/_includes/sections/participate.html @JonahAragon @privacytoolsIO/editorial
+/pages/sponsors.html @JonahAragon
 /pages/donate.html @JonahAragon @BurungHantu1605
 /assets/js/redirects.js @JonahAragon
 /.well-known/ @JonahAragon
 /404.html @JonahAragon
-/.github/CODEOWNERS @JonahAragon @BurungHantu1605
+/.github/CODEOWNERS @JonahAragon
 /.github/FUNDING.yml @JonahAragon @BurungHantu1605
-/LICENSE.txt @JonahAragon @BurungHantu1605
+/LICENSE.txt @JonahAragon
 /.travis.yml @JonahAragon @Shifterovich @nitrohorse
 /CNAME @JonahAragon
 /nginx/ @JonahAragon

.github/CONTRIBUTING.md

@@ -1,6 +1,22 @@
 # Contributing Guidelines
 
-Please read this before contributing.
+Please read this document in full before contributing.
+
+- [Rules](#rules)
+- [Quality over Quantity](#quality-over-quantity)
+- [Software Criteria](#software-criteria)
+  - [Main (All Software)](#main)
+  - [Providers](#providers)
+    - [DNS](#dns)
+    - [VPN](#vpn)
+    - [Email](#email)
+  - [Hardware](#hardware)
+  - [Software](#software)
+  - [Encryption](#encryption)
+  - [Operating Systems](#operating-systems)
+- [Images](#images)
+- [Licensing](#licensing)
+- [Contributing via email](#contributing-via-email)
 
 ## Rules
 
@@ -9,14 +25,16 @@ Please read this before contributing.
 - Be constructive.
 - Please feel free to *review changes* in the *files changed* tab of any
   pull request at any time.
-- See also our [Code of Conduct](https://github.com/privacytoolsIO/privacytools.io/blob/master/CODE_OF_CONDUCT.md)
+- See also our [Code of Conduct](https://github.com/privacytoolsIO/.github/blob/master/CODE_OF_CONDUCT.md)
 
 ## Quality over Quantity
 
 We're trying to keep it simple and promote the best tools, not all of them.
 
 ## Software Criteria
+
 ### Main
+
 - Easy to use. Could your mother use that tool or service? Usability is most important.
 - Cross-platform / Accessible.
 - Privacy respecting.
@@ -25,8 +43,10 @@ We're trying to keep it simple and promote the best tools, not all of them.
 
 There can be exceptions if no software is available that meet the criteria.
 
-Note: This criteria applies to all of privacytools.io
+Note: This criteria applies to all of the PrivacyTools website and recommendations.
+
 ### Providers
+
 - Prioritize Products by privacy respecting nationality.
 
 ### DNS
@@ -37,7 +57,9 @@ Note: This criteria applies to all of privacytools.io
 - Preferably supports QNAME minimization (if you have access to the dig command, `dig +short txt qnamemintest.internet.nl` or `Resolve-DnsName -Type TXT -Name qnamemintest.internet.nl` if you are on Windows 10)
 
 ### VPN
+
 See https://www.privacytools.io/providers/vpn/#criteria for more details.
+
 - Prioritize Products by privacy respecting nationality.
 - Cannot be based in USA or UK.
 - Must be accessible via Open Source Software (e.g. OpenVPN, WireGuard)
@@ -46,31 +68,46 @@ See https://www.privacytools.io/providers/vpn/#criteria for more details.
 - No logging policy
 
 ### Email
+
 - Outside of USA
 - Support SMTP SSL
 - Accessible Using Open Source Software (e.g. allows IMAP)
 
 ### Hardware
+
 - Must be [H-Node Class A](https://h-node.org/wiki/page/en/compatibility-classes) or equivalent (if applicable)
 - Must prioritize hardware certifications like [RYF](https://ryf.fsf.org/), [OSHWA](https://certification.oshwa.org/), and OSI when available.
 - Cannot lock users to a particular platform.
 
 ### Software
+
 - Must be able to download over encrypted network (can be a mirror)
 - Must be Open Source Software
 
 ### Encryption
+
 - Only verifiable encryption is to be trusted
 
-### OSes
+### Operating Systems
+
 - Must state if recommends, depends on, or offers non-free software (contrib)
 - No Tracking Policy (opt-in analytics is ok)
 
 ## Images
 
-- Provider logos are 200px x 70px ([example](https://www.privacytools.io/assets/img/provider/AirVPN.png))
+- Provider logos are 200px x 70px ([example](https://github.com/privacytoolsIO/privacytools.io/blob/master/assets/img/provider/Mullvad.png))
-- Tool logos are 120px x 120px ([example](https://www.privacytools.io/assets/img/tools/ChatSecure.png))
+- Tool logos are 120px x 120px ([example](https://github.com/privacytoolsIO/privacytools.io/blob/master/assets/img/tools/Firefox.png))
 
 ## Licensing
 
 The content and original technology of this website is made available under the Creative Commons Zero v1.0 Universal license text. Some files or folders may include works from other projects with separate licenses, and will be marked as such. **By contributing to this repository, contributors do not necessarily agree to sign a CLA or legally transfer their copyright to the project, but they do at a minimum agree to license their work under the current license of this repository: In this case, the Creative Commons Zero v1.0 Universal.**
+
+## Contributing via email
+
+If you have a GitHub account, or are able to create a GitHub account, we ask that you do not submit issues via email.
+
+If you do not have a GitHub account, you may submit software recommendations or other issues via email without creating a GitHub account by emailing `privacytools@fire.fundersclub.com`. The subject line of your email will become the issue title. Your name will be included in the posted issue.
+
+This repository uses [@fire-bot](https://github.com/fire-bot), [a service](https://fire.fundersclub.com) from FundersClub that converts incoming emails to GitHub issues. By sending a message to the email address above, you will be sharing your email address and message content with FundersClub. FundersClub has a privacy policy at [https://fundersclub.com/catalyst-privacy-policy/](https://fundersclub.com/catalyst-privacy-policy/) you should review before using this service. Any attachments you send via this service may be stored indefinitely by FundersClub for the purpose of making them available within the submitted GitHub issue.
+
+You can view an example of the created issues' format at [#1444](https://github.com/privacytoolsIO/privacytools.io/issues/1444).

.well-known/librehost.json

@@ -2,11 +2,11 @@
     "@context" : "http://schema.org",
     "@type" : "Organization",
     "organizationType" : "Informal collective",
-    "name" : "privacytools.io",
+    "name" : "PrivacyTools",
     "tagLine" : "Private Services: No Ads, No Google Analytics, No Affiliates, and No Cross-Site Requests",
     "homeUrl" : "https://www.privacytools.io/",
     "logo" : "https://www.privacytools.io/assets/img/layout/shield.svg",
-    "description": "privacytools.io is a socially motivated website that provides information and services for protecting your security and privacy online. No Ads, No Google Analytics, No Affiliates, and No Cross-Site Requests.",
+    "description": "PrivacyTools is a socially motivated website that provides information and services for protecting your security and privacy online. No Ads, No Google Analytics, No Affiliates, and No Cross-Site Requests.",
     "communicationLanguages": ["en"],
     "contactUrl": "https://www.privacytools.io/contact/",
     "privacyPolicyUrl" : "https://www.privacytools.io/privacy/",

Gemfile

@@ -1,13 +1,11 @@
 source "https://rubygems.org"
 
 # Install github-pages gem (https://jekyllrb.com/docs/github-pages/)
-gem "jekyll", group: :jekyll_plugins
+gem "github-pages", group: :jekyll_plugins
 
 # Plugins
 group :jekyll_plugins do
   # example: gem "jekyll-feed", "~> 0.6"
-  gem 'jekyll-multiple-languages-plugin'
-  gem 'jekyll-sitemap'
 end
 
 # Windows does not include zoneinfo files, so bundle the tzinfo-data gem
@@ -15,3 +13,4 @@ gem "tzinfo-data", platforms: [:mingw, :mswin, :x64_mingw, :jruby]
 
 # Performance-booster for watching directories on Windows
 gem "wdm", "~> 0.1.0" if Gem.win_platform?
+

Gemfile.lock

@@ -1,16 +1,89 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.5.2)
+    activesupport (4.2.11.1)
+      i18n (~> 0.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.3, >= 0.3.4)
+      tzinfo (~> 1.1)
+    addressable (2.6.0)
       public_suffix (>= 2.0.2, < 4.0)
+    coffee-script (2.4.1)
+      coffee-script-source
+      execjs
+    coffee-script-source (1.11.1)
     colorator (1.1.0)
+    commonmarker (0.17.13)
+      ruby-enum (~> 0.5)
     concurrent-ruby (1.1.5)
+    dnsruby (1.61.3)
+      addressable (~> 2.5)
     em-websocket (0.5.1)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0.6.0)
+    ethon (0.12.0)
+      ffi (>= 1.3.0)
     eventmachine (1.2.7)
+    execjs (2.7.0)
+    faraday (0.15.4)
+      multipart-post (>= 1.2, < 3)
     ffi (1.11.1)
     forwardable-extended (2.6.0)
+    gemoji (3.0.1)
+    github-pages (198)
+      activesupport (= 4.2.11.1)
+      github-pages-health-check (= 1.16.1)
+      jekyll (= 3.8.5)
+      jekyll-avatar (= 0.6.0)
+      jekyll-coffeescript (= 1.1.1)
+      jekyll-commonmark-ghpages (= 0.1.5)
+      jekyll-default-layout (= 0.1.4)
+      jekyll-feed (= 0.11.0)
+      jekyll-gist (= 1.5.0)
+      jekyll-github-metadata (= 2.12.1)
+      jekyll-mentions (= 1.4.1)
+      jekyll-optional-front-matter (= 0.3.0)
+      jekyll-paginate (= 1.1.0)
+      jekyll-readme-index (= 0.2.0)
+      jekyll-redirect-from (= 0.14.0)
+      jekyll-relative-links (= 0.6.0)
+      jekyll-remote-theme (= 0.3.1)
+      jekyll-sass-converter (= 1.5.2)
+      jekyll-seo-tag (= 2.5.0)
+      jekyll-sitemap (= 1.2.0)
+      jekyll-swiss (= 0.4.0)
+      jekyll-theme-architect (= 0.1.1)
+      jekyll-theme-cayman (= 0.1.1)
+      jekyll-theme-dinky (= 0.1.1)
+      jekyll-theme-hacker (= 0.1.1)
+      jekyll-theme-leap-day (= 0.1.1)
+      jekyll-theme-merlot (= 0.1.1)
+      jekyll-theme-midnight (= 0.1.1)
+      jekyll-theme-minimal (= 0.1.1)
+      jekyll-theme-modernist (= 0.1.1)
+      jekyll-theme-primer (= 0.5.3)
+      jekyll-theme-slate (= 0.1.1)
+      jekyll-theme-tactile (= 0.1.1)
+      jekyll-theme-time-machine (= 0.1.1)
+      jekyll-titles-from-headings (= 0.5.1)
+      jemoji (= 0.10.2)
+      kramdown (= 1.17.0)
+      liquid (= 4.0.0)
+      listen (= 3.1.5)
+      mercenary (~> 0.3)
+      minima (= 2.5.0)
+      nokogiri (>= 1.8.5, < 2.0)
+      rouge (= 2.2.1)
+      terminal-table (~> 1.4)
+    github-pages-health-check (1.16.1)
+      addressable (~> 2.3)
+      dnsruby (~> 1.60)
+      octokit (~> 4.0)
+      public_suffix (~> 3.0)
+      typhoeus (~> 1.3)
+    html-pipeline (2.12.0)
+      activesupport (>= 2)
+      nokogiri (>= 1.4)
     http_parser.rb (0.6.0)
     i18n (0.9.5)
       concurrent-ruby (~> 1.0)
@@ -27,14 +100,97 @@ GEM
       pathutil (~> 0.9)
       rouge (>= 1.7, < 4)
       safe_yaml (~> 1.0)
-    jekyll-multiple-languages-plugin (1.6.0)
+    jekyll-avatar (0.6.0)
-      jekyll (>= 2.0, < 4.0)
+      jekyll (~> 3.0)
+    jekyll-coffeescript (1.1.1)
+      coffee-script (~> 2.2)
+      coffee-script-source (~> 1.11.1)
+    jekyll-commonmark (1.3.1)
+      commonmarker (~> 0.14)
+      jekyll (>= 3.7, < 5.0)
+    jekyll-commonmark-ghpages (0.1.5)
+      commonmarker (~> 0.17.6)
+      jekyll-commonmark (~> 1)
+      rouge (~> 2)
+    jekyll-default-layout (0.1.4)
+      jekyll (~> 3.0)
+    jekyll-feed (0.11.0)
+      jekyll (~> 3.3)
+    jekyll-gist (1.5.0)
+      octokit (~> 4.2)
+    jekyll-github-metadata (2.12.1)
+      jekyll (~> 3.4)
+      octokit (~> 4.0, != 4.4.0)
+    jekyll-mentions (1.4.1)
+      html-pipeline (~> 2.3)
+      jekyll (~> 3.0)
+    jekyll-optional-front-matter (0.3.0)
+      jekyll (~> 3.0)
+    jekyll-paginate (1.1.0)
+    jekyll-readme-index (0.2.0)
+      jekyll (~> 3.0)
+    jekyll-redirect-from (0.14.0)
+      jekyll (~> 3.3)
+    jekyll-relative-links (0.6.0)
+      jekyll (~> 3.3)
+    jekyll-remote-theme (0.3.1)
+      jekyll (~> 3.5)
+      rubyzip (>= 1.2.1, < 3.0)
     jekyll-sass-converter (1.5.2)
       sass (~> 3.4)
+    jekyll-seo-tag (2.5.0)
+      jekyll (~> 3.3)
     jekyll-sitemap (1.2.0)
       jekyll (~> 3.3)
+    jekyll-swiss (0.4.0)
+    jekyll-theme-architect (0.1.1)
+      jekyll (~> 3.5)
+      jekyll-seo-tag (~> 2.0)
+    jekyll-theme-cayman (0.1.1)
+      jekyll (~> 3.5)
+      jekyll-seo-tag (~> 2.0)
+    jekyll-theme-dinky (0.1.1)
+      jekyll (~> 3.5)
+      jekyll-seo-tag (~> 2.0)
+    jekyll-theme-hacker (0.1.1)
+      jekyll (~> 3.5)
+      jekyll-seo-tag (~> 2.0)
+    jekyll-theme-leap-day (0.1.1)
+      jekyll (~> 3.5)
+      jekyll-seo-tag (~> 2.0)
+    jekyll-theme-merlot (0.1.1)
+      jekyll (~> 3.5)
+      jekyll-seo-tag (~> 2.0)
+    jekyll-theme-midnight (0.1.1)
+      jekyll (~> 3.5)
+      jekyll-seo-tag (~> 2.0)
+    jekyll-theme-minimal (0.1.1)
+      jekyll (~> 3.5)
+      jekyll-seo-tag (~> 2.0)
+    jekyll-theme-modernist (0.1.1)
+      jekyll (~> 3.5)
+      jekyll-seo-tag (~> 2.0)
+    jekyll-theme-primer (0.5.3)
+      jekyll (~> 3.5)
+      jekyll-github-metadata (~> 2.9)
+      jekyll-seo-tag (~> 2.0)
+    jekyll-theme-slate (0.1.1)
+      jekyll (~> 3.5)
+      jekyll-seo-tag (~> 2.0)
+    jekyll-theme-tactile (0.1.1)
+      jekyll (~> 3.5)
+      jekyll-seo-tag (~> 2.0)
+    jekyll-theme-time-machine (0.1.1)
+      jekyll (~> 3.5)
+      jekyll-seo-tag (~> 2.0)
+    jekyll-titles-from-headings (0.5.1)
+      jekyll (~> 3.3)
     jekyll-watch (2.2.1)
       listen (~> 3.0)
+    jemoji (0.10.2)
+      gemoji (~> 3.0)
+      html-pipeline (~> 2.2)
+      jekyll (~> 3.0)
     kramdown (1.17.0)
     liquid (4.0.0)
     listen (3.1.5)
@@ -42,6 +198,17 @@ GEM
       rb-inotify (~> 0.9, >= 0.9.7)
       ruby_dep (~> 1.2)
     mercenary (0.3.6)
+    mini_portile2 (2.4.0)
+    minima (2.5.0)
+      jekyll (~> 3.5)
+      jekyll-feed (~> 0.9)
+      jekyll-seo-tag (~> 2.1)
+    minitest (5.11.3)
+    multipart-post (2.1.1)
+    nokogiri (1.10.4)
+      mini_portile2 (~> 2.4.0)
+    octokit (4.14.0)
+      sawyer (~> 0.8.0, >= 0.5.3)
     pathutil (0.16.2)
       forwardable-extended (~> 2.6)
     public_suffix (3.1.1)
@@ -49,21 +216,33 @@ GEM
     rb-inotify (0.10.0)
       ffi (~> 1.0)
     rouge (2.2.1)
+    ruby-enum (0.7.2)
+      i18n
     ruby_dep (1.5.0)
+    rubyzip (1.2.3)
     safe_yaml (1.0.5)
     sass (3.7.4)
       sass-listen (~> 4.0.0)
     sass-listen (4.0.0)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
+    sawyer (0.8.2)
+      addressable (>= 2.3.5)
+      faraday (> 0.8, < 2.0)
+    terminal-table (1.8.0)
+      unicode-display_width (~> 1.1, >= 1.1.1)
+    thread_safe (0.3.6)
+    typhoeus (1.3.1)
+      ethon (>= 0.9.0)
+    tzinfo (1.2.5)
+      thread_safe (~> 0.1)
+    unicode-display_width (1.6.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  jekyll
+  github-pages
-  jekyll-multiple-languages-plugin
-  jekyll-sitemap
   tzinfo-data
 
 BUNDLED WITH

README.md

@@ -6,7 +6,7 @@ _Encryption Against Global Mass Surveillance._
 
 # Contributing
 
-It's important for a website like privacytools.io to be up-to-date. Keep an eye on software updates of the applications listed here. Follow recent news about providers that are recommended. We try our best to keep up but we're not perfect and the internet is changing fast. So if you find an error, or you think a provider should not be listed here, or a qualified service provider is missing or a browser plugin is not the best choice anymore or anything else...
+It's important for a website like PrivacyTools to be up-to-date. Keep an eye on software updates of the applications listed here. Follow recent news about providers that are recommended. We try our best to keep up but we're not perfect and the internet is changing fast. So if you find an error, or you think a provider should not be listed here, or a qualified service provider is missing or a browser plugin is not the best choice anymore or anything else...
 
 **Talk to us please.** Join our [subreddit](https://www.reddit.com/r/privacytoolsIO/) or [our Discourse community](https://forum.privacytools.io/) and start a discussion. This is a community project and we're aiming to deliver the best information available for a better privacy. Thank you for participating.
 

_config.yml

@@ -1,14 +1,13 @@
-title: Privacy Tools - Encryption Against Global Mass Surveillance
+title: PrivacyTools - Encryption Against Global Mass Surveillance
-description: You are being watched. Knowledge, encryption and privacy tools to protect you against global mass surveillance.
+name: PrivacyTools
+description: You are being watched. PrivacyTools provides knowledge, encryption, and software recommendations to protect you against global mass surveillance.
 url: "https://www.privacytools.io"
+production_url: "https://www.privacytools.io"
 sass:
   style: compressed
 plugins:
   - jekyll-sitemap
-  - jekyll-multiple-languages-plugin
-plugins_dir: "./_plugins"
 sitemap:
 file: "/sitemap.xml"
 include: [".well-known"]
-languages: ["en", "pl"]
 exclude: ["font", "vendor"]

_i18n/en.yml

@@ -1,367 +0,0 @@
-global:
-  further_reading: "Read also:"
-  new: "New"
-  home: "Home"
-  participate: "Participate"
-  language: "Language"
-  download: "Download"
-  related_information: "Related Information"
-  contrib: "This software may depend on or recommend non-free software."
-  theme: "Theme"
-aria:
-  nav_toggle: "Toggle navigation"
-service_descriptions:
-  services: "Services"
-  discourse: "Forum"
-  gitea: "Git-Repository Manager"
-  mastodon: "Social Network"
-  matrix: "Federated Chat"
-  privatebin: "Encrypted Pastebin"
-  searx: "Privacy Friendly Searx"
-  writefreely: "Federated Blog"
-  blog: "Blog"
-provider:
-  provider: "Provider"
-  us_uk: "Avoid US & UK services"
-  cloud_storage: "Cloud Storage"
-  dns: "DNS"
-  email: "Email"
-  hosting: "Hosting"
-  pastebins: "Pastebins"
-  search_engines: "Search Engines"
-  social_networks: "Social Networks"
-  news_aggregators: "Social News Aggregators"
-  vpn: "VPN"
-browser:
-  browser: "Browser"
-  fingerprint: "Fingerprinting Info"
-  privacy_addons: "Browser Add-ons"
-  tweaks: "Firefox Tweaks"
-  recommendations: "Recommendations"
-  webrtc_ip_leak: "WebRTC IP Leak"
-browser_addons:
-  improve_your_privacy: "Improve your privacy with these browser add-ons."
-  privacy_badger: "Privacy Badger"
-  privacy_badger_title: "Privacy Badger: Stop Tracking"
-  privacy_badger_description: "is a browser add-on that stops advertisers and other third-party trackers from secretly tracking where you go and what pages you look at on the web. Privacy Badger learns about trackers as you browse."
-  ublock_origin: "uBlock Origin"
-  ublock_origin_title: "uBlock Origin: Block Ads and Trackers"
-  ublock_origin_description: "is an efficient <a href=https://github.com/gorhill/uBlock/wiki/Blocking-mode>wide-spectrum blocker</a> that's easy on memory, and yet can load and enforce thousands more filters than other popular blockers out there. It has no monetization strategy and is completely open source."
-  cookie_autodelete: "Cookie AutoDelete"
-  cookie_autodelete_title: "Cookie AutoDelete: Automatically Delete Cookies"
-  cookie_autodelete_description: "automatically removes cookies when they are no longer used by open browser tabs. With the cookies, lingering sessions, as well as information used to spy on you, will be expunged."
-  https_everywhere: "HTTPS Everywhere"
-  https_everywhere_title: "HTTPS Everywhere: Secure Connections"
-  https_everywhere_description: "encrypts your communications with many major websites, making your browsing more secure. A collaboration between The Tor Project and the Electronic Frontier Foundation."
-  decentraleyes: "Decentraleyes"
-  decentraleyes_title: "Decentraleyes: Block Content Delivery Networks"
-  decentraleyes_description: "emulates Content Delivery Networks locally by intercepting requests, finding the required resource, and injecting it into the environment. This all happens instantaneously, automatically, and no prior configuration is required."
-  terms_of_service_didnt_read: "Terms of Service; Didn’t Read"
-  terms_of_service_didnt_read_title: "Terms of Service; Didn’t Read: Be Informed"
-  terms_of_service_didnt_read_description: "is an addon that aims to fix how \"I have read and agree to the Terms\" is the biggest lie on the web by grading websites based on their terms of service agreements and privacy policies. It also gives short summaries of those agreements. The analysis and ratings are done transparently by a community of reviewers."
-  snowflake: "Snowflake"
-  snowflake_title: "Snowflake"
-  snowflake_description: "is a new <a href=https://2019.www.torproject.org/docs/pluggable-transports.html.en>pluggable transport</a> from the Tor Project. If you have an uncensored connection, running this extension volunteers your connection to be used as a Snowflake proxy to help users unable to connect to the Tor network. Your IP will not be visible to the sites users visit using your proxy, as this extension will not make you an exit node. If your access to the Tor network is blocked, this extension will not assist you, and you should use the <a href=https://www.torproject.org>Tor Browser</a> instead."
-  umatrix: "uMatrix"
-  umatrix_title: "uMatrix: Stop Cross-Site Requests"
-  umatrix_description: "gives you control over the requests that websites make to other websites. Many websites integrate features which let other websites track you, such as Facebook Like Buttons or Google Analytics."
-  noScript_security_suite: "NoScript"
-  noScript_security_suite_title: "NoScript Security Suite: Be in total control"
-  noScript_security_suite_description: "is a highly customizable plugin to selectively allow JavaScript, Java, and Flash to run only on websites you trust. Not for casual users, it requires technical knowledge to configure."
-  for_power_users_only: "For Power Users Only"
-  addon_warning: "These addons require quite a lot of interaction from the user. Some sites will not work properly until you have configured the add-ons."
-  excellent_add_ons: "Recommended Browser Add-ons"
-software:
-  cal_card: "Calendar/Contacts Sync Tools"
-  software: "Software"
-  notebook: "Digital Notebook"
-  email_alt: "Email Alternatives"
-  email_clients: "Email Clients"
-  file_encryption: "File Encryption"
-  file_sharing: "File Sharing"
-  password_managers: "Password Manager"
-  productivity: "Productivity Tools"
-  rtc: "Real-Time Communication"
-  file_sync: "File Sync"
-  metadata_removal: "Metadata Removal Tools"
-  networks: "Self-contained Networks"
-  cloud: "Self-hosted Cloud Server"
-os:
-  os: "OS"
-  android_addons: "Android Privacy Add-ons"
-  windows_10: "Don't use Windows 10"
-  live_cd: "Live CD OS"
-  mobile: "Mobile OS"
-  pc_os: "PC OS"
-  router: "Router Firmware"
-android_addons:
-  description: "Improve your privacy with these add-ons for Android."
-  block_ads: "Block ads with"
-  control_traffic: "Control your traffic with"
-  tor: "Tor for Android with"
-  netguard: "provides simple and advanced ways to block certain apps' access to the internet without the help of root privileges. Applications and addresses can individually be allowed or denied access to your Wi-Fi and/or mobile connection, allowing you to control which apps are able to call home or not."
-  orbot: "is a free proxy app that empowers other apps to use the internet more securely. Orbot uses Tor to encrypt your Internet traffic and then hides it by bouncing through a series of computers around the world."
-  root_mode: "Root Mode:"
-  orbot_root: "Orbot can be configured to transparently proxy all of your Internet traffic through Tor. You can also choose which specific apps you want to use through Tor."
-windows_10:
-  header: "Don't use Windows 10 - It's a privacy nightmare"
-  warning: "Microsoft introduced a lot of new features in Windows 10 such as Cortana. However, most of them are violating your privacy."
-  alt: "Windows 10 Privacy"
-  data: "Data syncing is by default enabled."
-  data1: "Browsing history and open websites."
-  data2: "Apps settings."
-  data3: "WiFi hotspot names and passwords."
-  ad_id: "Your device is by default tagged with a unique advertising ID."
-  ad_id1: "Used to serve you with personalized advertisements by third-party advertisers and ad networks."
-  cortana: "Cortana can collect any of your data."
-  cortana1: "Your keystrokes, searches and mic input."
-  cortana2: "Calendar data."
-  cortana3: "Music you listen to."
-  cortana4: "Credit card information."
-  cortana5: "Purchases."
-  collection: "Microsoft can collect any personal data."
-  collection1: "Your identity."
-  collection2: "Passwords."
-  collection3: "Demographics."
-  collection4: "Interests and habits."
-  collection5: "Usage data."
-  collection6: "Contacts and relationships."
-  collection7: "Location data."
-  collection8: "Content like emails, instant messages, caller list, audio and video recordings."
-  sharing: "Your data can be shared."
-  sharing1: "When downloading Windows 10, you are authorizing Microsoft to share any of above-mentioned data with any third-party, with or without your consent."
-  tool: "This tool uses some known methods that attempt to disable major tracking features in Windows 10."
-header:
-  lead: "You are being watched. Private and state-sponsored organizations are monitoring and recording your online activities. privacytools.io provides services, tools and knowledge to protect your privacy against global mass surveillance."
-  search: "Try search.privacytools.io, a Privacy-Respecting Search Engine"
-  start_search: "start search"
-footer:
-  spread_the_word: "Spread the word and help your friends"
-  email_title: "Email"
-  facebook_title: "Facebook"
-  twitter_title: "Twitter"
-  mastodon_title: "Mastodon"
-  reddit_title: "reddit"
-  linkedin_title: "LinkedIn"
-  stumbleupon_title: "StumbleUpon"
-  diaspora_title: "Diaspora*"
-  copy_url_description: "Copy URL and Description"
-  for_easy_copy_paste: "For easy copy and paste. Share this text snippet."
-  CC0: "CC0"
-  CC0_title: "This work is free. You can redistribute it and/or modify it under the terms of the &quot;Creative Commons CC0 1.0 Universal Public Domain Dedication&quot;."
-  contact: "Contact"
-  donate: "Support Us!"
-  donate_title: "Please support this project by donating. We are ad free and not affiliated with any providers. Your donation will cover our cost for server and domain."
-  no_ads: "No Ads, No Google Analytics, No Affiliates, No Cross-Site Requests."
-  socially_motivated: "privacytools.io is a socially motivated website that provides information for protecting your data security and privacy. Never trust any company with your privacy, always encrypt."
-  privacy_policy: "View our privacy statement"
-  learn_more: "Learn More"
-  javascript: "JavaScript Licenses"
-resources:
-  tools: "Privacy Tools"
-  classic: "Prefer the classic site? View a single-page layout."
-  providers: "Providers"
-  providers_description: "Discover privacy-centric online services, including email providers, VPN operators, DNS administrators, and more!"
-  browsers: "Web Browsers"
-  browsers_description: "Find a web browser that respects your privacy, and discover how to harden your browser against tracking and leaks."
-  software: "Software"
-  software_description: "Discover a variety of open source software built to protect your privacy and keep your digital data secure."
-  os: "Operating Systems"
-  os_description: "Find out how your operating system is compromising your privacy, and what simple alternatives exist."
-  services: "privacytoolsIO Services"
-  services_description: "The privacytools.io team is proud to launch a variety of privacy-centric online services, including a Mastodon instance, search engine, and more!"
-  sponsors: "Sponsors"
-  donate: "Donate"
-  donate_description: "We can't operate this site without the generous contributions we receive from our viewers. If you love privacy and our website please consider donating."
-quotes:
-  header: "Privacy? I don't have anything to hide."
-  quotes: "Quotes"
-privacy_resources:
-  header: "More Privacy Resources"
-  guides: "Guides"
-  guide1: "Surveillance Self-Defense by EFF"
-  guide1_d: "Guide to defending yourself from surveillance by using secure technology and developing careful practices."
-  guide2: "The Crypto Paper"
-  guide2_d: "Privacy, Security and Anonymity for Every Internet User."
-  guide3: "Email Self-Defense by FSF"
-  guide3_d: "A guide to fighting surveillance with GnuPG encryption."
-  guide4: "The Ultimate Privacy Guide"
-  guide4_d: "Excellent privacy guide written by the creators of the bestVPN.com website."
-  guide5: "IVPN Privacy Guides"
-  guide5_d: "These privacy guides explain how to obtain vastly greater freedom, privacy and anonymity through compartmentalization and isolation."
-  guide6: "The Ultimate Guide to Online Privacy"
-  guide6_d: 'Comprehensive "Ninja Privacy Tips" and 150+ tools.'
-  info1: "r/privacytoolsIO Wiki"
-  info1_d: "Our Wiki on reddit.com."
-  info2: "Security Now!"
-  info2_d: "Weekly Internet Security Podcast by Steve Gibson and Leo Laporte."
-  info3: "TechSNAP"
-  info3_d: "Weekly Systems, Network, and Administration Podcast. Every week TechSNAP covers the stories that impact those of us in the tech industry."
-  info4: "Open Wireless Movement"
-  info4_d: "A coalition of Internet-freedom advocates, companies, organizations, and technologists working to develop new wireless technologies and to inspire a movement of Internet openness."
-  info5: "Freedom of the Press Foundation"
-  info5_d: "Supporting and defending journalism dedicated to transparency and accountability since 2012."
-  info6: "Erfahrungen.com"
-  info6_d: "German review aggregator website of privacy-related services."
-  info7: "Terms of Service; Didn't Read"
-  info7_d: '"I have read and agree to the Terms" is the biggest lie on the web. We aim to fix that.'
-  info8: "privacy.net"
-  info8_d: "What does the US government know about you?"
-  info9: "The Great Cloudwall"
-  info9_d: "Critique and information on why to avoid Cloudflare, a big company with a huge portion of the internet behind it."
-  tool1: "ipleak.net"
-  tool1_d: "IP/DNS Detect - What is your IP, what is your DNS, what informations you send to websites."
-  tool2: "The ultimate Online Privacy Test Resource List"
-  tool2_d: "A collection of Internet sites that check whether your web browser leaks information."
-  tool3: "PRISM Break"
-  tool3_d: "We all have a right to privacy, which you can exercise today by encrypting your communications and ending your reliance on proprietary services."
-  tool4: "Security in-a-Box"
-  tool4_d: "A guide to digital security for activists and human rights defenders throughout the world."
-  tool5: "SecureDrop"
-  tool5_d: "An open-source whistleblower submission system that media organizations can use to securely accept documents from and communicate with anonymous sources. It was originally created by the late Aaron Swartz and is currently managed by Freedom of the Press Foundation."
-  tool6: "Reset The Net - Privacy Pack"
-  tool6_d: "Help fight to end mass surveillance. Get these tools to protect yourself and your friends."
-  tool7: "Security First"
-  tool7_d: "Umbrella is an Android app that provides all the advice needed to operate safely in a hostile environment."
-  tool8: "Osalt"
-  tool8_d: "A directory to help you find open source alternatives to proprietary tools."
-  tool9: "AlternativeTo"
-  tool9_d: "A directory to help find alternatives to other software, with the option to only show open source software."
-  note: "Note: Just being open source does not make software secure!"
-participate:
-  participate: "Participate with suggestions and constructive criticism"
-  up_to_date: "It's important for a website like privacytools.io to stay up-to-date."
-  software_updates: "Keep an eye on software updates for the applications listed on our site."
-  follow_news: "Follow recent news about providers that we recommend."
-  keep_up: "We try our best to keep up, but we're not perfect and the internet is changing fast."
-  find_an_issue: "If you find an error, or you think a provider should not be listed here, or a qualified service provider is missing, or a browser plugin is not the best choice anymore, or anything else..."
-  talk_to_us: "Talk to us please."
-  find_us_on: "You can also find us on"
-  mastodon: "our own Mastodon instance"
-  or: "or on"
-  at: "at"
-  discourse: "Join our Discourse community to stay up to date on privacy news or make suggestions!"
-  follow: "Follow on"
-  mastodon_follow: "Get the latest privacy-related updates from our Mastodon Feed. Follow us today!"
-  github: "Develop on GitHub"
-  github_d: "The complete website source code is available on GitHub. Join our developer team!"
-  contributors: "Contributor List"
-  thanks: "This is a community project aiming to deliver the best information available to improve privacy online. Thank you for participating. This project needs you."
-sponsors:
-  sponsors_ptio: "Sponsors of privacytools.io"
-  community_proj: "The privacytools.io website and services are a community project. There is no advertising, affiliate links, or other forms of monetization."
-  donations_support: "Your donations here directly support hosting this website and compensating contributors to this project."
-  become_a_sponsor: "Become a Sponsor"
-  donate_directly: "Donate Directly"
-  why_sponsor: "Why sponsor privacytools.io?"
-  designed_to_allow: "This sponsorship program is designed to allow companies, organizations, and individuals partner with the privacytools.io team to support our vision of a more privacy-respecting internet and the greater online community."
-  recognize_privacy: "With this exposure and sponsorship, your customers will recognize your intrinsic understanding and commitment to user privacy. Moreover, you'll directly contribute to our mission of spreading privacy-respecting tools and knowledge worldwide!"
-  recognized_on_ptio: "As a sponsor of privacytools.io, your company will be widely recognized in a variety of ways, some of which we've detailed below."
-  general_info: "General Information"
-  stats_pageviews_featured: "This website receives well over 250,000 pageviews on a monthly basis and is highly ranked for privacy-related keywords. In addition to the benefits below your contribution will be featured on our OpenCollective page and we will thank you via social media for your contribution."
-  info_link: "Info"
-  bronze_sponsorship: "Bronze Sponsorship"
-  bronze_recognition: "Your name and link along with a small logo or avatar on the sponsors page of this website."
-  silver_sponsorship: "Silver Sponsorship"
-  silver_recognition: "Your medium-sized logo as a link at the top of our sponsors page."
-  gold_sponsorship: "Gold Sponsorship"
-  gold_recognition: "Your medium-sized logo as a link on the privacytools.io homepage and at the very top of our sponsors page."
-  we_will_not_provide: "We will not provide..."
-  details_for_not_provide: "We pride ourselves on our integrity and commitment to spreading unbiased and fact-based information regarding privacy and privacy-respecting tools. All tools we recommend throughout our website are subject to strict criteria as judged by our team and the community across our various platforms. Your sponsorship will not grant your organization any special consideration when choosing our recommendations throughout the website, a process which we make clear via our transparent ledger on OpenCollective and our public discussions on GitHub. Your sponsorship benefits are limited to those outlined above."
-  tax_and_financial_info: "Tax and Financial Information"
-  tax_and_financial_info_details: "Your contribution to privacytools.io will be handled by the Open Collective Foundation 501(c)(3). For US companies and taxpayers, this means your contribution is <strong>tax-deductible</strong>. As a non-profit, your sponsorship contribution will not be used for private profit and will only be used to cover expenses incurred by the project. All of our transactions (donations and expenses) are published transparently on OpenCollective. For the benefit of our readership, anonymous contributions will not be eligible for the sponsorship opportunities outlined above."
-  more_information: "More Information"
-  questions_to_email: "If you are interested and have further questions, you are welcome to reach out to us directly at"
-donate:
-  opencollective_card_title: "Donate via OpenCollective"
-  opencollective_card_text: "If you are able, please consider contributing to our development and outreach programs. <strong>Contributions via OpenCollective to privacytools.io are tax deductible for US taxpayers.</strong> These funds are transparently and primarily used to cover server costs."
-  opencollective_card_contribute: "Contribute"
-  opencollective_card_moreinfo: "More Info"
-  cta: "Please Donate"
-  ad_free: "Our website is free of advertisements and not affiliated with any listed providers."
-  costs: "Your donation will cover our costs for servers, domains, coffee, beer, and pizza."
-  bitcoin: "We prefer Bitcoin donations to be above $5 due to the state of the network's transaction fees."
-  bitcoin2: "You are welcome to donate any smaller or larger amount on any other cryptocurrency, such as Bitcoin Cash, Ethereum, or Stellar."
-  other_crypto_no_receipt: "You may also contribute via the cryptocurrencies below; however, we will not be able to provide a receipt for your contribution."
-  convert_opencollective: "Your contribution will be considered an anonymous, unrestricted contribution and paid to our Fiscal Host at OpenCollective when we convert to currency."
-  more: "More Cryptocurrencies"
-  the: "The"
-  team: "privacytools.io team"
-  endorse: "does not necessarily endorse all of the cryptocurrencies listed on this page. Please conduct your own research before purchasing any cryptocurrencies."
-  thanks: "Thanks for your support. You are awesome!"
-contact:
-  title: "Contact Us"
-  description: "Contact the privacytoolsIO team if you have any suggestions or are experiencing any issues."
-  editorial_team: "Editorial Team"
-  up_to_date: "It's very important to us to stay up-to-date on the latest changes in the privacy space."
-  reach_out: "If you have a software recommendation for us, or want to request a change on this website, please don't hesitate to reach out."
-  start_discussion: "Start a discussion in our Discourse Forum"
-  open_an_issue: "Open an issue or pull request on GitHub"
-  reddit_suggestion: "Suggest something new on Reddit"
-  transparency: "For complete transparency, software and providers will only be considered for this website after discussions take place on either of the above platforms."
-  on_matrix: "We're now on Matrix! Join us at"
-  on_matrix2: "to chat with us and other members about this site and privacy in general"
-  register_matrix: "If you need a Matrix account, you can sign up with our own homeserver"
-  using: "using"
-  or_matrix_client: "or any Matrix client!"
-  abuse1: "We take the operation of our various services very seriously."
-  abuse2: "Report only abuse here:"
-  searx_issues: "Searx Issues"
-  website_issues: "Website Issues"
-services:
-  title: "Services from privacytools.io"
-  description: "The privacytools.io team is proud to introduce a suite of privacy-centric online services to connect you with other privacy-minded individuals and stay safe and secure online. No advertisers, no Google Analytics, no tracking, no third-party requests of any kind."
-  we_have_the_following_services: "We currently have the following free-to-use services online now."
-  searx: "Searx - Privacy Friendly Search at search.privacytools.io"
-  mastodon: "Mastodon - Tracker Free Social Networking at social.privacytools.io"
-  matrix: "Matrix - Federated private chat at chat.privacytools.io"
-  discourse: "Discourse - Forum at forum.privacytools.io"
-  gitea: "Gitea - Git-Repository Manager at git.privacytools.io"
-  write_freely: "Write Freely - Federated minimalist blog at write.privacytools.io"
-  privatebin: "PrivateBin - Encrypted Pastebin at bin.privacytools.io"
-  more_services_on_the_way: "More services are on the way."
-  beneficial: "If there's something that would be super beneficial for us to run, don't hesitate to reach out and ask."
-  consider: "And of course, if you like our services, please consider"
-  donating: "donating to support our server costs"
-  helps: "any donation helps!"
-router:
-  firmware: "Open Source Router Firmware"
-  openwrt_descr: "OpenWrt is an operating system (in particular, an embedded operating system) based on the Linux kernel, primarily used on embedded devices to route network traffic. The main components are the Linux kernel, util-linux, uClibc and BusyBox. All components have been optimized for size, to be small enough for fitting into the limited storage and memory available in home routers."
-  pfsense_descr: "pfSense is an open source firewall/router computer software distribution based on FreeBSD. It is installed on a computer to make a dedicated firewall/router for a network and is noted for its reliability and offering features often only found in expensive commercial firewalls. pfSense is commonly deployed as a perimeter firewall, router, wireless access point, DHCP server, DNS server, and as a VPN endpoint."
-  librecmc_descr: "LibreCMC is a GNU/Linux-libre distribution for computers with minimal resources, such as the Ben Nanonote, ath9k-based Wi-Fi routers, and other hardware with emphasis on free software. The project's current goal is to aim for compliance with the GNU Free System Distribution Guidelines (GNU FSDG) and ensure that the project continues to meet these requirements set forth by the Free Software Foundation (FSF)."
-  worth_mentioning: "Worth Mentioning"
-  openbsd_descr: "A project that produces a free, multi-platform 4.4BSD-based UNIX-like operating system. Emphasizes portability, standardization, correctness, proactive security, and integrated cryptography."
-  ddwrt_descr: "A Linux-based open-source firmware compatible with several models of routers and access points."
-pc_os:
-  pc_operating_systems: "PC Operating Systems"
-  ms_warning: "If you are currently using a operating system like Windows 10, you should pick an alternative here."
-  qubesos_descr: "Qubes is an open-source operating system designed to provide strong security for desktop computing. Qubes is based on Xen, the X Window System, and Linux, and can run most Linux applications and utilize most of the Linux drivers."
-  debian_descr: "Debian is a Unix-like computer operating system and a Linux distribution that is composed entirely of free and open-source software, most of which is under the GNU General Public License, and packaged by a group of individuals known as the Debian project."
-  fedora_descr: "Fedora is a Linux distribution developed by the Fedora Project and sponsored by Red Hat. Fedora Workstation is a secure, reliable, and user-friendly edition developed for desktops and laptops, using GNOME as the default desktop environment."
-  warning: "Warning"
-  win10_nightmare: "Don't use Windows 10 - It's a privacy nightmare"
-  worth_mentioning: "Worth Mentioning"
-  openbsd_descr: "A project that produces a free, multi-platform 4.4BSD-based UNIX-like operating system. Emphasizes portability, standardization, correctness, proactive security, and integrated cryptography."
-  arch_descr: "A simple, lightweight Linux distribution. It is composed predominantly of free and open-source software, and supports community involvement."
-  trisquel_descr: "Derived from Ubuntu, this project aims for a fully free software system without proprietary software or firmware and uses Linux-libre, a version of the Linux kernel with the non-free code (binary blobs) removed."
-  parabola_descr: "is a completely open source version of Arch Linux."
-  whonix_descr: 'A Debian-based security-focused Linux distribution. It aims to provide privacy, security and anonymity on the internet. The operating system consists of two virtual machines, a "Workstation" and a Tor "Gateway". All communication are forced through the Tor network to accomplish this.'
-mobile_os:
-  mobile_operating_systems: "Mobile Operating Systems"
-  google_warning: "Even though the source code of the following OS is provided, installing Google Apps may compromise your setup."
-  lineageos_descr: "LineageOS is a free and open-source operating system for smartphones and tablets, based on the official releases of the Android Open Source Project. It is the continuation of the CyanogenMod project."
-  ubuntu_touch_descr: "Ubuntu Touch is a free and open-source operating system for smartphones and tablets. It's an alternative to the current popular mobile operating systems on the market. Only a few devices are <a href=https://devices.ubuntu-touch.io/>supported.</a>"
-  grapheneos_descr: "GrapheneOS (formerly known as CopperheadOS) is a free and open-source security- and privacy-focused mobile operating system built on top of the Android Open Source Project. It currently specifically targets devices offering strong hardware security."
-  worth_mentioning: "Worth Mentioning"
-  replicant_descr: "An open-source operating system based on Android, aiming to replace all proprietary components with free software."
-  omnirom_descr: "A free-software operating system for smartphones and tablet computers, based on the Android mobile platform."
-  microg_descr: "A project that aims to reimplement the proprietary Google Play Services in the Android operating system with a FLOSS replacement."
-  microg_lineage: "The microG project also maintains a fork of LineageOS with microG and F-Droid preinstalled at"
-live_os:
-  live_cd: "Live CD Operating Systems"
-  tails_descr: "Tails is a live operating system that starts on almost any computer from a DVD, USB stick, or SD card. It aims at preserving privacy and anonymity, and circumventing censorship by forcing Internet connections through the Tor network; leaving no trace on the computer; and using state-of-the-art cryptographic tools to encrypt files, emails, and instant messages."
-  knoppix_descr: "Knoppix is an operating system based on Debian designed to be run directly from a CD / DVD (Live CD) or a USB flash drive (Live USB), one of the first of its kind for any operating system. When starting a program, it is loaded from the removable medium and decompressed into a RAM drive. The decompression is transparent and on-the-fly."
-  puppy_linux_descr: "Puppy Linux operating system is a lightweight Linux distribution that focuses on ease of use and minimal memory footprint. The entire system can be run from RAM with current versions generally taking up about 210 MB, allowing the boot medium to be removed after the operating system has started."
-  worth_mentioning: "Worth Mentioning"
-  tiny_core_linux: "Tiny Core Linux"
-  tiny_core_linux_descr: "A minimal Linux operating system focusing on providing a base system using BusyBox and FLTK. The distribution is notable for its size (15 MB) and minimalism, with additional functionality provided by extensions."

_i18n/pl.yml

@@ -1,3 +0,0 @@
-header:
-  lead: "You are being watched. Private and state-sponsored organizations are monitoring and recording your online activities. privacytools.io provides services, tools and knowledge to protect your privacy against global mass surveillance."
-  search: "Try search.privacytools.io, a Privacy-Respecting Search Engine"

_includes/breadcrumbs.html

@@ -0,0 +1,22 @@
+<nav id="breadcrumb" aria-label="breadcrumb">
+  {% assign crumbs = page.url | remove:'/index.html' | split: '/' %}
+  <ol class="breadcrumb" itemscope itemtype="https://schema.org/BreadcrumbList">
+    <li class="breadcrumb-item">
+      <a href="/"><i class="fas fa-home" aria-hidden="true"></i> <span>Home</span></a>
+    </li>
+    {% for crumb in crumbs offset: 1 %}
+    {% if forloop.last %}
+    <li class="breadcrumb-item active" aria-current="page" itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem">
+      <link href="{% assign crumb_limit = forloop.index | plus: 1 %}{% for crumb in crumbs limit: crumb_limit %}{{ crumb | append: '/' | replace:'without-plugin/','without-plugins/' }}{% endfor %}" itemprop="item"  />
+      <span itemprop="name">{{ crumb | replace:'-',' ' | remove:'.html' | capitalize }}</span>
+      <meta itemprop="position" content="{{ forloop.index }}" />
+    </li>
+    {% else %}
+    <li class="breadcrumb-item" itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem">
+      <a href="{% assign crumb_limit = forloop.index | plus: 1 %}{% for crumb in crumbs limit: crumb_limit %}{{ crumb | append: '/' | replace:'without-plugin/','without-plugins/' }}{% endfor %}" itemprop="item"><span itemprop="name">{{ crumb | replace:'-',' ' | remove:'.html' | capitalize }}</span></a>
+      <meta itemprop="position" content="{{ forloop.index }}" />
+    </li>
+    {% endif %}
+    {% endfor %}
+  </ol>
+</nav>

_includes/cardv2.html

@@ -61,33 +61,43 @@
       {% endif %}
     </p>
     <div class="d-flex justify-content-between flex-column flex-md-row align-items-start align-items-md-center">
-      <div class="flex-shrink-0 mr-2">
+      <div class="d-flex flex-shrink-0 mr-1">
         <a
           href="{{include.website}}"
-          class="btn btn-primary mt-1">
+          rel="noopener"
+          class="btn btn-primary mt-1 mr-1">
           <i class="fas fa-external-link-alt fa-fw"></i>
           Website
         </a>
         {% if include.forum %}
           <a
             href="{{include.forum}}"
-            class="btn btn-success mt-1">
+            rel="noopener"
+            class="btn btn-success mt-1 mr-1">
             <i class="fab fa-discourse fa-fw"></i>
             Forum
           </a>
         {% endif %}
         {% if include.tor %}
           <a
+            href="{{include.tor}}"
+            rel="noopener"
+            class="hover-text-decoration-none mt-1 mr-1"
             data-toggle="tooltip"
             data-placement="bottom"
-            data-original-title="Requires specific software to access: torproject.org"
+            data-original-title="Requires specific software to access: torproject.org">
-            href="{{include.tor}}">
+            <span class="ptio-tor btn-tor btn-icon"></span>
-            <img
+          </a>
-              class="mt-2"
+        {% endif %}
-              alt="Tor"
+        {% if include.i2p %}
-              src="/assets/img/layout/tor.png"
+          <a
-              width="35"
+            href="{{include.i2p}}"
-              height="35">
+            rel="noopener"
+            class="hover-text-decoration-none mt-1 mr-1"
+            data-toggle="tooltip"
+            data-placement="bottom"
+            data-original-title="Requires specific software to access: geti2p.net">
+            <span class="ptio-i2p-garlic btn-secondary btn-icon"></span>
           </a>
         {% endif %}
       </div>
@@ -95,7 +105,7 @@
       <div class="mt-2">
           {% if include.windows %}
             {% if include.windows != "" %}
-              <a href="{{ include.windows }}" class="text-decoration-none hover-text-decoration-none">
+              <a href="{{ include.windows }}" rel="noopener" class="text-decoration-none hover-text-decoration-none">
                 <i class="fab fa-windows fa-2x fa-fw d-inline pr-1"></i>
               </a>
             {% else %}
@@ -105,7 +115,7 @@
 
           {% if include.mac %}
             {% if include.mac != "" %}
-              <a href="{{ include.mac }}" class="text-decoration-none hover-text-decoration-none">
+              <a href="{{ include.mac }}" rel="noopener" class="text-decoration-none hover-text-decoration-none">
                 <i class="ptio-macos fa-2x fa-fw d-inline pr-1"></i>
               </a>
             {% else %}
@@ -115,7 +125,7 @@
 
           {% if include.linux %}
             {% if include.linux != "" %}
-              <a href="{{ include.linux }}" class="text-decoration-none hover-text-decoration-none">
+              <a href="{{ include.linux }}" rel="noopener" class="text-decoration-none hover-text-decoration-none">
                 <i class="ptio-linux fa-2x fa-fw d-inline pr-1"></i>
               </a>
             {% else %}
@@ -125,7 +135,7 @@
 
           {% if include.freebsd %}
             {% if include.freebsd != "" %}
-              <a href="{{ include.freebsd }}" class="text-decoration-none hover-text-decoration-none">
+              <a href="{{ include.freebsd }}" rel="noopener" class="text-decoration-none hover-text-decoration-none">
                 <i class="fab fa-freebsd fa-2x fa-fw d-inline pr-1"></i>
               </a>
             {% else %}
@@ -135,7 +145,7 @@
 
           {% if include.openbsd %}
             {% if include.openbsd != "" %}
-              <a href="{{ include.openbsd }}" class="text-decoration-none hover-text-decoration-none">
+              <a href="{{ include.openbsd }}" rel="noopener" class="text-decoration-none hover-text-decoration-none">
                 <i class="ptio-openbsd fa-2x fa-fw d-inline pr-1"></i>
               </a>
             {% else %}
@@ -145,7 +155,7 @@
 
           {% if include.netbsd %}
             {% if include.netbsd != "" %}
-              <a href="{{ include.netbsd }}" class="text-decoration-none hover-text-decoration-none">
+              <a href="{{ include.netbsd }}" rel="noopener" class="text-decoration-none hover-text-decoration-none">
                 <i class="ptio-netbsd fa-2x fa-fw d-inline pr-1"></i>
               </a>
             {% else %}
@@ -155,7 +165,7 @@
 
           {% if include.firefox %}
             {% if include.firefox != "" %}
-              <a href="{{ include.firefox }}" class="text-decoration-none hover-text-decoration-none">
+              <a href="{{ include.firefox }}" rel="noopener" class="text-decoration-none hover-text-decoration-none">
                 <i class="fab fa-firefox fa-2x fa-fw d-inline pr-1"></i>
               </a>
             {% else %}
@@ -165,7 +175,7 @@
 
           {% if include.chrome %}
             {% if include.chrome != "" %}
-              <a href="{{ include.chrome }}" class="text-decoration-none hover-text-decoration-none">
+              <a href="{{ include.chrome }}" rel="noopener" class="text-decoration-none hover-text-decoration-none">
                 <i class="fab fa-chrome fa-2x fa-fw d-inline pr-1"></i>
               </a>
             {% else %}
@@ -175,7 +185,7 @@
 
           {% if include.safari %}
             {% if include.safari != "" %}
-              <a href="{{ include.safari }}" class="text-decoration-none hover-text-decoration-none">
+              <a href="{{ include.safari }}" rel="noopener" class="text-decoration-none hover-text-decoration-none">
                 <i class="fab fa-safari fa-2x fa-fw d-inline pr-1"></i>
               </a>
             {% else %}
@@ -185,7 +195,7 @@
 
           {% if include.opera %}
             {% if include.opera != "" %}
-              <a href="{{ include.opera }}" class="text-decoration-none hover-text-decoration-none">
+              <a href="{{ include.opera }}" rel="noopener" class="text-decoration-none hover-text-decoration-none">
                 <i class="fab fa-opera fa-2x fa-fw d-inline pr-1"></i>
               </a>
             {% else %}
@@ -195,7 +205,7 @@
 
           {% if include.edge %}
             {% if include.edge != "" %}
-              <a href="{{ include.edge }}" class="text-decoration-none hover-text-decoration-none">
+              <a href="{{ include.edge }}" rel="noopener" class="text-decoration-none hover-text-decoration-none">
                 <i class="fab fa-edge fa-2x fa-fw d-inline pr-1"></i>
               </a>
             {% else %}
@@ -205,7 +215,7 @@
 
           {% if include.fdroid %}
             {% if include.fdroid != "" %}
-              <a href="{{ include.fdroid }}" class="text-decoration-none hover-text-decoration-none">
+              <a href="{{ include.fdroid }}" rel="noopener" class="text-decoration-none hover-text-decoration-none">
                 <i class="ptio-f-droid fa-2x fa-fw d-inline pr-1"></i>
               </a>
             {% else %}
@@ -215,7 +225,7 @@
 
           {% if include.googleplay %}
             {% if include.googleplay != "" %}
-              <a href="{{ include.googleplay }}" class="text-decoration-none hover-text-decoration-none">
+              <a href="{{ include.googleplay }}" rel="noopener" class="text-decoration-none hover-text-decoration-none">
                 <i class="fab fa-google-play fa-2x fa-fw d-inline pr-1"></i>
               </a>
             {% else %}
@@ -225,7 +235,7 @@
 
           {% if include.android %}
             {% if include.android != "" %}
-              <a href="{{ include.android }}" class="text-decoration-none hover-text-decoration-none">
+              <a href="{{ include.android }}" rel="noopener" class="text-decoration-none hover-text-decoration-none">
                 <i class="fab fa-android fa-2x fa-fw d-inline pr-1"></i>
               </a>
             {% else %}
@@ -235,7 +245,7 @@
 
           {% if include.ios %}
             {% if include.ios != "" %}
-              <a href="{{ include.ios }}" class="text-decoration-none hover-text-decoration-none">
+              <a href="{{ include.ios }}" rel="noopener" class="text-decoration-none hover-text-decoration-none">
                 <i class="ptio-ios fa-2x fa-fw d-inline pr-1"></i>
               </a>
             {% else %}
@@ -245,7 +255,7 @@
 
           {% if include.sailfish %}
             {% if include.sailfish != "" %}
-              <a href="{{ include.sailfish }}" class="text-decoration-none hover-text-decoration-none">
+              <a href="{{ include.sailfish }}" rel="noopener" class="text-decoration-none hover-text-decoration-none">
                 <i class="ptio-sailfish-os fa-2x fa-fw d-inline pr-1"></i>
               </a>
             {% else %}
@@ -255,7 +265,7 @@
 
           {% if include.web %}
             {% if include.web != "" %}
-              <a href="{{ include.web }}" class="text-decoration-none hover-text-decoration-none">
+              <a href="{{ include.web }}" rel="noopener" class="text-decoration-none hover-text-decoration-none">
                 <i class="fas fa-globe-americas fa-2x fa-fw d-inline pr-1"></i>
               </a>
             {% else %}
@@ -268,25 +278,25 @@
           {{include.icon3}}
 
           {% if include.github %}
-            <a href="{{include.github}}" class="text-decoration-none hover-text-decoration-none">
+            <a href="{{include.github}}" rel="noopener" class="text-decoration-none hover-text-decoration-none">
               <i class="fab fa-github fa-2x fa-fw d-inline"></i>
             </a>
           {% endif %}
 
           {% if include.gitlab %}
-            <a href="{{include.gitlab}}" class="text-decoration-none hover-text-decoration-none">
+            <a href="{{include.gitlab}}" rel="noopener" class="text-decoration-none hover-text-decoration-none">
               <i class="fab fa-gitlab fa-2x fa-fw d-inline"></i>
             </a>
           {% endif %}
 
           {% if include.git %}
-            <a href="{{include.git}}" class="text-decoration-none hover-text-decoration-none">
+            <a href="{{include.git}}" rel="noopener" class="text-decoration-none hover-text-decoration-none">
               <i class="fab fa-git-square fa-2x fa-fw d-inline"></i>
             </a>
           {% endif %}
 
           {% if include.source %}
-            <a href="{{include.source}}" class="text-decoration-none hover-text-decoration-none">
+            <a href="{{include.source}}" rel="noopener" class="text-decoration-none hover-text-decoration-none">
               <i class="fas fa-code-branch fa-2x fa-fw d-inline"></i>
             </a>
           {% endif %}

_includes/footer.html

@@ -2,83 +2,83 @@
 
   <hr class="footer-divider" />
 
-  <h3 id="participate">{% t footer.spread_the_word %}</h3>
+  <h3 id="participate">Spread the word and help your friends</h3>
 
   <div class="row mb-4">
     <div class="col-12 col-md-6 d-flex justify-content-between">
-      <a href="mailto:?subject=privacytools.io%20-%20encryption%20against%20global%20mass%20surveillance&body=https://www.privacytools.io/" class="share-btn email" title="{% t footer.email_title %}">
+      <a href="mailto:?subject=privacytools.io%20-%20encryption%20against%20global%20mass%20surveillance&body={{ site.production_url }}/" class="share-btn email" title="Email">
         <i class="fas fa-envelope pl-3"></i>
       </a>
 
-      <a href="https://www.facebook.com/sharer/sharer.php?u=https://www.privacytools.io" class="share-btn facebook" title="{% t footer.facebook_title %}">
+      <a href="https://www.facebook.com/sharer/sharer.php?u={{ site.production_url }}" class="share-btn facebook" title="Facebook">
         <i class="fab fa-facebook-f pl-3"></i>
       </a>
 
-      <a href="https://twitter.com/share?text=Knowledge%20and%20tools%20to%20protect%20your%20privacy%20against%20global%20mass%20surveillance%20&amp;url=https://www.privacytools.io/&amp;via=privacytoolsIO" class="share-btn twitter" title="{% t footer.twitter_title %}">
+      <a href="https://twitter.com/share?text=Knowledge%20and%20tools%20to%20protect%20your%20privacy%20against%20global%20mass%20surveillance%20&amp;url={{ site.production_url }}/&amp;via=privacytoolsIO" class="share-btn twitter" title="Twitter">
         <i class="fab fa-twitter pl-3"></i>
       </a>
 
-      <a href="https://sharetomastodon.github.io/?title=privacytools.io%20-%20encryption%20against%20global%20mass%20surveillance&url=https://www.privacytools.io" class="share-btn mastodon" title="{% t footer.mastodon_title %}">
+      <a href="https://sharetomastodon.github.io/?title=privacytools.io%20-%20encryption%20against%20global%20mass%20surveillance&url={{ site.production_url }}" class="share-btn mastodon" title="Mastodon">
         <i class="fab fa-mastodon pl-3"></i>
       </a>
     </div>
     <div class="col-12 col-md-6 d-flex justify-content-between">
-      <a href="https://reddit.com/submit?url=https://www.privacytools.io&title=privacytools.io%20-%20encryption%20against%20global%20mass%20surveillance" class="share-btn reddit" title="{% t footer.mastodon_title %}">
+      <a href="https://reddit.com/submit?url={{ site.production_url }}&title=privacytools.io%20-%20encryption%20against%20global%20mass%20surveillance" class="share-btn reddit" title="reddit">
         <i class="fab fa-reddit-alien pl-3"></i>
       </a>
 
-      <a href="https://www.linkedin.com/shareArticle?url=https://www.privacytools.io&title=privacytools.io%20-%20encryption%20against%20global%20mass%20surveillance" class="share-btn linkedin" title="{% t footer.linkedin_title %}">
+      <a href="https://www.linkedin.com/shareArticle?url={{ site.production_url }}&title=privacytools.io%20-%20encryption%20against%20global%20mass%20surveillance" class="share-btn linkedin" title="LinkedIn">
         <i class="fab fa-linkedin-in pl-3"></i>
       </a>
 
-      <a href="https://mix.com/mixit?su=submit&url=https://www.privacytools.io&title=privacytools.io%20-%20encryption%20against%20global%20mass%20surveillance" class="share-btn mix" title="Mix">
+      <a href="https://mix.com/mixit?su=submit&url={{ site.production_url }}&title=privacytools.io%20-%20encryption%20against%20global%20mass%20surveillance" class="share-btn mix" title="Mix">
         <i class="ptio-mix pl-3"></i>
       </a>
 
-      <a href="https://sharetodiaspora.github.io/?title=privacytools.io%20-%20encryption%20against%20global%20mass%20surveillance&url=https://www.privacytools.io" class="share-btn diaspora" title="{% t footer.diaspora_title %}">
+      <a href="https://sharetodiaspora.github.io/?title=privacytools.io%20-%20encryption%20against%20global%20mass%20surveillance&url={{ site.production_url }}" class="share-btn diaspora" title="Diaspora*">
         <i class="fas fa-asterisk pl-3"></i>
       </a>
     </div>
   </div>
 
-  <h3>{% t footer.copy_url_description %}</h3>
+  <h3>Copy URL and Description</h3>
 
   <p>
-  <input type="text" value="privacytools.io - encryption against global mass surveillance" class="form-control input-lg onclick-select">
+  <input type="text" value="PrivacyTools - Encryption and tools to protect against global mass surveillance - {{ site.production_url }}" class="form-control input-lg onclick-select">
-  <span class="help-block">{% t footer.for_easy_copy_paste %}</span>
+  <span class="help-block">For easy copy and paste. Share this text snippet.</span>
   </p>
 
   <hr class="footer-divider" />
 
   <div class="row mt-3">
     <div class="col-sm-4 mb-3 d-flex justify-content-center d-flex justify-content-center">
-      <a href="/LICENSE.txt" data-toggle="tooltip" data-placement="top" data-original-title="{% t footer.CC0_title %}"><img alt="{% t footer.CC0 %}" src="/assets/img/layout/zero.png" width="32" height="32">CC0</a>
+      <a href="/LICENSE.txt" data-toggle="tooltip" data-placement="top" data-original-title="This work is free. You can redistribute it and/or modify it under the terms of the &quot;Creative Commons CC0 1.0 Universal Public Domain Dedication&quot;."><img alt="CC0" src="/assets/img/layout/zero.png" width="32" height="32">CC0</a>
     </div>
 
     <div class="col-sm-4 mb-3 d-flex justify-content-center">
-      <i class="far fa-envelope fa-2x"></i>
+      <i class="far fa-address-card fa-2x"></i>
-      <a href="/contact/">{% t footer.contact %}</a>
+      <a href="/about/">About Us &amp; Contact</a>
     </div>
 
     <div class="col-sm-4 mb-3 d-flex justify-content-center">
       <i class="fas fa-donate fa-2x"></i>
-      <a data-toggle="tooltip" data-placement="top" data-original-title="{% t footer.donate_title %}" href="https://opencollective.com/privacytoolsio#section-contribute">{% t footer.donate %}</a>
+      <a href="/donate/" data-toggle="tooltip" data-placement="top" data-original-title="Please support this project by donating. We are ad-free and not affiliated with any providers. Your donation will cover our costs for servers and domains.">Support Us!</a>
     </div>
   </div>
 
   <div class="copyright-text">
     <a href="/about/javascript" data-jslicense="1">
       <span class="fab fa-js fa-lg"></span>
-      {% t footer.javascript %}
+      JavaScript Licenses
     </a>
     <p class="mt-2">
-      <strong>{% t footer.no_ads %}</strong>
+      <strong>No Ads, No Google Analytics, No Affiliates, No Cross-Site Requests.</strong>
-      <em>{% t footer.socially_motivated %}</em>
+      <em>PrivacyTools is a socially motivated website that provides information for protecting your data security and privacy. Never trust any company with your privacy, always encrypt.</em>
-      <a href="/privacy/">{% t footer.privacy_policy %}</a>.
+      <a href="/privacy/">View our privacy statement</a>.
     </p>
     <p class="text-left">
       Tor v3: <strong>privacy2zbidut4m4jyj3ksdqidzkw3uoip2vhvhbvwxbqux5xy5obyd.onion</strong>
-      (<a href="https://write.privacytools.io/jonah/tor-on-privacytools-io">{% t footer.learn_more %}</a>)
+      (<a href="https://write.privacytools.io/jonah/tor-on-privacytools-io">Learn More</a>)
     </p>
 
   </div>

_includes/head.html

@@ -9,21 +9,47 @@
   <meta name="msapplication-TileImage" content="/assets/img/favicons/mstile-144x144.png">
   <meta name="msapplication-config" content="/assets/img/favicons/browserconfig.xml">
   <meta name="theme-color" content="#ffffff">
+  <link rel="canonical" href="{{ site.production_url }}{{ page.url | replace:'index.html',''}}">
 
   <!-- title -->
   {% if page.title %}
-  <title>{{ page.title | flatify }} | privacytools.io</title>
+  <title>{{ page.title }} | {{ site.name }}</title>
-  <meta property="og:title" content="{{ page.title | flatify }} | privacytools.io" />
+  <meta property="og:title" content="{{ page.title }} | {{ site.name }}" />
   {% else %}
   <title>{{ site.title }}</title>
   <meta property="og:title" content="{{ site.title }}" />
   {% endif %}
   <meta property="og:type" content="website" />
   <meta property="og:url" content="{{ page.permalink | prepend: site.url }}" />
-  <meta property="og:image" content="https://www.privacytools.io/assets/img/layout/ogimage.jpg" />
+  <meta property="og:image" content="{{ site.production_url }}/assets/img/layout/ogimage.jpg" />
-  <meta property="og:description" content="{% if page.description %}{{ page.description | flatify }}{% else %}{{ site.description }}{% endif %}"/>
+  <meta property="og:description" content="{% if page.description %}{{ page.description }}{% else %}{{ site.description }}{% endif %}"/>
   <meta property="og:locale" content="en_GB" />
-  <meta property="og:site_name" content="privacytools.io" />
+  <meta property="og:site_name" content="{{ site.name }}" />
+
+  {% if page.url == "/" or page.url == "/about/" %}
+  <script type="application/ld+json">
+  {
+    "@context": "https://schema.org",
+    "@type": "Organization",
+    "name": "{{ site.name }}",
+    "description": "{{ site.description }}",
+    "alternateName": [
+      "privacytools.io",
+      "Privacy Tools",
+      "privacytoolsIO"
+    ],
+    "url": "{{ site.production_url }}",
+    "logo": "{{ site.production_url }}/assets/img/layout/shield.png",
+    "sameAs": [
+      "https://blog.privacytools.io",
+      "https://twitter.com/privacytoolsIO",
+      "https://social.privacytools.io/@privacytools",
+      "https://www.youtube.com/channel/UCen3taxHtzByXV8Da73B1Vg",
+      "https://github.com/privacytoolsIO"
+    ]
+  }
+  </script>
+  {% endif %}
 
   <!-- icons -->
   <link rel="apple-touch-icon" sizes="57x57" href="/assets/img/favicons/apple-touch-icon-57x57.png">
@@ -43,6 +69,6 @@
   <link rel="shortcut icon" href="/assets/img/favicons/favicon.ico">
 
   <!-- CSS stylesheets -->
-  <link href="/assets/css/style.css?v=8" rel="stylesheet">
+  <link href="/assets/css/style.css?v=9" rel="stylesheet">
   <link id="dark-css" href="/assets/css/dark.css?v=4" rel="stylesheet" media="(prefers-color-scheme: dark)">
 </head>

_includes/nav.html

@@ -1,14 +1,14 @@
-<div class="fixed-top bg-dark">
+<nav class="fixed-top bg-dark">
-  <nav id="navbar">
+  <div id="navbar" class="d-flex flex-wrap justify-content-between align-items-center">
-
+    <div class="w-50">
+      <a id="nav-home-mobile" class="nav-anchor" href="/index.html">
+        <img src="/assets/img/layout/logo_smaller.png" width="150px" />
+      </a>
+    </div>
     <input type="checkbox" id="nav-toggle" checked />
     <label for="nav-toggle" id="nav-toggle-label" class="fas fa-bars fa-lg"></label>
-    <a id="nav-home-mobile" class="nav-anchor" href="/index.html">
-      <img src="/assets/img/layout/logo_smaller.png" width="148px" height="22px" />
-    </a>
-
-    <div class="menu">
 
+    <div class="menu w-100">
       <div id="nav-left" class="position-relative flex-col">
         <a class="nav-anchor" href="/index.html">
           <span id="nav-home" class="fas fa-home fa-fw"></span>
@@ -18,21 +18,21 @@
         <details class="nav-details">
           <summary>
             <span class="nav-summary">
-              {% t provider.provider %}
+              Provider
               <span class="dropdown-toggle"></span>
             </span>
           </summary>
           <span class="nav-dropdown">
-            <a class="dropdown-item" href="/providers/#ukusa"><span class="fas fa-user-secret fa-fw"></span> {% t provider.us_uk %}</a>
+            <a class="dropdown-item" href="/providers/#ukusa"><span class="fas fa-user-secret fa-fw"></span> Avoid US & UK services</a>
-            <a class="dropdown-item" href="/providers/cloud-storage/"><span class="fas fa-cloud fa-fw"></span> {% t provider.cloud_storage %}</a>
+            <a class="dropdown-item" href="/providers/cloud-storage/"><span class="fas fa-cloud fa-fw"></span> Cloud Storage</a>
-            <a class="dropdown-item" href="/providers/dns/"><span class="fa fa-tasks fa-fw"></span> {% t provider.dns %}</a>
+            <a class="dropdown-item" href="/providers/dns/"><span class="fa fa-tasks fa-fw"></span> DNS</a>
-            <a class="dropdown-item" href="/providers/email/"><span class="fas fa-mail-bulk fa-fw"></span> {% t provider.email %}</a>
+            <a class="dropdown-item" href="/providers/email/"><span class="fas fa-mail-bulk fa-fw"></span> Email</a>
-            <a class="dropdown-item" href="/providers/hosting/"><span class="fas fa-database fa-fw"></span> {% t provider.hosting %}</a>
+            <a class="dropdown-item" href="/providers/hosting/"><span class="fas fa-database fa-fw"></span> Hosting</a>
-            <a class="dropdown-item" href="/providers/paste/"><span class="fas fa-paste fa-fw"></span> {% t provider.pastebins %}</a>
+            <a class="dropdown-item" href="/providers/paste/"><span class="fas fa-paste fa-fw"></span> Pastebins</a>
-            <a class="dropdown-item" href="/providers/search-engines/"><span class="fas fa-search fa-fw"></span> {% t provider.search_engines %}</a>
+            <a class="dropdown-item" href="/providers/search-engines/"><span class="fas fa-search fa-fw"></span> Search Engines</a>
-            <a class="dropdown-item" href="/providers/social-networks/"><span class="fas fa-expand-arrows-alt fa-fw"></span> {% t provider.social_networks %}</a>
+            <a class="dropdown-item" href="/providers/social-networks/"><span class="fas fa-expand-arrows-alt fa-fw"></span> Social Networks</a>
-            <a class="dropdown-item" href="/providers/social-news-aggregator/"><span class="far fa-newspaper fa-fw"></span> {% t provider.news_aggregators %}</a>
+            <a class="dropdown-item" href="/providers/social-news-aggregator/"><span class="far fa-newspaper fa-fw"></span> Social News Aggregators</a>
-            <a class="dropdown-item" href="/providers/vpn/"><span class="far fa-eye-slash fa-fw"></span> {% t provider.vpn %}</a>
+            <a class="dropdown-item" href="/providers/vpn/"><span class="far fa-eye-slash fa-fw"></span> VPN</a>
           </span>
         </details>
 
@@ -40,16 +40,16 @@
         <details class="nav-details">
           <summary>
             <span class="nav-summary">
-              {% t browser.browser %}
+              Browser
               <span class="dropdown-toggle"></span>
             </span>
           </summary>
           <span class="nav-dropdown">
-            <a class="dropdown-item" href="/browsers/#browser"><span class="fas fa-check fa-fw"></span> {% t browser.recommendations %}</a>
+            <a class="dropdown-item" href="/browsers/#browser"><span class="fas fa-check fa-fw"></span> Recommendation</a>
-            <a class="dropdown-item" href="/browsers/#fingerprint"><span class="fas fa-fingerprint fa-fw"></span> {% t browser.fingerprint %}</a>
+            <a class="dropdown-item" href="/browsers/#fingerprint"><span class="fas fa-fingerprint fa-fw"></span> Fingerprinting Info</a>
-            <a class="dropdown-item" href="/browsers/#webrtc"><span class="far fa-eye fa-fw"></span> {% t browser.webrtc_ip_leak %}</a>
+            <a class="dropdown-item" href="/browsers/#webrtc"><span class="far fa-eye fa-fw"></span> WebRTC IP Leak</a>
-            <a class="dropdown-item" href="/browsers/#addons"><span class="far fa-list-alt fa-fw"></span> {% t browser.privacy_addons %}</a>
+            <a class="dropdown-item" href="/browsers/#addons"><span class="far fa-list-alt fa-fw"></span> Browser Add-ons</a>
-            <a class="dropdown-item" href="/browsers/#about_config"><span class="fas fa-wrench fa-fw"></span> {% t browser.tweaks %}</a>
+            <a class="dropdown-item" href="/browsers/#about_config"><span class="fas fa-wrench fa-fw"></span> Firefox Tweaks</a>
           </span>
         </details>
 
@@ -57,24 +57,24 @@
         <details class="nav-details">
           <summary>
             <span class="nav-summary">
-              {% t software.software %}
+              Software
               <span class="dropdown-toggle"></span>
             </span>
           </summary>
           <span class="nav-dropdown">
-            <a class="dropdown-item" href="/software/calendar-contacts/"><span class="fas fa-calendar fa-fw"></span> {% t software.cal_card %}</a>
+            <a class="dropdown-item" href="/software/calendar-contacts/"><span class="fas fa-calendar fa-fw"></span> Calendar/Contacts Sync Tools</a>
-            <a class="dropdown-item" href="/software/notebooks/"><span class="far fa-sticky-note fa-fw"></span> {% t software.notebook %}</a>
+            <a class="dropdown-item" href="/software/notebooks/"><span class="far fa-sticky-note fa-fw"></span> Digital Notebook</a>
-            <a class="dropdown-item" href="/software/email/#messaging"><span class="fas fa-random fa-fw"></span> {% t software.email_alt %}</a>
+            <a class="dropdown-item" href="/software/email/#messaging"><span class="fas fa-random fa-fw"></span> Email Alternatives</a>
-            <a class="dropdown-item" href="/software/email/"><span class="fas fa-envelope fa-fw"></span> {% t software.email_clients %}</a>
+            <a class="dropdown-item" href="/software/email/"><span class="fas fa-envelope fa-fw"></span> Email Clients</a>
-            <a class="dropdown-item" href="/software/encryption-tools/"><span class="fas fa-lock fa-fw"></span> {% t software.file_encryption %}</a>
+            <a class="dropdown-item" href="/software/encryption-tools/"><span class="fas fa-lock fa-fw"></span> File Encryption</a>
-            <a class="dropdown-item" href="/software/file-sharing/"><span class="fas fa-file-export fa-fw"></span> {% t software.file_sharing %}</a>
+            <a class="dropdown-item" href="/software/file-sharing/"><span class="fas fa-file-export fa-fw"></span> File Sharing</a>
-            <a class="dropdown-item" href="/software/file-sync/"><span class="fas fa-copy fa-fw"></span> {% t software.file_sync %}</a>
+            <a class="dropdown-item" href="/software/file-sync/"><span class="fas fa-copy fa-fw"></span> File Sync</a>
-            <a class="dropdown-item" href="/software/productivity/#metadata-removal-tools"><span class="far fa-eye-slash fa-fw"></span> {% t software.metadata_removal %}</a>
+            <a class="dropdown-item" href="/software/productivity/#metadata-removal-tools"><span class="far fa-eye-slash fa-fw"></span> Metadata Removal Tools</a>
-            <a class="dropdown-item" href="/software/passwords/"><span class="fas fa-user-lock fa-fw"></span> {% t software.password_managers %}</a>
+            <a class="dropdown-item" href="/software/passwords/"><span class="fas fa-user-lock fa-fw"></span> Password Manager</a>
-            <a class="dropdown-item" href="/software/productivity/"><span class="fas fa-briefcase fa-fw"></span> {% t software.productivity %}</a>
+            <a class="dropdown-item" href="/software/productivity/"><span class="fas fa-briefcase fa-fw"></span> Productivity Tools</a>
-            <a class="dropdown-item" href="/software/real-time-communication/"><span class="fas fa-comments fa-fw"></span> {% t software.rtc %}</a>
+            <a class="dropdown-item" href="/software/real-time-communication/"><span class="fas fa-comments fa-fw"></span> Real-Time Communication</a>
-            <a class="dropdown-item" href="/software/networks/"><span class="fas fa-user-secret fa-fw"></span> {% t software.networks %}</a>
+            <a class="dropdown-item" href="/software/networks/"><span class="fas fa-user-secret fa-fw"></span> Self-contained Networks</a>
-            <a class="dropdown-item" href="/software/cloud/"><span class="fas fa-hdd fa-fw"></span> {% t software.cloud %}</a>
+            <a class="dropdown-item" href="/software/cloud/"><span class="fas fa-hdd fa-fw"></span> Self-Hosted Cloud Server</a>
           </span>
         </details>
 
@@ -82,73 +82,65 @@
         <details class="nav-details">
           <summary>
             <span class="nav-summary">
-              {% t os.os %}
+              OS
               <span class="dropdown-toggle"></span>
             </span>
           </summary>
           <span class="nav-dropdown">
-            <a class="dropdown-item" href="/operating-systems/#os"><span class="fas fa-th-large fa-fw"></span> {% t os.pc_os %}</a>
+            <a class="dropdown-item" href="/operating-systems/#os"><span class="fas fa-th-large fa-fw"></span> PC OS</a>
-            <a class="dropdown-item" href="/operating-systems/#live_os"><span class="fas fa-compact-disc fa-fw"></span> {% t os.live_cd %}</a>
+            <a class="dropdown-item" href="/operating-systems/#live_os"><span class="fas fa-compact-disc fa-fw"></span> Live CD OS</a>
-            <a class="dropdown-item" href="/operating-systems/#mobile_os"><span class="fas fa-mobile-alt fa-fw"></span> {% t os.mobile %}</a>
+            <a class="dropdown-item" href="/operating-systems/#mobile_os"><span class="fas fa-mobile-alt fa-fw"></span> Mobile OS</a>
-            <a class="dropdown-item" href="/operating-systems/#aaddons"><span class="fas fa-th fa-fw"></span> {% t os.android_addons %}</a>
+            <a class="dropdown-item" href="/operating-systems/#aaddons"><span class="fas fa-th fa-fw"></span> Android Privacy Add-ons</a>
-            <a class="dropdown-item" href="/operating-systems/#firmware"><span class="fas fa-signal fa-fw"></span> {% t os.router %}</a>
+            <a class="dropdown-item" href="/operating-systems/#firmware"><span class="fas fa-signal fa-fw"></span> Router Firmware</a>
-            <a class="dropdown-item" href="/operating-systems/#win10"><span class="far fa-thumbs-down fa-fw"></span> {% t os.windows_10 %}</a>
+            <a class="dropdown-item" href="/operating-systems/#win10"><span class="far fa-thumbs-down fa-fw"></span> Don't use Windows 10</a>
           </span>
         </details>
 
-        <a class="nav-anchor" href="/index.html#participate">{% t global.participate %}</a>
+        <a class="nav-anchor" href="/index.html#participate">Participate</a>
       </div>
 
       <!-- Language -->
       <div id="nav-right">
-        <details class="nav-details">
-          <summary>
-            <span class="nav-summary">
-              <span class="fas fa-language text-danger fa-fw"></span>
-              {% t global.language %}
-              <span class="dropdown-toggle"></span>
-            </span>
-          </summary>
-          <span class="nav-dropdown">
-            <a href="https://privacytools.io/" class="dropdown-item">English</a>
-            <a href="https://privacytools.twngo.xyz/" class="dropdown-item">繁體中文</a>
-            <a href="https://victorhck.gitlab.io/privacytools-es/" class="dropdown-item">Español</a>
-            <a href="https://pl.privacytools.io/" class="dropdown-item">Polski</a>
-            <a href="https://www.privacidade.digital/" class="dropdown-item">Português</a>
-            <a href="https://privacytools.it-sec.rocks/" class="dropdown-item">Deutsch</a>
-            <a href="https://privacytools-it.github.io/" class="dropdown-item">Italiano</a>
-            <a href="https://privacytools.ru" class="dropdown-item">Русский</a>
-            <a href="https://privacytools.dreads-unlock.fr" class="dropdown-item">Français</a>
-          </span>
-        </details>
 
-        <!-- Services -->
+        <a href="/services/" class="nav-anchor">
-        <details class="nav-details">
+          Services
-          <summary>
+        </a>
-            <span class="nav-summary">
+        <a href="https://blog.privacytools.io/" class="nav-anchor">
-              {% t service_descriptions.services %}
+          Blog
-              <span class="dropdown-toggle"></span>
+        </a>
-            </span>
-          </summary>
-          <span class="nav-dropdown">
-            <a class="dropdown-item" href="https://forum.privacytools.io/"><span class="fab fa-discourse fa-fw"></span> Discourse - {% t service_descriptions.discourse %}</a>
-            <a class="dropdown-item" href="https://git.privacytools.io/"><span class="fab fa-git fa-fw"></span> Gitea - {% t service_descriptions.gitea %}</a>
-            <a class="dropdown-item" href="https://social.privacytools.io/"><span class="fas fa-retweet fa-fw"></span> Mastodon - {% t service_descriptions.mastodon %}</a>
-            <a class="dropdown-item" href="https://chat.privacytools.io/"><span class="fas fa-comment fa-fw"></span> Matrix - {% t service_descriptions.matrix %}</a>
-            <a class="dropdown-item" href="https://bin.privacytools.io/"><span class="fas fa-clipboard fa-fw"></span> PrivateBin - {% t service_descriptions.privatebin %}</a>
-            <a class="dropdown-item" href="https://search.privacytools.io/"><span class="fas fa-search fa-fw"></span> Searx - {% t service_descriptions.searx %}</a>
-            <a class="dropdown-item" href="https://write.privacytools.io/"><span class="fas fa-pen-alt fa-fw"></span> Write Freely - {% t service_descriptions.writefreely %}</a>
-          </span>
-        </details>
-
-        <a href="https://blog.privacytools.io/" class="nav-anchor">{% t service_descriptions.blog %} </a>
         <a href="/sponsors/" class="nav-anchor">
-          {% t resources.sponsors %}
+          Sponsors
+        </a>
+        <a href="/about/" class="nav-anchor">
+          About Us
         </a>
         <span id="nav-switch-theme" class="nav-anchor">
-          {% t global.theme %} <span class="nav-theme-icon fas fa-fw"></span>
+          <span class="nav-theme-icon fas fa-fw" aria-hidden="true" title="Theme"></span>
+          <span class="sr-only">Toggle Theme</span>
         </span>
+
+        <details class="nav-details">
+          <summary>
+            <span class="nav-summary">
+              <span class="fas fa-language text-danger fa-fw" aria-hidden="true" title="Language"></span>
+              <span class="sr-only">Language Selection</span>
+              <span class="dropdown-toggle"></span>
+            </span>
+          </summary>
+          <span class="nav-dropdown">
+            <a href="https://www.privacytools.io/" class="dropdown-item">English</a>
+            <a href="https://privacytools.twngo.xyz/" rel="nofollow noopener" class="dropdown-item">繁體中文</a>
+            <a href="https://victorhck.gitlab.io/privacytools-es/" rel="nofollow noopener" class="dropdown-item">Español</a>
+            <a href="https://pl.privacytools.io/" rel="nofollow noopener" class="dropdown-item">Polski</a>
+            <a href="https://www.privacidade.digital/" rel="nofollow noopener" class="dropdown-item">Português</a>
+            <a href="https://privacytools.it-sec.rocks/" rel="nofollow noopener" class="dropdown-item">Deutsch</a>
+            <a href="https://privacytools-it.github.io/" rel="nofollow noopener" class="dropdown-item">Italiano</a>
+            <a href="https://privacytools.ru" rel="nofollow noopener" class="dropdown-item">Русский</a>
+            <a href="https://privacytools.dreads-unlock.fr" rel="nofollow noopener" class="dropdown-item">Français</a>
+          </span>
+        </details>
+
       </div>
     </div>
-  </nav>
+  </div>
-</div>
+</nav>

_includes/sections/android-addons.html

@@ -1,7 +1,7 @@
-<h1 id="aaddons" class="anchor"><a href="#aaddons"><i class="fas fa-link anchor-icon"></i></a> {% t os.android_addons %}</h1>
+<h1 id="aaddons" class="anchor"><a href="#aaddons"><i class="fas fa-link anchor-icon"></i></a> Android Privacy Add-ons</h1>
 
 <div class="alert alert-success" role="alert">
-  <strong>{% t android_addons.description %}</strong>
+  <strong>Improve your privacy with these add-ons for Android.</strong>
 </div>
 
 <div class="container-fluid">
@@ -11,8 +11,8 @@
       <img src="/assets/img/addons/netguard.png" height="70" width="200" class="img-fluid d-block mr-auto ml-auto align-middle" alt="NetGuard">
     </div>
     <div class="col">
-    <h3>{% t android_addons.control_traffic %} <a href="https://www.netguard.me/">NetGuard</a></h3>
+    <h3>Control your traffic with <a href="https://www.netguard.me/">NetGuard</a></h3>
-    <p><strong>NetGuard</strong> {% t android_addons.netguard %}
+    <p><strong>NetGuard</strong> provides simple and advanced ways to block certain apps' access to the internet without the help of root privileges. Applications and addresses can individually be allowed or denied access to your Wi-Fi and/or mobile connection, allowing you to control which apps are able to call home or not.
     </div>
   </div>
 
@@ -21,8 +21,8 @@
       <img src="/assets/img/addons/Orbot.png" height="70" width="200" class="img-fluid d-block mr-auto ml-auto align-middle" alt="Orbot">
     </div>
     <div class="col">
-    <h3>{% t android_addons.tor %} <a href="https://guardianproject.info/apps/orbot/">Orbot</a></h3>
+    <h3>Tor for Android with <a href="https://guardianproject.info/apps/orbot/">Orbot</a></h3>
-    <p><strong>Orbot</strong> {% t android_addons.orbot %} <strong>{% t android_addons.root_mode %}</strong> {% t android_addons.orbot_root %}
+    <p><strong>Orbot</strong> is a free proxy app that empowers other apps to use the internet more securely. Orbot uses Tor to encrypt your Internet traffic and then hides it by bouncing through a series of computers around the world. <strong>Root Mode:</strong> Orbot can be configured to transparently proxy all of your Internet traffic through Tor. You can also choose which specific apps you want to use through Tor.
     </div>
   </div>
 

_includes/sections/browser-addons.html

@@ -1,32 +1,13 @@
-<h1 id="addons" class="anchor"><a href="#addons"><i class="fas fa-link anchor-icon"></i></a> {% t browser_addons.excellent_add_ons %}</h1>
+<h1 id="addons" class="anchor"><a href="#addons"><i class="fas fa-link anchor-icon"></i></a> Recommended Browser Add-ons</h1>
 
 <div class="alert alert-primary" role="alert">
-  <strong>{% t browser_addons.improve_your_privacy %}</strong>
+  <strong>Improve your privacy with these browser add-ons.</strong>
 </div>
 
-{%- capture title1 -%}{% t browser_addons.privacy_badger_title %}{%- endcapture -%}
-{%- capture descr1 -%}<strong>{% t browser_addons.privacy_badger %}</strong> {% t browser_addons.privacy_badger_description %}{%- endcapture -%}
-{%- capture title2 -%}{% t browser_addons.ublock_origin_title %}{%- endcapture -%}
-{%- capture descr2 -%}<strong>{% t browser_addons.ublock_origin %}</strong> {% t browser_addons.ublock_origin_description %}{%- endcapture -%}
-{%- capture title3 -%}{% t browser_addons.cookie_autodelete_title %}{%- endcapture -%}
-{%- capture descr3 -%}<strong>{% t browser_addons.cookie_autodelete %}</strong> {% t browser_addons.cookie_autodelete_description %}{%- endcapture -%}
-{%- capture title4 -%}{% t browser_addons.https_everywhere_title %}{%- endcapture -%}
-{%- capture descr4 -%}<strong>{% t browser_addons.https_everywhere %}</strong> {% t browser_addons.https_everywhere_description %}{%- endcapture -%}
-{%- capture title5 -%}{% t browser_addons.decentraleyes_title %}{%- endcapture -%}
-{%- capture descr5 -%}<strong>{% t browser_addons.decentraleyes %}</strong> {% t browser_addons.decentraleyes_description %}{%- endcapture -%}
-{%- capture title6 -%}{% t browser_addons.terms_of_service_didnt_read_title %}{%- endcapture -%}
-{%- capture descr6 -%}<strong>{% t browser_addons.terms_of_service_didnt_read %}</strong> {% t browser_addons.terms_of_service_didnt_read_description %}{%- endcapture -%}
-{%- capture title7 -%}{% t browser_addons.snowflake_title %}{%- endcapture -%}
-{%- capture descr7 -%}<strong>{% t browser_addons.snowflake %}</strong> {% t browser_addons.snowflake_description %}{%- endcapture -%}
-{%- capture title8 -%}{% t browser_addons.umatrix_title %}{%- endcapture -%}
-{%- capture descr8 -%}<strong>{% t browser_addons.umatrix %}</strong> {% t browser_addons.umatrix_description %}{%- endcapture -%}
-{%- capture title9 -%}{% t browser_addons.noScript_security_suite_title %}{%- endcapture -%}
-{%- capture descr9 -%}<strong>{% t browser_addons.noScript_security_suite %}</strong> {% t browser_addons.noScript_security_suite_description %}{%- endcapture -%}
-
 {% include cardv2.html
-title=title2
+title="uBlock Origin: Block Ads and Trackers"
 image="/assets/img/addons/ublock-origin.png"
-description=descr2
+description="<strong>uBlock Origin</strong> is an efficient <a href=https://github.com/gorhill/uBlock/wiki/Blocking-mode>wide-spectrum blocker</a> that's easy on memory, and yet can load and enforce thousands more filters than other popular blockers out there. It has no monetization strategy and is completely open source."
 website="https://addons.mozilla.org/firefox/addon/ublock-origin/"
 forum="https://forum.privacytools.io/t/discussion-ublock-origin/266"
 github="https://github.com/gorhill/uBlock/"
@@ -37,9 +18,9 @@ edge="https://www.microsoft.com/en-us/p/ublock-origin/9nblggh444l4"
 %}
 
 {% include cardv2.html
-title=title3
+title="Cookie AutoDelete: Automatically Delete Cookies"
 image="/assets/img/addons/cookie-autodelete.png"
-description=descr3
+description="<strong>Cookie AutoDelete</strong> automatically removes cookies when they are no longer used by open browser tabs. With the cookies, lingering sessions, as well as information used to spy on you, will be expunged."
 website="https://addons.mozilla.org/firefox/addon/cookie-autodelete/"
 forum="https://forum.privacytools.io/t/discussion-cookie-autodelete/267"
 github="https://github.com/Cookie-AutoDelete/Cookie-AutoDelete"
@@ -48,9 +29,9 @@ chrome="https://chrome.google.com/webstore/detail/cookie-autodelete/fhcgjolkccmb
 %}
 
 {% include cardv2.html
-title=title4
+title="HTTPS Everywhere: Secure Connections"
 image="/assets/img/addons/https-everywhere.png"
-description=descr4
+description="<strong>HTTPS Everywhere</strong> encrypts your communications with many major websites, making your browsing more secure. A collaboration between The Tor Project and the Electronic Frontier Foundation."
 website="https://www.eff.org/https-everywhere"
 forum="https://forum.privacytools.io/t/discussion-https-everywhere/268"
 github="https://github.com/EFForg/https-everywhere"
@@ -60,9 +41,9 @@ opera="https://addons.opera.com/en/extensions/details/https-everywhere"
 %}
 
 {% include cardv2.html
-title=title5
+title="Decentraleyes: Block Content Delivery Networks"
 image="/assets/img/addons/decentraleyes.png"
-description=descr5
+description="<strong>Decentraleyes</strong> emulates Content Delivery Networks locally by intercepting requests, finding the required resource, and injecting it into the environment. This all happens instantaneously, automatically, and no prior configuration is required."
 website="https://decentraleyes.org/"
 forum="https://forum.privacytools.io/t/discussion-decentraleyes/269"
 gitlab="https://git.synz.io/Synzvato/decentraleyes"
@@ -72,9 +53,9 @@ opera="https://addons.opera.com/en/extensions/details/decentraleyes"
 %}
 
 {% include cardv2.html
-title=title6
+title="Terms of Service; Didn’t Read: Be Informed"
 image="/assets/img/addons/tosdr.png"
-description=descr6
+description="<strong>Terms of Service; Didn’t Read</strong> is an addon that aims to fix how “I have read and agree to the Terms” is the biggest lie on the web by grading websites based on their terms of service agreements and privacy policies. It also gives short summaries of those agreements. The analysis and ratings are done transparently by a community of reviewers."
 website="https://tosdr.org/"
 forum="https://forum.privacytools.io/t/discussion-terms-of-service-didn-t-read/270"
 github="https://github.com/tosdr/"
@@ -84,9 +65,9 @@ opera="https://addons.opera.com/en/extensions/details/terms-of-service-didnt-rea
 %}
 
 {% include cardv2.html
-title=title7
+title="Snowflake"
 image="/assets/img/addons/snowflake.png"
-description=descr7
+description="<strong>Snowflake</strong> is a new <a href=https://2019.www.torproject.org/docs/pluggable-transports.html.en>pluggable transport</a> from the Tor Project. If you have an uncensored connection, running this extension volunteers your connection to be used as a Snowflake proxy to help users unable to connect to the Tor network. Your IP will not be visible to the sites users visit using your proxy, as this extension will not make you an exit node. If your access to the Tor network is blocked, this extension will not assist you, and you should use the <a href=https://www.torproject.org>Tor Browser</a> instead."
 website="https://snowflake.torproject.org"
 forum="https://forum.privacytools.io/t/discussion-snowflake/1146"
 git="https://gitweb.torproject.org/pluggable-transports/snowflake.git"
@@ -95,9 +76,9 @@ chrome="https://chrome.google.com/webstore/detail/snowflake/mafpmfcccpbjnhfhjnll
 %}
 
 {% include cardv2.html
-title=title1
+title="Privacy Badger: Stop Tracking"
 image="/assets/img/addons/privacy-badger.png"
-description=descr1
+description="<strong>Privacy Badger</strong> is a browser add-on that stops advertisers and other third-party trackers from secretly tracking where you go and what pages you look at on the web. Privacy Badger learns about trackers as you browse."
 website="https://www.eff.org/privacybadger"
 forum="https://forum.privacytools.io/t/discussion-privacy-badger/265"
 github="https://github.com/EFForg/privacybadger"
@@ -106,16 +87,16 @@ chrome="https://chrome.google.com/webstore/detail/privacy-badger/pkehgijcmpdhfbd
 opera="https://addons.opera.com/en/extensions/details/privacy-badger/"
 %}
 
-<h2>{% t browser_addons.for_power_users_only %}</h2>
+<h2>For Power Users Only</h2>
 
 <div class="alert alert-warning" role="alert">
-  <strong>{% t browser_addons.addon_warning %}</strong>
+  <strong>These addons require quite a lot of interaction from the user. Some sites will not work properly until you have configured the add-ons.</strong>
 </div>
 
 {% include cardv2.html
-title=title8
+title="uMatrix: Stop Cross-Site Requests"
 image="/assets/img/addons/umatrix.png"
-description=descr8
+description="<strong>uMatrix</strong> gives you control over the requests that websites make to other websites. Many websites integrate features which let other websites track you, such as Facebook Like Buttons or Google Analytics."
 website="https://addons.mozilla.org/firefox/addon/umatrix/"
 forum="https://forum.privacytools.io/t/discussion-umatrix/271"
 github="https://github.com/gorhill/uMatrix"
@@ -125,9 +106,9 @@ opera="https://addons.opera.com/en/extensions/details/umatrix"
 %}
 
 {% include cardv2.html
-title=title9
+title="NoScript Security Suite: Be in total control"
 image="/assets/img/addons/noscript.png"
-description=descr9
+description="<strong>NoScript</strong> is a highly customizable plugin to selectively allow JavaScript, Java, and Flash to run only on websites you trust. Not for casual users, it requires technical knowledge to configure."
 website="https://addons.mozilla.org/firefox/addon/noscript/"
 forum="https://forum.privacytools.io/t/discussion-noscript-security-suite/272"
 github="https://github.com/hackademix/noscript"

_includes/sections/browser-tweaks.html

@@ -115,6 +115,7 @@
 <h3>Related Information</h3>
 
 <ul>
+  <li><a href="https://blog.privacytools.io/firefox-privacy-an-introduction-to-safe/">Firefox Privacy: Tips and Tricks for Better Browsing</a> - A good starting guide for users looking to keep their data private and secure.</li>
   <li><a href="https://ffprofile.com/">ffprofile.com</a> - Helps you to create a Firefox profile with the defaults you like.</li>
   <li><a href="http://kb.mozillazine.org/Category:Security_and_privacy-related_preferences">mozillazine.org</a> - Security and privacy-related preferences. </li>
   <li><a href="https://addons.mozilla.org/firefox/addon/privacy-settings/">Privacy Settings</a> - A Firefox add-on to alter built-in privacy settings easily with a toolbar panel.</li>

_includes/sections/calendar-contacts-sync.html

@@ -34,16 +34,20 @@
   include cardv2.html
   title="EteSync"
   image="/assets/img/provider/etesync.png"
-  description="<strong>EteSync</strong> is a secure, end-to-end encrypted, and journaled personal information (e.g. contacts and calendar) cloud synchronization and backup for Android and any OS that supports CalDAV/CardDAV. It costs $24 per year to use, or you can host the server yourself for free."
+  description="<strong>EteSync</strong> is a secure, end-to-end encrypted, and privacy-respecting cloud backup and synchronization software for your personal information (e.g. contacts and calendars). There are native clients for Android, iOS, and the web, and an adapter layer for most desktop clients. It costs $24 per year to use, or you can host the server yourself for free."
   website="https://www.etesync.com/"
   forum="https://forum.privacytools.io/t/discussion-etesync-calender-contacts-sync-tools/1536"
   github="https://github.com/etesync"
   web="https://client.etesync.com/"
-  windows="https://github.com/etesync/etesync-dav/blob/master/README.md#installation"
+  windows="https://www.etesync.com/install/dav/"
-  mac="https://github.com/etesync/etesync-dav/blob/master/README.md#installation"
+  mac="https://www.etesync.com/install/dav/"
-  linux="https://github.com/etesync/etesync-dav/blob/master/README.md#installation"
+  linux="https://www.etesync.com/install/dav/"
+  freebsd="https://www.etesync.com/install/dav/"
+  openbsd="https://www.etesync.com/install/dav/"
+  netbsd="https://www.etesync.com/install/dav/"
   fdroid="https://f-droid.org/packages/com.etesync.syncadapter/"
   googleplay="https://play.google.com/store/apps/details?id=com.etesync.syncadapter"
+  ios="https://www.etesync.com/install/ios/"
 %}
 
 <h3>Worth Mentioning</h3>

_includes/sections/cloud-storage.html

@@ -26,6 +26,6 @@ googleplay="https://play.google.com/store/apps/details?id=com.nextcloud.client"
 <h3>Worth Mentioning</h3>
 
 <ul>
-  <li><a href="https://cryptomator.org/">Cryptomator</a> - Free client-side AES encryption for your cloud files. Open source software: No backdoors, no registration.</li>
+  <li><a href="https://cryptomator.org/">Cryptomator</a> - Free client-side AES encryption for your cloud files. Open source software: No backdoors, no registration. <span class="badge badge-warning" data-toggle="tooltip" title="Cryptomator's mobile apps are not open-source."><a href="https://github.com/cryptomator/cryptomator-android/issues/1#issuecomment-257979375"><i class="fas fa-exclamation-triangle"></i></a></span></li>
   <li><a href="https://cryptpad.fr">CryptPad</a> - Free and end-to-end encrypted real time collaboration sharing folders, media, and documents.</li>
 </ul>

_includes/sections/file-encryption.html

@@ -53,8 +53,7 @@
 <h3>Worth Mentioning</h3>
 
 <ul>
-  <li><a href="https://cryptomator.org/">Cryptomator</a> - Free client-side AES encryption for your cloud files. Open-source software: No backdoors, no registration.</li>
+  <li><a href="https://cryptomator.org/">Cryptomator</a> - Free client-side AES encryption for your cloud files. Open source software: No backdoors, no registration. <span class="badge badge-warning" data-toggle="tooltip" title="Cryptomator's mobile apps are not open-source."><a href="https://github.com/cryptomator/cryptomator-android/issues/1#issuecomment-257979375"><i class="fas fa-exclamation-triangle"></i></a></span></li></li>
-  <li><a href="https://diskcryptor.net/">DiskCryptor</a> - A full disk and partition encryption system for Windows including the ability to encrypt the partition and disk on which the OS is installed.</li>
   <li><a href="https://gitlab.com/cryptsetup/cryptsetup/">Linux Unified Key Setup (LUKS)</a> - A full disk encryption system for Linux using dm-crypt as the disk encryption backend. Included by default in Ubuntu. Available for Windows and Linux.</li>
   <li><a href="https://hat.sh/">Hat.sh</a> - A cross-platform, serverless JavaScript web application that provides secure file encryption using the AES-256-GCM algorithm in your browser. It can also be downloaded and run offline.</a></li>
   <li><a href="https://www.keka.io/">Keka</a> - A macOS-only, open-source file archiver with the ability to encrypt files.</li>

_includes/sections/header.html

@@ -1,17 +1,17 @@
 <div class="alert alert-success" role="alert">
-  <strong>New!</strong> Contributions to privacytools.io via <a href="https://opencollective.com/privacytoolsio" class="alert-link">OpenCollective</a> are now tax deductible! <a href="https://blog.privacytools.io/privacytools-io-joins-the-open-collective-foundation" class="alert-link">Learn more...</a>
+  <strong>New!</strong> Financial <a href="https://opencollective.com/privacytoolsio" class="alert-link">contributions</a> to PrivacyTools are now tax deductible in the US! <a href="https://blog.privacytools.io/privacytools-io-joins-the-open-collective-foundation" class="alert-link">Learn more...</a>
 </div>
 
 <div class="jumbotron p-5">
-  <h1 class="display-4"><a href="https://www.privacytools.io/" title="privacytools.io"><img src="/assets/img/layout/logo.png" width="600" height="88" class="img-fluid" alt="privacytools.io"></a></h1>
+  <h1 class="display-4"><a href="{{ site.production_url }}" title="PrivacyTools"><img src="/assets/img/layout/logo.png" width="600" height="88" class="img-fluid" alt="PrivacyTools"></a></h1>
-  <p class="lead">{% t header.lead %}</p>
+  <p class="lead">You are being watched. Private and state-sponsored organizations are monitoring and recording your online activities. PrivacyTools provides services, tools and knowledge to protect your privacy against global mass surveillance.</p>
 </div>
 
 <form method="POST" action="https://search.privacytools.io/" id="search_form" role="search">
 <div class="input-group col-12 col-md-8 offset-md-2">
-<input type="search" name="q" class="form-control input-lg" id="q" placeholder="{%t header.search %}" autocomplete="off" value="">
+<input type="search" name="q" class="form-control input-lg" id="q" placeholder="Try PrivacyTools Search, a Privacy-Respecting Search Engine" autocomplete="off" value="">
 <span class="input-group-btn">
-<button type="submit" class="btn btn-primary input-lg"><span class="hide_if_nojs"><i class="fas fa-search"></i> </span><span class="hidden active_if_nojs">{% t header.start_search %}</span></button>
+<button type="submit" class="btn btn-primary input-lg"><span class="hide_if_nojs"><i class="fas fa-search"></i> </span><span class="hidden active_if_nojs">start search</span></button>
 </span>
 </div>
 </form>

_includes/sections/instant-messenger.html

@@ -22,24 +22,6 @@ android="https://signal.org/android/apk/#apk-danger"
 ios="https://apps.apple.com/us/app/signal-private-messenger/id874139669"
 %}
 
-
-{% include cardv2.html
-title="Wire"
-image="/assets/img/tools/wire.png"
-description="Wire is a free and end-to-end encrypted chatting application that supports instant messaging, voice, and video calls. Full source code is available."
-labels="warning:<a href=//www.vice.com/en_us/article/gvzw5x/secure-messaging-app-wire-stores-everyone-youve-ever-contacted-in-plain-text>Warning</a>:Wire stores some plaintext metadata about its users on their servers. This data includes profile names, profile pictures, usernames, and users' lists of connections and conversations.|success:VoIP"
-website="https://wire.com/"
-forum="https://forum.privacytools.io/t/discussion-wire/750"
-github="https://github.com/wireapp/"
-windows="https://wire.com/en/download"
-mac="https://wire.com/en/download"
-linux="https://wire.com/en/download"
-googleplay="https://play.google.com/store/apps/details?id=com.wire"
-android="https://wire.com/en/download"
-ios="https://itunes.apple.com/app/wire/id930944768?mt=8"
-web="https://app.wire.com"
-%}
-
 <h3>Complete Comparison</h3>
 <ul>
 	<li><a href="https://securechatguide.org/effguide.html">securechatguide.org</a> - Guide to Choosing a Messenger.</li>
@@ -77,7 +59,6 @@ web="https://app.wire.com"
   <li>Independent security audits</li>
   <ul>
     <li><a href="https://eprint.iacr.org/2016/1013.pdf">A Formal Security Analysis of the Signal Messaging Protocol (2019)</a> by Katriel Cohn-Gordon, Cas Cremers, Benjamin Dowling, Luke Garratt and Douglas Stebila</li>
-    <li><a href="https://wire.com/en/security/#audits">Independent security audits</a> on Wire's website</li>
     <li><a href="https://keybase.io/docs-assets/blog/NCC_Group_Keybase_KB2018_Public_Report_2019-02-27_v1.3.pdf">Keybase's Protocol Security Review (2019)</a> by <a href="https://www.nccgroup.trust/">NCC Group</a></li>
   </ul>
 </ul>

_includes/sections/live-operating-systems.html

@@ -1,18 +1,11 @@
-<h1 id="live_os" class="anchor"><a href="#live_os"><i class="fas fa-link anchor-icon"></i></a> {% t live_os.live_cd %}</h1>
+<h1 id="live_os" class="anchor"><a href="#live_os"><i class="fas fa-link anchor-icon"></i></a> Live CD Operating Systems</h1>
-
-{%- capture live_os_tails_labels -%}warning:contrib:{% t global.contrib %}{%- endcapture -%}
-{%- capture live_os_tails_descr -%}{% t live_os.tails_descr %}{%- endcapture -%}
-{%- capture live_os_knoppix_labels -%}warning:contrib:{% t global.contrib %}{%- endcapture -%}
-{%- capture live_os_knoppix_descr -%}{% t live_os.knoppix_descr %}{%- endcapture -%}
-{%- capture live_os_puppy_linux_labels -%}warning:contrib:{% t global.contrib %}{%- endcapture -%}
-{%- capture live_os_puppy_linux_descr -%}{% t live_os.puppy_linux_descr %}{%- endcapture -%}
 
 {% include cardv2.html
 title="Tails"
 image="/assets/img/tools/Tails.png"
-description=live_os_tails_descr
+description='Tails is a live operating system that starts on almost any computer from a DVD, USB stick, or SD card. It aims at preserving privacy and anonymity, and circumventing censorship by forcing Internet connections through the Tor network; leaving no trace on the computer; and using state-of-the-art cryptographic tools to encrypt files, emails, and instant messages.'
 badges="info:GNU/Linux"
-labels=live_os_tails_labels
+labels="warning:contrib:This software may depend on or recommend non-free software."
 website="https://tails.boum.org/"
 git="https://git-tails.immerda.ch/tails/"
 %}
@@ -20,9 +13,9 @@ git="https://git-tails.immerda.ch/tails/"
 {% include cardv2.html
 title="KNOPPIX"
 image="/assets/img/tools/KNOPPIX.png"
-description=live_os_knoppix_descr
+description='Knoppix is an operating system based on Debian designed to be run directly from a CD / DVD (Live CD) or a USB flash drive (Live USB), one of the first of its kind for any operating system. When starting a program, it is loaded from the removable medium and decompressed into a RAM drive. The decompression is transparent and on-the-fly.'
 badges="info:GNU/Linux"
-labels=live_os_knoppix_labels
+labels="warning:contrib:This software may depend on or recommend non-free software."
 website="https://www.knopper.net/knoppix/index-en.html"
 source="https://www.knopper.net/knoppix-info/index-en.html#license"
 %}
@@ -30,15 +23,16 @@ source="https://www.knopper.net/knoppix-info/index-en.html#license"
 {% include cardv2.html
 title="Puppy Linux"
 image="/assets/img/tools/Puppy-Linux.png"
-description=live_os_puppy_linux_descr
+description='Puppy Linux operating system is a lightweight Linux distribution that focuses on ease of use and minimal memory footprint. The entire system can be run from RAM with current versions generally taking up about 210 MB, allowing the boot medium to be removed after the operating system has started.'
 badges="info:GNU/Linux"
-labels=live_os_puppy_linux_labels
+labels="warning:contrib:This software may depend on or recommend non-free software."
 website="http://puppylinux.org/"
 source="http://distro.ibiblio.org/puppylinux/"
 %}
 
-<h3>{% t live_os.worth_mentioning %}</h3>
+<h3>Worth Mentioning</h3>
 
 <ul>
-  <li><a href="https://distro.ibiblio.org/tinycorelinux/">{% t live_os.tiny_core_linux %}</a> <span class="badge badge-info">GNU/Linux</span> <span class="badge badge-warning" data-toggle="tooltip" title="{% t global.contrib %}">contrib <i class="far fa-question-circle"></i></span> - {% t live_os.tiny_core_linux_descr %}</li>
+  <li><a href="https://distro.ibiblio.org/tinycorelinux/">Tiny Core Linux</a> <span class="badge badge-info">GNU/Linux</span> <span class="badge badge-warning" data-toggle="tooltip" title="This software may depend on or recommend non-free software.">contrib <i class="far fa-question-circle"></i></span> - A minimal Linux operating system focusing on providing a base system using BusyBox and FLTK. The distribution is notable for its size (15 MB) and minimalism, with additional functionality
+    provided by extensions.</li>
 </ul>

_includes/sections/mobile-operating-systems.html

@@ -1,23 +1,16 @@
-<h1 id="mobile_os" class="anchor"><a href="#mobile_os"><i class="fas fa-link anchor-icon"></i></a> {% t mobile_os.mobile_operating_systems %}</h1>
+<h1 id="mobile_os" class="anchor"><a href="#mobile_os"><i class="fas fa-link anchor-icon"></i></a> Mobile Operating Systems</h1>
 
 <div class="alert alert-warning" role="alert">
-  <strong>{% t mobile_os.google_warning %}</strong>
+  <strong>Even though the source code of the following OS is provided, installing Google Apps may compromise your setup.</strong>
 </div>
 
-{%- capture mobile_os_lineageos_labels -%}warning:contrib:{% t global.contrib %}{%- endcapture -%}
-{%- capture mobile_os_lineageos_descr -%}{% t mobile_os.lineageos_descr %}{%- endcapture -%}
-{%- capture mobile_os_ubuntu_touch_labels -%}warning:contrib:{% t global.contrib %}{%- endcapture -%}
-{%- capture mobile_os_ubuntu_touch_descr -%}{% t mobile_os.ubuntu_touch_descr %}{%- endcapture -%}
-{%- capture mobile_os_grapheneos_labels -%}warning:contrib:{% t global.contrib %}{%- endcapture -%}
-{%- capture mobile_os_grapheneos_descr -%}{% t mobile_os.grapheneos_descr %}{%- endcapture -%}
-
 {% include cardv2.html
 title="GrapheneOS"
 image="/assets/img/tools/GrapheneOS.png"
 image-dark="/assets/img/tools/GrapheneOS-dark.png"
-description=mobile_os_grapheneos_descr
+description='GrapheneOS (formerly known as CopperheadOS) is a free and open-source security- and privacy-focused mobile operating system built on top of the Android Open Source Project. It currently specifically targets devices offering strong hardware security.'
 badges="info:AOSP"
-labels=mobile_os_grapheneos_labels
+labels="warning:contrib:This software may depend on or recommend non-free software."
 website="https://grapheneos.org/"
 github="https://github.com/GrapheneOS/"
 %}
@@ -25,9 +18,9 @@ github="https://github.com/GrapheneOS/"
 {% include cardv2.html
 title="LineageOS"
 image="/assets/img/tools/LineageOS.png"
-description=mobile_os_lineageos_descr
+description='LineageOS is a free and open-source operating system for smartphones and tablets, based on the official releases of the Android Open Source Project. It is the continuation of the CyanogenMod project.'
 badges="info:AOSP"
-labels=mobile_os_lineageos_labels
+labels="warning:contrib:This software may depend on or recommend non-free software."
 website="https://www.lineageos.org/"
 github="https://github.com/LineageOS"
 %}
@@ -35,17 +28,17 @@ github="https://github.com/LineageOS"
 {% include cardv2.html
 title="Ubuntu Touch"
 image="/assets/img/tools/Ubuntu-Touch.png"
-description=mobile_os_ubuntu_touch_descr
+description="Ubuntu Touch is a free and open-source operating system for smartphones and tablets. It's an alternative to the current popular mobile operating systems on the market. Only a few devices are <a href=https://devices.ubuntu-touch.io/>supported.</a>"
 badges="info:GNU/Linux"
-labels=mobile_os_ubuntu_touch_labels
+labels="warning:contrib:This software may depend on or recommend non-free software."
 website="https://ubuntu-touch.io/"
 github="https://github.com/ubports"
 %}
 
-<h3>{% t mobile_os.worth_mentioning %}</h3>
+<h3>Worth Mentioning</h3>
 
 <ul>
-  <li><a href="https://www.replicant.us/">Replicant</a> <span class="badge badge-info">AOSP</span> - {% t mobile_os.replicant_descr %}</li>
+  <li><a href="https://www.replicant.us/">Replicant</a> <span class="badge badge-info">AOSP</span> - An open-source operating system based on Android, aiming to replace all proprietary components with free software.</li>
-  <li><a href="https://www.omnirom.org/">OmniROM</a> <span class="badge badge-info">AOSP</span> <span class="badge badge-warning" data-toggle="tooltip" title="{% t global.contrib %}">contrib <i class="far fa-question-circle"></i></span> - {% t mobile_os.omnirom_descr %}</li>
+  <li><a href="https://www.omnirom.org/">OmniROM</a> <span class="badge badge-info">AOSP</span> <span class="badge badge-warning" data-toggle="tooltip" title="This software may depend on or recommend non-free software.">contrib <i class="far fa-question-circle"></i></span> - A free-software operating system for smartphones and tablet computers, based on the Android mobile platform.</li>
-  <li><a href="https://microg.org/">MicroG</a> <span class="badge badge-info">Add-on Package</span> <span class="badge badge-warning" data-toggle="tooltip" title="{% t global.contrib %}">contrib <i class="far fa-question-circle"></i></span> - {% t mobile_os.microg_descr %} {% t mobile_os.microg_lineage %} <a href="https://lineage.microg.org/">Lineage for microG</a>.</li>
+  <li><a href="https://microg.org/">MicroG</a> <span class="badge badge-info">Add-on Package</span> <span class="badge badge-warning" data-toggle="tooltip" title="This software may depend on or recommend non-free software.">contrib <i class="far fa-question-circle"></i></span> - A project that aims to reimplement the proprietary Google Play Services in the Android operating system with a FLOSS replacement. The microG project also maintains a fork of LineageOS with microG and F-Droid preinstalled at <a href="https://lineage.microg.org/">Lineage for microG</a>.</li>
 </ul>

_includes/sections/operating-systems.html

@@ -1,20 +1,15 @@
-<h1 id="os" class="anchor"><a href="#os"><i class="fas fa-link anchor-icon"></i></a> {% t pc_os.pc_operating_systems %}</h1>
+<h1 id="os" class="anchor"><a href="#os"><i class="fas fa-link anchor-icon"></i></a> PC Operating Systems</h1>
 
 <div class="alert alert-warning" role="alert">
-  <strong>{% t pc_os.ms_warning %}</strong>
+  <strong>If you are currently using a operating system like Windows 10, you should pick an alternative here.</strong>
 </div>
 
-{%- capture pc_os_contrib_labels -%}warning:contrib:{% t global.contrib %}{%- endcapture -%}
-{%- capture pc_os_qubesos_descr -%}{% t pc_os.qubesos_descr %}{%- endcapture -%}
-{%- capture pc_os_debian_descr -%}{% t pc_os.debian_descr %}{%- endcapture -%}
-{%- capture pc_os_fedora_descr -%}{% t pc_os.fedora_descr %}{%- endcapture -%}
-
 {% include cardv2.html
 title="Qubes OS"
 image="/assets/img/tools/Qubes-OS.png"
-description=pc_os_qubesos_descr
+description='Qubes is an open-source operating system designed to provide strong security for desktop computing. Qubes is based on Xen, the X Window System, and Linux, and can run most Linux applications and utilize most of the Linux drivers.'
 badges="info:Xen"
-labels=pc_os_contrib_labels
+labels="warning:contrib:This software may depend on or recommend non-free software."
 website="https://www.qubes-os.org/"
 github="https://github.com/QubesOS"
 tor="http://qubesosfasa4zl44o4tws22di6kepyzfeqv3tg4e3ztknltfxqrymdad.onion/"
@@ -23,9 +18,9 @@ tor="http://qubesosfasa4zl44o4tws22di6kepyzfeqv3tg4e3ztknltfxqrymdad.onion/"
 {% include cardv2.html
 title="Fedora Workstation"
 image="/assets/img/tools/Fedora.png"
-description=pc_os_fedora_descr
+description='Fedora is a Linux distribution developed by the Fedora Project and sponsored by Red Hat. Fedora Workstation is a secure, reliable, and user-friendly edition developed for desktops and laptops, using GNOME as the default desktop environment.'
 badges="info:GNU/Linux"
-labels=pc_os_contrib_labels
+labels="warning:contrib:This software may depend on or recommend non-free software."
 website="https://getfedora.org/"
 git="https://src.fedoraproject.org/"
 %}
@@ -33,26 +28,28 @@ git="https://src.fedoraproject.org/"
 {% include cardv2.html
 title="Debian"
 image="/assets/img/tools/Debian.png"
-description=pc_os_debian_descr
+description='Debian is a Unix-like computer operating system and a Linux distribution that is composed entirely of free and open-source software, most of which is under the GNU General Public License, and packaged by a group of individuals known as the Debian project.'
 badges="info:GNU/Linux"
 website="https://www.debian.org/"
 tor="http://sejnfjrq6szgca7v.onion"
 gitlab="https://salsa.debian.org/qa/debsources"
 %}
 
-<h3>{% t pc_os.worth_mentioning %}</h3>
+<h3>Worth Mentioning</h3>
 
 <ul>
-  <li><a href="https://www.openbsd.org/">OpenBSD</a> <span class="badge badge-info">BSD</span> - {% t pc_os.openbsd_descr %}</li>
+  <li><a href="https://www.openbsd.org/">OpenBSD</a> <span class="badge badge-info">BSD</span> - A project that produces a free, multi-platform 4.4BSD-based UNIX-like operating system. Emphasizes portability, standardization, correctness, proactive security and integrated cryptography.</li>
-  <li><a href="https://www.archlinux.org/">Arch Linux</a> <span class="badge badge-info">GNU/Linux</span> <span class="badge badge-warning" data-toggle="tooltip" title="{% t global.contrib %}">contrib <i class="far fa-question-circle"></i></span> - {% t pc_os.arch_descr %} <a href="https://www.parabola.nu/">Parabola</a> {% t pc_os.parabola_descr %}</li>
+  <li><a href="https://www.archlinux.org/">Arch Linux</a> <span class="badge badge-info">GNU/Linux</span> <span class="badge badge-warning" data-toggle="tooltip" title="This software may depend on or recommend non-free software.">contrib <i class="far fa-question-circle"></i></span> - A simple, lightweight Linux distribution. It is composed predominantly of free and open-source software, and supports community involvement. <a href="https://www.parabola.nu/">Parabola</a> is a
-  <li><a href="https://trisquel.info/">Trisquel</a> <span class="badge badge-info">GNU/Linux</span> - {% t pc_os.trisquel_descr %}</li>
+    completely open source version of Arch Linux.</li>
-  <li><a href="https://www.whonix.org/">Whonix</a> <span class="badge badge-info">GNU/Linux</span> - {% t pc_os.whonix_descr %}</li>
+  <li><a href="https://trisquel.info/">Trisquel</a> <span class="badge badge-info">GNU/Linux</span> - Derived from Ubuntu, this project aims for a fully free software system without proprietary software or firmware and uses Linux-libre, a version of the Linux kernel with the non-free code (binary blobs) removed.</li>
+  <li><a href="https://www.whonix.org/">Whonix</a> <span class="badge badge-info">GNU/Linux</span> - A Debian-based security-focused Linux distribution. It aims to provide privacy, security and anonymity on the internet. The operating system consists of two virtual machines, a "Workstation"
+    and a Tor "Gateway". All communication are forced through the Tor network to accomplish this.</li>
 </ul>
 
-<h3>{% t pc_os.warning %}</h3>
+<h3>Warning</h3>
 
 <ul>
-  <li><a href="#win10"><i class="fas fa-link"></i> {% t pc_os.win10_nightmare %}</a></li>
+  <li><a href="#win10"><i class="fas fa-link"></i> Don't use Windows 10 - It's a privacy nightmare</a></li>
 </ul>
 
 <h4 id="cpuvulns">Remember to check CPU vulnerability mitigations</h4>

_includes/sections/participate.html

@@ -1,15 +1,8 @@
 <div class="page-header">
-  <h1 id="participate" class="anchor"><a href="#participate"><i class="fas fa-link anchor-icon"></i></a> {% t participate.participate %}</h1>
+  <h1 id="participate" class="anchor"><a href="#participate"><i class="fas fa-link anchor-icon"></i></a> Participate with suggestions and constructive criticism</h1>
 </div>
 
-<p>{% t participate.up_to_date %} {% t participate.software_updates %} {% t participate.follow_news %} {% t participate.keep_up %} {% t participate.find_an_issue %} <strong>{% t participate.talk_to_us %}</strong> {% t participate.find_us_on %} <a rel="me" href="https://social.privacytools.io/@privacytools">{% t participate.mastodon %}</a> {% t participate.or %} <a href="https://chat.privacytools.io">Matrix</a> {% t participate.at %} <code class="highlighter-rouge">#general:privacytools.io</code>.</p>
+<p>It's important for a website like PrivacyTools to stay up-to-date. Keep an eye on software updates for the applications listed on our site. Follow recent news about providers that we recommend. We try our best to keep up, but we're not perfect and the internet is changing fast. If you find an error, or you think a provider should not be listed here, or a qualified service provider is missing, or a browser plugin is not the best choice anymore, or anything else... <strong>Talk to us please.</strong> You can also find us on <a rel="me" href="https://social.privacytools.io/@privacytools">our own Mastodon instance</a> or on <a href="https://chat.privacytools.io">Matrix</a> at <code class="highlighter-rouge">#general:privacytools.io</code>.</p>
-
-{%- capture discourse -%}{% t participate.discourse %}{%- endcapture -%}
-{%- capture mastodon -%}{% t participate.follow %} Mastodon & Twitter{%- endcapture -%}
-{%- capture mastodon2 -%}{% t participate.mastodon_follow %}{%- endcapture -%}
-{%- capture github -%}{% t participate.github %}{%- endcapture -%}
-{%- capture github2 -%}{% t participate.github_d %}{%- endcapture -%}
-{%- capture contrib -%}<a class="btn btn-warning mb-1" href="https://github.com/privacytoolsIO/privacytools.io/graphs/contributors">{% t participate.contributors %}</a>{%- endcapture -%}
 
 <div class="row">
 
@@ -19,27 +12,27 @@
   url="https://forum.privacytools.io/"
   website="Discourse"
   extra_button='<a class="btn btn-success mb-1" href="https://www.reddit.com/r/privacytoolsIO/">Reddit</a>'
-  description=discourse
+  description='Join our Discourse community to stay up to date on privacy news or make suggestions!'
   %}
 
   {% include card.html color="primary"
-  title=mastodon
+  title="Follow on Mastodon & Twitter"
   image="/assets/img/icons/mastodon.png"
   url="https://social.privacytools.io/"
   website="Mastodon"
   extra_button='<a class="btn btn-primary mb-1" href="https://twitter.com/privacytoolsIO">Twitter</a>'
-  description=mastodon2
+  description="Get the latest privacy-related updates from our Mastodon Feed. Follow us today!"
   %}
 
   {% include card.html color="warning"
-  title=github
+  title="Develop on GitHub"
   font="fab fa-github"
   url="https://github.com/privacytoolsIO/privacytools.io"
   website="GitHub"
-  description=github2
+  description="The complete website source code is available on GitHub. Join our developer team!"
-  extra_button=contrib
+  extra_button='<a class="btn btn-warning mb-1" href="https://github.com/privacytoolsIO/privacytools.io/graphs/contributors">Contributor List</a>'
   %}
 
 </div>
 
-<p>{% t participate.thanks %}</p>
+<p>This is a community project aiming to deliver the best information available to improve privacy online. Thank you for participating. This project needs you.</p>

_includes/sections/privacy-resources.html

@@ -1,42 +1,43 @@
-<h1 id="resources" class="anchor"><a href="#resources"><i class="fas fa-link anchor-icon"></i></a> {% t privacy_resources.header %}</h1>
+<h1 id="resources" class="anchor"><a href="#resources"><i class="fas fa-link anchor-icon"></i></a> More Privacy Resources</h1>
 
-<h3>{% t privacy_resources.guides %}</h3>
+<h3>Guides</h3>
 
 <ul>
-  <li><a href="https://ssd.eff.org/"><strong>{% t privacy_resources.guide1 %}</strong></a> - {% t privacy_resources.guide1_d %}</li>
+  <li><a href="https://ssd.eff.org/"><strong>Surveillance Self-Defense by EFF</strong></a> - Guide to defending yourself from surveillance by using secure technology and developing careful practices.</li>
-  <li><a href="https://github.com/cryptoseb/CryptoPaper"><strong>{% t privacy_resources.guide2 %}</strong></a> - {% t privacy_resources.guide2_d %}</li>
+  <li><a href="https://github.com/cryptoseb/CryptoPaper"><strong>The Crypto Paper</strong></a> - Privacy, Security and Anonymity for Every Internet User.</li>
-  <li><a href="https://emailselfdefense.fsf.org/en/"><strong>{% t privacy_resources.guide3 %}</strong></a> - {% t privacy_resources.guide3_d %}</li>
+  <li><a href="https://emailselfdefense.fsf.org/en/"><strong>Email Self-Defense by FSF</strong></a> - A guide to fighting surveillance with GnuPG encryption.</li>
-  <li><a href="https://www.bestvpn.com/the-ultimate-privacy-guide/"><strong>{% t privacy_resources.guide4 %}</strong></a> - {% t privacy_resources.guide4_d %}</li>
+  <li><a href="https://www.bestvpn.com/the-ultimate-privacy-guide/"><strong>The Ultimate Privacy Guide</strong></a> - Excellent privacy guide written by the creators of the bestVPN.com website.</li>
-  <li><a href="https://www.ivpn.net/privacy-guides"><strong>{% t privacy_resources.guide5 %}</strong></a> - {% t privacy_resources.guide5_d %}</li>
+  <li><a href="https://www.ivpn.net/privacy-guides"><strong>IVPN Privacy Guides</strong></a> - These privacy guides explain how to obtain vastly greater freedom, privacy and anonymity through compartmentalization and isolation.</li>
-  <li><a href="https://fried.com/privacy"><strong>{% t privacy_resources.guide6 %}</strong></a> - {% t privacy_resources.guide6_d %}</li>
+  <li><a href="https://fried.com/privacy"><strong>The Ultimate Guide to Online Privacy</strong></a> - Comprehensive "Ninja Privacy Tips" and 150+ tools.</li>
 </ul>
 
 <h3>Information</h3>
 
 <ul>
-  <li><a href="https://freedom.press/"><strong>{% t privacy_resources.info5 %}</strong></a> - {% t privacy_resources.info5_d %}</li>
+  <li><a href="https://freedom.press/"><strong>Freedom of the Press Foundation</strong></a> - Supporting and defending journalism dedicated to transparency and accountability since 2012.</li>
-  <li><a href="https://www.erfahrungen.com/mit/anonymisierung/t/"><strong>{% t privacy_resources.info6 %}</strong></a> - {% t privacy_resources.info6_d %}</li>
+  <li><a href="https://www.erfahrungen.com/mit/anonymisierung/t/"><strong>Erfahrungen.com</strong></a> - German review aggregator website of privacy-related services.</li>
-  <li><a href="https://openwireless.org/"><strong>{% t privacy_resources.info4 %}</strong></a> - {% t privacy_resources.info4_d %}</li>
+  <li><a href="https://openwireless.org/"><strong>Open Wireless Movement</strong></a> - a coalition of Internet freedom advocates, companies, organizations, and technologists working to develop new wireless technologies and to inspire a movement of Internet openness.</li>
-  <li><a href="https://privacy.net/us-government-surveillance-spying-data"><strong>{% t privacy_resources.info8 %}</strong></a> - {% t privacy_resources.info8_d %}</li>
+  <li><a href="https://privacy.net/us-government-surveillance-spying-data"><strong>privacy.net</strong></a> - What does the US government know about you?</li>
-  <li><a href="https://www.reddit.com/r/privacytoolsIO/wiki/index"><strong>{% t privacy_resources.info1 %}</strong></a> - {% t privacy_resources.info1_d %}</li>
+  <li><a href="https://www.reddit.com/r/privacytoolsIO/wiki/index"><strong>r/privacytoolsIO Wiki</strong></a> - Our Wiki on reddit.com.</li>
-  <li><a href="https://www.grc.com/securitynow.htm"><strong>{% t privacy_resources.info2 %}</strong></a> - {% t privacy_resources.info2_d %}</li>
+  <li><a href="https://www.grc.com/securitynow.htm"><strong>Security Now!</strong></a> - Weekly Internet Security Podcast by Steve Gibson and Leo Laporte.</li>
-  <li><a href="https://www.jupiterbroadcasting.com/show/techsnap/"><strong>{% t privacy_resources.info3 %}</strong></a> - {% t privacy_resources.info3_d %}</li>
+  <li><a href="https://www.jupiterbroadcasting.com/show/techsnap/"><strong>TechSNAP</strong></a> - Weekly Systems, Network, and Administration Podcast. Every week TechSNAP covers the stories that impact those of us in the tech industry.</li>
-  <li><a href="https://tosdr.org/"><strong>{% t privacy_resources.info7 %}</strong></a> - {% t privacy_resources.info7_d %}</li>
+  <li><a href="https://tosdr.org/"><strong>Terms of Service; Didn't Read</strong></a> - "I have read and agree to the Terms" is the biggest lie on the web. We aim to fix that.</li>
-  <li><a href="https://codeberg.org/crimeflare/cloudflare-tor"><strong>{% t privacy_resources.info9 %}</strong></a> - {% t privacy_resources.info9_d %}</li>
+  <li><a href="https://codeberg.org/crimeflare/cloudflare-tor"><strong>The Great Cloudwall</strong></a> - Critique and information on why to avoid Cloudflare, a big company with a huge portion of the internet behind it.</li>
 </ul>
 
 <h3>Tools</h3>
 
 <ul>
-  <li><a href="https://ipleak.net/"><strong>{% t privacy_resources.tool1 %}</strong></a> - {% t privacy_resources.tool1_d %}</li>
+  <li><a href="https://ipleak.net/"><strong>ipleak.net</strong></a> - IP/DNS Detect - What is your IP, what is your DNS, what informations you send to websites.</li>
-  <li><a href="https://www.ghacks.net/2015/12/28/the-ultimate-online-privacy-test-resource-list/"><strong>{% t privacy_resources.tool2 %}</strong></a> - {% t privacy_resources.tool2_d %}</li>
+  <li><a href="https://www.ghacks.net/2015/12/28/the-ultimate-online-privacy-test-resource-list/"><strong>The ultimate Online Privacy Test Resource List</strong></a> - A collection of Internet sites that check whether your web browser leaks information.</li>
-  <li><a href="https://prism-break.org/"><strong>{% t privacy_resources.tool3 %}</strong></a> - {% t privacy_resources.tool3_d %}</li>
+  <li><a href="https://prism-break.org/"><strong>PRISM Break</strong></a> - We all have a right to privacy, which you can exercise today by encrypting your communications and ending your reliance on proprietary services.</li>
-  <li><a href="https://securityinabox.org/"><strong>{% t privacy_resources.tool4 %}</strong></a> - {% t privacy_resources.tool4_d %}</li>
+  <li><a href="https://securityinabox.org/"><strong>Security in-a-Box</strong></a> - A guide to digital security for activists and human rights defenders throughout the world.</li>
-  <li><a href="https://securedrop.org/"><strong>{% t privacy_resources.tool5 %}</strong></a> - {% t privacy_resources.tool5_d %}</li>
+  <li><a href="https://securedrop.org/"><strong>SecureDrop</strong></a> - An open-source whistleblower submission system that media organizations can use to securely accept documents from and communicate with anonymous sources. It was originally created
-  <li><a href="https://pack.resetthenet.org/"><strong>{% t privacy_resources.tool6 %}</strong></a> - {% t privacy_resources.tool6_d %}</li>
+    by the late Aaron Swartz and is currently managed by Freedom of the Press Foundation.</li>
-  <li><a href="https://secfirst.org/"><strong>{% t privacy_resources.tool7 %}</strong></a> - {% t privacy_resources.tool7_d %}</li>
+  <li><a href="https://pack.resetthenet.org/"><strong>Reset The Net - Privacy Pack</strong></a> - Help fight to end mass surveillance. Get these tools to protect yourself and your friends.</li>
-  <li><a href="https://www.osalt.com/"><strong>{% t privacy_resources.tool8 %}</strong></a> - {% t privacy_resources.tool8_d %}</li>
+  <li><a href="https://secfirst.org/"><strong>Security First</strong></a> - Umbrella is an Android app that provides all the advice needed to operate safely in a hostile environment.</li>
-  <li><a href="https://alternativeto.net/"><strong>{% t privacy_resources.tool9 %}</strong></a> - {% t privacy_resources.tool9_d %}</li>
+  <li><a href="https://www.osalt.com/"><strong>Osalt</strong></a> - A directory to help you find open source alternatives to proprietary tools.</li>
+  <li><a href="https://alternativeto.net/"><strong>AlternativeTo</strong></a> - A directory to help find alternatives to other software, with the option to only show open source software</li>
 </ul>
 
-<p>{% t privacy_resources.note %}</p>
+<p>Note: Just being open source does not make software secure!</p>

_includes/sections/quotes.html

@@ -1,5 +1,5 @@
 <div class="page-header">
-  <h1>{% t quotes.header %}</h1>
+  <h1>Privacy? I don't have anything to hide.</h1>
 </div>
 <blockquote class="blockquote">
   <p><a href="https://www.ted.com/talks/glenn_greenwald_why_privacy_matters" title="Glenn Greenwald - Why privacy matters - TED Talk"><img src="/assets/img/layout/Glenn-Greenwald-Why-privacy-matters.jpg" width="177" height="200" class="img-fluid float-right ml-2" alt="Glenn Greenwald: Why privacy matters"></a>
@@ -14,7 +14,7 @@
    <footer class="blockquote-footer">Joshua in <cite title="The Crypto Paper"><a href="https://github.com/cryptoseb/CryptoPaper#let-me-explain-further">The Crypto Paper</a></cite></footer>
 </blockquote>
 
-<h4>{% t global.further_reading %}</h4>
+<h4>Read also:</h4>
 
 <ul>
   <li><a href="https://en.wikipedia.org/wiki/Nothing_to_hide_argument">Nothing to hide argument (Wikipedia)</a></li>
@@ -22,7 +22,7 @@
   <li><a href="https://papers.ssrn.com/sol3/papers.cfm?abstract_id=998565">'I've Got Nothing to Hide' and Other Misunderstandings of Privacy (Daniel J. Solove - San Diego Law Review)</a></li>
 </ul>
 
-<h1 id="quotes" class="anchor"><a href="#quotes"><i class="fas fa-link anchor-icon"></i></a> {% t quotes.quotes %}</h1>
+<h1 id="quotes" class="anchor"><a href="#quotes"><i class="fas fa-link anchor-icon"></i></a> Quotes</h1>
 
 <blockquote class="blockquote">
   <p>Arguing that you don't care about the right to privacy because you have nothing to hide is no different than saying you don't care about free speech because you have nothing to say.</p>

_includes/sections/resources.html

@@ -1,68 +1,55 @@
-<h1 id="os" class="anchor">{% t resources.tools %}</h1>
+<h1 id="os" class="anchor">Privacy Tools</h1>
 
-<p><a href="/classic/"><i class="fas fa-info-circle"></i> {%t resources.classic %}</a></p>
+<p><a href="/classic/"><i class="fas fa-info-circle"></i> Prefer the classic site? View a single-page layout.</a></p>
-
-{%- capture title1 -%}{% t resources.providers %}{%- endcapture -%}
-{%- capture descr1 -%}{% t resources.providers_description %}{%- endcapture -%}
-{%- capture title2 -%}{% t resources.browsers %}{%- endcapture -%}
-{%- capture descr2 -%}{% t resources.browsers_description %}{%- endcapture -%}
-{%- capture title3 -%}{% t resources.software %}{%- endcapture -%}
-{%- capture descr3 -%}{% t resources.software_description %}{%- endcapture -%}
-{%- capture title4 -%}{% t resources.os %}{%- endcapture -%}
-{%- capture descr4 -%}{% t resources.os_description %}{%- endcapture -%}
-{%- capture title5 -%}{% t resources.services %}{%- endcapture -%}
-{%- capture descr5 -%}{% t resources.services_description %}{%- endcapture -%}
-{%- capture title6 -%}{% t resources.donate %}{%- endcapture -%}
-{%- capture descr6 -%}{% t resources.donate_description %}{%- endcapture -%}
 
 <div class="row">
 
   {% include card.html color="success"
-  title=title1
+  title="Providers"
   icon="fas fa-server"
   iconcolor="dark"
   page="/providers/"
-  description=descr1
+  description="Discover privacy-centric online services, including email providers, VPN operators, DNS administrators, and more!"
   %}
 
   {% include card.html color="primary"
-  title=title2
+  title="Web Browsers"
   icon="far fa-compass"
   iconcolor="dark"
   page="/browsers/"
-  description=descr2
+  description="Find a web browser that respects your privacy, and discover how to harden your browser against tracking and leaks."
   %}
 
   {% include card.html color="warning"
-  title=title3
+  title="Software"
   icon="far fa-window-restore"
   iconcolor="dark"
   page="/software/"
-  description=descr3
+  description="Discover a variety of open source software built to protect your privacy and keep your digital data secure."
   %}
 
   {% include card.html color="info"
-  title=title4
+  title="Operating Systems"
   icon="fas fa-desktop"
   iconcolor="dark"
   page="/operating-systems/"
-  description=descr4
+  description="Find out how your operating system is compromising your privacy, and what simple alternatives exist."
   %}
 
   {% include card.html color="secondary"
-  title=title5
+  title="PrivacyTools Services"
   icon="far fa-eye-slash"
   iconcolor="dark"
   page="/services/"
-  description=descr5
+  description="The PrivacyTools team is proud to launch a variety of privacy-centric online services, including a Mastodon instance, search engine, and more!"
   %}
 
   {% include card.html color="danger"
-  title=title6
+  title="Donate"
   icon="fas fa-donate"
   iconcolor="dark"
   page="/donate/"
-  description=descr6
+  description="We can't operate this site without the generous contributions we receive from our viewers. If you love privacy and our website please consider donating."
   %}
 
 </div>

_includes/sections/router-firmware.html

@@ -1,18 +1,11 @@
-<h1 id="firmware" class="anchor"><a href="#firmware"><i class="fas fa-link anchor-icon"></i></a> {% t router.firmware %}</h1>
+<h1 id="firmware" class="anchor"><a href="#firmware"><i class="fas fa-link anchor-icon"></i></a> Open Source Router Firmware</h1>
-
-{%- capture router_openwrt_labels -%}warning:contrib:{% t global.contrib %}{%- endcapture -%}
-{%- capture router_openwrt_descr -%}{% t router.openwrt_descr %}{%- endcapture -%}
-{%- capture router_pfsense_labels -%}warning:contrib:{% t global.contrib %}{%- endcapture -%}
-{%- capture router_pfsense_descr -%}{% t router.pfsense_descr %}{%- endcapture -%}
-{%- capture router_librecmc_descr -%}{% t router.librecmc_descr %}{%- endcapture -%}
-
 
 {% include cardv2.html
 title="OpenWrt"
 image="/assets/img/tools/OpenWrt.png"
-description=router_openwrt_descr
+description="OpenWrt is an operating system (in particular, an embedded operating system) based on the Linux kernel, primarily used on embedded devices to route network traffic. The main components are the Linux kernel, util-linux, uClibc and BusyBox. All components have been optimized for size, to be small enough for fitting into the limited storage and memory available in home routers."
 badges="info:Linux"
-labels=router_openwrt_labels
+labels="warning:contrib:This software may depend on or recommend non-free software."
 website="https://openwrt.org/"
 git="https://git.openwrt.org/"
 %}
@@ -20,9 +13,9 @@ git="https://git.openwrt.org/"
 {% include cardv2.html
 title="pfSense"
 image="/assets/img/tools/pfSense.png"
-description=router_pfsense_descr
+description="pfSense is an open source firewall/router computer software distribution based on FreeBSD. It is installed on a computer to make a dedicated firewall/router for a network and is noted for its reliability and offering features often only found in expensive commercial firewalls. pfSense is commonly deployed as a perimeter firewall, router, wireless access point, DHCP server, DNS server, and as a VPN endpoint."
 badges="info:BSD"
-labels=router_pfsense_labels
+labels="warning:contrib:This software may depend on or recommend non-free software."
 website="https://www.pfsense.org/"
 github="https://github.com/pfsense/"
 %}
@@ -30,15 +23,15 @@ github="https://github.com/pfsense/"
 {% include cardv2.html
 title="LibreCMC"
 image="/assets/img/tools/LibreCMC.png"
-description=router_librecmc_descr
+description="LibreCMC is a GNU/Linux-libre distribution for computers with minimal resources, such as the Ben Nanonote, ath9k-based Wi-Fi routers, and other hardware with emphasis on free software. The project's current goal is to aim for compliance with the GNU Free System Distribution Guidelines (GNU FSDG) and ensure that the project continues to meet these requirements set forth by the Free Software Foundation (FSF)."
 badges="info:GNU/Linux"
 website="https://librecmc.org"
 git="https://gogs.librecmc.org/libreCMC/libreCMC"
 %}
 
-<h3>{% t router.worth_mentioning %}</h3>
+<h3>Worth Mentioning</h3>
 
 <ul>
-  <li><a href="https://www.openbsd.org/">OpenBSD</a> <span class="badge badge-info">BSD</span> - {% t router.openbsd_descr %}</li>
+  <li><a href="https://www.openbsd.org/">OpenBSD</a> <span class="badge badge-info">BSD</span> - A project that produces a free, multi-platform 4.4BSD-based UNIX-like operating system. Emphasizes portability, standardization, correctness, proactive security and integrated cryptography.</li>
-  <li><a href="https://dd-wrt.com/">DD-WRT</a> <span class="badge badge-info">Linux</span> <span class="badge badge-warning" data-toggle="tooltip" title="{% t global.contrib %}">contrib <i class="far fa-question-circle"></i></span> - {% t router.ddwrt_descr %}</li>
+  <li><a href="https://dd-wrt.com/">DD-WRT</a> <span class="badge badge-info">Linux</span> <span class="badge badge-warning" data-toggle="tooltip" title="This software may depend on or recommend non-free software.">contrib <i class="far fa-question-circle"></i></span> - A Linux-based open-source firmware compatible with several models of routers and access points.</li>
 </ul>

_includes/sections/search-engines.html

@@ -7,21 +7,13 @@
 {% include cardv2.html
 title="searx - Decentral"
 image="/assets/img/provider/searx.png"
-description='searx is an <a href="https://github.com/asciimoo/searx">open-source</a> metasearch engine, aggregating the results of other search engines while not storing information about its users. No logs, no ads and no tracking. <a href="https://github.com/asciimoo/searx/wiki/Searx-instances">List of Instances</a> or try <a href="https://search.privacytools.io/">search.privacytools.io</a>'
+description='searx is an <a href="https://github.com/asciimoo/searx">open-source</a> metasearch engine, aggregating the results of other search engines while not storing information about its users. No logs, no ads and no tracking. There is a <a href="https://github.com/asciimoo/searx/wiki/Searx-instances">list of public instances</a>, or you can try <a href="https://search.privacytools.io/">the PrivacyTools Search</a>'
 website="https://searx.me/"
 tor="http://ulrn6sryqaifefld.onion"
 forum="https://forum.privacytools.io/t/discussion-searx/283"
 github="https://github.com/asciimoo/searx"
 %}
 
-{% include cardv2.html
-title="StartPage - Netherlands"
-image="/assets/img/provider/StartPage.png"
-description="StartPage is a search engine that provides Google search results with complete privacy protection. Behind StartPage is a European company that has been obsessive about privacy since 2006."
-website="https://www.startpage.com/"
-forum="https://forum.privacytools.io/t/discussion-startpage/284"
-%}
-
 {% include cardv2.html
 title="DuckDuckGo - USA"
 image="/assets/img/provider/DuckDuckGo.png"

_includes/sections/self-contained-networks.html

@@ -4,37 +4,59 @@
   <strong>If you are currently browsing <a href="https://en.wikipedia.org/wiki/Surface_Web">clearnet</a> and want to access the <a href="https://en.wikipedia.org/wiki/Dark_web">dark web</a>, this section is for you.</strong>
 </div>
 
-<div class="row mb-2">
+{% include cardv2.html
+title="Tor"
+image="/assets/img/tools/Tor-Project.png"
+description="The Tor network is a group of volunteer-operated servers that allows people to improve their privacy and security on the Internet. Tor's users employ this network by connecting through a series of virtual tunnels rather than making a direct connection, thus allowing both organizations and individuals to share information over public networks without compromising their privacy. Tor is an effective censorship circumvention tool."
+website="https://www.torproject.org/"
+tor="http://expyuzz4wqqyqhjn.onion"
+forum="https://forum.privacytools.io/t/discussion-tor/1589"
+windows="https://www.torproject.org/download/"
+mac="https://www.torproject.org/download/"
+linux="https://www.torproject.org/download/"
+freebsd="https://www.freshports.org/security/tor"
+openbsd="http://openports.se/net/tor"
+netbsd="http://pkgsrc.se/net/tor"
+fdroid="https://support.torproject.org/tormobile/tormobile-7/"
+googleplay="https://play.google.com/store/apps/details?id=org.torproject.torbrowser"
+android="https://www.torproject.org/download/#android"
+git="https://gitweb.torproject.org/tor.git"
+%}
 
-  {% include card.html color="success"
+{% include cardv2.html
-  title="Tor"
+title="I2P Anonymous Network"
-  image="/assets/img/tools/Tor-Project.png"
+image="/assets/img/tools/I2P.png"
-  url="https://www.torproject.org/"
+image-dark="/assets/img/tools/I2P-dark.png"
-  tor="http://expyuzz4wqqyqhjn.onion"
+description="The Invisible Internet Project (I2P) is a computer network layer that allows applications to send messages to each other pseudonymously and securely. Uses include anonymous Web surfing, chatting, blogging, and file transfers. The software that implements this layer is called an I2P router and a computer running I2P is called an I2P node. The software is free and open-source and is published under multiple licenses."
-  footer='OS: Windows, macOS, Linux, <a href="https://mike.tig.as/onionbrowser/">iOS</a>, Android (<a href="https://www.torproject.org/download/#android">Tor Browser</a>, <a href="https://guardianproject.info/apps/orbot/">Proxy other apps with Orbot</a>), <a href="https://github.com/torbsd/openbsd-ports">OpenBSD.</a>'
+website="https://geti2p.net/"
-  description="The Tor network is a group of volunteer-operated servers that allows people to improve their privacy and security on the Internet. Tor's users employ this network by connecting through a series of virtual tunnels rather than making a direct connection, thus allowing both organizations and individuals to share information over public networks without compromising their privacy. Tor is an effective censorship circumvention tool."
+forum="https://forum.privacytools.io/t/discussion-i2p/1590"
-  %}
+i2p="http://i2p-projekt.i2p/"
+windows="https://geti2p.net/en/download#windows"
+mac="https://geti2p.net/en/download#mac"
+linux="https://geti2p.net/en/download#unix"
+freebsd="https://www.freshports.org/security/i2p/"
+openbsd="http://openports.se/net/i2pd"
+netbsd="http://pkgsrc.se/wip/i2pd"
+fdroid="https://f-droid.org/app/net.i2p.android.router"
+googleplay="https://play.google.com/store/apps/details?id=net.i2p.android"
+android="https://download.i2p2.de/android/current/"
+source="https://geti2p.net/en/get-involved/guides/new-developers#getting-the-i2p-code"
+%}
 
-  {% include card.html color="primary"
+{% include cardv2.html
-  title="I2P Anonymous Network"
+title="The Freenet Project"
-  image="/assets/img/tools/I2P.png"
+image="/assets/img/tools/Freenet.png"
-  url="https://geti2p.net/"
+description="Freenet is a peer-to-peer platform for censorship-resistant communication. It uses a decentralized distributed data store to keep and deliver information, and has a suite of free software for publishing and communicating on the Web without fear of censorship. Both Freenet and some of its associated tools were originally designed by Ian Clarke, who defined Freenet's goal as providing freedom of speech on the Internet with strong anonymity protection."
-  footer="OS: Windows, macOS, Linux, Android, BSD / Solaris."
+website="https://freenetproject.org/"
-  description="The Invisible Internet Project (I2P) is a computer network layer that allows applications to send messages to each other pseudonymously and securely. Uses include anonymous
+forum="https://forum.privacytools.io/t/discussion-freenet/1591"
-  Web surfing, chatting, blogging, and file transfers. The software that implements this layer is called an I2P router and a computer running I2P is called an I2P node. The software is free and open-source and is published under multiple licenses."
+windows="https://freenetproject.org/pages/download.html#windows"
-  %}
+mac="https://freenetproject.org/pages/download.html#os-x"
-
+linux="https://freenetproject.org/pages/download.html#gnulinux-posix"
-  {% include card.html color="warning"
+freebsd="https://freenetproject.org/pages/download.html#gnulinux-posix"
-  title="The Freenet Project"
+openbsd="https://freenetproject.org/pages/download.html#gnulinux-posix"
-  image="/assets/img/tools/Freenet.png"
+netbsd="https://freenetproject.org/pages/download.html#gnulinux-posix"
-  url="https://freenetproject.org/"
+github="https://github.com/freenet/"
-  footer="OS: Windows, macOS, Linux."
+%}
-  description="Freenet is a peer-to-peer platform for censorship-resistant communication. It uses a decentralized distributed data store to keep and deliver information, and
-  has a suite of free software for publishing and communicating on the Web without fear of censorship. Both Freenet and some of its associated tools were originally designed by Ian Clarke, who defined Freenet's goal as providing freedom of speech
-  on the Internet with strong anonymity protection."
-  %}
-
-</div>
 
 <h3>Related Information</h3>
 
@@ -45,7 +67,7 @@
 <h3>Worth Mentioning</h3>
 
 <ul>
-  <li><a href="https://zeronet.io/">ZeroNet</a> - Open, free, and uncensorable websites, using Bitcoin cryptography and BitTorrent network.</li>
+  <li><a href="https://zeronet.io/">ZeroNet</a> - Open, free, and uncensorable websites, using Bitcoin cryptography and BitTorrent network. <span class="badge badge-danger" data-toggle="tooltip" title="Your IP address isn't hidden by default and won't be, unless you enforce Tor usage.">privacy warning <span class="far fa-question-circle"></span></span></li>
   <li><a href="https://retroshare.cc/">RetroShare</a> - An open source, cross-platform, friend-to-friend, secure, and decentralized communication platform.</li>
   <li><a href="https://gnunet.org/">GNUnet</a> - GNUnet provides a strong foundation of free software for a global, distributed network that provides security and privacy.</li>
   <li><a href="https://ipfs.io/">IPFS</a> <em>and</em> <a href="https://github.com/ipfs-shipyard/ipfs-companion">IPFS Companion</a>- A peer-to-peer hypermedia protocol to make the web faster, safer, and more open. IPFS Companion is a browser extension for redirecting queries to a gateway of your choice (generally local). <a href="https://github.com/privacytoolsIO/privacytools.io/pull/361#issuecomment-344414022">

_includes/sections/selfhosted-cloud.html

@@ -7,7 +7,7 @@
 {% include cardv2.html
 title="Nextcloud"
 image="/assets/img/provider/Nextcloud.png"
-description="Nextcloud has similar functionally to the widely used Dropbox, with the difference being that Nextcloud is free and open-source, thereby allowing anyone to install and operate it without charge on a private server with no limits on storage space or the number of connected clients."
+description="Nextcloud is similar in functionality to the widely used Dropbox, with the difference being that Nextcloud is free and open-source, thereby allowing anyone to install and operate it without charge on a private server with no limits on storage space or the number of connected clients."
 website="https://nextcloud.com/"
 forum="https://forum.privacytools.io/t/discussion-nextcloud/287"
 windows="https://nextcloud.com/install/#install-clients"

_includes/sections/teamchat.html

@@ -58,10 +58,3 @@
   firefox="https://addons.mozilla.org/en-US/firefox/addon/keybase-for-firefox/"
   chrome="https://chrome.google.com/webstore/detail/keybase-for-reddit/ognfafcpbkogffpmmdglhbjboeojlefj"
 %}
-
-
-<h3>Worth Mentioning</h3>
-
-<ul>
-  <li><a href="https://wire.com/en/products/pro-secure-team-collaboration/">Wire Pro</a> - Paid team communication with E2EE. <span class="badge badge-warning" data-toggle="tooltip" title="While the free edition of Wire is a recommended platform, we have not tested the Pro edition.">Untested <i class="far fa-question-circle"></i></span></li>
-</ul>

_includes/sections/windows10.html

@@ -1,83 +1,83 @@
-<h1 id="win10" class="anchor"><a href="#win10"><i class="fas fa-link anchor-icon"></i></a> {% t windows_10.header %}</h1>
+<h1 id="win10" class="anchor"><a href="#win10"><i class="fas fa-link anchor-icon"></i></a> Don't use Windows 10 - It's a privacy nightmare</h1>
 
 <div class="alert alert-warning" role="alert">
-  <strong>{% t windows_10.warning %}</strong>
+  <strong>Microsoft introduced a lot of new features in Windows 10 such as Cortana. However, most of them are violating your privacy.</strong>
 </div>
 
-<img src="/assets/img/layout/Windows-10-Privacy.png" width="367" height="369" class="img-fluid float-right ml-3" alt="{% t windows_10.alt %}">
+<img src="/assets/img/layout/Windows-10-Privacy.png" width="367" height="369" class="img-fluid float-right ml-3" alt="Windows 10 Privacy">
 
 <ol>
-  <li><strong>{% t windows_10.data %}</strong>
+  <li><strong>Data syncing is by default enabled.</strong>
     <ul>
-      <li>{% t windows_10.data1 %}</li>
+      <li>Browsing history and open websites.</li>
-      <li>{% t windows_10.data2 %}</li>
+      <li>Apps settings.</li>
-      <li>{% t windows_10.data3 %}</li>
+      <li>WiFi hotspot names and passwords.</li>
     </ul>
   </li>
 
-  <li><strong>{% t windows_10.ad_id %}</strong>
+  <li><strong>Your device is by default tagged with a unique advertising ID.</strong>
     <ul>
-      <li>{% t windows_10.ad_id1 %}</li>
+      <li>Used to serve you with personalized advertisements by third-party advertisers and ad networks.</li>
     </ul>
   </li>
 
-  <li><strong>{% t windows_10.cortana %}</strong>
+  <li><strong>Cortana can collect any of your data.</strong>
     <ul>
-      <li>{% t windows_10.cortana1 %}</li>
+      <li>Your keystrokes, searches and mic input.</li>
     </ul>
     <ul>
-      <li>{% t windows_10.cortana2 %}</li>
+      <li>Calendar data.</li>
     </ul>
     <ul>
-      <li>{% t windows_10.cortana3 %}</li>
+      <li>Music you listen to.</li>
     </ul>
     <ul>
-      <li>{% t windows_10.cortana4 %}</li>
+      <li>Credit Card information.</li>
     </ul>
     <ul>
-      <li>{% t windows_10.cortana5 %}</li>
+      <li>Purchases.</li>
     </ul>
   </li>
 
-  <li><strong>{% t windows_10.collection %}</strong>
+  <li><strong>Microsoft can collect any personal data.</strong>
     <ul>
-      <li>{% t windows_10.collection1 %}</li>
+      <li>Your identity.</li>
     </ul>
     <ul>
-      <li>{% t windows_10.collection2 %}</li>
+      <li>Passwords.</li>
     </ul>
     <ul>
-      <li>{% t windows_10.collection3 %}</li>
+      <li>Demographics.</li>
     </ul>
     <ul>
-      <li>{% t windows_10.collection4 %}</li>
+      <li>Interests and habits.</li>
     </ul>
     <ul>
-      <li>{% t windows_10.collection5 %}</li>
+      <li>Usage data.</li>
     </ul>
     <ul>
-      <li>{% t windows_10.collection6 %}</li>
+      <li>Contacts and relationships.</li>
     </ul>
     <ul>
-      <li>{% t windows_10.collection7 %}</li>
+      <li>Location data.</li>
     </ul>
     <ul>
-      <li>{% t windows_10.collection8 %}</li>
+      <li>Content like emails, instant messages, caller list, audio and video recordings.</li>
     </ul>
   </li>
 
-  <li><strong>{% t windows_10.sharing %}</strong>
+  <li><strong>Your data can be shared.</strong>
     <ul>
-      <li>{% t windows_10.sharing1 %}</li>
+      <li>When downloading Windows 10, you are authorizing Microsoft to share any of above-mentioned data with any third-party, with or without your consent.</li>
     </ul>
   </li>
 </ol>
 
-<p><a class="btn btn-warning" href="https://www.winprivacy.de/english-home/">{% t global.download %}: W10Privacy</a></p>
+<p><a class="btn btn-warning" href="https://www.winprivacy.de/english-home/">Download: W10Privacy</a></p>
 
-<p>{% t windows_10.tool %}</p>
+<p>This tool uses some known methods that attempt to disable major tracking features in Windows 10.</p>
 
-<h3>{% t global.related_information %}</h3>
+<h3>Related Information</h3>
 
 <ul>
   <li><a href="https://privacy.microsoft.com/en-us/privacystatement">Microsoft Privacy Statement</a> - Microsoft collects, uses and discloses personal information as described here. This allows OneDrive data, Cortana searches, and MS browser history to be sold to third parties.</li>

_includes/team.html

@@ -0,0 +1,51 @@
+<div class="col-12 col-sm-6 col-lg-4 col-xl-3">
+  <div class="card mb-3 mx-4 mx-sm-0" itemscope itemtype="http://schema.org/Person">
+    <img src="{{ site.baseurl }}/assets/img/team/{{ include.avatar }}" class="card-img-top" itemprop="image" alt="{% if include.nick %}{{ include.nick }}{% else %}{{ include.name }}{% endif %}">
+    <div class="card-body">
+
+      <h5 class="card-title mt-0" itemprop="name">
+      {% if include.nick %}
+        {{ include.nick }}</h5>
+      <meta itemprop="alternateName" content="{{ include.name }}" />
+      {% else %}
+        {{ include.name }}</h5>
+      {% endif %}
+
+      <meta itemprop="affiliation" content="PrivacyTools" />
+      <h6 class="card-subtitle mb-2 text-muted" itemprop="jobTitle">{{ include.role | default: "Contributor" }}</h6>
+      <p class="card-text" {% if include.bio %}itemprop="description"{% endif %}>{{ include.bio | default: "<i>Hmm, this user hasn't written a bio quite yet :(</i>" }}</p>
+      <div class="mx-n2">
+        {% if include.email %}
+        <a href="mailto:{{ include.email }}" aria-label="Email" class="mx-2 text-decoration-none" itemprop="email">
+          <i class="fas fa-envelope" aria-hidden="true" title="{{ include.email }}"></i>
+        </a>
+        {% endif %}
+        {% if include.website %}
+        <a href="{{ include.website }}" aria-label="Website" class="mx-2 text-decoration-none" itemprop="url">
+          <i class="fas fa-link" aria-hidden="true" title="Website"></i>
+        </a>
+        {% endif %}
+        {% if include.keys %}
+        <a href="{{ include.keys }}" aria-label="Keys" class="mx-2 text-decoration-none" itemprop="sameAs">
+          <i class="fas fa-key" aria-hidden="true" title="Keys"></i>
+        </a>
+        {% endif %}
+        {% if include.mastodon %}
+        <a href="{{ include.mastodon }}" aria-label="Mastodon" class="mx-2 text-decoration-none" itemprop="sameAs">
+          <i class="fab fa-mastodon" aria-hidden="true" title="Mastodon Profile"></i>
+        </a>
+        {% endif %}
+        {% if include.twitter %}
+        <a href="https://twitter.com/{{ include.twitter }}" aria-label="Twitter" class="mx-2 text-decoration-none" itemprop="sameAs">
+          <i class="fab fa-twitter" aria-hidden="true" title="Twitter Profile"></i>
+        </a>
+        {% endif %}
+        {% if include.blog %}
+        <a href="https://blog.privacytools.io/author/{{ include.blog }}" aria-label="Blog" class="mx-2 text-decoration-none" itemprop="sameAs">
+          <i class="fas fa-pen-nib" aria-hidden="true" title="PrivacyTools Blog Author"></i>
+        </a>
+        {% endif %}
+      </div>
+    </div>
+  </div>
+</div>

_layouts/page.html

@@ -2,9 +2,11 @@
 layout: default
 ---
 
+{% include breadcrumbs.html %}
+
 <div class="jumbotron p-5">
-  <h1 class="display-4">{{ page.title | flatify }}</h1>
+  <h1 class="display-4">{{ page.title }}</h1>
-  {% if page.description and page.hidedesc != true %}<p class="lead">{{ page.description | flatify }}</p>{% endif %}
+  {% if page.description and page.hidedesc != true %}<p class="lead">{{ page.description }}</p>{% endif %}
 </div>
 
 {{ content }}

_plugins/expand_nested_variable_filter.rb

@@ -1,9 +0,0 @@
-module Jekyll
-  module ExpandNestedVariableFilter
-    def flatify(input)
-      Liquid::Template.parse(input).render(@context)
-    end
-  end
-end
-
-Liquid::Template.register_filter(Jekyll::ExpandNestedVariableFilter)

_sass/_vars.scss

@@ -24,3 +24,4 @@ $reddit:              #ff5700;
 $linkedin:            #4875b4;
 $email:               #444;
 $diaspora:            #2f3537;
+$tor:                 #7d4698;

_sass/ptio-font.scss

@@ -25,13 +25,15 @@
 
 [data-icon]:before,
 .ptio-f-droid:before,
+.ptio-i2p-garlic:before,
 .ptio-ios:before,
 .ptio-linux:before,
 .ptio-macos:before,
 .ptio-mix:before,
 .ptio-netbsd:before,
 .ptio-openbsd:before,
-.ptio-sailfish-os:before {
+.ptio-sailfish-os:before,
+.ptio-tor:before {
   display: inline-block;
   font-family: "ptio-font";
   font-style: normal;
@@ -47,6 +49,7 @@
 }
 
 .ptio-f-droid:before { content: "\f100"; }
+.ptio-i2p-garlic:before { content: "\f10c"; }
 .ptio-ios:before { content: "\f101"; }
 .ptio-linux:before { content: "\f102"; }
 .ptio-macos:before { content: "\f103"; }
@@ -54,3 +57,4 @@
 .ptio-netbsd:before { content: "\f104"; }
 .ptio-openbsd:before { content: "\f105"; }
 .ptio-sailfish-os:before { content: "\f106"; }
+.ptio-tor:before { content: "\f10b"; }

assets/css/dark.scss

@@ -99,6 +99,9 @@ img {
   border-color: darken($danger, 10%);
 }
 
+.btn-tor { background: desaturate($tor, 10%); }
+.btn-tor:hover { background: darken($tor, 5%); }
+
 .card {
   box-shadow: none !important;
 }
@@ -122,7 +125,8 @@ img {
 
 .card,
 .jumbotron,
-.list-group-item {
+.list-group-item,
+ol.breadcrumb {
   background: $dark-800;
 }
 

assets/css/style.scss

@@ -203,6 +203,39 @@ footer {
 }
 
 
+.btn-icon {
+  font-size: 1.5rem;
+  padding: 0.5rem;
+  border-radius: 0.25rem;
+  display: flex;
+  height: 2.4rem;
+  color: #ddd;
+}
+
+.btn-tor {
+  background: $tor;
+}
+.btn-tor:hover {
+  background: darken($tor, 5%);
+}
+
+
+
+/*
+ * Bootstrap 4.2+ features
+ */
+
+.text-decoration-none {
+  text-decoration: none !important;
+}
+
+.mx-n2 {
+  margin-left: -0.5rem;
+  margin-right: -0.5rem;
+}
+
+
+
 /*
  * Navbar
  */
@@ -323,8 +356,7 @@ input#nav-toggle,
   input#nav-toggle + label {
     display: block;
     cursor: pointer;
-    margin-top: 0.25rem;
+    margin-bottom: 0;
-    float: right;
   }
   .nav-dropdown {
     display: block;

assets/webfonts/ptio-font-preview.html

@@ -1,324 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <title>ptio-font glyphs preview</title>
-
-    <style>
-      /* Page Styles */
-
-      * {
-        -moz-box-sizing: border-box;
-        -webkit-box-sizing: border-box;
-        box-sizing: border-box;
-        margin: 0;
-        padding: 0;
-      }
-
-      body {
-        background: #fff;
-        color: #444;
-        font: 16px/1.5 "Helvetica Neue", Helvetica, Arial, sans-serif;
-      }
-
-      a,
-      a:visited {
-        color: #888;
-        text-decoration: underline;
-      }
-      a:hover,
-      a:focus { color: #000; }
-
-      header {
-        border-bottom: 2px solid #ddd;
-        margin-bottom: 20px;
-        overflow: hidden;
-        padding: 20px 0;
-      }
-
-      header h1 {
-        color: #888;
-        float: left;
-        font-size: 36px;
-        font-weight: 300;
-      }
-
-      header a {
-        float: right;
-        font-size: 14px;
-      }
-
-      .container {
-        margin: 0 auto;
-        max-width: 1200px;
-        min-width: 960px;
-        padding: 0 40px;
-        width: 90%;
-      }
-
-      .glyph {
-        border-bottom: 1px dotted #ccc;
-        padding: 10px 0 20px;
-        margin-bottom: 20px;
-      }
-
-      .preview-glyphs { vertical-align: bottom; }
-
-      .preview-scale {
-        color: #888;
-        font-size: 12px;
-        margin-top: 5px;
-      }
-
-      .step {
-        display: inline-block;
-        line-height: 1;
-        position: relative;
-        width: 10%;
-      }
-
-      .step .letters,
-      .step i {
-        -webkit-transition: opacity .3s;
-        -moz-transition: opacity .3s;
-        -ms-transition: opacity .3s;
-        -o-transition: opacity .3s;
-        transition: opacity .3s;
-      }
-
-      .step:hover .letters { opacity: 1; }
-      .step:hover i { opacity: .3; }
-
-      .letters {
-        opacity: .3;
-        position: absolute;
-      }
-
-      .characters-off .letters { display: none; }
-      .characters-off .step:hover i { opacity: 1; }
-
-      
-      .size-12 { font-size: 12px; }
-      
-      .size-14 { font-size: 14px; }
-      
-      .size-16 { font-size: 16px; }
-      
-      .size-18 { font-size: 18px; }
-      
-      .size-21 { font-size: 21px; }
-      
-      .size-24 { font-size: 24px; }
-      
-      .size-36 { font-size: 36px; }
-      
-      .size-48 { font-size: 48px; }
-      
-      .size-60 { font-size: 60px; }
-      
-      .size-72 { font-size: 72px; }
-      
-
-      .usage { margin-top: 10px; }
-
-      .usage input {
-        font-family: monospace;
-        margin-right: 3px;
-        padding: 2px 5px;
-        text-align: center;
-      }
-
-      .usage .point { width: 150px; }
-
-      .usage .class { width: 250px; }
-
-      footer {
-        color: #888;
-        font-size: 12px;
-        padding: 20px 0;
-      }
-
-      /* Icon Font: ptio-font */
-
-      @font-face {
-  font-family: "ptio-font";
-  src: url("./ptio-font.eot");
-  src: url("./ptio-font.eot?#iefix") format("embedded-opentype"),
-       url("./ptio-font.woff2") format("woff2"),
-       url("./ptio-font.woff") format("woff"),
-       url("./ptio-font.ttf") format("truetype"),
-       url("./ptio-font.svg#ptio-font") format("svg");
-  font-weight: normal;
-  font-style: normal;
-}
-
-@media screen and (-webkit-min-device-pixel-ratio:0) {
-  @font-face {
-    font-family: "ptio-font";
-    src: url("./ptio-font.svg#ptio-font") format("svg");
-  }
-}
-
-      [data-icon]:before { content: attr(data-icon); }
-
-      [data-icon]:before,
-      .ptio-f-droid:before,
-.ptio-ios:before,
-.ptio-linux:before,
-.ptio-macos:before,
-.ptio-mix:before,
-.ptio-netbsd:before,
-.ptio-openbsd:before,
-.ptio-sailfish-os:before {
-        display: inline-block;
-  font-family: "ptio-font";
-  font-style: normal;
-  font-weight: normal;
-  font-variant: normal;
-  line-height: 1;
-  text-decoration: inherit;
-  text-rendering: optimizeLegibility;
-  text-transform: none;
-  -moz-osx-font-smoothing: grayscale;
-  -webkit-font-smoothing: antialiased;
-  font-smoothing: antialiased;
-      }
-
-      .ptio-f-droid:before { content: "\f100"; }
-.ptio-ios:before { content: "\f101"; }
-.ptio-linux:before { content: "\f102"; }
-.ptio-macos:before { content: "\f103"; }
-.ptio-mix:before { content: "\f107"; }
-.ptio-netbsd:before { content: "\f104"; }
-.ptio-openbsd:before { content: "\f105"; }
-.ptio-sailfish-os:before { content: "\f106"; }
-    </style>
-
-    <!--[if lte IE 8]><script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
-
-    <script>
-      function toggleCharacters() {
-        var body = document.getElementsByTagName('body')[0];
-        body.className = body.className === 'characters-off' ? '' : 'characters-off';
-      }
-    </script>
-  </head>
-
-  <body class="characters-off">
-    <div id="page" class="container">
-      <header>
-        <h1>ptio-font contains 8 glyphs:</h1>
-        <a onclick="toggleCharacters(); return false;" href="#">Toggle Preview Characters</a>
-      </header>
-
-      
-      <div class="glyph">
-        <div class="preview-glyphs">
-          <span class="step size-12"><span class="letters">Pp</span><i id="ptio-f-droid" class="ptio-f-droid"></i></span><span class="step size-14"><span class="letters">Pp</span><i id="ptio-f-droid" class="ptio-f-droid"></i></span><span class="step size-16"><span class="letters">Pp</span><i id="ptio-f-droid" class="ptio-f-droid"></i></span><span class="step size-18"><span class="letters">Pp</span><i id="ptio-f-droid" class="ptio-f-droid"></i></span><span class="step size-21"><span class="letters">Pp</span><i id="ptio-f-droid" class="ptio-f-droid"></i></span><span class="step size-24"><span class="letters">Pp</span><i id="ptio-f-droid" class="ptio-f-droid"></i></span><span class="step size-36"><span class="letters">Pp</span><i id="ptio-f-droid" class="ptio-f-droid"></i></span><span class="step size-48"><span class="letters">Pp</span><i id="ptio-f-droid" class="ptio-f-droid"></i></span><span class="step size-60"><span class="letters">Pp</span><i id="ptio-f-droid" class="ptio-f-droid"></i></span><span class="step size-72"><span class="letters">Pp</span><i id="ptio-f-droid" class="ptio-f-droid"></i></span>
-        </div>
-        <div class="preview-scale">
-          <span class="step">12</span><span class="step">14</span><span class="step">16</span><span class="step">18</span><span class="step">21</span><span class="step">24</span><span class="step">36</span><span class="step">48</span><span class="step">60</span><span class="step">72</span>
-        </div>
-        <div class="usage">
-          <input class="class" type="text" readonly="readonly" onClick="this.select();" value=".ptio-f-droid" />
-          <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf100;" />
-        </div>
-      </div>
-      
-      <div class="glyph">
-        <div class="preview-glyphs">
-          <span class="step size-12"><span class="letters">Pp</span><i id="ptio-ios" class="ptio-ios"></i></span><span class="step size-14"><span class="letters">Pp</span><i id="ptio-ios" class="ptio-ios"></i></span><span class="step size-16"><span class="letters">Pp</span><i id="ptio-ios" class="ptio-ios"></i></span><span class="step size-18"><span class="letters">Pp</span><i id="ptio-ios" class="ptio-ios"></i></span><span class="step size-21"><span class="letters">Pp</span><i id="ptio-ios" class="ptio-ios"></i></span><span class="step size-24"><span class="letters">Pp</span><i id="ptio-ios" class="ptio-ios"></i></span><span class="step size-36"><span class="letters">Pp</span><i id="ptio-ios" class="ptio-ios"></i></span><span class="step size-48"><span class="letters">Pp</span><i id="ptio-ios" class="ptio-ios"></i></span><span class="step size-60"><span class="letters">Pp</span><i id="ptio-ios" class="ptio-ios"></i></span><span class="step size-72"><span class="letters">Pp</span><i id="ptio-ios" class="ptio-ios"></i></span>
-        </div>
-        <div class="preview-scale">
-          <span class="step">12</span><span class="step">14</span><span class="step">16</span><span class="step">18</span><span class="step">21</span><span class="step">24</span><span class="step">36</span><span class="step">48</span><span class="step">60</span><span class="step">72</span>
-        </div>
-        <div class="usage">
-          <input class="class" type="text" readonly="readonly" onClick="this.select();" value=".ptio-ios" />
-          <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf101;" />
-        </div>
-      </div>
-      
-      <div class="glyph">
-        <div class="preview-glyphs">
-          <span class="step size-12"><span class="letters">Pp</span><i id="ptio-linux" class="ptio-linux"></i></span><span class="step size-14"><span class="letters">Pp</span><i id="ptio-linux" class="ptio-linux"></i></span><span class="step size-16"><span class="letters">Pp</span><i id="ptio-linux" class="ptio-linux"></i></span><span class="step size-18"><span class="letters">Pp</span><i id="ptio-linux" class="ptio-linux"></i></span><span class="step size-21"><span class="letters">Pp</span><i id="ptio-linux" class="ptio-linux"></i></span><span class="step size-24"><span class="letters">Pp</span><i id="ptio-linux" class="ptio-linux"></i></span><span class="step size-36"><span class="letters">Pp</span><i id="ptio-linux" class="ptio-linux"></i></span><span class="step size-48"><span class="letters">Pp</span><i id="ptio-linux" class="ptio-linux"></i></span><span class="step size-60"><span class="letters">Pp</span><i id="ptio-linux" class="ptio-linux"></i></span><span class="step size-72"><span class="letters">Pp</span><i id="ptio-linux" class="ptio-linux"></i></span>
-        </div>
-        <div class="preview-scale">
-          <span class="step">12</span><span class="step">14</span><span class="step">16</span><span class="step">18</span><span class="step">21</span><span class="step">24</span><span class="step">36</span><span class="step">48</span><span class="step">60</span><span class="step">72</span>
-        </div>
-        <div class="usage">
-          <input class="class" type="text" readonly="readonly" onClick="this.select();" value=".ptio-linux" />
-          <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf102;" />
-        </div>
-      </div>
-      
-      <div class="glyph">
-        <div class="preview-glyphs">
-          <span class="step size-12"><span class="letters">Pp</span><i id="ptio-macos" class="ptio-macos"></i></span><span class="step size-14"><span class="letters">Pp</span><i id="ptio-macos" class="ptio-macos"></i></span><span class="step size-16"><span class="letters">Pp</span><i id="ptio-macos" class="ptio-macos"></i></span><span class="step size-18"><span class="letters">Pp</span><i id="ptio-macos" class="ptio-macos"></i></span><span class="step size-21"><span class="letters">Pp</span><i id="ptio-macos" class="ptio-macos"></i></span><span class="step size-24"><span class="letters">Pp</span><i id="ptio-macos" class="ptio-macos"></i></span><span class="step size-36"><span class="letters">Pp</span><i id="ptio-macos" class="ptio-macos"></i></span><span class="step size-48"><span class="letters">Pp</span><i id="ptio-macos" class="ptio-macos"></i></span><span class="step size-60"><span class="letters">Pp</span><i id="ptio-macos" class="ptio-macos"></i></span><span class="step size-72"><span class="letters">Pp</span><i id="ptio-macos" class="ptio-macos"></i></span>
-        </div>
-        <div class="preview-scale">
-          <span class="step">12</span><span class="step">14</span><span class="step">16</span><span class="step">18</span><span class="step">21</span><span class="step">24</span><span class="step">36</span><span class="step">48</span><span class="step">60</span><span class="step">72</span>
-        </div>
-        <div class="usage">
-          <input class="class" type="text" readonly="readonly" onClick="this.select();" value=".ptio-macos" />
-          <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf103;" />
-        </div>
-      </div>
-      
-      <div class="glyph">
-        <div class="preview-glyphs">
-          <span class="step size-12"><span class="letters">Pp</span><i id="ptio-mix" class="ptio-mix"></i></span><span class="step size-14"><span class="letters">Pp</span><i id="ptio-mix" class="ptio-mix"></i></span><span class="step size-16"><span class="letters">Pp</span><i id="ptio-mix" class="ptio-mix"></i></span><span class="step size-18"><span class="letters">Pp</span><i id="ptio-mix" class="ptio-mix"></i></span><span class="step size-21"><span class="letters">Pp</span><i id="ptio-mix" class="ptio-mix"></i></span><span class="step size-24"><span class="letters">Pp</span><i id="ptio-mix" class="ptio-mix"></i></span><span class="step size-36"><span class="letters">Pp</span><i id="ptio-mix" class="ptio-mix"></i></span><span class="step size-48"><span class="letters">Pp</span><i id="ptio-mix" class="ptio-mix"></i></span><span class="step size-60"><span class="letters">Pp</span><i id="ptio-mix" class="ptio-mix"></i></span><span class="step size-72"><span class="letters">Pp</span><i id="ptio-mix" class="ptio-mix"></i></span>
-        </div>
-        <div class="preview-scale">
-          <span class="step">12</span><span class="step">14</span><span class="step">16</span><span class="step">18</span><span class="step">21</span><span class="step">24</span><span class="step">36</span><span class="step">48</span><span class="step">60</span><span class="step">72</span>
-        </div>
-        <div class="usage">
-          <input class="class" type="text" readonly="readonly" onClick="this.select();" value=".ptio-mix" />
-          <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf107;" />
-        </div>
-      </div>
-      
-      <div class="glyph">
-        <div class="preview-glyphs">
-          <span class="step size-12"><span class="letters">Pp</span><i id="ptio-netbsd" class="ptio-netbsd"></i></span><span class="step size-14"><span class="letters">Pp</span><i id="ptio-netbsd" class="ptio-netbsd"></i></span><span class="step size-16"><span class="letters">Pp</span><i id="ptio-netbsd" class="ptio-netbsd"></i></span><span class="step size-18"><span class="letters">Pp</span><i id="ptio-netbsd" class="ptio-netbsd"></i></span><span class="step size-21"><span class="letters">Pp</span><i id="ptio-netbsd" class="ptio-netbsd"></i></span><span class="step size-24"><span class="letters">Pp</span><i id="ptio-netbsd" class="ptio-netbsd"></i></span><span class="step size-36"><span class="letters">Pp</span><i id="ptio-netbsd" class="ptio-netbsd"></i></span><span class="step size-48"><span class="letters">Pp</span><i id="ptio-netbsd" class="ptio-netbsd"></i></span><span class="step size-60"><span class="letters">Pp</span><i id="ptio-netbsd" class="ptio-netbsd"></i></span><span class="step size-72"><span class="letters">Pp</span><i id="ptio-netbsd" class="ptio-netbsd"></i></span>
-        </div>
-        <div class="preview-scale">
-          <span class="step">12</span><span class="step">14</span><span class="step">16</span><span class="step">18</span><span class="step">21</span><span class="step">24</span><span class="step">36</span><span class="step">48</span><span class="step">60</span><span class="step">72</span>
-        </div>
-        <div class="usage">
-          <input class="class" type="text" readonly="readonly" onClick="this.select();" value=".ptio-netbsd" />
-          <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf104;" />
-        </div>
-      </div>
-      
-      <div class="glyph">
-        <div class="preview-glyphs">
-          <span class="step size-12"><span class="letters">Pp</span><i id="ptio-openbsd" class="ptio-openbsd"></i></span><span class="step size-14"><span class="letters">Pp</span><i id="ptio-openbsd" class="ptio-openbsd"></i></span><span class="step size-16"><span class="letters">Pp</span><i id="ptio-openbsd" class="ptio-openbsd"></i></span><span class="step size-18"><span class="letters">Pp</span><i id="ptio-openbsd" class="ptio-openbsd"></i></span><span class="step size-21"><span class="letters">Pp</span><i id="ptio-openbsd" class="ptio-openbsd"></i></span><span class="step size-24"><span class="letters">Pp</span><i id="ptio-openbsd" class="ptio-openbsd"></i></span><span class="step size-36"><span class="letters">Pp</span><i id="ptio-openbsd" class="ptio-openbsd"></i></span><span class="step size-48"><span class="letters">Pp</span><i id="ptio-openbsd" class="ptio-openbsd"></i></span><span class="step size-60"><span class="letters">Pp</span><i id="ptio-openbsd" class="ptio-openbsd"></i></span><span class="step size-72"><span class="letters">Pp</span><i id="ptio-openbsd" class="ptio-openbsd"></i></span>
-        </div>
-        <div class="preview-scale">
-          <span class="step">12</span><span class="step">14</span><span class="step">16</span><span class="step">18</span><span class="step">21</span><span class="step">24</span><span class="step">36</span><span class="step">48</span><span class="step">60</span><span class="step">72</span>
-        </div>
-        <div class="usage">
-          <input class="class" type="text" readonly="readonly" onClick="this.select();" value=".ptio-openbsd" />
-          <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf105;" />
-        </div>
-      </div>
-      
-      <div class="glyph">
-        <div class="preview-glyphs">
-          <span class="step size-12"><span class="letters">Pp</span><i id="ptio-sailfish-os" class="ptio-sailfish-os"></i></span><span class="step size-14"><span class="letters">Pp</span><i id="ptio-sailfish-os" class="ptio-sailfish-os"></i></span><span class="step size-16"><span class="letters">Pp</span><i id="ptio-sailfish-os" class="ptio-sailfish-os"></i></span><span class="step size-18"><span class="letters">Pp</span><i id="ptio-sailfish-os" class="ptio-sailfish-os"></i></span><span class="step size-21"><span class="letters">Pp</span><i id="ptio-sailfish-os" class="ptio-sailfish-os"></i></span><span class="step size-24"><span class="letters">Pp</span><i id="ptio-sailfish-os" class="ptio-sailfish-os"></i></span><span class="step size-36"><span class="letters">Pp</span><i id="ptio-sailfish-os" class="ptio-sailfish-os"></i></span><span class="step size-48"><span class="letters">Pp</span><i id="ptio-sailfish-os" class="ptio-sailfish-os"></i></span><span class="step size-60"><span class="letters">Pp</span><i id="ptio-sailfish-os" class="ptio-sailfish-os"></i></span><span class="step size-72"><span class="letters">Pp</span><i id="ptio-sailfish-os" class="ptio-sailfish-os"></i></span>
-        </div>
-        <div class="preview-scale">
-          <span class="step">12</span><span class="step">14</span><span class="step">16</span><span class="step">18</span><span class="step">21</span><span class="step">24</span><span class="step">36</span><span class="step">48</span><span class="step">60</span><span class="step">72</span>
-        </div>
-        <div class="usage">
-          <input class="class" type="text" readonly="readonly" onClick="this.select();" value=".ptio-sailfish-os" />
-          <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf106;" />
-        </div>
-      </div>
-      
-
-      <footer>
-        Made with love using <a href="http://fontcustom.com">Font Custom</a>.
-      </footer>
-    </div>
-  </body>
-</html>

assets/webfonts/ptio-font.svg

@@ -1,11 +1,11 @@
 <?xml version="1.0" standalone="no"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
 <!--
-2019-9-22: Created with FontForge (http://fontforge.org)
+2019-11-6: Created with FontForge (http://fontforge.org)
 -->
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1">
 <metadata>
-Created by FontForge 20190801 at Sun Sep 22 19:49:38 2019
+Created by FontForge 20190801 at Wed Nov  6 20:45:23 2019
  By Dawid Potocki
 
 </metadata>
@@ -19,10 +19,10 @@ Created by FontForge 20190801 at Sun Sep 22 19:49:38 2019
     panose-1="2 0 5 3 0 0 0 0 0 0"
     ascent="448"
     descent="-64"
-    bbox="-0.00195312 -64.0039 512.014 448"
+    bbox="-0.00195312 -64.0049 512.014 448"
     underline-thickness="25.6"
     underline-position="-51.2"
-    unicode-range="U+0020-F107"
+    unicode-range="U+0020-F10C"
   />
     <missing-glyph />
     <glyph glyph-name="space" unicode=" " horiz-adv-x="200" 
@@ -38,6 +38,19 @@ c-18.7656 0 -33.8721 15.1074 -33.8721 33.873v225.816c0 18.7656 15.1064 33.873 33
 c0 65.3486 -53.2041 118.553 -118.552 118.553zM255.998 183.253c53.7549 0 97.0977 -43.3428 97.0977 -97.0977s-43.3428 -97.0977 -97.0977 -97.0977c-53.7559 0 -97.0977 43.3428 -97.0977 97.0977s43.3418 97.0977 97.0977 97.0977zM255.998 156.724
 l-0.00292969 -0.00195312c-32.5244 0 -60.0645 -22.4082 -68.1191 -52.5068h36.2764c6.25879 11.125 18.0098 18.6348 31.8438 18.6348c20.4668 0 36.6953 -16.2285 36.6953 -36.6953s-16.2285 -36.6953 -36.6953 -36.6953c-14.7617 0 -27.2246 8.49902 -33.0781 20.8838
 h-35.6152c7.25195 -31.2285 35.3633 -54.7568 68.6953 -54.7568c38.7725 0 70.5684 31.7949 70.5684 70.5693c0 38.7734 -31.7959 70.5684 -70.5684 70.5684z" />
+    <glyph glyph-name="i2p-garlic" unicode="&#xf10c;" 
+d="M385.84 18.6582l-0.000976562 -0.00488281c-10.4199 -5.89355 -73.4902 -33.2764 -44.791 -6.45703c3.48438 3.22852 6.81641 6.71289 9.97656 10.4541c51.6914 61.166 32.2188 140.886 4.47559 206.979c-3.36523 8.01172 -26.1191 61.8398 -29.502 70.9287
+c-13.9043 37.2402 -18.3809 64.8633 -16.6553 65.7344c8.88184 4.49219 19.2695 -45.4238 58.7305 -103.231c31.3477 -45.9014 75.2158 -77.5205 72.0557 -147.1c0 -47.5068 -20.7559 -78.376 -54.2891 -97.3037zM233.802 -24.5605
+c-1.60645 -1.00781 -3.29688 -2.01562 -5.02246 -3.02344c-15.2559 -8.78125 -28.835 -13.8203 -30.3564 -11.1895c-1.50293 2.61328 9.63477 11.8721 24.8896 20.6875c11.958 6.90137 15.0322 4.27148 32.0303 4.40723c14.2979 0.120117 20.5166 3.00684 33.3633 -4.40723
+c15.2559 -8.79688 26.3926 -18.0732 24.8896 -20.6875c-1.52051 -2.61426 -15.1016 2.3916 -30.3564 11.2061c-2.08398 1.19629 -4.09961 2.42578 -6.0127 3.62207c12.7266 -15.1699 20.4824 -28.3242 17.8184 -30.7158c-2.81934 -2.51074 -16.332 7.89258 -30.9209 23.6426
+c-0.921875 -18.8936 -3.96289 -33.0205 -7.44824 -32.9863c-3.62109 0.0351562 -6.49121 15.4092 -6.90137 35.5488c-15.4766 -17.168 -30.2695 -28.8525 -33.2598 -26.2051c-2.64746 2.375 4.86914 15.1865 17.2881 30.1006h-0.000976562zM227.635 436.466
+c4.16797 19.2012 14.9131 13.0342 14.0244 -8.33594c-1.70801 -41.2725 -4.56152 -74.8574 -8.14844 -103.01c12.0088 38.1455 23.3691 73.4902 28.8525 102.258c5.79102 30.4238 21.3369 5.1416 22.1914 -24.1895c13.3242 -88.4365 34.3018 -138.394 51.2139 -178.671
+c14.8965 -35.4805 26.5635 -66.1436 26.5635 -106.46v2.78418h0.015625c0 -45.9189 -15.5117 -78.2227 -37.8389 -98.9609c-9.75391 -9.07031 -20.8574 -15.9893 -32.5254 -20.8574c-15.375 -6.44043 -25.7607 -10.2324 -39.957 0.0146484
+c-3.41602 2.49414 -6.76465 5.51758 -9.95898 9.13965c-36.7441 29.9121 -49.6592 72.6523 -49.6426 120.57c-0.273438 -4.71484 -0.410156 -9.61719 -0.410156 -14.7422c0 -18.9277 1.60547 -35.8398 4.47559 -50.7021c4.13379 -21.5068 10.4551 -39.0859 19.2871 -52
+c14.1953 -20.7383 13.7168 -19.082 -16.4854 -13.8369c-4.45801 0.768555 -8.64355 2.4082 -12.8125 3.79199c-30.9199 10.3008 -67.4092 25.8975 -94.1084 47.9004c8.2334 -12.334 18.4658 -23.335 30.0996 -33.1572c16.5869 -13.9746 17.3389 -18.126 -12.8809 -6.9873
+c-60.0625 22.1055 -101.113 62.1309 -90.6758 135.181c7.96094 55.793 48.1221 78.001 85.4658 112.815c82.5947 77.0947 39.666 23.5918 -3.10938 -31.4834c-13.1709 -16.9287 -22.0537 -35.3447 -26.8711 -56.9873c31.9102 46.7725 94.7236 99.2676 125.626 183.71
+c11.9238 22.2588 20.4492 49.2676 27.6055 82.2197zM406.985 251.055c42.6221 -31.501 78.4102 -58.9531 86.0801 -104.871c6.71387 -40.2646 -7.49902 -72.8242 -34.917 -97.0469c-12.2998 -10.8652 -35.3457 -35.6006 -9.70312 7.84082
+c9.30957 15.8008 12.4697 35.9932 12.4697 58.9873c0 58.4561 -28.084 90.6064 -59.9434 127.08c-15.2549 15.9902 -12.8125 21.9336 6.01367 8.01172v-0.00195312z" />
     <glyph glyph-name="ios" unicode="&#xf101;" 
 d="M125.831 448h260.341c69.7109 0 125.831 -56.1201 125.831 -125.831v-260.341c0 -69.7109 -56.1201 -125.831 -125.831 -125.831h-260.341c-69.7109 0 -125.831 56.1201 -125.831 125.831v260.341c0 69.7109 56.1201 125.831 125.831 125.831zM59.2627 96.6289h32.8428
 v139.813h-32.8428v-139.813zM75.6191 254.78c10.2881 0 18.334 7.91406 18.334 17.8066c0 10.0244 -8.0459 17.9385 -18.334 17.9385c-10.1572 0 -18.2021 -7.91406 -18.2021 -17.9385c0 -9.89355 8.0459 -17.8066 18.2021 -17.8066zM201.456 290.132
@@ -147,5 +160,30 @@ c8.31445 -22.0557 6.37891 -48.1729 -5.6709 -75.6553c-21.5723 -49.2031 -70.1602 -
 c0.810547 -2.9541 3.49219 -4.92383 6.44824 -4.92383c0.441406 0 0.883789 0.0439453 1.3291 0.134766c10.0469 2.02344 74.2061 18.9258 136.608 50.3584c4.25977 2.14551 8.39453 4.31641 12.457 6.49805l0.00195312 -0.00390625
 c0.0166016 0.00976562 0.0654297 0.0371094 0.0859375 0.0517578c77.2275 41.5039 118.729 89.5742 123.359 143.022c2.9541 34.0928 -16.4551 56.5459 -37.6768 77.2021c26.7793 38.7305 114.028 68.5859 115.03 68.9258l86.1172 30.7246
 c27.3418 8.91504 48.9072 17.3955 50.4531 18.0068c3.39648 1.34082 5.09082 5.1582 3.80664 8.5791z" />
+    <glyph glyph-name="tor" unicode="&#xf10b;" 
+d="M280.216 409.741l-13.5029 -54.0127c19.1289 38.2588 50.0742 66.9531 85.5195 92.2715c-25.8809 -29.8193 -49.5117 -59.6387 -63.5771 -90.0215c24.1934 34.3203 56.8262 52.8877 93.3975 65.8281c-48.9492 -43.3223 -87.7715 -90.584 -117.028 -137.282
+l-23.6309 10.127c3.93848 37.6963 18.0049 75.9561 38.8223 113.09zM262.212 288.774l16.3154 -8.43945c-1.6875 -10.6895 0.563477 -34.3203 11.2529 -39.9463c47.2617 -29.2568 91.1465 -60.7646 108.589 -92.835c61.8896 -111.964 -43.3232 -216.051 -135.032 -205.924
+c49.5117 36.5713 64.1396 111.964 45.5732 194.671c-7.31445 32.0703 -19.1299 61.3271 -39.9473 94.5225c-9.00195 15.1914 -5.62598 35.4463 -6.75098 57.9512zM244.207 235.324c-3.37598 -17.4414 -7.31445 -48.9482 -22.5049 -60.7637
+c-6.18945 -4.50098 -12.9404 -9.00293 -19.6924 -13.5039c-27.5693 -18.5664 -54.5752 -36.0078 -66.9531 -80.4561c-2.81348 -9.56445 -0.5625 -19.6924 1.6875 -29.2568c6.75195 -27.5693 25.8809 -56.8262 41.0723 -74.2676c0 -0.5625 2.81348 -2.81348 2.81348 -3.37598
+c12.3779 -14.6289 16.3164 -19.1299 63.5771 -29.8193l-1.125 -5.06445c-28.6943 7.31445 -51.7627 14.6289 -66.9531 31.5078c0 0.5625 -2.81348 2.81348 -2.81348 2.81348c-15.7539 18.0039 -35.4463 48.3867 -42.1973 77.0801
+c-2.81348 11.2529 -5.06445 20.2549 -1.68848 32.0703c12.9404 46.1357 41.0723 64.7031 69.2041 83.833c6.18945 3.93848 14.0654 7.87695 20.2549 12.9404c12.9404 8.43945 19.1299 34.8828 25.3184 56.2627zM256.585 162.183
+c2.25098 -18.0049 2.25098 -33.7588 7.31445 -42.1982c3.93848 -7.31348 10.6904 -17.4414 14.6279 -27.5684c7.87695 -18.5674 11.8154 -38.8223 12.3779 -48.3867c0.563477 -16.3164 -1.6875 -41.6348 -7.31348 -61.8896
+c-6.75195 -21.9424 -19.6924 -38.8213 -29.8203 -40.5098v-1.6875c-13.5029 2.25 -34.8828 10.6895 -46.1357 18.5664c-27.0059 18.5674 -40.5098 41.6348 -42.7598 75.9561c-1.68848 27.0059 14.6279 54.5752 46.6982 71.4541
+c21.9434 11.8154 28.6943 29.2568 35.4463 50.6367c-5.06348 -24.7559 -10.6904 -39.3838 -33.1953 -52.8877c-27.0068 -15.1904 -46.1357 -46.1357 -44.4482 -66.9531c2.25098 -25.3184 19.6924 -54.5752 39.9473 -72.0166
+c10.127 -9.00195 27.5684 -14.6289 42.7598 -17.4424c14.6289 9.00293 23.0684 25.3193 27.0068 43.8857c5.06348 22.5059 5.62598 43.8857 5.62598 55.1387c0 10.127 -4.50098 26.4434 -8.43945 41.0713c-2.81348 11.2529 -13.5029 22.5059 -16.3164 30.9453
+c-5.06348 14.0654 -2.81348 24.1934 -3.37598 43.8857zM253.209 85.1016c2.81348 -12.3779 9.00293 -29.8193 12.3779 -46.6982c2.81348 -13.5039 3.37598 -26.4443 2.25098 -36.5713c-1.125 -11.8154 -1.68848 -21.3799 -3.37598 -31.5078
+c-1.6875 -8.43945 -6.18848 -16.3164 -13.5029 -24.7559v-0.5625c-3.93848 0.5625 -11.8154 6.18848 -18.0049 15.1914c-3.93848 5.62598 -6.75098 13.5029 -9.56445 20.8174c-2.81348 6.75098 -5.62598 14.6279 -5.62598 21.3799c0 16.3164 1.6875 36.5713 13.5029 50.0742
+c10.6904 12.3779 14.0654 14.0654 18.5674 28.6943c-3.37598 -16.3164 -5.62695 -17.4414 -15.7539 -32.0703c-12.9404 -18.0039 -13.5039 -36.0088 -11.8154 -47.2607c1.125 -7.31445 3.93848 -14.0664 6.18848 -19.6924
+c2.81348 -7.31445 6.18945 -14.0654 10.6904 -20.2549c3.93848 -4.50098 6.18848 -7.31445 11.8154 -10.127c6.18848 11.8145 10.127 35.4453 10.6895 48.3857c0.563477 11.2529 1.12598 24.1934 -0.5625 37.1338c-2.25 17.4424 -7.31445 34.3213 -7.87695 47.8242z
+M255.46 251.078c0.5625 -23.0674 5.06348 -57.9512 9.00195 -65.8281c1.6875 -5.06348 16.8789 -29.2568 27.5693 -54.5752c7.31445 -16.3164 9.56445 -32.0703 10.127 -36.5713c5.62695 -47.2607 1.125 -66.9531 -11.2529 -109.15
+c-7.31348 -25.3193 -27.5684 -45.0107 -36.0078 -45.5732l2.8125 5.06348c14.6289 9.00195 27.5693 32.0703 31.5078 50.6367c7.31445 34.3203 12.9404 70.8916 8.43945 92.2715c-1.125 5.06445 -2.81348 21.9434 -9.56445 39.9473
+c-9.56543 26.4443 -23.6309 47.8242 -25.3184 52.8877c-5.62695 14.6289 -6.75195 51.1992 -7.31445 70.8916zM262.212 287.087l5.62598 -2.81348c-2.81348 -6.18848 -1.125 -37.6963 3.37598 -49.5117c5.62598 -15.7539 21.9424 -33.7578 32.0693 -59.0762
+c7.31445 -16.8789 14.6289 -57.3887 15.1914 -61.8896c5.62695 -47.2617 2.81348 -91.709 -11.2529 -129.406c-9.00195 -23.6299 -31.5068 -44.4473 -39.9463 -45.0098l-15.7539 3.93848c21.9424 8.43945 43.3223 35.4453 47.8242 54.0127
+c11.8145 52.3242 16.3154 119.841 -0.563477 171.603c-9.00195 27.0068 -30.3818 50.6377 -34.3203 66.9541c-3.37598 15.1904 -3.37598 30.9443 -2.25 51.1992zM374.738 187.501c30.9443 -28.1318 48.3867 -67.5166 48.3867 -108.589s-18.5674 -81.0186 -50.6377 -107.463
+c-29.8193 -24.7559 -71.4541 -35.4453 -111.401 -35.4453c-24.7559 0 -47.2607 1.125 -71.4541 9.00195c-55.7012 18.5664 -96.7734 65.8281 -100.148 122.654c-3.37598 43.8848 6.75098 77.6436 41.0723 113.089c17.4414 18.5674 53.4502 39.9473 78.2061 56.8262
+c12.3779 7.87695 25.3184 31.5078 0.5625 75.9551l5.06348 3.93848l73.7051 -30.3818c-10.1279 -32.6328 19.1289 -55.7012 28.6943 -60.7646c21.3799 -11.8154 41.6348 -24.1934 57.9512 -38.8213zM364.048 -20.1113c29.2568 24.1934 45.0107 61.3271 45.0107 99.0234
+c0 37.6973 -14.6279 73.7051 -43.3223 99.0234c-16.3164 14.6289 -42.7607 32.6328 -59.6396 42.1982c-16.8789 9.56445 -37.6963 36.0078 -30.9443 61.3271l-55.1387 24.1924c2.81348 -3.9375 9.56543 -20.8174 11.2529 -25.8809
+c3.37598 -14.0654 1.6875 -27.5693 -1.125 -33.7578c-15.1914 -28.1318 -42.1982 -36.0088 -61.3271 -51.7627c-34.3203 -28.1309 -71.4541 -50.0742 -67.5166 -127.154c2.25098 -37.6973 31.5078 -84.3955 75.9561 -105.775
+c25.3184 -12.3779 54.0127 -16.8789 83.2695 -18.5674c26.4443 -1.125 75.9561 14.6289 103.524 37.1338z" />
   </font>
 </defs></svg>

contact.md

@@ -1,38 +0,0 @@
----
-layout: page
-permalink: /contact/
-title: "{% t contact.title %}"
-description: "{% t contact.description %}"
----
-
-## {% t contact.editorial_team %}
-
-{% t contact.up_to_date %} {% t contact.reach_out %}
-
-[<i class="fab fa-discourse fa-lg fa-fw"></i> {% t contact.start_discussion %}](https://forum.privacytools.io/)
-
-[<i class="fab fa-github fa-lg fa-fw"></i> {% t contact.open_an_issue %}](https://github.com/privacytoolsIO/privacytools.io/issues)
-
-[<i class="fab fa-reddit fa-lg fa-fw"></i> {% t contact.reddit_suggestion %}](https://www.reddit.com/r/privacytoolsIO/)
-
-{% t contact.transparency %}
-
-<span class="text-success"><i class="fas fa-comment"></i> {% t global.new %}:</span> {% t contact.on_matrix %} `#general:privacytools.io` {% t contact.on_matrix2 %}. {% t contact.register_matrix %} (`https://chat.privacytools.io`) {% t contact.using %} [riot.privacytools.io](https://riot.privacytools.io/) {% t contact.or_matrix_client %}
-
-## Abuse
-
-{% t contact.abuse1 %} {% t contact.abuse2 %} abuse at privacytools dot io.
-
-<div class="row">
-  <div class="col-12">
-    <div class="card mb-4">
-      <div class="card-header">
-        GitHub Issues
-      </div>
-      <ul class="list-group list-group-flush">
-        <li class="list-group-item"><strong>{% t contact.searx_issues %}:</strong> <a href="https://github.com/privacytoolsIO/search">github.com/privacytoolsIO/search</a></li>
-        <li class="list-group-item"><strong>{% t contact.website_issues %}:</strong> <a href="https://github.com/privacytoolsIO/privacytools.io">github.com/privacytoolsIO/privacytools.io</a></li>
-      </ul>
-    </div>
-  </div>
-</div>

font/README.md

@@ -10,6 +10,7 @@ This font contains icons we need, which Font Awesome does not have.
 | OpenBSD     | `ptio-openbsd`        | https://github.com/FortAwesome/Font-Awesome/issues/5345  |
 | NetBSD      | `ptio-netbsd`         | https://github.com/FortAwesome/Font-Awesome/issues/15496 |
 | Sailfish OS | `ptio-sailfish-os`    | https://github.com/FortAwesome/Font-Awesome/issues/15498 |
+| I2P         | `ptio-i2p-garlic`     | https://github.com/FortAwesome/Font-Awesome/issues/15772 |
 
 We also have custom Linux icon (`ptio-linux`), because I (@dawidpotocki) made it before and looks cleaner.
 And since we are bundling additional font anyway, why not.

font/svg/i2p-garlic.svg

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="96pc" height="96pc" version="1.1" viewBox="0 0 406.4 406.4" xmlns="http://www.w3.org/2000/svg"><path d="m306.26 340.79c26.617-15.024 43.092-39.526 43.092-77.235 2.5085-55.228-32.312-80.326-57.194-116.76-31.322-45.885-39.567-85.506-46.617-81.94-1.3695 0.69153 2.1831 22.617 13.22 52.177 2.6848 7.2136 20.746 49.94 23.417 56.299 22.021 52.462 37.478 115.74-3.5526 164.29-2.5085 2.9695-5.1526 5.7357-7.9188 8.2984-22.78 21.288 27.282-0.44747 35.553-5.1255zm-120.68 34.305c-1.2746 0.80004-2.617 1.6-3.9865 2.4-12.109 6.9696-22.888 10.97-24.095 8.8815-1.1932-2.0746 7.6476-9.4238 19.756-16.421 9.4916-5.478 11.932-3.3899 25.424-3.4984 11.349-0.0949 16.285-2.3865 26.482 3.4984 12.109 6.9831 20.949 14.346 19.756 16.421-1.2068 2.0746-11.987-1.8983-24.095-8.895-1.6543-0.94917-3.2543-1.9255-4.7729-2.8746 10.102 12.041 16.258 22.482 14.143 24.38-2.2373 1.9932-12.963-6.2645-24.543-18.766-0.73221 14.997-3.1458 26.21-5.9119 26.183-2.8746-0.028-5.1526-12.231-5.478-28.217-12.285 13.627-24.027 22.902-26.4 20.8-2.1017-1.8848 3.8644-12.054 13.722-23.892zm-4.895-365.94c3.3085-15.241 11.837-10.346 11.132 6.617-1.356 32.76-3.6204 59.418-6.4679 81.764 9.5323-30.278 18.549-58.333 22.902-81.167 4.5967-24.149 16.936-4.0814 17.614 19.2 10.576 70.197 27.227 109.85 40.651 141.82 11.824 28.163 21.085 52.502 21.085 84.503v-2.2102h0.0121c0 36.448-12.312 62.089-30.034 78.55-7.7424 7.2001-16.556 12.692-25.817 16.556-12.204 5.1119-20.448 8.1221-31.716-0.012-2.7119-1.9797-5.3696-4.3797-7.9052-7.2543-29.166-23.743-39.417-57.668-39.404-95.703-0.21696 3.7424-0.32542 7.634-0.32542 11.702 0 15.024 1.2746 28.448 3.5526 40.245 3.2814 17.071 8.2984 31.024 15.309 41.275 11.268 16.461 10.888 15.146-13.085 10.983-3.539-0.61019-6.8611-1.9119-10.17-3.0102-24.543-8.1764-53.506-20.556-74.699-38.021 6.5357 9.7899 14.658 18.522 23.892 26.319 13.166 11.092 13.763 14.387-10.224 5.5458-47.675-17.546-80.259-49.316-71.974-107.3 6.3187-44.285 38.197-61.913 67.838-89.547 65.56-61.194 31.485-18.726-2.4678 24.99-10.454 13.437-17.505 28.055-21.329 45.234 25.329-37.126 75.187-78.794 99.716-145.82 9.4645-17.668 16.231-39.106 21.912-65.262zm142.36 147.17c33.831 25.004 62.238 46.794 68.326 83.242 5.3289 31.96-5.9526 57.804-27.716 77.031-9.7628 8.6238-28.055 28.258-7.7018-6.2238 7.3899-12.542 9.8984-28.57 9.8984-46.821 0-46.4-22.292-71.919-47.58-100.87-12.109-12.692-10.17-17.41 4.773-6.3594z" fill-rule="evenodd" stroke-width="13.559"/></svg>

font/svg/tor.svg

@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="96pc" height="96pc" enable-background="new 0 0 150.5 91.1" version="1.1" viewBox="0 0 1536 1536" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+<g transform="translate(0,1444.9)">
+	
+	<g transform="matrix(16.879 0 0 16.879 -592.38 -1444.9)"><g id="layer3_20_" transform="translate(-92 -64)">
+			<g id="layer5_20_">
+				<g id="path2554_21_">
+					<path d="m176.9 70.8-2.4 9.6c3.4-6.8 8.9-11.9 15.2-16.4-4.6 5.3-8.8 10.6-11.3 16 4.3-6.1 10.1-9.4 16.6-11.7-8.7 7.7-15.6 16.1-20.8 24.4l-4.2-1.8c0.7-6.7 3.2-13.5 6.9-20.1z" fill="#010101"/>
+				</g>
+				<g id="path2536_21_">
+					<path d="m173.7 92.3 2.9 1.5c-0.3 1.9 0.1 6.1 2 7.1 8.4 5.2 16.2 10.8 19.3 16.5 11 19.9-7.7 38.4-24 36.6 8.8-6.5 11.4-19.9 8.1-34.6-1.3-5.7-3.4-10.9-7.1-16.8-1.6-2.7-1-6.3-1.2-10.3z" fill="#010101"/>
+				</g>
+			</g>
+			<g id="layer4_20_">
+				<g id="path2540_21_">
+					<path d="m170.5 101.8c-0.6 3.1-1.3 8.7-4 10.8-1.1 0.8-2.3 1.6-3.5 2.4-4.9 3.3-9.7 6.4-11.9 14.3-0.5 1.7-0.1 3.5 0.3 5.2 1.2 4.9 4.6 10.1 7.3 13.2 0 0.1 0.5 0.5 0.5 0.6 2.2 2.6 2.9 3.4 11.3 5.3l-0.2 0.9c-5.1-1.3-9.2-2.6-11.9-5.6 0-0.1-0.5-0.5-0.5-0.5-2.8-3.2-6.3-8.6-7.5-13.7-0.5-2-0.9-3.6-0.3-5.7 2.3-8.2 7.3-11.5 12.3-14.9 1.1-0.7 2.5-1.4 3.6-2.3 2.3-1.5 3.4-6.2 4.5-10z" fill="#010101"/>
+				</g>
+				<g id="path2542_21_">
+					<path d="m172.7 114.8c0.1 3.5-0.3 5.3 0.6 7.8 0.5 1.5 2.4 3.5 2.9 5.5 0.7 2.6 1.5 5.5 1.5 7.3 0 2-0.1 5.8-1 9.8-0.7 3.3-2.2 6.2-4.8 7.8-2.7-0.5-5.8-1.5-7.6-3.1-3.6-3.1-6.7-8.3-7.1-12.8-0.3-3.7 3.1-9.2 7.9-11.9 4-2.4 5-5 5.9-9.4-1.2 3.8-2.4 6.9-6.3 9-5.7 3-8.6 7.9-8.3 12.7 0.4 6.1 2.8 10.2 7.6 13.5 2 1.4 5.8 2.9 8.2 3.3v-0.3c1.8-0.3 4.1-3.3 5.3-7.2 1-3.6 1.4-8.1 1.3-11-0.1-1.7-0.8-5.3-2.2-8.6-0.7-1.8-1.9-3.6-2.6-4.9-0.9-1.5-0.9-4.3-1.3-7.5z" fill="#010101"/>
+				</g>
+				<g id="path2544_21_">
+					<path d="m172.1 128.5c0.1 2.4 1 5.4 1.4 8.5 0.3 2.3 0.2 4.6 0.1 6.6-0.1 2.3-0.8 6.5-1.9 8.6-1-0.5-1.4-1-2.1-1.8-0.8-1.1-1.4-2.3-1.9-3.6-0.4-1-0.9-2.2-1.1-3.5-0.3-2-0.2-5.2 2.1-8.4 1.8-2.6 2.2-2.8 2.8-5.7-0.8 2.6-1.4 2.9-3.3 5.1-2.1 2.4-2.4 6-2.4 8.9 0 1.2 0.5 2.6 1 3.8 0.5 1.3 1 2.7 1.7 3.7 1.1 1.6 2.5 2.6 3.2 2.7v-0.1c1.3-1.5 2.1-2.9 2.4-4.4 0.3-1.8 0.4-3.5 0.6-5.6 0.2-1.8 0.1-4.1-0.4-6.5-0.6-3-1.7-6.1-2.2-8.3z" fill="#010101"/>
+				</g>
+				<g id="path2550_21_">
+					<path d="m172.5 99c0.1 3.5 0.3 10 1.3 12.6 0.3 0.9 2.8 4.7 4.5 9.4 1.2 3.2 1.5 6.2 1.7 7.1 0.8 3.8-0.2 10.3-1.5 16.4-0.7 3.3-3 7.4-5.6 9l-0.5 0.9c1.5-0.1 5.1-3.6 6.4-8.1 2.2-7.5 3-11 2-19.4-0.1-0.8-0.5-3.6-1.8-6.5-1.9-4.5-4.6-8.8-4.9-9.7-0.7-1.4-1.5-7.6-1.6-11.7z" fill="#010101"/>
+				</g>
+				<g id="path2552_21_">
+					<path d="m173.7 92.6c-0.2 3.6-0.2 6.4 0.4 9.1 0.7 2.9 4.5 7.1 6.1 11.9 3 9.2 2.2 21.2 0.1 30.5-0.8 3.3-4.6 8.1-8.5 9.6l2.8 0.7c1.5-0.1 5.5-3.8 7.1-8 2.5-6.7 3-14.6 2-23-0.1-0.8-1.4-8-2.7-11-1.8-4.5-4.7-7.7-5.7-10.5-0.8-2.1-1.1-7.7-0.6-8.8z" fill="#010101"/>
+				</g>
+			</g>
+		</g>
+		<path d="m101.7 46.3c-2.9-2.6-6.5-4.8-10.3-6.9-1.7-0.9-6.9-5-5.1-10.8l-13.1-5.4-0.9 0.7c4.4 7.9 2.1 12.1-0.1 13.5-4.4 3-10.8 6.8-13.9 10.1-6.1 6.3-7.9 12.3-7.3 20.1 0.6 10.1 7.9 18.5 17.8 21.8 4.3 1.4 8.3 1.6 12.7 1.6 7.1 0 14.5-1.9 19.8-6.3 5.7-4.7 9-11.8 9-19.1s-3.1-14.3-8.6-19.3zm-1.9 36.9c-4.9 4-13.7 6.8-18.4 6.6-5.2-0.3-10.3-1.1-14.8-3.3-7.9-3.8-13.1-12.1-13.5-18.8-0.7-13.7 5.9-17.6 12-22.6 3.4-2.8 8.2-4.2 10.9-9.2 0.5-1.1 0.8-3.5 0.2-6-0.3-0.9-1.5-3.9-2-4.6l9.8 4.3c-1.2 4.5 2.5 9.2 5.5 10.9s7.7 4.9 10.6 7.5c5.1 4.5 7.7 10.9 7.7 17.6s-2.8 13.3-8 17.6z" fill="#010101"/>
+	</g>
+</g>
+</svg>

index.html

@@ -8,7 +8,7 @@ layout: default
 <h1 id="sponsors" class="anchor"><a href="#sponsors"><i class="fas fa-link anchor-icon"></i></a> Sponsors</h1>
 
 <div class="alert alert-success" role="alert">
-  <strong>New!</strong> We have a great new opportunity for you or your organization to support the spread of privacy-related education online! <a href="/sponsors/" class="alert-link">Learn more...</a>
+  <strong>New!</strong> Showcase your brand as a sponsor of PrivacyTools here and support our mission of creating a world free of mass surveillance! <a href="/sponsors/" class="alert-link">Learn more...</a>
 </div>
 {% include sections/quotes.html %}
 {% include sections/privacy-resources.html %}

nginx/020-redirects.conf

@@ -4,6 +4,12 @@ location = /old/ {
 location = /privacy-policy/ {
 	return 301 /privacy/;
 }
+location = /contact/ {
+	return 301 /about/;
+}
+location = /webrtc.html {
+	return 301 /browsers/;
+}
 location = /software/im/ {
 	return 301 /software/real-time-communication/;
 }

pages/about.html

@@ -0,0 +1,147 @@
+---
+layout: page
+permalink: /about/
+title: "About PrivacyTools"
+description: "About the PrivacyTools organization, and contributors to the PrivacyTools website, communities, and services."
+hidedesc: true
+---
+
+<div class="row">
+  <div class="col">
+    <p><em>You are being watched. Private and state-sponsored organizations are monitoring and recording your online activities.</em></p>
+    <p>At <strong>PrivacyTools</strong>, we provide services, tools, and knowledge to protect your privacy against global mass surveillance, and moderate a thriving community of privacy-minded individuals like yourself to discuss and learn about new advances in protecting your online data. This website serves as the centerpiece of our organization, where we research and recommend various software solutions for our community.</p>
+    <p><strong>Transparency</strong> is our strongest value, and it's what sets us apart from the rest of the "privacy recommendations" community. Editorial changes to this website and the products we recommend are always discussed on our extensive <a href="https://github.com/privacytoolsIO/privacytools.io/issues">issue tracker</a>, drafted in a public <a href="https://github.com/privacytoolsIO/privacytools.io/pulls">pull request</a> open for further discussion, and logged in a comprehensive <a href="https://github.com/privacytoolsIO/privacytools.io/commits/master">commit log</a> dating back to our original founding date in 2015. The <em>core</em> team members listed below are responsible for most of the edits and final decisions to changes on this website and across our services, but this website is truly the work of hundreds <a href="https://github.com/privacytoolsIO/privacytools.io/graphs/contributors">contributors and fact checkers</a> working to make sure our recommendations are solid and trustworthy.</p>
+    <p>Additionally, we are a not-for-profit organization. We do not utilize paid recommendations or affiliate programs to make the recommendations on this website. Unfortunately this practice is very common elsewhere online, which makes it difficult to trust other review sites. We are unique in this area, in that all of our research is conducted independently, and we will never accept payments to modify, add, or remove any of our reviews or recommendations. Our finances are provided entirely by our community <a href="https://opencollective.com/privacytoolsio">donors</a> and <a href="/sponsors/">sponsors</a>, and are handled by the Open Collective Foundation 501(c)(3). Because we are operating as a charity in the United States, we are legally obligated to only use our funding to further our mission of spreading privacy education and promoting online services like Mastodon, Matrix, and WriteFreely. This website is a public resource, not a profit generator. To that regard, all our financial transactions (incoming and outgoing) are logged and made available to the public via our page at <a href="https://opencollective.com/privacytoolsio">opencollective.com/privacytoolsio</a>.</p>
+    <p>We take the operation of our various <a href="/services/">services</a> very seriously, and require all participants to adhere to our <a href="https://github.com/privacytoolsIO/.github/blob/master/CODE_OF_CONDUCT.md">Code of Conduct</a>. For any questions or to report abuse, please see our CoC’s <a href="https://github.com/privacytoolsIO/.github/blob/master/CODE_OF_CONDUCT.md#enforcement">Enforcement section</a>.</p>
+  </div>
+</div>
+
+<div class="row">
+  <div class="col">
+    <h2>Core Contributors</h2>
+  </div>
+</div>
+
+<div class="row">
+
+{% include team.html
+avatar="burung.jpg"
+name="Burung Hantu"
+role="Founder"
+bio="I founded PrivacyTools in 2015 to share resources and tools, allowing users to avoid international mass-surveillance programs."
+email="dude@privacytools.io"
+keys="https://keybase.io/privacytools"
+mastodon="https://social.privacytools.io/@BurungHantu"
+twitter="privacytoolsIO"
+%}
+
+{% include team.html
+avatar="jonah.png"
+name="Jonah Aragon"
+nick="Jonah"
+role="Administrator"
+bio="I run the website and services for PrivacyTools. My goal is to spread the word about data privacy as widely as possible."
+email="jonah@privacytools.io"
+website="https://www.jonaharagon.com"
+keys="https://keybase.io/jonaharagon"
+mastodon="https://social.privacytools.io/@jonah"
+twitter="JonahAragon"
+blog="jonah"
+%}
+
+{% include team.html
+avatar="blacklight447.png"
+name="blacklight447"
+bio="I research new privacy recommendations and moderate our communities. My expertise is endpoint security and networking."
+role="Community Manager"
+email="blacklight447@privacytools.io"
+mastodon="https://social.privacytools.io/@blacklight447"
+%}
+
+{% include team.html
+avatar="danarel.jpg"
+name="Dan Arel"
+role="ThinkPrivacy Editor"
+bio="I'm an author, columnist, and privacy advocate whose work has appeared in Time, Huff Post, OpenSource, and more."
+website="https://danarel.com"
+keys="https://keybase.io/dan_arel"
+twitter="danarel"
+mastodon="https://mastodon.technology/@danarel"
+blog="danarel"
+%}
+
+{% include team.html
+avatar="dawid.png"
+name="Dawid Potocki"
+role="Developer"
+bio="I'm a student interested in software development. I help improve PrivacyTools and promote using free libre software."
+website="https://dawidpotocki.com"
+email="dawidpotocki@privacytools.io"
+keys="https://dawidpotocki.com/accounts/#pgp"
+mastodon="https://social.privacytools.io/@dawidpotocki"
+%}
+
+{% include team.html
+avatar="dngray.png"
+name="dngray"
+nick="Daniel Gray"
+bio="I liaise with and research privacy-focused services to refine our recommendations. My background is infosec and network security."
+email="dngray@privacytools.io"
+keys="https://keybase.io/dngray"
+mastodon="https://social.privacytools.io/@dngray"
+%}
+
+{% include team.html
+avatar="mikaela.png"
+name="Mikaela Suomalainen"
+nick="Mikaela"
+bio="I am interested in instant messengers. I review privacy tools, and participate in our forum, Matrix room, and issue tracker."
+website="https://mikaela.info/"
+keys="https://gitea.blesmrt.net/mikaela/shell-things/src/branch/master/.mikaela/keys"
+%}
+
+{% include team.html
+avatar="nitrohorse.jpg"
+name="Andreas Basurto"
+nick="nitrohorse"
+role="Developer"
+bio="I'm a privacy advocate and software developer. I write web extensions, help research, and make updates to the site."
+website="https://nitrohorse.com/"
+keys="https://keybase.io/513"
+mastodon="https://nitro.horse/@andreas"
+blog="nitrohorse"
+%}
+
+{% include team.html
+avatar="trai_dep.jpg"
+name="trai_dep"
+role="Subreddit Mod"
+bio="I'm the moderator at r/Privacy and r/privacytoolsIO. Day to day, I am also – <i>irony alert</i> – an (ethical) digital marketer."
+email="trai_dep@privacytools.io"
+website="https://www.reddit.com/user/trai_dep"
+%}
+
+</div>
+<div class="row mt-4 mb-4">
+  <div class="col">
+    <div class="card">
+      <div class="card-body">
+        <p class="card-text">Of course, we couldn't do any of this without our very generous <a href="https://opencollective.com/privacytoolsio/">financial contributors</a>, <a href="https://github.com/privacytoolsIO/privacytools.io/graphs/contributors">website contributors</a>, and the countless community members that help share new ideas and spread the word! Thank you.</p>
+        <a href="/#participate" class="btn btn-primary"><i class="fas fa-hands-helping"></i> Get involved!</a>
+        <a href="/donate/" class="btn btn-outline-danger"><i class="fas fa-heart"></i> Donate</a>
+      </div>
+    </div>
+  </div>
+</div>
+
+<div class="row">
+  <div class="col">
+    <h2>Contact Us</h2>
+    <p>It's very important to us to stay up-to-date on the latest changes in the privacy space. If you have a software recommendation for us, or want to request a change on this website, please don't hesitate to reach out in one of the following ways.</p>
+    <p><a href="https://forum.privacytools.io/"><i class="fab fa-discourse fa-lg fa-fw"></i> Start a discussion in our Discourse forum</a></p>
+    <p><a href="https://github.com/privacytoolsIO/privacytools.io/issues"><i class="fab fa-github fa-lg fa-fw"></i> Open an issue on GitHub</a></p>
+    <p><a href="https://www.reddit.com/r/privacytoolsIO/"><i class="fab fa-reddit fa-lg fa-fw"></i> Suggest something new on our subreddit</a></p>
+    <p>For complete transparency, software and providers will only be considered for this website after discussions take place on our GitHub issue tracker. We of course don't make any changes in secret.</p>
+    <p>Join our Matrix room at <code>#general:privacytools.io</code> or join the <a href="https://keybase.io/team/privacytools_io">privacytools_io Keybase team</a> to chat with us and other members about this site and privacy in general! If you need a Matrix account, you can sign up with our own homeserver (<code>https://chat.privacytools.io</code>) using <a href="https://riot.privacytools.io">Riot</a>.</p>
+  </div>
+</div>

pages/contact.md

@@ -1,26 +0,0 @@
----
-layout: page
-permalink: /contact/
-title: "Contact Us"
-description: "Contact the privacytoolsIO team if you have any suggestions or are experiencing any issues."
----
-
-## Suggestions?
-
-It's very important to us to stay up-to-date on the latest changes in the privacy space. If you have a software recommendation for us, or want to request a change on this website, please don't hesitate to reach out.
-
-[<i class="fab fa-discourse fa-lg fa-fw"></i> Start a discussion in our Discourse forum](https://forum.privacytools.io/)
-
-[<i class="fab fa-github fa-lg fa-fw"></i> Open an issue on GitHub](https://github.com/privacytoolsIO/privacytools.io/issues)
-
-[<i class="fab fa-reddit fa-lg fa-fw"></i> Suggest something new on our subreddit](https://www.reddit.com/r/privacytoolsIO/)
-
-For complete transparency, software and providers will only be considered for this website after discussions take place on any of the above platforms.
-
-## Chat with the Team
-
-Join our Matrix room at `#general:privacytools.io` or [privacytools_io Keybase team](https://keybase.io/team/privacytools_io) to chat with [us](https://github.com/orgs/privacytoolsIO/people) and other members about this site and privacy in general! If you need a Matrix account, you can sign up with our own homeserver (`https://chat.privacytools.io`) using [riot.privacytools.io](https://riot.privacytools.io/).
-
-## Code of Conduct
-
-We take the operation of our various [services](/services/) very seriously, and adhere to our [Code of Conduct](https://github.com/privacytoolsIO/privacytools.io/blob/master/CODE_OF_CONDUCT.md). For any questions or to report abuse, please see our CoC's [Enforcement](https://github.com/privacytoolsIO/privacytools.io/blob/master/CODE_OF_CONDUCT.md#enforcement) section.

pages/donate.html

@@ -7,22 +7,22 @@ permalink: /donate/
   <div class="row">
     <div class="mx-auto text-center">
       <div class="mt-4 mb-4">
-        <a href="https://www.privacytools.io/"><img src="/assets/img/layout/logo.png" class="img-fluid" alt="privacytools.io"></a>
+        <a href="{{ site.production_url }}"><img src="/assets/img/layout/logo.png" class="img-fluid" alt="PrivacyTools"></a>
       </div>
 
       <div class="card border-success mt-5 mb-5">
-        <div class="card-header text-success"><i class="fas fa-donate fa-fw"></i> {% t donate.opencollective_card_title %}</div>
+        <div class="card-header text-success"><i class="fas fa-donate fa-fw"></i> Donate via OpenCollective</div>
         <div class="card-body text-success">
-          <p class="card-text">{% t donate.opencollective_card_text %}</p>
+          <p class="card-text">If you are able, please consider contributing to our development and outreach programs. <strong>Contributions via OpenCollective to PrivacyTools are tax deductible for US taxpayers.</strong> These funds are transparently and primarily used to cover server costs.</p>
-          <a href="https://opencollective.com/privacytoolsio#section-contribute" class="btn btn-success">{% t donate.opencollective_card_contribute %}</a>
+          <a href="https://opencollective.com/privacytoolsio#section-contribute" class="btn btn-success">Contribute</a>
-          <a href="https://blog.privacytools.io/privacytools-io-joins-the-open-collective-foundation" class="btn btn-outline-success">{% t donate.opencollective_card_moreinfo %}</a>
+          <a href="https://blog.privacytools.io/privacytools-io-joins-the-open-collective-foundation" class="btn btn-outline-success">More Info</a>
         </div>
       </div>
 
-      <h1>{% t donate.cta %}</h1>
+      <h1>Please Donate</h1>
 
-      <p>{% t donate.ad_free %}<br>{% t donate.costs %}</p>
+      <p>Our website is free of advertisements and not affiliated with any listed providers.<br>Your donation will cover our costs for servers, domains, coffee, beer, and pizza.</p>
-      <p>{% t donate.other_crypto_no_receipt %}<br>{% t donate.convert_opencollective %}</p>
+      <p>You may also contribute via the cryptocurrencies below, however we will not be able to provide a receipt for your contribution.<br>Your contribution will be considered an anonymous, unrestricted contribution and paid to our Fiscal Host at OpenCollective when we convert to currency.</p>
 
     </div>
   </div>
@@ -79,9 +79,9 @@ permalink: /donate/
       </div>
 
     <div class="text-center">
-      <p>{% t donate.bitcoin %} {% t donate.bitcoin2 %}</p>
+      <p>We prefer Bitcoin donations to be above $5 due to the state of the network's transaction fees. You are welcome to donate any smaller or larger amount on any other cryptocurrency, such as Bitcoin Cash, Ethereum, or Stellar.</p>
 
-      <h2>{% t donate.more %}</h2>
+      <h2>More Cryptocurrencies</h2>
 
     </div>
 
@@ -297,8 +297,8 @@ permalink: /donate/
       </div>
 
     <div class="text-center">
-      <p>{% t donate.the %} <a href="/contact/">{% t donate.team %}</a> {% t donate.endorse %}</p>
+      <p>The <a href="/contact/">PrivacyTools team</a> does not necessarily endorse all of the cryptocurrencies listed on this page. Please conduct your own research before purchasing any cryptocurrencies.</p>
-      <h3>{% t donate.thanks %}</h3>
+      <h3>Thanks for your support. You are awesome!</h3>
       <p>
       <span class="far fa-smile-beam fa-3x"></span>
       </p>

pages/privacy.md

@@ -1,21 +1,21 @@
 ---
 layout: page
 permalink: /privacy/
-title: "Privacy Q&A"
+title: "Privacy Q&A"
-description: "This Privacy Statement explains what information privacytoolsIO and its related entities collect about its users, what we do with that information, and how we handle the content you place in our products and services."
+description: "This Privacy Statement explains what information PrivacyTools and its related entities collect about its users, what we do with that information, and how we handle the content you place in our products and services."
 ---
 
-## Who is privacytools.io?
+## Who is PrivacyTools?
 
-privacytools.io is an unincorporated community developing this website and a number of privacy-friendly services. The current list of public team members [can be found on GitHub](https://github.com/orgs/privacytoolsIO/people). In order to operate these services, privacytools.io receives hosting and administration services from Aragon Ventures LLC, which also collects payments and donations on the privacytools.io team's behalf.
+PrivacyTools is an unincorporated community developing this website and a number of privacy-friendly services. The current list of public team members [can be found on GitHub](https://github.com/orgs/privacytoolsIO/people). In order to operate these services, PrivacyTools receives hosting and administration services from Aragon Ventures LLC.
 
-## How does privacytools.io collect data about me?
+## How does PrivacyTools collect data about me?
 
 We collect data:
 
-* When you browse a website, forum, or other privacytools.io service.
+* When you browse a website, forum, or other PrivacyTools service.
-* When you create an account on a privacytools.io service.
+* When you create an account on a PrivacyTools service.
-* When you post, send private messages, or otherwise participate on a privacytools.io service.
+* When you post, send private messages, or otherwise participate on a PrivacyTools service.
 
 This data will be collected regardless of browser, device, or app used to access our services. We do not buy or otherwise receive data from data brokers.
 
@@ -23,7 +23,7 @@ This data will be collected regardless of browser, device, or app used to access
 
 ### We collect data about visits to our websites.
 
-When you visit a privacytools.io website or service, regardless of whether you have an account or not, the website may use cookies, server logs, and other methods to collect the following data:
+When you visit a PrivacyTools website or service, regardless of whether you have an account or not, the website may use cookies, server logs, and other methods to collect the following data:
 
 * What pages you visit,
 * What actions you take on our website,
@@ -68,15 +68,15 @@ We will store your account data as long as your account remains open. After clos
 
 ## Who is my data shared with?
 
-When you use services provided by privacytools.io your data is shared with Aragon Ventures LLC, in order to facilitate their hosting obligations. Aragon Ventures LLC may collect and use your data as described in their privacy statement at [https://aragon.ventures/privacy](https://aragon.ventures/privacy/).
+When you use services provided by PrivacyTools your data is shared with Aragon Ventures LLC, in order to facilitate their hosting obligations. Aragon Ventures LLC may collect and use your data as described in their privacy statement at [https://aragon.ventures/privacy](https://aragon.ventures/privacy/).
 
-Your account data, posts, and other activities on privacytools.io services is shared with others as mentioned in the section about account data.
+Your account data, posts, and other activities on PrivacyTools services is shared with others as mentioned in the section about account data.
 
 ## Where is my data stored?
 
-Your data is stored on servers provided by Aragon Ventures LLC, a company incorporated in Minnesota, United States. The primary datacenter for privacytools.io is located in France. Some websites, services, or backups may reside in datacenters in multiple jurisdictions, including the United States and the European Union.
+Your data is stored on servers provided by Aragon Ventures LLC, a company incorporated in Minnesota, United States. The primary datacenter for PrivacyTools is located in France. Some websites, services, or backups may reside in datacenters in multiple jurisdictions, including the United States and the European Union.
 
-## Is privacytools.io GDPR compliant?
+## Is PrivacyTools GDPR compliant?
 
 We respect privacy rights under [Regulation (EU) 2016/679](https://eur-lex.europa.eu/legal-content/EN/TXT/?uri=uriserv:OJ.L_.2016.119.01.0001.01.ENG), the European Union’s General Data Protection Regulation (GDPR). Information that GDPR requires us to give can be found throughout this document.
 
@@ -91,9 +91,9 @@ We would like to make sure you are fully aware of all of your data protection ri
 * **The right to object to processing** – You have the right to object to our processing of your personal data, under certain conditions.
 * **The right to data portability** – You have the right to request that we transfer the data that we have collected to another organization, or directly to you, under certain conditions.
 
-## How can I contact the privacytools.io team about privacy?
+## How can I contact the PrivacyTools team about privacy?
 
-The privacytools.io 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 the data controller for these services, Aragon Ventures LLC:
+The PrivacyTools 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 the data controller for these services, Aragon Ventures LLC:
 
 ```
 Jonah Aragon
@@ -110,7 +110,7 @@ Anoka, MN 55303
 United States
 ```
 
-For all other inquiries, you can contact the team via methods described on our [contact page](https://www.privacytools.io/contact/).
+For all other inquiries, you can contact the team via methods described on our [contact page]({{ site.production_url }}/contact/).
 
 For complaints under GDPR more generally, European Union users may lodge complaints with their local data protection supervisory authorities.
 
@@ -118,6 +118,6 @@ For complaints under GDPR more generally, European Union users may lodge complai
 
 This version of our privacy statement took effect October 9th, 2019.
 
-We will post any new versions of this statement at [https://www.privacytools.io/privacy/](https://www.privacytools.io/privacy/). 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 [https://www.privacytools.io/privacy/](https://www.privacytools.io/privacy/) for the latest contact information at any time.
+We will post any new versions of this statement at [{{ site.production_url }}/privacy/]({{ site.production_url }}/privacy/). 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 [{{ site.production_url }}/privacy/]({{ site.production_url }}/privacy/) for the latest contact information at any time.
 
 A full [revision history](https://github.com/privacytoolsIO/privacytools.io/commits/master/pages/privacy.md) for this page can be found on GitHub.

pages/providers/vpn.html

@@ -170,7 +170,7 @@ description: "Find a no-logging VPN operator who isn't out to sell or read your
         <ol>
           <li><a href="https://schub.io/blog/2019/04/08/very-precarious-narrative.html">VPN - a Very Precarious Narrative</a> by Dennis Schubert</li>
           <li><a href="https://gist.github.com/joepie91/5a9909939e6ce7d09e29">Don't use VPN services</a> by Sven Slootweg</li>
-          <li><a href="/software/networks/">The self-contained networks</a> recommended on privacytools.io are able to replace a VPN that allows access to services on local area network</li>
+          <li><a href="/software/networks/">The self-contained networks</a> recommended by PrivacyTools are able to replace a VPN that allows access to services on local area network</li>
           <li><a href="https://write.privacytools.io/my-thoughts-on-security/slicing-onions-part-1-myth-busting-tor">Slicing Onions: Part 1 – Myth-busting Tor</a> by blacklight447</li>
           <li><a href="https://write.privacytools.io/my-thoughts-on-security/slicing-onions-part-2-onion-recipes-vpn-not-required">Slicing Onions: Part 2 – Onion recipes; VPN not required</a> by blacklight447</li>
         </ol>

pages/services.html

@@ -1,22 +1,22 @@
 ---
 layout: page
 permalink: /services/
-title: "{% t services.title %}"
+title: "Services from PrivacyTools"
-description: "{% t services.description %}"
+description: "The PrivacyTools team is proud to introduce a suite of privacy-centric online services to connect you with other privacy-minded individuals and stay safe and secure online. No advertisers, no Google Analytics, no tracking, no third-party requests of any kind."
 ---
 
-<p>{% t services.we_have_the_following_services %}</p>
+<p>We currently have the following free-to-use services online now.</p>
 
 <div class="card card-list">
   <ul class="list-group list-group-flush">
-  	<li class="list-group-item"><a href="https://search.privacytools.io/"><i class="fas fa-search fa-lg fa-fw"></i> {% t services.searx %}</a></li>
+  	<li class="list-group-item"><a href="https://search.privacytools.io/"><i class="fas fa-search fa-lg fa-fw"></i> Searx - Privacy Friendly Search at search.privacytools.io</a></li>
-    <li class="list-group-item"><a href="https://social.privacytools.io/"><i class="fas fa-retweet fa-lg fa-fw"></i> {% t services.mastodon %}</a></li>
+    <li class="list-group-item"><a href="https://social.privacytools.io/"><i class="fas fa-retweet fa-lg fa-fw"></i> Mastodon - Tracker Free Social Networking at social.privacytools.io</a></li>
-    <li class="list-group-item"><a href="https://chat.privacytools.io/"><i class="fas fa-comment fa-lg fa-fw"></i> {% t services.matrix %}</a></li>
+    <li class="list-group-item"><a href="https://chat.privacytools.io/"><i class="fas fa-comment fa-lg fa-fw"></i> Matrix - Federated private chat at chat.privacytools.io</a></li>
-    <li class="list-group-item"><a href="https://forum.privacytools.io/"><i class="fab fa-discourse fa-lg fa-fw"></i> {% t services.discourse %}</a></li>
+    <li class="list-group-item"><a href="https://forum.privacytools.io/"><i class="fab fa-discourse fa-lg fa-fw"></i> Discourse - Forum at forum.privacytools.io</a></li>
-    <li class="list-group-item"><a href="https://git.privacytools.io/"><i class="fab fa-git fa-lg fa-fw"></i> {% t services.gitea %}</a></li>
+    <li class="list-group-item"><a href="https://git.privacytools.io/"><i class="fab fa-git fa-lg fa-fw"></i> Gitea - Git-Repository Manager at git.privacytools.io</a></li>
-    <li class="list-group-item"><a href="https://write.privacytools.io/"><i class="fas fa-pen-alt fa-lg fa-fw"></i> {% t services.write_freely %}</a></li>
+    <li class="list-group-item"><a href="https://write.privacytools.io/"><i class="fas fa-pen-alt fa-lg fa-fw"></i> Write Freely - Federated minimalist blog at write.privacytools.io</a></li>
-    <li class="list-group-item"><a href="https://bin.privacytools.io/"><i class="fas fa-clipboard fa-lg fa-fw"></i> {% t services.privatebin %}</a></li>
+    <li class="list-group-item"><a href="https://bin.privacytools.io/"><i class="fas fa-clipboard fa-lg fa-fw"></i> PrivateBin - Encrypted Pastebin at bin.privacytools.io</a></li>
   </ul>
 </div>
 
-<p>{% t services.more_services_on_the_way %} {% t services.beneficial %} {% t services.consider %} <a href="/donate/">{% t services.donating %}</a>, <em>{% t services.helps %}</em></p>
+<p>More services are on the way. If there's something that would be super beneficial for us to run, don't hesitate to reach out and ask. And of course, if you like our services, please consider <a href="/donate/">donating to support our server costs</a>, <em>any donation helps!</em></p>

pages/sponsors.html

@@ -8,42 +8,50 @@ permalink: /sponsors/
   <div class="row">
     <div class="mx-auto text-center">
       <div class="mt-4 mb-4">
-        <h1>{% t sponsors.sponsors_ptio %}</h1>
+        <h1>Sponsors of PrivacyTools</h1>
       </div>
       <div class="mb-4">
-        <p>{% t sponsors.community_proj %}<br><strong>{% t sponsors.donations_support %}</strong></p>
+        <p>The PrivacyTools website and services are a community project. There is no advertising, affiliate links, or other forms of monetization.<br><strong>Your donations here directly support hosting this website and compensating contributors to this project.</strong></p>
         <p>
-          <a href="https://opencollective.com/privacytoolsio#section-contribute" class="btn btn-success mb-5">{% t sponsors.become_a_sponsor %}</a>
+          <a href="https://opencollective.com/privacytoolsio#section-contribute" class="btn btn-success mb-5">Become a Sponsor</a>
-          <a href="/donate/" class="btn btn-outline-danger mb-5"><span class="fas fa-heart fa-fw"></span> {% t sponsors.donate_directly %}</a>
+          <a href="/donate/" class="btn btn-outline-danger mb-5"><span class="fas fa-heart fa-fw"></span> Donate to PrivacyTools</a>
         </p>
       </div>
     </div>
   </div>
-  <h3>{% t sponsors.why_sponsor %}</h3>
+  <h3>Why sponsor PrivacyTools?</h3>
-  <p>{% t sponsors.designed_to_allow %}</p>
+  <p>This sponsorship program is designed to allow companies, organizations, and individuals partner with the PrivacyTools team to support our vision of a more privacy-respecting internet and the greater online community.</p>
-  <p>{% t sponsors.recognize_privacy %}</p>
+  <p>With this exposure and sponsorship, your customers will recognize your intrinsic understanding and commitment to user privacy. Moreover, you'll directly contribute to our mission of spreading privacy-respecting tools and knowledge worldwide!</p>
-  <p>{% t sponsors.recognized_on_ptio %}</p>
+  <p>At PrivacyTools, we believe in...</p>
-  <h5>{% t sponsors.general_info %}</h5>
-  <p>{% t sponsors.stats_pageviews_featured %}</p>
-  <h5>🥉 {% t sponsors.bronze_sponsorship %} - <a href="https://opencollective.com/privacytoolsio/contribute/bronze-12311">{% t sponsors.info_link %}</a></h5>
   <ul>
-  <li>{% t sponsors.bronze_recognition %}</li>
+    <li><strong>Privacy</strong>, of course. Privacy gives you as a user control over how your information is used and spread online. Trustworthy and secure products and services are the key to that future.</li>
+    <li><strong>Security</strong>. We believe services cannot provide privacy at all without being secure. Strong encryption is the only way to prevent malicious actors from snooping in on our communications.</li>
+    <li><strong>Freedom</strong>. The right to express your opinion online without interference or surveillance is the only way we can grow as a society, and privacy-respecting tools should foster that growth.</li>
   </ul>
-  <h5>🥈 {% t sponsors.silver_sponsorship %} - <a href="https://opencollective.com/privacytoolsio/contribute/silver-12313">{% t sponsors.info_link %}</a></h5>
+  <p>We reserve the right or deny all sponsors from receiving the benefits detailed below if we believe that your organization or product is not aligned with our key values. Therefore, if you are interested in sponsoring our project, please first email <a href="mailto:sponsors@privacytools.io">sponsors@privacytools.io</a> so we may discuss further.</p>
+  <p>As a sponsor of PrivacyTools, your company will be widely recognized in a variety of ways, some of which we've detailed below.</p>
+  <h5>General Information</h5>
+  <p>This website receives well over 250,000 pageviews on a monthly basis and is highly ranked for privacy-related keywords. In addition to the benefits below your contribution will be featured on our OpenCollective page and we will thank you via social media for your contribution.</p>
+  <h5>🥉 Bronze Sponsorship - <a href="https://opencollective.com/privacytoolsio/contribute/bronze-12311">Info</a></h5>
   <ul>
-  <li>{% t sponsors.silver_recognition %}</li>
+  <li>Your name and link along with a small logo or avatar on the sponsors page of this website.</li>
   </ul>
-  <h5>🥇 {% t sponsors.gold_sponsorship %} - <a href="https://opencollective.com/privacytoolsio/contribute/gold-12312">{% t sponsors.info_link %}</a></h5>
+  <h5>🥈 Silver Sponsorship - <a href="https://opencollective.com/privacytoolsio/contribute/silver-12313">Info</a></h5>
   <ul>
-  <li>{% t sponsors.gold_recognition %}</li>
+  <li>Your medium-sized logo as a link at the top of our sponsors page.</li>
   </ul>
-  <h5>{% t sponsors.we_will_not_provide %}</h5>
+  <h5>🥇 Gold Sponsorship - <a href="https://opencollective.com/privacytoolsio/contribute/gold-12312">Info</a></h5>
-  <p>{% t sponsors.details_for_not_provide %}</p>
+  <ul>
-  <h5>{% t sponsors.tax_and_financial_info %}</h5>
+  <li>Your medium-sized logo as a link on the PrivacyTools homepage and at the very top of our sponsors page.</li>
-  <p>{% t sponsors.tax_and_financial_info_details %}</p>
+  </ul>
-  <h5>{% t sponsors.more_information %}</h5>
+  <h5>We will not provide...</h5>
-  <p>{% t sponsors.questions_to_email %} <a href="mailto:sponsors@privacytools.io">sponsors@privacytools.io</a>.</p>
+  <p>We pride ourselves on our integrity and commitment to spreading unbiased and fact-based information regarding privacy and privacy-respecting tools. All tools we recommend throughout our website are subject to strict criteria as judged by our team and the community across our various platforms. Your sponsorship will not grant your organization any special consideration when choosing our recommendations throughout the website, a process which we make clear via our transparent ledger on OpenCollective and our public discussions on GitHub. Your sponsorship benefits are limited to those outlined above.</p>
+  <h5>Tax and Financial Information</h5>
+  <p>Your contribution to PrivacyTools will be handled by the Open Collective Foundation 501(c)(3). For US companies and taxpayers, this means your contribution is <strong>tax deductible</strong>. As a non-profit, your sponsorship contribution will not be used for private profit and will only be used to cover expenses incurred by the project. All of our transactions (donations and expenses) are published transparently on OpenCollective. For the benefit of our readership, anonymous contributions will not be eligible for the sponsorship opportunities outlined above.</p>
+  <h5>More Information</h5>
+  <p>If you are interested and have further questions, please reach out to us directly at <a href="mailto:sponsors@privacytools.io">sponsors@privacytools.io</a>.</p>
+  <p>We reserve the right to decline any sponsorship we don't believe is aligned with our values as an organization.</p>
   <div class="mt-5 text-center">
-    <a href="https://opencollective.com/privacytoolsio#section-contribute" class="btn btn-success mb-5">{% t sponsors.become_a_sponsor %}</a>
+    <a href="https://opencollective.com/privacytoolsio#section-contribute" class="btn btn-success mb-5">Contribute to PrivacyTools</a>
   </div>
 </div>