Add Galaxy Note II

Removes OnlyKey: https://github.com/privacytoolsIO/privacytools.io/pull/1713#issuecomment-588311326
Rewords iPhone recommendation: https://github.com/privacytoolsIO/privacytools.io/pull/1713#issuecomment-587419590

.github/CODEOWNERS

@@ -22,11 +22,3 @@
 /.travis.yml @JonahAragon @Shifterovich @nitrohorse
 /CNAME @JonahAragon
 /nginx/ @JonahAragon
-
-# WKD
-/.well-known/openpgpkey/hu/mrobfoimg5wz876m7kp6spyu66941weo @Mikaela
-/.well-known/openpgpkey/hu/nqspr7yd4bgs8ry43zbzpjd45p4iug5b @dawidpotocki
-/.well-known/openpgpkey/hu/dnrefmbtd6i58w8xfy4imj94cmbw3u3h @dngray
-/.well-known/openpgpkey/hu/rse6m7dxfdjo86qhyj6wqs1hcdcp7em4 @danarel
-/.well-known/openpgpkey/hu/zt71pstaerw1jpa5ru3borqmfsnbwnf6 @nitrohorse
-/.well-known/openpgpkey/hu/omn8s4nziz8zmyz6f756asto39gefr63 @JonahAragon

.github/CONTRIBUTING.md

@@ -95,9 +95,8 @@ See https://www.privacytools.io/providers/vpn/#criteria for more details.
 
 ## Images
 
