Merge branch 'master' into update-stumbleupon-link

.github/CONTRIBUTING.md

@@ -7,6 +7,9 @@ Please read this before contributing.
 - Be nice and respectful.
 - English only.
 - 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)
 
 ## Quality over Quantity
 
@@ -17,7 +20,7 @@ We're trying to keep it simple and promote the best tools, not all of them.
 - Easy to use. Could your mother use that tool or service? Usability is most important.
 - Cross-platform / Accessible.
 - Privacy respecting.
-- Open Source / free software is preferred but not required.
+- Open Source / Free Software is preferred but not required.
 - Must list source code in [source_code.md](https://github.com/privacytoolsIO/privacytools.io/blob/master/source_code.md) (if applicable)
 - Prioritize Products without Vendor Lock-in (decentralized/self-hostable) or data interoperability.
 
@@ -37,7 +40,7 @@ Note: This criteria applies to all of privacytools.io
 ### VPN
 - Prioritize Products by privacy respecting nationality.
 - Cannot be based in USA or UK.
-- Must be acessable via free software (i.e OpenVPN, WireGuard)
+- Must be accessible via Open Source Software (i.e OpenVPN, WireGuard)
 - Use Encryption
 - Accept Cryptocurrency
 - No logging policy
@@ -45,16 +48,16 @@ Note: This criteria applies to all of privacytools.io
 ### Email
 - Outside of USA
 - Support SMTP SSL
-- Accessable Using Free Software (i.e IMAP)
+- Accessable Using Open Source Software (i.e IMAP)
 
 ### Hardware
-- Must be [H-Node Class A](https://h-node.org/wiki/page/en/compatibility-classes) or Equivlant (if applicable)
+- 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 avalible.
 - Cannot lock users to a particular platform.
 
 ### Software
 - Must be able to download over encrypted network (can be a mirror)
-- Must be free software
+- Must be Open Source Software
 
 ### Encryption
 - Only verifiable encryption is to be trusted

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,19 +1,17 @@
-<!-- PLEASE READ OUR CONTRIBUTING GUIDELINES (https://github.com/privacytoolsIO/privacytools.io/blob/master/.github/CONTRIBUTING.md) BEFORE SUBMITTING -->
+<!-- PLEASE READ OUR CODE OF CONDUCT (https://github.com/privacytoolsIO/privacytools.io/blob/master/CODE_OF_CONDUCT.md) AND CONTRIBUTING GUIDELINES (https://github.com/privacytoolsIO/privacytools.io/blob/master/.github/CONTRIBUTING.md) BEFORE SUBMITTING -->
 
 ## Description
 
-Resolves: #none <!-- The number of the issue that is resolved by this pull request. If there is none, feel free to delete this line -->
+Resolves: #none <!-- A link to the (discussion) issue resolved by this pull request. There must be a discussion issue here at GitHub, before a pull request of software/service suggestion can be considered for merging. -->
 
 #### Check List <!-- Please add an x in each box below, like so: [x] -->
 
 - [ ] I have read and understand [the contributing guidelines](https://github.com/privacytoolsIO/privacytools.io/blob/master/.github/CONTRIBUTING.md).
 
-- [ ] I have [listed the source code](https://github.com/privacytoolsIO/privacytools.io/blob/master/source_code.md).
+- [ ] I have listed the source code in [source_code.md](https://github.com/privacytoolsIO/privacytools.io/blob/master/source_code.md).
 
-- [ ] This project is [free/libre software](https://www.wikipedia.org/wiki/Free_software).
-
-- [ ] This project has an [associated discussion](https://github.com/privacytoolsIO/privacytools.io/issues).
+- [ ] The project is [Free Libre](https://en.wikipedia.org/wiki/Free_software) and/or [Open Source](https://en.wikipedia.org/wiki/Open-source_software) Software
 
 * Netlify preview for the mainly edited page: <!-- link or Non Applicable? Edit this in afterwards -->
 
-* Code Repository (if applicable): 
+* Code repository of the project (if applicable): 

_includes/card.html

@@ -1,4 +1,4 @@
-<div class="col-xl-4 col-lg-6 col-md-12 mb-2">
+<div class="col-xl-4 col-lg-6 col-md-12 mb-4">
     <div class="card card-{{include.color}}">
         {% if include.color == "warning" %}
         <div class="card-header text-dark bg-{{include.color}}">
@@ -31,13 +31,15 @@
               <img src="{{include.image}}" width="120" height="120" alt="{{include.title}}" class="panel-item">
               {% elsif include.icon %}
               <i class="{{ include.icon }} panel-icon{% if include.iconcolor %} text-{{include.iconcolor}}{% endif %}"></i>
+              {% elsif include.font %}
+              <span class="{{ include.font }} panel-item" style="font-size: 120px;" alt="{{ include.title }}"></span>
               {% endif %}
               {{include.description}}
             </p>
             <div>
             <p>
                 {% if include.url %}
-                <a class="btn btn-{{include.color}} mb-1" href="{{include.url}}">Website:
+                <a class="btn btn-{{include.color}} mb-1" href="{{include.url}}">
                     {% if include.website %}
                         {{include.website}}
                     {% else %}

_includes/cardv2.html

@@ -30,6 +30,9 @@
     <p class="card-text">
       <img
         src="{{include.image}}"
+        {% if include.image-dark %}
+        data-theme-src="{{include.image-dark}}"
+        {% endif %}
         height="120"
         width="120"
         class="panel-pic"

_includes/footer.html

@@ -44,27 +44,23 @@
   <h3>Copy URL and Description</h3>
 
   <p>
-  <input type="text" value="www.privacytools.io - encryption against global mass surveillance" onclick="this.focus();this.select()" class="form-control input-lg">
+  <input type="text" value="privacytools.io - encryption against global mass surveillance" onclick="this.focus();this.select()" class="form-control input-lg">
   <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-md-3 col-sm-6 mb-3 d-flex justify-content-center d-flex justify-content-center">
-      <a href="https://www.privacytools.io/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 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="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-md-3 col-sm-6 mb-3 d-flex justify-content-center">
-      <a href="https://www.kopimi.com/" data-toggle="tooltip" data-placement="top" data-original-title="kopimi (copyme), symbol showing that you want to be copied. use kopimi in your own fancy. kopimi may be put on homepages or blogs, in books, in software, as sound logos in music or whatever."><img alt="kopimi" src="/assets/img/layout/kopimi.png" width="32" height="33">kopimi</a>
-    </div>
-
-    <div class="col-md-3 col-sm-6 mb-3 d-flex justify-content-center">
+    <div class="col-sm-4 mb-3 d-flex justify-content-center">
       <i class="far fa-envelope fa-2x"></i>
       <a href="/contact/">Contact</a>
     </div>
 
-    <div class="col-md-3 col-sm-6 mb-3 d-flex justify-content-center">
+    <div class="col-sm-4 mb-3 d-flex justify-content-center">
       <i class="fas fa-heart fa-2x text-danger"></i>
       <a 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 cost for server and domain." href="/donate/">Donate</a>
     </div>

_includes/head.html

@@ -44,5 +44,5 @@
 
   <!-- CSS stylesheets -->
   <link href="/assets/css/style.css?v=7" rel="stylesheet">
-  <link id="dark-css" href="/assets/css/dark.css?v=2" rel="stylesheet" media="(prefers-color-scheme: dark)">
+  <link id="dark-css" href="/assets/css/dark.css?v=3" rel="stylesheet" media="(prefers-color-scheme: dark)">
 </head>

_includes/nav.html

@@ -68,10 +68,11 @@
             <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> File Encryption</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> File Sync</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> Password Manager</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> Real-Time Communication</a>
-            <a class="dropdown-item" href="/software/file-sync/"><span class="fas fa-copy fa-fw"></span> Secure File Sync</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> Self-Hosted Cloud Server</a>
           </span>

_includes/panel.html

@@ -1,4 +1,4 @@
-<div class="col-xl-4 col-lg-6 col-md-12 mb-2">
+<div class="col-xl-4 col-lg-6 col-md-12 mb-4">
     <div class="card card-{{include.color}}">
         {% if include.color == "warning" %}
         <div class="card-header text-dark bg-{{include.color}}">
@@ -11,4 +11,4 @@
             {{include.body}}
         </div>
     </div>
-</div>
+</div>

_includes/scripts.html

@@ -2,7 +2,7 @@
 <script src="/assets/js/popper.min.js?v=4"></script>
 <script src="/assets/js/bootstrap.min.js?v=4"></script>
 <script src="/assets/js/sortable.min.js?v=4"></script>
-<script src="/assets/js/main.js?v=3"></script>
+<script src="/assets/js/main.js?v=4"></script>
 
 <!--
   Matomo is the leading open-source analytics platform:

_includes/sections/android-addons.html

@@ -6,16 +6,6 @@
 
 <div class="container-fluid">
 
-  <div class="row mb-2">
-    <div class="col-lg-3 col-sm-12 pt-lg-5">
-      <img src="/assets/img/addons/Blokada.png" height="70" width="200" class="img-fluid d-block mr-auto ml-auto align-middle" alt="Blokada">
-    </div>
-    <div class="col">
-    <h3>Block ads with <a href="https://blokada.org/">Blokada</a></h3>
-    <p><strong>Blokada</strong> works across all of your apps, not only the browser. It doesn't require root, supports both wifi and mobile networks, and is perfectly safe and simple to use. Just turn it on, and it will do the job silently!
-    </div>
-  </div>
-
   <div class="row mb-2">
     <div class="col-lg-3 col-sm-12 pt-lg-5">
       <img src="/assets/img/addons/netguard.png" height="70" width="200" class="img-fluid d-block mr-auto ml-auto align-middle" alt="NetGuard">
@@ -36,4 +26,12 @@
     </div>
   </div>
 
-</div>
+</div>
+
+<h2>See also</h2>
+
+<ul>
+  <li>
+    <a href="/providers/dns#clients">Our DNS page</a> which also has information on encrypting DNS on Android.
+  </li>
+</ul>

_includes/sections/browser-addons.html

@@ -5,17 +5,6 @@
 </div>
 
 
-{% include cardv2.html
-title="Privacy Badger: Stop Tracking"
-image="/assets/img/addons/privacy-badger.png"
-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"
-firefox="https://addons.mozilla.org/en-US/firefox/addon/privacy-badger17"
-chrome="https://chrome.google.com/webstore/detail/privacy-badger/pkehgijcmpdhfbdbbnkijodmdjhbjlgp"
-opera="https://addons.opera.com/en/extensions/details/privacy-badger/"
-%}
 
 {% include cardv2.html
 title="uBlock Origin: Block Ads and Trackers"
@@ -90,6 +79,17 @@ firefox="https://addons.mozilla.org/en-US/firefox/addon/torproject-snowflake"
 chrome="https://chrome.google.com/webstore/detail/snowflake/mafpmfcccpbjnhfhjnllmmalhifmlcie"
 %}
 
+{% include cardv2.html
+title="Privacy Badger: Stop Tracking"
+image="/assets/img/addons/privacy-badger.png"
+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"
+firefox="https://addons.mozilla.org/en-US/firefox/addon/privacy-badger17"
+chrome="https://chrome.google.com/webstore/detail/privacy-badger/pkehgijcmpdhfbdbbnkijodmdjhbjlgp"
+opera="https://addons.opera.com/en/extensions/details/privacy-badger/"
+%}
 
 <h2>For Power Users Only</h2>
 

_includes/sections/browser-fingerprint.html

@@ -4,8 +4,6 @@
   <strong>Your Browser sends information that makes you unique amongst millions of users and therefore easy to identify.</strong>
 </div>
 
-<img src="/assets/img/layout/browser-fingerprint.png" width="439" height="350" class="img-fluid float-right" alt="Fingerprint image" style="margin-left:20px;">
-
 <p>When you visit a web page, your browser voluntarily sends information about its configuration, such as available fonts, browser type, and add-ons. If this combination of information is unique, it may be possible to identify and track you without using cookies. EFF created a Tool called <a href="https://panopticlick.eff.org/">Panopticlick</a> to test your browser to see how unique it is.</p>
 
 <p>

_includes/sections/dns.html

@@ -343,7 +343,7 @@
           </a>
         </td>
         <td>No</td>
-        <td>DoT</td>
+        <td>DoH, DoT</td>
         <td>Yes</td>
         <td>Yes</td>
         <td>
@@ -533,7 +533,7 @@
   <li>QNAME Minimization - Run <code>dig +short txt qnamemintest.internet.nl</code> from the command-line (taken from <a href="https://nlnetlabs.nl/downloads/presentations/unbound_qnamemin_oarc24.pdf">this NLnet Labs presentation</a>). If you are on Windows 10, run <code>Resolve-DnsName -Type TXT -Name qnamemintest.internet.nl</code> from the PowerShell. You should see this display: <code>"HOORAY - QNAME minimisation is enabled on your resolver :)!"</code></li>
 </ul>
 
-<h3>Worth Mentioning and Additional Information</h3>
+<h3 id="clients">Worth Mentioning and Additional Information</h3>
 
 <ul>
   <li><strong>Encrypted DNS clients for desktop:</strong>

_includes/sections/file-sync.html

@@ -1,24 +1,36 @@
-<h1 id="sync" class="anchor"><a href="#sync"><i class="fas fa-link anchor-icon"></i></a> Secure File Sync Software</h1>
+<h1 id="sync" class="anchor">
+  <a href="#sync">
+    <i class="fas fa-link anchor-icon"></i>
+  </a>
+  File Sync
+</h1>
 
-<div class="row mb-2">
-
-  {% include card.html color="success"
-  title="SparkleShare"
-  image="/assets/img/tools/SparkleShare.png"
-  url="https://sparkleshare.org/"
-  footer="OS: Windows, macOS, Linux."
-  description="SparkleShare creates a special folder on your computer. You can add remotely hosted folders (or \"projects\") to this folder. These projects will be automatically
-  kept in sync with both the host and all of your peers when someone adds, removes or edits a file."
-  %}    {% include card.html color="primary"
+{%
+  include cardv2.html
   title="Syncthing"
   image="/assets/img/tools/Syncthing.png"
-  url="https://syncthing.net/"
-  footer="OS: Windows, macOS, Linux, Android, BSD, Solaris."
-  description="Syncthing replaces proprietary sync and cloud services with something open, trustworthy and decentralized. Your data is your data alone and you deserve to
-  choose where it is stored, if it is shared with some third-party and how it's transmitted over the Internet."
-  %}
+  description="<strong>Syncthing</strong> replaces proprietary sync and cloud services with something open, trustworthy and decentralized. Your data is your data alone and you deserve to choose where it is stored, if it is shared with some third-party and how it's transmitted over the Internet."
+  website="https://syncthing.net/"
+  forum="https://forum.privacytools.io/t/discussion-syncthing/1627/2"
+  github="https://github.com/syncthing?type=source"
+  windows="https://github.com/syncthing/syncthing-gtk/releases/latest"
+  linux="https://github.com/syncthing/syncthing-gtk/releases/latest"
+  mac="https://github.com/syncthing/syncthing-macos/releases/latest"
+  fdroid="https://f-droid.org/packages/com.github.catfriend1.syncthingandroid/"
+  googleplay="https://play.google.com/store/apps/details?id=com.github.catfriend1.syncthingandroid"
+%}
 
-</div>
+{%
+  include cardv2.html
+  title="SparkleShare"
+  image="/assets/img/tools/SparkleShare.png"
+  description="<strong>SparkleShare</strong> creates a special folder on your computer. You can add remotely hosted folders (or \"projects\") to this folder. These projects will be automatically kept in sync with both the host and all of your peers when someone adds, removes or edits a file."
+  website="https://sparkleshare.org/"
+  forum="https://forum.privacytools.io/t/discussion-sparkleshare/1626"
+  github="https://github.com/hbons/SparkleShare"
+  linux="https://www.sparkleshare.org/"
+  mac="https://github.com/hbons/SparkleShare/releases/"
+%}
 
 <h3>Worth Mentioning</h3>
 

_includes/sections/instant-messenger.html

@@ -14,11 +14,10 @@ labels="success:VoIP"
 website="https://signal.org/"
 forum="https://forum.privacytools.io/t/discussion-signal/664"
 github="https://github.com/signalapp"
-playstore="https://play.google.com/store/apps/details?id=org.thoughtcrime.securesms"
 windows="https://signal.org/download/"
 mac="https://signal.org/download/"
 linux="https://signal.org/download/"
-playstore="https://play.google.com/store/apps/details?id=org.thoughtcrime.securesms"
+googleplay="https://play.google.com/store/apps/details?id=org.thoughtcrime.securesms"
 android="https://signal.org/android/apk/#apk-danger"
 ios="https://apps.apple.com/us/app/signal-private-messenger/id874139669"
 %}

_includes/sections/mobile-operating-systems.html

@@ -7,6 +7,7 @@
 {% include cardv2.html
 title="GrapheneOS"
 image="/assets/img/tools/GrapheneOS.png"
+image-dark="/assets/img/tools/GrapheneOS-dark.png"
 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="warning:contrib:This software may depend on or recommend non-free software."

_includes/sections/participate.html

@@ -26,7 +26,7 @@
 
   {% include card.html color="warning"
   title="Develop on GitHub"
-  image="/assets/img/icons/github.png"
+  font="fab fa-github"
   url="https://github.com/privacytoolsIO/privacytools.io"
   website="GitHub"
   description="The complete website source code is available on GitHub. Join our developer team!"

_includes/sections/productivity-tools.html

@@ -15,6 +15,7 @@
   include cardv2.html
   title="Etherpad"
   image="/assets/img/tools/Etherpad.png"
+  image-dark="/assets/img/tools/Etherpad-dark.png"
   description="<strong>Etherpad</strong> is a highly customizable open source online editor providing collaborative editing in real-time. <a href=https://github.com/ether/etherpad-lite/wiki/Sites-that-run-Etherpad>Here are a list of sites that run Etherpad</a>."
   website="https://etherpad.org/"
   forum="https://forum.privacytools.io/t/discussion-etherpad-productivity-tools/1538"
@@ -32,6 +33,7 @@
   include cardv2.html
   title="Write.as"
   image="/assets/img/tools/WriteAs.png"
+  image-dark="/assets/img/tools/WriteAs-dark.png"
   description="<strong>Write.as</strong> is a cross-platform, privacy-oriented blogging platform. It's anonymous by default, letting you publish without signing up. If you create an account, it doesn't require any personal information. No ads, distraction-free, and built on a sustainable business model."
   website="https://write.as/"
   forum="https://forum.privacytools.io/t/discussion-write-as-productivity-tools/1539"
@@ -46,6 +48,18 @@
   ios="https://itunes.apple.com/app/apple-store/id1000755153"
 %}
 
+<h3>Worth Mentioning</h3>
+
+<ul>
+  <li><a href="https://crypt.ee/">Cryptee</a> - Free privacy-friendly service for storing Documents, files and Photos</li>
+  <li><a href="https://ethercalc.net/">EtherCalc</a> - EtherCalc is a web spreadsheet. Data is saved on the web, and people can edit the same document at the same time. Changes are instantly reflected on all screens. Work together on inventories, survey forms, list management, brainstorming sessions.</li>
+  <li><a href="https://disroot.org/">Disroot</a> - Free privacy-friendly service that offers Etherpad, EtherCalc and PrivateBin.</li>
+  <li><a href="https://dudle.inf.tu-dresden.de/anonymous/">dudle</a> - An online scheduling application, free and open source. Schedule meetings or make small online polls. No email collection or the need of registration.</li>
+  <li><a href="https://framadate.org/">Framadate</a> - A free and open source online service for planning an appointment or making a decision quickly and easily. No registration is required.</li>
+  <li><a href="https://www.libreoffice.org/">LibreOffice</a> - Free and open source office suite.</li>
+  <li><a href="https://vscodium.com/">VSCodium</a> - Fork of Microsoft's Visual Studio Code editor without branding or telemetry.</li>
+</ul>
+
 <h1 id="metadata-removal-tools" class="anchor">
   <a href="#metadata-removal-tools"
     ><i class="fas fa-link anchor-icon"></i>
@@ -69,15 +83,3 @@
   netbsd="https://pypi.org/project/mat2/"
 %}
 </div>
-
-<h3>Worth Mentioning</h3>
-
-<ul>
-  <li><a href="https://crypt.ee/">Cryptee</a> - Free privacy-friendly service for storing Documents, files and Photos</li>
-  <li><a href="https://ethercalc.net/">EtherCalc</a> - EtherCalc is a web spreadsheet. Data is saved on the web, and people can edit the same document at the same time. Changes are instantly reflected on all screens. Work together on inventories, survey forms, list management, brainstorming sessions.</li>
-  <li><a href="https://disroot.org/">Disroot</a> - Free privacy-friendly service that offers Etherpad, EtherCalc and PrivateBin.</li>
-  <li><a href="https://dudle.inf.tu-dresden.de/anonymous/">dudle</a> - An online scheduling application, free and open source. Schedule meetings or make small online polls. No email collection or the need of registration.</li>
-  <li><a href="https://framadate.org/">Framadate</a> - A free and open source online service for planning an appointment or making a decision quickly and easily. No registration is required.</li>
-  <li><a href="https://www.libreoffice.org/">LibreOffice</a> - Free and open source office suite.</li>
-  <li><a href="https://vscodium.com/">VSCodium</a> - Fork of Microsoft's Visual Studio Code editor without branding or telemetry.</li>
-</ul>

_includes/sections/selfhosted-cloud.html

@@ -4,35 +4,37 @@
   <strong>If you are currently using a Cloud Storage Services like Dropbox, Google Drive, Microsoft OneDrive or Apple iCloud, you should think about hosting it on your own.</strong>
 </div>
 
-<div class="row mb-2">
+{% include cardv2.html
+title="Nextcloud"
+image="/assets/img/provider/Nextcloud.png"
+description="Similar functionally to the widely used Dropbox, with the difference being that Nextcloud is free and open-source, and 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"
+mac="https://nextcloud.com/install/#install-clients"
+linux="https://nextcloud.com/install/#install-clients"
+freebsd="https://www.freshports.org/www/nextcloud/"
+openbsd="http://openports.se/www/nextcloud"
+netbsd="http://pkgsrc.se/www/php-nextcloud"
+fdroid="https://f-droid.org/packages/com.nextcloud.client/"
+googleplay="https://play.google.com/store/apps/details?id=com.nextcloud.client"
+ios="https://itunes.apple.com/us/app/nextcloud/id1125420102?mt=8"
+github="https://github.com/nextcloud"
+%}
 
-  {% include card.html color="success"
-  title="Pydio"
-  image="/assets/img/tools/Pydio.png"
-  url="https://pydio.com/"
-  footer="OS: Windows, macOS, Linux, iOS, Android."
-  description="Pydio is open source software that turns instantly any server (on-premise, NAS, cloud IaaS or PaaS) into a file sharing platform for your company. It is an alternative
-  to SaaS Boxes and Drives, with more control, safety and privacy, and favorable TCOs."
-  %}
-
-  {% include card.html color="primary"
-  title="Tahoe-LAFS"
-  image="/assets/img/tools/Tahoe-LAFS.png"
-  url="https://www.tahoe-lafs.org/"
-  footer="OS: Windows, macOS, Linux."
-  description="Tahoe-LAFS is a Free and Open decentralized cloud storage system. It distributes your data across multiple servers. Even if some of the servers fail or are
-  taken over by an attacker, the entire file store continues to function correctly, preserving your privacy and security."
-  %}
-
-  {% include card.html color="warning"
-  title="Nextcloud"
-  image="/assets/img/provider/Nextcloud.png"
-  url="https://nextcloud.com/"
-  footer="Client OS: Windows, macOS, Linux, BSD, Unix, iOS, Android, Fire OS. Server: Linux."
-  description="Similar functionally to the widely used Dropbox, with the difference being that Nextcloud is free and open-source, and 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."
-  %}
-
-</div>
+{% include cardv2.html
+title="Tahoe-LAFS"
+image="/assets/img/tools/Tahoe-LAFS.png"
+image-dark="/assets/img/tools/Tahoe-LAFS-dark.png"
+website="https://www.tahoe-lafs.org/"
+forum="https://forum.privacytools.io/t/discussion-tahoe-lafs/1662"
+description="Tahoe-LAFS is a Free and Open decentralized cloud storage system. It distributes your data across multiple servers. Even if some of the servers fail or are taken over by an attacker, the entire file store continues to function correctly, preserving your privacy and security."
+windows="https://github.com/tahoe-lafs/tahoe-lafs#via-pip"
+mac="https://github.com/tahoe-lafs/tahoe-lafs#via-pip"
+linux="https://github.com/tahoe-lafs/tahoe-lafs#using-os-packages"
+netbsd="http://pkgsrc.se/filesystems/tahoe-lafs"
+git="https://www.tahoe-lafs.org/trac/tahoe-lafs/browser"
+%}
 
 <h3>Worth Mentioning</h3>
 <ul>

assets/css/dark.scss

@@ -1,13 +1,15 @@
 ---
 ---
-$dark-400: #181b21;
-$dark-300: #22262e;
-$dark-200: #343a46;
-$dark-100: #464f60;
+@import '_vars';
+
+$dark-900: #181b21;
+$dark-800: #22262e;
+$dark-700: #343a46;
+$dark-600: #464f60;
 $light: #d8d8d8;
 $primary: #345e8e;
 $danger: #b63f4a;
-$secondary: $dark-100;
+$secondary: $dark-600;
 $success: #2c7f40;
 $warning: #c6a339;
 $info: #218899;
@@ -18,7 +20,7 @@ $info: #218899;
  */
 
 body {
-  background: $dark-400;
+  background: $dark-900;
   color: $light;
 }
 a {
@@ -37,12 +39,11 @@ img {
  */
 
 .alert a {
-  color: #214D97;
+  color: lighten($primary, 30%);
 }
 
 .bg-secondary, .btn-secondary, .badge-secondary { background-color: $secondary !important; }
 .btn-secondary, .card-secondary .card-header { border-color: $secondary !important; }
-.text-secondary { color: $secondary !important; }
 .alert-secondary, .btn-secondary:hover {
   color: $light;
   background-color: darken($secondary, 10%);
@@ -60,12 +61,15 @@ img {
 
 .bg-warning, .btn-warning, .badge-warning { background-color: $warning !important; }
 .btn-warning, .card-warning .card-header { border-color: $warning !important; }
+.btn-warning:hover { color: $dark-700 !important }
 .text-warning { color: $warning !important; }
-.card-warning > .text-dark { color: $dark-400 !important; }
+.card-warning > .text-dark { color: $dark-900 !important; }
+.alert-warning a { color: darken($primary, 6%); }
+.badge-warning a { color: $primary; }
 .alert-warning, .btn-warning:hover {
-  color: $light;
-  background-color: darken($warning, 10%);
-  border-color: darken($warning, 10%);
+  color: $dark-900;
+  background-color: darken($warning, 8%);
+  border-color: darken($warning, 8%);
 }
 
 .bg-info, .btn-info, .badge-info { background-color: $info !important; }
@@ -101,33 +105,33 @@ img {
 
 .dropdown-item:hover {
   color: $light;
-  background-color: $dark-300;
+  background-color: $dark-800;
 }
 
 .form-control,
 .form-control:focus {
   color: $light;
-  background: $dark-300;
-  border-color: $dark-300;
+  background: $dark-800;
+  border-color: $dark-800;
 }
 
 .form-control[readonly],
 .form-control:disabled {
-  background: $dark-300;
+  background: $dark-800;
 }
 
 .card,
 .jumbotron,
 .list-group-item {
-  background: $dark-300;
+  background: $dark-800;
 }
 
 .blockquote {
-  border-color: $dark-300;
+  border-color: $dark-800;
 }
 
 .bg-dark {
-  background-color: $dark-300 !important;
+  background-color: $dark-800 !important;
 }
 
 .dropdown-item {
@@ -135,24 +139,25 @@ img {
 }
 
 .list-group-item {
-  border-color: $dark-200;
+  border-color: $dark-700;
 }
 
 .text-dark {
   color: $light !important;
 }
 
+
 table[data-sortable].sortable-theme-bootstrap {
   color: $light;
-  background-color: $dark-300;
+  background-color: $dark-800;
 }
 table[data-sortable].sortable-theme-bootstrap th,
 table[data-sortable].sortable-theme-bootstrap td {
-  border-color: $dark-100 !important;
+  border-color: $dark-600 !important;
 }
 table[data-sortable].sortable-theme-bootstrap th[data-sorted="true"] {
   color: $light;
-  background: $dark-200;
+  background: $dark-700;
 }
 table[data-sortable].sortable-theme-bootstrap th[data-sorted="true"][data-sorted-direction="ascending"]::after, {
   border-bottom-color: $light;
@@ -168,8 +173,8 @@ table[data-sortable].sortable-theme-bootstrap th[data-sorted="true"][data-sorted
 
 .nav-dropdown {
   color: $light;
-  background-color: $dark-400;
-  border-color: $dark-300;
+  background-color: $dark-900;
+  border-color: $dark-800;
 }
 
 .nav-theme-icon:before {
@@ -177,3 +182,12 @@ table[data-sortable].sortable-theme-bootstrap th[data-sorted="true"][data-sorted
   font-size: 1em;
   content: "\f185";
 }
+
+.twitter { background: desaturate($twitter, 25%); }
+.mastodon { background: desaturate($mastodon, 25%); }
+.facebook { background: desaturate($facebook, 25%); }
+.stumbleupon { background: desaturate($stumbleupon, 25%); }
+.reddit { background: desaturate($reddit, 25%); }
+.linkedin { background: desaturate($linkedin, 25%); }
+.email { background: desaturate($email, 25%); }
+.diaspora { background: desaturate($diaspora, 25%); }

assets/js/main.js

@@ -66,6 +66,24 @@ function changeColorScheme() {
     document.querySelector("#dark-css").removeAttribute("media");
     localStorage.setItem("colorScheme", "dark");
   }
+  fixThemeImages();
+}
+
+
+// Fix images in dark theme
+function fixThemeImages() {
+  document.querySelectorAll('[data-theme-src]').forEach(function(image) {
+    tempSrc = image.src;
+    image.src = image.getAttribute("data-theme-src");
+    image.setAttribute("data-theme-src", tempSrc);
+  });
+}
+if (
+  (localStorage.getItem("colorScheme") === "dark") ||
+  (window.matchMedia("(prefers-color-scheme: dark)").matches ^
+    localStorage.getItem("colorScheme") === "light")
+) {
+  fixThemeImages();
 }
 
 

contact.md

@@ -5,34 +5,22 @@ title: "Contact Us"
 description: "Contact the privacytoolsIO team if you have any suggestions or are experiencing any issues."
 ---
 
-## Editorial Team
+## 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-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 or pull request on GitHub](https://github.com/privacytoolsIO/privacytools.io/issues)
+[<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 reddit](https://www.reddit.com/r/privacytoolsIO/)
+[<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 either of the above platforms.
+For complete transparency, software and providers will only be considered for this website after discussions take place on any of the above platforms.
 
-We're on Matrix! Join us at `#general:privacytools.io` 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 (`https://chat.privacytools.io`) using [riot.privacytools.io](https://riot.privacytools.io/) or any Matrix client!
+## Chat with the Team
 
-## Abuse
+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/).
 
-We take the operation of our various [services](/services/) very seriously. Report only <strong>abuse</strong> here: abuse at privacytools dot io.
+## Code of Conduct
 
-<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>Searx Issues:</strong> <a href="https://github.com/privacytoolsIO/search">github.com/privacytoolsIO/search</a></li>
-        <li class="list-group-item"><strong>Website Issues:</strong> <a href="https://github.com/privacytoolsIO/privacytools.io">github.com/privacytoolsIO/privacytools.io</a></li>
-      </ul>
-    </div>
-  </div>
-</div>
+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.

donate.html

@@ -294,7 +294,7 @@ permalink: /donate/
       <p>The <a href="/contact/">privacytools.io 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>Thanks for your support. You are awesome!</h3>
       <p>
-      <img src="/assets/img/misc/smile.png" class="img-fluid" alt="Smile">
+      <span class="far fa-smile-beam fa-3x"></span>
       </p>
     </div>
 

pages/software/file-sync.html

@@ -1,7 +1,7 @@
 ---
 layout: page
 permalink: /software/file-sync/
-title: "File Sync Tools"
+title: "File Sync"
 description: "Discover free, open source, and secure ways to sync your files across your devices."
 ---
 

source_code.md

@@ -175,7 +175,6 @@ Magic Wormhole: https://github.com/warner/magic-wormhole
  Cryptomator: https://github.com/cryptomator/cryptomator
 
 ## Self-Hosted Cloud Server Software
- Pydio: https://github.com/pydio
 
  Tahoe-LAFS: https://github.com/tahoe-lafs/tahoe-lafs
 
@@ -185,13 +184,14 @@ Magic Wormhole: https://github.com/warner/magic-wormhole
 [WIP]
 
 ## Secure File Sync Software
- SparkleShare: https://www.github.com/hbons/SparkleShare/
 
- Syncthing: https://github.com/syncthing/syncthing
+SparkleShare: https://github.com/hbons/SparkleShare/
 
-   Worth Mentioning
-.
-    git-annex: http://source.git-annex.branchable.com/?p=source.git;a=summary
+Syncthing: https://github.com/syncthing/syncthing
+
+### Worth Mentioning
+
+- git-annex: http://source.git-annex.branchable.com/?p=source.git;a=summary
 
 ## Password Manager Software