Update title

* Update README build instructions

* Update Ruby download link

* Specify Bundler version

* Add --incremental to bundle argument

* Specify exact Bundler version

* Specify bundler version in command

.github/CODEOWNERS

@@ -22,3 +22,11 @@
 /.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,8 +95,9 @@ See https://www.privacytools.io/providers/vpn/#criteria for more details.
 
 ## Images
 
-- 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))
+- 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))
 
 ## 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

@@ -1,13 +0,0 @@
-<!--
-    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/3_Feature_Suggestion.md

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

.github/ISSUE_TEMPLATE/4_Content_Correction.md

@@ -0,0 +1,21 @@
+---
+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/5_Website_Issues.md

@@ -1,10 +1,19 @@
 ---
 name: "🌐 Website Issue"
-about: Report an issue with the website.
+about: Report a bug with the website. (NO CONTENT ISSUES)
 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

@@ -1,47 +0,0 @@
----
-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

@@ -0,0 +1,7 @@
+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,3 +6,5 @@ font/assets/
 font/_sass/
 font/.fontcustom-manifest.json
 assets/webfonts/ptio-font-preview.html
+vendor
+.bundle

README.md

@@ -14,14 +14,19 @@ 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.
 
-## Building
+## Developing
 
-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`
+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`
 
-# Support privacytools.io
+# Support
 
 - [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, No Affiliates, No Cross-Site Requests.</strong>
+      <strong>No Ads, No Google Analytics, {% if page.title != "Shop" %}No Affiliates, {% endif %}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

@@ -113,6 +113,9 @@
         <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

@@ -0,0 +1,12 @@
+<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/notebooks.html

@@ -60,7 +60,6 @@ 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,6 +19,11 @@
   <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/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://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>'
+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>.'
 website="https://searx.me/"
 tor="http://ulrn6sryqaifefld.onion"
 forum="https://forum.privacytools.io/t/discussion-searx/283"

pages/shop.html

@@ -0,0 +1,188 @@
+---
+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>