-- SVG file format is strongly preferred. PNG files can be used as a fallback if images are too complex or otherwise unsuitable as a vector format.
-- Provider logo dimensions are 384px x 128px ([example](https://github.com/privacytoolsIO/privacytools.io/blob/master/assets/img/svg/3rd-party/mullvad.svg))
-- Tool logo dimensions are 120px x 120px ([SVG example](https://github.com/privacytoolsIO/privacytools.io/blob/master/assets/img/svg/3rd-party/firefox_browser.svg), [PNG example](https://github.com/privacytoolsIO/privacytools.io/blob/master/assets/img/png/3rd-party/claws_mail.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://github.com/privacytoolsIO/privacytools.io/blob/master/assets/img/tools/Firefox.png))
 
 ## Licensing
 

.github/ISSUE_TEMPLATE/1_Software_Suggestion.md

@@ -24,4 +24,4 @@ labels: 🆕 software suggestion
 
 <!-- Are you the author? Enthustiastic or early adopter? Friends with the author or requested by them to open the isue? An employee of the software maker? -->
 
-- [ ] I will keep the issue up-to-date if something I have said changes or I remember a connection with the software.
+- [ ] I will keep the issue up-to-date if something I have said changes or I remember a connection with the software.

.github/ISSUE_TEMPLATE/2_Software_Removal.md

@@ -18,4 +18,4 @@ labels: ❌ software removal
 
 <!-- Are you the author? Competitor? Just hating the software with passsion for some reason? -->
 
-- [ ] I will keep the issue up-to-date if something I have said changes or I remember a connection with the software.
+- [ ] I will keep the issue up-to-date if something I have said changes or I remember a connection with the software.

.github/ISSUE_TEMPLATE/3_Discussion.md

@@ -0,0 +1,13 @@
+<!--
+    Is there already a discussion about this on the forum (https://forum.privacytools.io/search)?
+    If not, please open a new discussion there. Thank you!
+-->
+
+---
+name: "💬 Discussion"
+about: Discuss the website or any mentioned software in general.
+title: "💬 Discussion | "
+labels: 💬 discussion, feedback wanted
+---
+
+<!-- Remember to stay civil! -->

.github/ISSUE_TEMPLATE/4_Content_Correction.md

@@ -1,21 +0,0 @@
----
-name: "📝 Content Correction"
-about: Report any inaccurate, incorrect, or outdated information on the website.
-title: "📝 Correction | "
-labels: 📝 correction
----
-
-## Description
-
-
-
-## Why I am making the suggestion
-
-<!-- Anything you would like to tell us about the software? -->
-
-
-## My connection with the software
-
-<!-- Are you the author? Competitor? Just hating the software with passsion for some reason? -->
-
-- [ ] I will keep the issue up-to-date if something I have said changes or I remember a connection with the software.

.github/ISSUE_TEMPLATE/4_Feature.md

@@ -1,8 +1,9 @@
 ---
 name: "✨ Feature Suggestion"
-about: Suggest a new feature/section/page for the website.
+about: Suggest a new feature for the website.
 title: "✨ Feature Suggestion | "
 labels: ✨ enhancement
 ---
 
 ## Description
+

.github/ISSUE_TEMPLATE/5_Website_Issues.md

@@ -1,19 +1,10 @@
 ---
 name: "🌐 Website Issue"
-about: Report a bug with the website. (NO CONTENT ISSUES)
+about: Report an issue with the website.
 title: "🌐 Website Issue | "
 labels: 🌐 website issue
 ---
 
-<!--
-
-READ ME FIRST:
-This is NOT the place to request changes to the content of the website.
-This is NOT the place to report issues with our services. (That is https://github.com/privacytoolsIO/services/issues/new)
-This is ONLY for reporting bugs or technical issues with www.privacytools.io.
-
--->
-
 ## Description
 
 <!--

.github/ISSUE_TEMPLATE/7_DNS_provider.md

@@ -0,0 +1,47 @@
+---
+name: "🗄️ encrypted DNS provider suggestion"
+about: Suggest a new encrypted DNS provider.
+title: "🗄️ DNS provider suggestion | "
+labels: 🌐 website issue, 🗄️ DNS
+---
+
+<!-- Please feel free to overwrite these comments -->
+
+## Basic Information
+
+**Name:** 
+**Filtering:** <!-- What is being filtered? Is it opt-in with separate address or not? -->
+**Privacy policy:** <!-- Link, especially when there is logging -->
+**Protocols:** <!-- at least DoH or DoT? DNSCrypt? -->
+**Server/Location:** <!-- Where is the provider based? Where are their servers located? Anycast if there are multiple servers answering to the same address -->
+**Source:** <!-- link to the source code, preferred, but optional -->
+**Type:** <!-- Non-profit, commercial, hobby project? -->
+**Website:** 
+
+## Description
+
+<!-- Why should we list your suggestion? Anything else, that you wish us to know? -->
+
+
+### Required features:
+
+<!-- DoH and DoT are supported natively by platforms like Firefox and Android 9+ -->
+
+* [ ] supports DoH or DoT <!-- We love DNSCrypt, but there is already https://github.com/DNSCrypt/dnscrypt-resolvers which is directly supported by dnscrypt-proxy, so we don't consider useful to list providers only supporting it.  -->
+* [ ] supports DNSSEC <!--  https://dnssec.vs.uni-due.de/ can test your current DNS provider. -->
+* [ ] doesn't log IP addresses during normal operation <!-- If your suggestion logs, please compare its privacy policy with other servers on our table that keep logs. -->
+
+#### Desired features
+
+* [ ] supports QNAME minimization <!-- if you have access to the dig command run `dig +short txt qnamemintest.internet.nl` or `Resolve-DnsName -Type TXT -Name qnamemintest.internet.nl` if you are on Windows 10 -->
+
+## Why I am making the suggestion
+
+<!-- Anything you would like to tell us about the software? -->
+
+
+## My connection with the software
+
+<!-- Are you the author? Enthustiastic or early adopter? Friends with the author or requested by them to open the isue? An employee of the software maker? -->
+
+- [ ] I will keep the issue up-to-date if something I have said changes or I remember a connection with the software.

.github/ISSUE_TEMPLATE/config.yml

@@ -1,7 +0,0 @@
-contact_links:
-  - name: Services issues
-    url: https://github.com/privacytoolsIO/services/issues/new/choose
-    about: Open any issues/bug reports/requests related to our services (Mastodon, Matrix, etc) here.
-  - name: PrivacyTools Community
-    url: https://forum.privacytools.io/
-    about: Please ask any generic questions on our forum.

.gitignore

@@ -6,5 +6,3 @@ font/assets/
 font/_sass/
 font/.fontcustom-manifest.json
 assets/webfonts/ptio-font-preview.html
-vendor
-.bundle

README.md

@@ -14,19 +14,14 @@ It's important for a website like PrivacyTools to be up-to-date. Keep an eye on
 
 You can submit your suggestions here on GitHub [(Issues)](https://github.com/privacytoolsIO/privacytools.io/issues) and also in our [subreddit](https://www.reddit.com/r/privacytoolsIO/). Please refer to the [Contributing Guidelines](.github/CONTRIBUTING.md) before submitting. Thank you.
 
-## Developing
+## Building
 
-1. Install the latest stable version of [Ruby](https://www.ruby-lang.org/en/downloads/).
-1. Install [Bundler](https://bundler.io/) v2.0.1:
-	* `gem install bundler -v 2.0.1`
-1. Install the required dependencies:
-	* `bundle install`
-1. Build the website (the output can be found in the `_site` directory):
-	* `bundle exec jekyll build`
-1. Serve the website locally with live reloading:
-	* `bundle exec jekyll serve --incremental --livereload`
+1. Install [Ruby](https://www.ruby-lang.org/en/documentation/installation/)
+1. Install [bundler](https://bundler.io/) by running `gem install bundler`.
+1. Run `bundle install` to install the required dependencies.
+1. Use `bundle exec jekyll build` to build the website. The output can be found in the `_site` directory.  Live preview is also possible by running `bundle exec jekyll serve`
 
-# Support
+# Support privacytools.io
 
 - [Donate.](https://www.privacytools.io/donate/)
 - [Liberapay](https://liberapay.com/privacytools.io/donate) or [Patreon.](https://www.patreon.com/privacytools)

_includes/footer.html

@@ -79,7 +79,7 @@
       JavaScript Licenses
     </a>
     <p class="mt-2">
-      <strong>No Ads, No Google Analytics, {% if page.title != "Shop" %}No Affiliates, {% endif %}No Cross-Site Requests.</strong>
+      <strong>No Ads, No Google Analytics, No Affiliates, No Cross-Site Requests.</strong>
       <em>{{ site.name }} 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>
     </p>
     <p class="text-left">

_includes/nav.html

@@ -77,6 +77,22 @@
           </span>
         </details>
 
+        <!-- Hardware -->
+        <details class="nav-details">
+          <summary>
+            <span class="nav-summary">
+              Hardware
+              <span class="dropdown-toggle"></span>
+            </span>
+          </summary>
+          <span class="nav-dropdown">
+            <a class="dropdown-item" href="/hardware/#mobile"><span class="fas fa-mobile-alt fa-fw"></span> Mobile Devices</a>
+            <a class="dropdown-item" href="/hardware/#u2f"><span class="fas fa-key fa-fw"></span> U2F Security Keys</a>
+            <a class="dropdown-item" href="/hardware/#routers"><span class="fas fa-network-wired fa-fw"></span> Routers</a>
+            <a class="dropdown-item" href="/hardware/#laptops"><span class="fas fa-coins fa-fw"></span> Hardware Wallets</a>
+          </span>
+        </details>
+
         <!-- OS -->
         <details class="nav-details">
           <summary>
@@ -113,9 +129,6 @@
         <a href="/about/" class="nav-anchor">
           About Us
         </a>
-        <a href="/shop/" class="nav-anchor">
-          Shop
-        </a>
         <span id="nav-switch-theme" class="nav-anchor">
           <span class="nav-theme-icon fas fa-fw" aria-hidden="true" title="Theme"></span>
           <span class="sr-only">Toggle Theme</span>

_includes/product.html

@@ -1,12 +0,0 @@
-<div class="col-md-4">
-  <div class="card m-3">
-    <img src="/assets/img/png/merch/{{include.image}}" class="card-img-top">
-    <div class="card-body">
-      <h5 class="card-title mt-1">{{include.title}}</h5>
-      <h6 class="card-subtitle mb-2 text-muted">{% if include.sale %}<strong>{{include.sale}}</strong> <del>{% endif %}{{include.price}}{% if include.sale %}</del>{% endif %}</h6>
-      <p class="card-text">{{include.description}}</p>
-      <a href="{{include.link}}" class="btn btn-primary">Purchase</a>
-      <p class="card-text mt-3">Fulfilled by <span class="badge badge-secondary">{{include.vendor}}</span></p>
-    </div>
-  </div>
-</div>

_includes/sections/hardware-wallets.html

@@ -0,0 +1,24 @@
+<h1 id="hardware-wallets" class="anchor"><a href="#hardware-wallets"><i class="fas fa-link anchor-icon"></i></a> Hardware Wallets</h1>
+
+{% include cardv2.html
+title="Trezor One"
+image="/assets/img/png/3rd-party/trezor-one.png"
+description='A fully open-source cryptocurrency wallet with support for over 1,000 coins/tokens. Trezor also has password manager functionality, supports GPG and SSH key storage functionality, and can act as a U2F key, making it a great backup for your U2F key (or vice versa).'
+website="https://trezor.io/"
+github="https://github.com/trezor"
+%}
+
+{% include cardv2.html
+title="Trezor Model T"
+badges="info:Upgrade Pick"
+image="/assets/img/png/3rd-party/trezor-model-t.png"
+description='The Trezor Model T supports all the same functionality as the Trezor One, as well as FIDO2 authentication support, a wider variety of coins/tokens, and a full color touchscreen for easier use.'
+website="https://trezor.io/"
+github="https://github.com/trezor"
+%}
+
+<h3>Worth Mentioning</h3>
+
+<ul>
+  <li><a href="https://www.ledger.com/">Ledger Nano X</a> - A great pick if you are an iOS user, or if the Trezor One does not support the coins/tokens you use. It does have some closed-source components, and it is not as intuitive to use as Trezor's devices.</li>
+</ul>

_includes/sections/mobile-devices.html

@@ -0,0 +1,65 @@
+<h1 id="mobile" class="anchor"><a href="#mobile"><i class="fas fa-link anchor-icon"></i></a> Mobile Hardware</h1>
+
+<p><em><strong>A note from the team:</strong> It is important to remember that you can only truly have privacy if the devices you use are secure. This includes security against both remote and physical attackers, and passive and active attacks. In the mobile computing space this dramatically limits your available options to devices that many would consider to be unsafe by default. You will need to make both software and lifestyle modifications to make these devices privacy-respecting. If you are unable or unwilling to do so, consider using mobile devices as little as possible, as they are at odds with your privacy almost by design. Please understand that we will never recommend any "privacy-respecting" mobile hardware that sacrifices your security.</em></p>
+
+<div class="container-fluid">
+
+  <div class="row mb-2">
+    <div class="col-lg-3 col-sm-12 pt-lg-5">
+      <img
+        src="/assets/img/png/3rd-party/pixel-3.png"
+        data-theme-src="/assets/img/png/3rd-party/pixel-3.png"
+        height="200"
+        width="200"
+        class="img-fluid d-block mr-auto ml-auto align-middle"
+        alt="Pixel 3 XL">
+    </div>
+    <div class="col">
+    <h2>Google Pixel 3</h2>
+    <p>The <strong>Google Pixel 3/3 XL</strong> and the <strong>Google Pixel 3a/3a XL</strong> are the only secure Android devices currently on the market that can be made privacy-respecting. They have hardware-backed keystores, verified boot functionality <em>with custom ROMs</em>, attestation support, as well as proper ongoing support for their firmware and proper ongoing support for software specific to the hardware used in the device, which is necessary for <em>complete</em> security updates.</p>
+
+    <h5><span class="badge badge-danger">Google OS</span></h5>
+    <p>Google Pixel devices come with a modified version of Android specific to Pixel devices. This software comes with added functionality specific to Pixel devices, but also is heavily linked with Google and Google Play Services. Using the stock ROM on a Google Pixel device is <em>strongly discouraged</em>. We recommend the use of either GrapheneOS or LineageOS to "de-Google" your device.</p>
+
+    <h5><span class="badge badge-success">GrapheneOS Support</span></h5>
+    <p>The Google Pixel supports GrapheneOS, the free and open-source mobile operating system <a href="/operating-systems/#mobile_os">we currently recommend</a> for use on mobile devices.</p>
+    <p>Note that using a custom Android operating system means you have to make the compromise between app availibility and stability, and having decent security and privacy. This operating system does not come with Google Play Services by default, nor is it possible to install Google Play Services or microG. We recommend using F-Droid for app installations as needed, and to avoid third-party apps as much as possible. For this reason, a Pixel with GrapheneOS may not be the best choice for less technical users and users requiring the use of many third-party apps.</p>
+
+    <h5><span class="badge badge-success">Titan M</span></h5>
+    <p>The Google Pixel 3 has a new hardware security chip, the Titan M, making it more secure than its predecessors or other Android devices. This chip is tasked with protecting your device against boot-time attacks, too many log-in attempts, and secure data storage, among other security-related processes. Unlike other mobile hardware security solutions such as ARM TrustZone, the Titan M is a dedicated chip with physically separate RAM and processing power, preventing sidechannel attacks (a la Spectre, Meltdown, Rowhammer).</p>
+    </div>
+  </div>
+
+  <div class="row mb-2">
+    <div class="col-lg-3 col-sm-12 pt-lg-5">
+      <img
+        src="/assets/img/png/3rd-party/iphone-11-pro.png"
+        data-theme-src="/assets/img/png/3rd-party/iphone-11-pro.png"
+        height="200"
+        width="200"
+        class="img-fluid d-block mr-auto ml-auto align-middle"
+        alt="iPhone 11 Pro">
+    </div>
+    <div class="col">
+    <h2>iPhone 11</h2>
+    <p>The <strong>iPhone 11 Pro</strong> and the <strong>iPhone 11</strong> are some of the most secure and tested mobile devices on the market. They support verified boot, strong sandboxing, and strong hardware security (Secure Enclave). They also receive regular and frequent security updates, and they will receive updates far longer than competing Android devices.</p>
+    <p>An iPhone does not make people compromise between the avalibility of third-party apps and having strong security and privacy from their device. Therefore we believe it is the most suitable option for less technical users, or users looking for a better out-of-the-box experience.</p>
+
+    <h5><span class="badge badge-danger">iCloud</span></h5>
+    <p>It is important to note that iOS comes with numerous iCloud integrations, many of which are enabled by default. We recommend advoiding the use of iCloud whenever possible to avoid your personal information being stored on Apple's servers, and we only recommend the use of an Apple ID for App Store use.</p>
+    <p>Contrary to popular belief, iCloud device backups are currently <strong>not</strong> End-to-End Encrypted. You should only backup your device using iTunes.</p>
+
+    <h5><span class="badge badge-success">No Known Exploits</span></h5>
+    <p>There are no known, major <em>hardware</em> exploits for the iPhone 11 series, making them a safer choice over older iPhone models. All iPhone models up to and including the iPhone X are affected by <strong>checkm8</strong>, a permanent unpatchable bootrom exploit that <em>may</em> compromise your device's security.</p>
+    <p>This does not mean an exploit is impossible: <strong>unc0ver</strong> is an iOS 13 software exploit that affects even the iPhone 11, however it has been patched in iOS 13.3.1. Always keeping your device up-to-date is the most important step to take to keep your devices secure.</p>
+    </div>
+  </div>
+
+</div>
+
+<h3>Worth Mentioning</h3>
+
+<ul>
+  <li><a href="https://devices.ubuntu-touch.io/device/FP2">Fairphone 2</a> <span class="badge badge-info">Ubuntu Touch</span> - The Fairphone 2 is an interesting look into modular, ethical, and sustainable mobile devices with an emphasis on open source. This our preferred hardware if you wish to run Ubuntu Touch, however using older and less tested hardware like this inherently forces you to make significant security compromises.</li>
+  <li><a href="https://redmine.replicant.us/projects/replicant/wiki/GalaxyS3I9300">Samsung Galaxy S3</a> and <a href="https://redmine.replicant.us/projects/replicant/wiki/GalaxyNote2N7100">Samsung Galaxy Note II</a> <span class="badge badge-info">ReplicantOS</span> - This is the best hardware available if you wish to run ReplicantOS, however using older hardware like this inherently forces you to make significant security and usability compromises.</li>
+</ul>

_includes/sections/notebooks.html

@@ -60,6 +60,7 @@ chrome="https://chrome.google.com/webstore/detail/turtl/dgcojenhfdjhieoglmiaheih
 <h3>Worth Mentioning</h3>
 
 <ul>
+  <li><a href="https://notable.md/">Notable</a> - The markdown-based note-taking app that doesn't suck.</li>
   <li><a href="https://paperwork.cloud/">Paperwork</a> - An open-source and self-hosted solution. For PHP / MySQL servers.</li>
   <li><a href="https://orgmode.org">Org-mode</a> - A major mode for GNU Emacs. Org-mode is for keeping notes, maintaining TODO lists, planning projects, and authoring documents with a fast and effective plain-text system. </li>
 </ul>

_includes/sections/quotes.html

@@ -19,11 +19,6 @@
   <footer class="blockquote-footer">Edward Snowden in <cite title="Permanent Record"><a href="https://en.wikipedia.org/wiki/Permanent_Record_(autobiography)">Permanent Record</a></cite></footer>
 </blockquote>
 
-<blockquote class="blockquote">
-  <p>Privacy is not a luxury [in America]: it is a right – one that we need to defend in the digital realm as much as in the physical realm. We need to stay vigilant to maintain access to that right, though ... especially as technology continues to advance...</p>
-  <footer class="blockquote-footer">Chelsea Manning in <cite title="The Guardian"><a href="https://www.theguardian.com/commentisfree/2016/feb/22/privacy-is-a-right-not-a-luxury-and-its-increasingly-at-risk-for-lgbt-people">The Guardian</a></cite></footer>
-</blockquote>
-
 <h4>Read also:</h4>
 
 <ul>

_includes/sections/resources.html

@@ -28,6 +28,14 @@
   description="Discover a variety of open source software built to protect your privacy and keep your digital data secure."
   %}
 
+  {% include card.html color="danger"
+  title="Hardware"
+  icon="fas fa-laptop"
+  iconcolor="dark"
+  page="/hardware/"
+  description="You can't protect your privacy without starting with the right hardware. Discover the devices for the job."
+  %}
+
   {% include card.html color="info"
   title="Operating Systems"
   icon="fas fa-desktop"
@@ -41,15 +49,7 @@
   icon="far fa-eye-slash"
   iconcolor="dark"
   page="/services/"
-  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="Donate"
-  icon="fas fa-donate"
-  iconcolor="dark"
-  page="/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."
+  description="We are proud to operate a variety of privacy-centric services, including Mastodon, Matrix, and more!"
   %}
 
 </div>

_includes/sections/routers.html

@@ -0,0 +1,36 @@
+<h1 id="routers" class="anchor"><a href="#routers"><i class="fas fa-link anchor-icon"></i></a> Home Routers</h1>
+
+<div class="container-fluid">
+  <div class="row mb-2">
+    <div class="col-lg-3 col-sm-12 pt-lg-5 text-center">
+      <img
+        src="/assets/img/png/3rd-party/turris-omnia.png"
+        data-theme-src="/assets/img/png/3rd-party/turris-omnia.png"
+        height="200"
+        width="200"
+        class="img-fluid d-block mr-auto ml-auto align-middle"
+        alt="Turris Omnia">
+        <a class="btn btn-primary mt-4" href="https://www.turris.cz/en/omnia/" role="button"><i class="fas fa-external-link-alt fa-fw"></i> Website</a>
+    </div>
+    <div class="col">
+    <h2>Turris Omnia</h2>
+    <p><strong>Turris Omnia</strong> is a secure, high performance, and open-source home router. It has specifications that would allow it to easily handle Gigabit-level networking, as well as additional functionality (NAS, printserver, or other server type use-cases).</p>
+    <p>Turris Omnia was created by <strong>NIC.CZ</strong>, the non-profit .CZ domain registry behind many massive internet open-source projects including Knot (DNS Server), BIRD (Internet routing daemon), and FRED (Domain registry platform). As such, we believe they have the experience required to make a secure routing platform.</p>
+
+    <h5><span class="badge badge-success">OpenWrt</span></h5>
+    <p>Turris Omnia runs OpenWrt, the router operating system platform <a href="/operating-systems/#firmware">we recommend</a> for home users. It is an incredibly lightweight operating system perfect for this workload, and it is well supported by its developers.</p>
+
+    <h5><span class="badge badge-success">Secure Defaults</span></h5>
+    <p>Turris Omnia is configured securely and privately by default. It also features <strong>automatic updates</strong> that require no user interaction. The lack of updates is a security problem for most home router brands.</p>
+
+    <h5><span class="badge badge-info">Additional Functionality</span></h5>
+    <p>This device can be used for more than just routing. It is a highly extensible product, allowing you to do things like add mSATA storage. It features a SIM slot that can be used alongside an LTE USB or miniPCIe modem for backup connectivity. It comes with a "virtual server", which allows you to install normal Linux applications or even entirely seperate Linux distros like Ubuntu or Debian independently of the main software, improving security and allowing for safe software experimentation.</p>
+    </div>
+  </div>
+</div>
+
+<h3>Worth Mentioning</h3>
+
+<ul>
+  <li><a href="https://www.peplink.com/products/pepwave-surf-soho/">Pepwave Surf SOHO</a> - A lower-end business-class router with stable, secure, and easy-to-use firmware. Unlike most business-class routers, the interface is easy to use while still feature-rich.</li>
+</ul>

_includes/sections/search-engines.html

@@ -7,7 +7,7 @@
 {% include cardv2.html
 title="searx - Decentral"
 image="/assets/img/svg/3rd-party/searx.svg"
-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://searx.space/">list of public instances</a> or you can try the <a href="https://search.privacytools.io/">PrivacyTools instance</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"

_includes/sections/security-keys.html

@@ -0,0 +1,24 @@
+<h1 id="u2f" class="anchor"><a href="#u2f"><i class="fas fa-link anchor-icon"></i></a> U2F Security Keys</h1>
+
+{% include cardv2.html
+title="SoloKeys"
+image="/assets/img/png/3rd-party/solokey.png"
+description='The SoloKey is the "first open-source FIDO2 security key", available in both USB-A and USB-C variants with optional NFC capability for mobile devices. It is less feature-rich compared to the YubiKey 5 lineup, but at $20 it is a great starting point for securing your accounts, or backup U2F authenticator.'
+website="https://solokeys.com/"
+github="https://github.com/solokeys"
+%}
+
+{% include cardv2.html
+title="YubiKey 5"
+badges="info:Upgrade Pick"
+image="/assets/img/png/3rd-party/yubikey-5c.png"
+description='The YubiKey 5 is a multi-protocol security key, providing strong two-factor, multi-factor and passwordless authentication, and seamless touch-to-sign. It supports FIDO2, FIDO U2F, one-time password (OTP), and OpenPGP smart card functionality. It is available in a variety of form factors for desktop or laptop.'
+website="https://www.yubico.com/products/yubikey-5-overview/"
+github="https://github.com/yubico"
+%}
+
+<h3>Worth Mentioning</h3>
+
+<ul>
+  <li><a href="https://www.nitrokey.com/">Nitrokey</a> - A variety of security key products for different workloads. All Nitrokey products are open-source and customizable. The <a href="https://www.nitrokey.com/sites/default/files/NitrokeyFirmwareSecurityAuditReport05-2015.pdf">firmware</a> and <a href="https://www.nitrokey.com/sites/default/files/NitrokeyHardwareSecurityAuditReport08-2015.pdf">hardware</a> have been independently assessed by Cure53 in 2015. We have found that there is no best overall product (the <em>Pro 2</em> lacks Curve25519 while the lower-end <em>Start</em> supports it, for example) and they are lacking a variety of form factors such as USB-C and NFC that would be more convenient for many users.</li>
+</ul>

pages/hardware.html

@@ -0,0 +1,18 @@
+---
+layout: page
+permalink: /hardware/
+title: "Hardware"
+description: "Your privacy is only as strong as the devices you use."
+---
+
+{% include sections/mobile-devices.html %}
+
+{% include sections/security-keys.html %}
+
+{% include sections/routers.html %}
+<h3>Further Reading</h3>
+<ul>
+  <li><a href="https://routersecurity.org/">RouterSecurity.org</a> - A list of router configuration tips to keep your router and network secure.</li>
+</ul>
+
+{% include sections/hardware-wallets.html %}

pages/old.html

@@ -71,6 +71,14 @@ permalink: /classic/
 
 {% include sections/productivity-tools.html %}
 
+{% include sections/mobile-devices.html %}
+
+{% include sections/security-keys.html %}
+
+{% include sections/routers.html %}
+
+{% include sections/hardware-wallets.html %}
+
 {% include sections/operating-systems.html %}
 
 {% include sections/live-operating-systems.html %}

pages/shop.html

@@ -1,188 +0,0 @@
----
-layout: page
-permalink: /shop/
-title: "Shop"
-description: "Support PrivacyTools via our official merchandise partners!"
----
-
-<div class="alert alert-warning" role="alert">
-  By clicking the purchase links below, you will be redirected to one of our partner's third-party sites. PrivacyTools makes no representations nor has any supervision or control over the quality, content, reliability or security of the third party website, nor shall PrivacyTools be liable for its use.
-</div>
-<div class="alert alert-secondary" role="alert">
-  Some of the products listed on this page are created and sold by a third-party, and we are using affiliate links to keep track of commissions. If you buy something through a link on this page, you will not be charged extra, but we will receive a portion of the sale.
-</div>
-
-<div class="row">
-  <div class="col">
-    <h2>Stickers</h2>
-  </div>
-</div>
-
-<div class="row">
-  {% include product.html
-  image="blue-shield-sticker.png"
-  title="Blue Shield Sticker"
-  price="$3.12"
-  description="Decorate your laptop with our water-resistant, vinyl stickers. Available in a variety of sizes."
-  link="https://go.privacytools.io/rb/bss"
-  vendor="RedBubble"
-  %}
-  {% include product.html
-  image="holographic-sticker.png"
-  title="Holographic Sticker"
-  price="$5.00"
-  sale="$1.99"
-  description="Limited edition holographic black shield sticker. High quality, perfect for laptop decoration!"
-  link="https://go.privacytools.io/aragon/holo/"
-  vendor="Aragon Ventures LLC"
-  %}
-  {% include product.html
-  image="sticker-pack-1.png"
-  title="Sticker Pack"
-  price="$7.20"
-  description="Decorate your laptop with our water-resistant, vinyl stickers. Available in a variety of sizes."
-  link="https://go.privacytools.io/rb/sp1"
-  vendor="RedBubble"
-  %}
-  {% include product.html
-  image="trust-your-government.png"
-  title="Trust Your Government"
-  price="$2.60"
-  description="Decorate your laptop with our water-resistant, vinyl stickers. Available in a variety of sizes."
-  link="https://go.privacytools.io/rb/trust"
-  vendor="RedBubble (Aff)"
-  %}
-  {% include product.html
-  image="nsa-monitored.png"
-  title="Monitored by the NSA"
-  price="$4.16"
-  description="Decorate your laptop with our water-resistant, vinyl stickers. Available in a variety of sizes."
-  link="https://go.privacytools.io/rb/nsa"
-  vendor="RedBubble (Aff)"
-  %}
-</div>
-
-<div class="row">
-  <div class="col">
-    <h2>Shirts</h2>
-  </div>
-</div>
-
-<div class="alert alert-info" role="alert">
-   <strong>Coming soon:</strong> We are working with a quality shirt partner to develop embroidered polos, t-shirts, and sweatshirts. Stay tuned!
-</div>
-
-<div class="row">
-  <div class="col">
-    <h2>Mobile Accessories</h2>
-  </div>
-</div>
-
-<div class="row">
-  {% include product.html
-  image="blue-shield-iphone.png"
-  title="iPhone Case"
-  price="$21.00+"
-  description="Qi wireless charging compatible phone cases to show your support and protect your iPhone!"
-  link="https://go.privacytools.io/rb/bsiphone"
-  vendor="RedBubble"
-  %}
-  {% include product.html
-  image="white-shield-iphone.png"
-  title="iPhone Case"
-  price="$21.00+"
-  description="Qi wireless charging compatible phone cases to show your support and protect your iPhone!"
-  link="https://go.privacytools.io/rb/wsiphone"
-  vendor="RedBubble"
-  %}
-  {% include product.html
-  image="blue-shield-wallet-case.png"
-  title="Wallet Case"
-  price="$35.35"
-  description="Open book style wallet case with a built in stand and elastic strap keeps your phone and cards protected."
-  link="https://go.privacytools.io/rb/bswallet"
-  vendor="RedBubble"
-  %}
-</div>
-
-<div class="row">
-  <div class="col">
-    <h2>Laptop Accessories</h2>
-  </div>
-</div>
-
-<div class="row">
-  {% include product.html
-  image="white-shield-laptop-sleeve.png"
-  title="Laptop Skin"
-  price="$35.86"
-  description="Foam padded, zipped laptop sleeve protects your laptop from scratches and minor impacts."
-  link="https://go.privacytools.io/rb/wssleeve"
-  vendor="RedBubble"
-  %}
-  {% include product.html
-  image="blue-shield-skin.png"
-  title="Laptop Skin"
-  price="$25.25"
-  description="Form-fitting vinyl 3M Controltac sticker, provides resistance to minor scrapes and scratches."
-  link="https://go.privacytools.io/rb/bsskin"
-  vendor="RedBubble"
-  %}
-  {% include product.html
-  image="white-shield-skin.png"
-  title="Laptop Skin"
-  price="$25.25"
-  description="Form-fitting vinyl 3M Controltac sticker, provides resistance to minor scrapes and scratches."
-  link="https://go.privacytools.io/rb/wsskin"
-  vendor="RedBubble"
-  %}
-</div>
-
-<div class="row">
-  <div class="col">
-    <h2>Additional Products</h2>
-  </div>
-</div>
-
-<div class="row">
-  {% include product.html
-  image="white-shield-notebook.png"
-  title="Spiral Notebook"
-  price="$12.62"
-  description="Spiral notebook with document pocket, available in ruled line and graph paper."
-  link="https://go.privacytools.io/rb/wsnotebook"
-  vendor="RedBubble"
-  %}
-  {% include product.html
-  image="blue-shield-notebook.png"
-  title="Spiral Notebook"
-  price="$12.62"
-  description="Spiral notebook with document pocket, available in ruled line and graph paper."
-  link="https://go.privacytools.io/rb/bsnotebook"
-  vendor="RedBubble"
-  %}
-  {% include product.html
-  image="white-shield-journal.png"
-  title="Hardcover Journal"
-  price="$20.51"
-  description="128 page hardcover journal available with ruled line, graph, and blank paper options."
-  link="https://go.privacytools.io/rb/wsjournal"
-  vendor="RedBubble"
-  %}
-  {% include product.html
-  image="blue-shield-journal.png"
-  title="Hardcover Journal"
-  price="$20.51"
-  description="128 page hardcover journal available with ruled line, graph, and blank paper options."
-  link="https://go.privacytools.io/rb/bsjournal"
-  vendor="RedBubble"
-  %}
-  {% include product.html
-  image="blue-shield-pouch.png"
-  title="Zipper Pouch"
-  price="$12.12"
-  description="Available in various sizes, perfect for holding coins, pencils, cards, or other belongings."
-  link="https://go.privacytools.io/rb/bspouch"
-  vendor="RedBubble"
-  %}
-</div>