diff --git a/_includes/sections/browser-addons.html b/_includes/sections/browser-addons.html
index 6bba6c32..02dd1455 100644
--- a/_includes/sections/browser-addons.html
+++ b/_includes/sections/browser-addons.html
@@ -12,10 +12,9 @@ description="<strong>Privacy Badger</strong> is a browser add-on that stops adve
 website="https://www.eff.org/privacybadger"
 forum="https://forum.privacytools.io/t/discussion-privacy-badger/265"
 github="https://github.com/EFForg/privacybadger"
-firefox=""
-chrome=""
-opera=""
-android=""
+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
@@ -25,12 +24,11 @@ description="<strong>uBlock Origin</strong> is an efficient <a href=https://gith
 website="https://addons.mozilla.org/firefox/addon/ublock-origin/"
 forum="https://forum.privacytools.io/t/discussion-ublock-origin/266"
 github="https://github.com/gorhill/uBlock/"
-firefox=""
-chrome=""
-safari=""
-opera=""
-edge=""
-android=""
+firefox="https://addons.mozilla.org/en-US/firefox/addon/ublock-origin/"
+chrome="https://chrome.google.com/webstore/detail/ublock-origin/cjpalhdlnbpafiamejdnhcphjbkeiagm"
+safari="https://safari-extensions.apple.com/details/?id=com.el1t.uBlock-3NU33NW2M3"
+opera="https://addons.opera.com/en/extensions/details/ublock/"
+edge="https://www.microsoft.com/en-us/p/ublock-origin/9nblggh444l4"
 %}
 
 {% include cardv2.html
@@ -40,8 +38,8 @@ description="<strong>Cookie AutoDelete</strong> automatically removes cookies wh
 website="https://addons.mozilla.org/firefox/addon/cookie-autodelete/"
 forum="https://forum.privacytools.io/t/discussion-cookie-autodelete/267"
 github="https://github.com/Cookie-AutoDelete/Cookie-AutoDelete"
-firefox=""
-chrome=""
+firefox="https://addons.mozilla.org/en-US/firefox/addon/cookie-autodelete"
+chrome="https://chrome.google.com/webstore/detail/cookie-autodelete/fhcgjolkccmbidfldomjliifgaodjagh"
 %}
 
 {% include cardv2.html
@@ -51,10 +49,9 @@ description="<strong>HTTPS Everywhere</strong> encrypts your communications with
 website="https://www.eff.org/https-everywhere"
 forum="https://forum.privacytools.io/t/discussion-https-everywhere/268"
 github="https://github.com/EFForg/https-everywhere"
-firefox=""
-chrome=""
-android=""
-opera=""
+firefox="https://addons.mozilla.org/en-US/firefox/addon/https-everywhere"
+chrome="https://chrome.google.com/webstore/detail/https-everywhere/gcbommkclmclpchllfjekcdonpmejbdp"
+opera="https://addons.opera.com/en/extensions/details/https-everywhere"
 %}
 
 {% include cardv2.html
@@ -64,9 +61,9 @@ description="<strong>Decentraleyes</strong> emulates Content Delivery Networks l
 website="https://decentraleyes.org/"
 forum="https://forum.privacytools.io/t/discussion-decentraleyes/269"
 gitlab="https://git.synz.io/Synzvato/decentraleyes"
-firefox=""
-chrome=""
-opera=""
+firefox="https://addons.mozilla.org/en-US/firefox/addon/decentraleyes"
+chrome="https://chrome.google.com/webstore/detail/decentraleyes/ldpochfccmkkmhdbclfhpagapcfdljkj"
+opera="https://addons.opera.com/en/extensions/details/decentraleyes"
 %}
 
 {% include cardv2.html
@@ -76,10 +73,10 @@ description="<strong>Terms of Service; Didn’t Read</strong> “I have read and
 website="https://tosdr.org/"
 forum="https://forum.privacytools.io/t/discussion-decentraleyes/270"
 github="https://github.com/tosdr/"
-firefox=""
-chrome=""
-opera=""
-safari=""
+firefox="https://addons.mozilla.org/en-US/firefox/addon/decentraleyes"
+chrome="https://chrome.google.com/webstore/detail/terms-of-service-didn%E2%80%99t-r/hjdoplcnndgiblooccencgcggcoihigg"
+opera="https://addons.opera.com/en/extensions/details/terms-of-service-didnt-read"
+safari="https://safariextension.tosdr.org/"
 %}
 
 {% include cardv2.html
@@ -89,8 +86,8 @@ description="<strong>Snowflake</strong> is a new <a href=https://2019.www.torpro
 website="https://snowflake.torproject.org"
 forum="https://forum.privacytools.io/t/discussion-snowflake/1146"
 git="https://gitweb.torproject.org/pluggable-transports/snowflake.git"
-firefox=""
-chrome=""
+firefox="https://addons.mozilla.org/en-US/firefox/addon/torproject-snowflake"
+chrome="https://chrome.google.com/webstore/detail/snowflake/mafpmfcccpbjnhfhjnllmmalhifmlcie"
 %}
 
 
@@ -107,9 +104,9 @@ description="<strong>uMatrix</strong> gives you control over the requests that w
 website="https://addons.mozilla.org/firefox/addon/umatrix/"
 forum="https://forum.privacytools.io/t/discussion-umatrix/271"
 github="https://github.com/gorhill/uMatrix"
-firefox=""
-chrome=""
-opera=""
+firefox="https://addons.mozilla.org/en-US/firefox/addon/umatrix"
+chrome="https://chrome.google.com/webstore/detail/umatrix/ogfcmafjalglgifnmanfmnieipoejdcf"
+opera="https://addons.opera.com/en/extensions/details/umatrix"
 %}
 
 {% include cardv2.html
@@ -119,6 +116,6 @@ description="<strong>NoScript</strong> is a highly customizable plugin to select
 website="https://addons.mozilla.org/firefox/addon/noscript/"
 forum="https://forum.privacytools.io/t/discussion-noscript-security-suite/272"
 github="https://github.com/hackademix/noscript"
-firefox=""
-chrome=""
+firefox="https://addons.mozilla.org/en-US/firefox/addon/noscript"
+chrome="https://chrome.google.com/webstore/detail/noscript/doojmbjmlfjjnbmnoijecmcbfeoakpjm"
 %}
diff --git a/_includes/sections/calendar-contacts-sync.html b/_includes/sections/calendar-contacts-sync.html
index d91da841..9d12ec3b 100644
--- a/_includes/sections/calendar-contacts-sync.html
+++ b/_includes/sections/calendar-contacts-sync.html
@@ -15,6 +15,9 @@
   windows="https://nextcloud.com/install/"
   linux="https://nextcloud.com/install/"
   mac="https://nextcloud.com/install/"
+  freebsd="https://www.freshports.org/deskutils/nextcloudclient/"
+  openbsd="http://openports.se/www/nextcloud"
+  netbsd="http://pkgsrc.se/www/php-nextcloud"
   android="https://nextcloud.com/install/"
   ios="https://nextcloud.com/install/"
 %}
@@ -35,9 +38,12 @@
   website="https://www.etesync.com/"
   forum="https://forum.privacytools.io/t/discussion-etesync-calender-contacts-sync-tools/1536"
   github="https://github.com/etesync"
-  web="https://www.etesync.com/"
-  linux="https://www.etesync.com/"
-  android="https://www.etesync.com/"
+  web="https://client.etesync.com/"
+  windows="https://github.com/etesync/etesync-dav/blob/master/README.md#installation"
+  mac="https://github.com/etesync/etesync-dav/blob/master/README.md#installation"
+  linux="https://github.com/etesync/etesync-dav/blob/master/README.md#installation"
+  fdroid="https://f-droid.org/packages/com.etesync.syncadapter/"
+  googleplay="https://play.google.com/store/apps/details?id=com.etesync.syncadapter"
 %}
 
 <h3>Worth Mentioning</h3>
diff --git a/_includes/sections/cloud-storage.html b/_includes/sections/cloud-storage.html
index bbf0e8b8..5a67b9fd 100644
--- a/_includes/sections/cloud-storage.html
+++ b/_includes/sections/cloud-storage.html
@@ -29,10 +29,9 @@ description="S4 (Simple Secure Storage Service) is Least Authority's verifiably
 website="https://leastauthority.com/"
 forum="https://forum.privacytools.io/t/discussion-least-authority-s4/288"
 github="https://github.com/LeastAuthority"
-windows=""
-mac=""
-linux=""
-freebsd=""
+windows="https://github.com/gridsync/gridsync#installation-and-running"
+mac="https://github.com/gridsync/gridsync#installation-and-running"
+linux="https://github.com/gridsync/gridsync#installation-and-running"
 %}
 
 
diff --git a/_includes/sections/email-alternatives.html b/_includes/sections/email-alternatives.html
index 94c48ff8..64eee0fa 100644
--- a/_includes/sections/email-alternatives.html
+++ b/_includes/sections/email-alternatives.html
@@ -8,9 +8,9 @@ meaning that you need-not inherently trust any entities like root certificate au
 website="https://bitmessage.org/"
 forum="https://forum.privacytools.io/t/discussion-bitmessage/661"
 github="https://github.com/Bitmessage/PyBitmessage"
-windows=""
-mac=""
-linux=""
+windows="https://github.com/Bitmessage/PyBitmessage/releases"
+mac="https://github.com/Bitmessage/PyBitmessage/releases"
+linux="https://repology.org/project/pybitmessage/versions"
 %}
 
 {% include cardv2.html
@@ -20,9 +20,10 @@ description="Retroshare creates encrypted connections to your friends. Nobody ca
 website="https://retroshare.cc/"
 forum="https://forum.privacytools.io/t/discussion-retroshare/662"
 github="https://github.com/RetroShare/RetroShare"
-windows=""
-mac=""
-linux=""
+windows="https://retroshare.cc/downloads.html#windows"
+mac="https://retroshare.cc/downloads.html#mac"
+linux="https://retroshare.cc/downloads.html#gnulinux"
+freebsd="https://retroshare.cc/downloads.html#freebsd"
 %}
 
 
diff --git a/_includes/sections/email-clients.html b/_includes/sections/email-clients.html
index 9327f207..f1f8f814 100644
--- a/_includes/sections/email-clients.html
+++ b/_includes/sections/email-clients.html
@@ -7,10 +7,12 @@ description="Thunderbird is a free, open source, cross-platform email, newsgroup
 website="https://www.thunderbird.net/"
 forum="https://forum.privacytools.io/t/discussion-thunderbird/659"
 source="https://hg.mozilla.org/comm-central/"
-windows=""
-mac=""
-linux=""
-freebsd=""
+windows="https://www.thunderbird.net/en-US/"
+mac="https://www.thunderbird.net/en-US/"
+linux="https://www.thunderbird.net/en-US/"
+freebsd="https://www.freshports.org/mail/thunderbird/"
+openbsd="http://openports.se/mail/mozilla-thunderbird"
+netbsd="http://pkgsrc.se/mail/thunderbird"
 %}
 
 {% include cardv2.html
@@ -20,10 +22,12 @@ description="Claws Mail is a free and open source, GTK-based email and news clie
 website="https://www.claws-mail.org/"
 forum="https://forum.privacytools.io/t/discussion-claws-mail/660"
 git="https://git.claws-mail.org/"
-windows=""
-mac=""
-linux=""
-freebsd=""
+windows="https://www.claws-mail.org/win32/"
+mac="https://www.claws-mail.org/faq/index.php/Installation_and_Configuration#What_do_I_need_to_compile_Claws_Mail.3F"
+linux="https://www.claws-mail.org/downloads.php?section=downloads"
+freebsd="https://www.freshports.org/mail/claws-mail/"
+openbsd="http://openports.se/mail/claws-mail"
+netbsd="http://pkgsrc.se/mail/claws-mail"
 %}
 
 
diff --git a/_includes/sections/file-encryption.html b/_includes/sections/file-encryption.html
index aa99e83b..f66d584a 100644
--- a/_includes/sections/file-encryption.html
+++ b/_includes/sections/file-encryption.html
@@ -24,11 +24,15 @@
   description="<strong>GnuPG</strong> is a GPL Licensed alternative to the PGP suite of cryptographic software. GnuPG is compliant with RFC 4880, which is the current IETF standards track specification of OpenPGP. Current versions of PGP (and Veridis' Filecrypt) are interoperable with GnuPG and other OpenPGP-compliant systems. GnuPG is a part of the Free Software Foundation's GNU software project, and has received major funding from the German government."
   website="https://gnupg.org/"
   forum="https://forum.privacytools.io/t/discussion-gnupg-file-encryption/1533"
-  git="https://gnupg.org/download/git.html"
-  windows="https://gnupg.org/download/index.html"
-  linux="https://gnupg.org/download/index.html"
-  mac="https://gnupg.org/download/index.html"
-  android="https://gnupg.org/download/index.html"
+  git="https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gnupg.git"
+  windows="https://gpg4win.org/download.html"
+  linux="https://gnupg.org/download/index.html#binary"
+  freebsd="https://www.freshports.org/security/gnupg/"
+  openbsd="http://openports.se/security/gnupg"
+  netbsd="http://pkgsrc.se/security/gnupg"
+  mac="https://gpgtools.org/"
+  fdroid="https://f-droid.org/app/org.sufficientlysecure.keychain"
+  googleplay="https://play.google.com/store/apps/details?id=org.sufficientlysecure.keychain"
 %}
 
 {%
@@ -38,9 +42,12 @@
   description="<strong>PeaZip</strong> is a free and open-source file manager and file archiver made by Giorgio Tani. It supports its native PEA archive format (featuring compression, multi volume split and flexible authenticated encryption and integrity check schemes) and other mainstream formats, with special focus on handling open formats. It supports 180+ archive formats."
   website="http://www.peazip.org"
   forum="https://forum.privacytools.io/t/discussion-peazip-file-encryption/1534"
-  source="https://sourceforge.net/projects/peazip/files/"
-  windows="https://www.peazip.org/"
-  linux="https://www.peazip.org/"
+  source="https://osdn.net/projects/peazip"
+  windows="https://www.peazip.org/peazip-64bit.html"
+  linux="https://www.peazip.org/peazip-linux.html"
+  freebsd="https://www.freshports.org/archivers/peazip/"
+  openbsd="https://www.peazip.org/peazip-bsd.html"
+  netbsd="https://www.peazip.org/peazip-bsd.html"
 %}
 
 <h3>Worth Mentioning</h3>
diff --git a/_includes/sections/file-sharing.html b/_includes/sections/file-sharing.html
index 3e56763e..a4b5dff9 100644
--- a/_includes/sections/file-sharing.html
+++ b/_includes/sections/file-sharing.html
@@ -7,8 +7,8 @@ website="https://send.firefox.com/"
 description="Send uses end-to-end encryption to keep your data secure from the moment you share to the moment your file is opened. It also offers security controls that you can set. You can choose when your file link expires, the number of downloads, and whether to add an optional password for an extra layer of security."
 forum="https://forum.privacytools.io/t/discussion-firefox-send/755"
 github="https://github.com/mozilla/send"
-web=""
-android=""
+web="https://send.firefox.com/"
+googleplay="https://play.google.com/store/apps/details?id=org.mozilla.firefoxsend"
 %}
 
 {% include cardv2.html
@@ -19,21 +19,26 @@ tor="http://elx57ue5uyfplgva.onion/"
 description="OnionShare is an open source tool that lets you securely and anonymously share a file of any size. It works by starting a web server, making it accessible as a Tor onion service, and generating an unguessable URL to access and download the files."
 forum="https://forum.privacytools.io/t/discussion-onionshare/754"
 github="https://github.com/micahflee/onionshare"
-windows=""
-mac=""
-linux=""
+windows="https://onionshare.org/#downloads"
+mac="https://onionshare.org/#downloads"
+linux="https://onionshare.org/#downloads"
+freebsd="https://www.freshports.org/www/onionshare/"
+openbsd="http://openports.se/net/onionshare"
 %}
 
 {% include cardv2.html
 title="Magic Wormhole"
 image="/assets/img/tools/Magic-Wormhole.png"
-website="https://github.com/warner/magic-wormhole"
+website="https://magic-wormhole.readthedocs.io"
 description="Get things from one computer to another, safely. This package provides a library and a command-line tool named wormhole, which makes it possible to get arbitrary-sized files and directories (or short pieces of text) from one computer to another."
 forum="https://forum.privacytools.io/t/discussion-magic-wormhole/756"
 github="https://github.com/warner/magic-wormhole"
-windows=""
-mac=""
-linux=""
+windows="https://magic-wormhole.readthedocs.io/en/latest/welcome.html#installation"
+mac="https://magic-wormhole.readthedocs.io/en/latest/welcome.html#installation"
+linux="https://magic-wormhole.readthedocs.io/en/latest/welcome.html#installation"
+freebsd="https://www.freshports.org/net/py-magic-wormhole/"
+openbsd="https://pypi.org/project/magic-wormhole/"
+netbsd="https://pypi.org/project/magic-wormhole/"
 %}
 
 <h3>Worth Mentioning</h3>
diff --git a/_includes/sections/instant-messenger.html b/_includes/sections/instant-messenger.html
index cca3e64f..3ccab45c 100644
--- a/_includes/sections/instant-messenger.html
+++ b/_includes/sections/instant-messenger.html
@@ -14,8 +14,13 @@ labels="success:VoIP"
 website="https://signal.org/"
 forum="https://forum.privacytools.io/t/discussion-signal/664"
 github="https://github.com/signalapp"
-android=""
-ios=""
+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"
+android="https://signal.org/android/apk/#apk-danger"
+ios="https://apps.apple.com/us/app/signal-private-messenger/id874139669"
 %}
 
 
@@ -27,12 +32,13 @@ labels="warning:<a href=//www.vice.com/en_us/article/gvzw5x/secure-messaging-app
 website="https://wire.com/"
 forum="https://forum.privacytools.io/t/discussion-wire/750"
 github="https://github.com/wireapp/"
-android=""
-ios=""
-mac=""
-windows=""
-linux=""
-web=""
+windows="https://wire.com/en/download"
+mac="https://wire.com/en/download"
+linux="https://wire.com/en/download"
+googleplay="https://play.google.com/store/apps/details?id=com.wire"
+android="https://wire.com/en/download"
+ios="https://itunes.apple.com/app/wire/id930944768?mt=8"
+web="https://app.wire.com"
 %}
 
 <h3>Complete Comparison</h3>
diff --git a/_includes/sections/live-operating-systems.html b/_includes/sections/live-operating-systems.html
index 5248e5c5..d718ece0 100644
--- a/_includes/sections/live-operating-systems.html
+++ b/_includes/sections/live-operating-systems.html
@@ -17,7 +17,7 @@ description='Knoppix is an operating system based on Debian designed to be run d
 badges="info:GNU/Linux"
 labels="warning:contrib:This software may depend on or recommend non-free software."
 website="https://www.knopper.net/knoppix/index-en.html"
-source="https://www.knopper.net/knoppix-info/index-en.html"
+source="https://www.knopper.net/knoppix-info/index-en.html#license"
 %}
 
 {% include cardv2.html
diff --git a/_includes/sections/notebooks.html b/_includes/sections/notebooks.html
index 1e0021a1..e6cd694a 100644
--- a/_includes/sections/notebooks.html
+++ b/_includes/sections/notebooks.html
@@ -10,13 +10,15 @@ image="/assets/img/tools/Joplin.png"
 description="Joplin is a free, open source, fully featured note taking and to-do application, which can handle a large number of markdown notes organized into notebooks and tags. It offers E2EE encryption and can sync through Nextcloud, Dropbox and more. It also offers easy import from Evernote and plain text notes."
 website="https://joplinapp.org/"
 github="https://github.com/laurent22/joplin"
-windows=""
-mac=""
-linux=""
-ios=""
-android=""
-firefox=""
-chrome=""
+windows="https://joplinapp.org/#desktop-applications"
+mac="https://joplinapp.org/#desktop-applications"
+linux="https://joplinapp.org/#desktop-applications"
+freebsd="https://www.npmjs.com/package/joplin"
+googleplay="https://joplinapp.org/images/BadgeAndroid.png"
+android="https://joplinapp.org/#mobile-applications"
+ios="https://itunes.apple.com/us/app/joplin/id1315599797"
+firefox="https://addons.mozilla.org/en-US/firefox/addon/joplin-web-clipper/"
+chrome="https://chrome.google.com/webstore/detail/joplin-web-clipper/alofnhikmmkdbbbgpnglcpdollgjjfek"
 %}
 
 {% include cardv2.html
@@ -25,12 +27,13 @@ image="/assets/img/tools/StandardNotes.png"
 description="Standard Notes is a simple and private notes app that makes your notes easy and available everywhere you are. Features end-to-end encryption on every platform, and a powerful desktop experience with themes and custom editors."
 website="https://standardnotes.org/"
 github="https://github.com/standardnotes"
-windows=""
-mac=""
-linux=""
-ios=""
-android=""
-web=""
+windows="https://standardnotes.org/#get-started"
+mac="https://standardnotes.org/#get-started"
+linux="https://standardnotes.org/#get-started"
+ios="https://itunes.apple.com/us/app/standard-notes/id1285392450"
+fdroid="https://f-droid.org/packages/com.standardnotes/"
+googleplay="https://play.google.com/store/apps/details?id=com.standardnotes"
+web="https://app.standardnotes.org/"
 %}
 
 {% include cardv2.html
@@ -39,10 +42,13 @@ image="/assets/img/tools/Turtl.png"
 description="Turtl lets you take notes, bookmark websites, and store documents for sensitive projects. From sharing passwords with your coworkers to tracking research on an article you're writing, Turtl keeps it all safe from everyone but you and those you share with."
 website="https://turtlapp.com/"
 github="https://github.com/turtl"
-windows=""
-mac=""
-linux=""
-android=""
+windows="https://turtlapp.com/download/"
+mac="https://turtlapp.com/download/"
+linux="https://turtlapp.com/download/"
+googleplay="https://play.google.com/store/apps/details?id=com.lyonbros.turtl"
+android="https://turtlapp.com/download/"
+firefox="https://addons.mozilla.org/en-US/firefox/addon/turtl-bookmarking/"
+chrome="https://chrome.google.com/webstore/detail/turtl/dgcojenhfdjhieoglmiaheihjadlpcml"
 %}
 
 <h3>Warning</h3>
diff --git a/_includes/sections/operating-systems.html b/_includes/sections/operating-systems.html
index 9dc6d511..945b434d 100644
--- a/_includes/sections/operating-systems.html
+++ b/_includes/sections/operating-systems.html
@@ -31,8 +31,8 @@ image="/assets/img/tools/Debian.png"
 description='Debian is a Unix-like computer operating system and a Linux distribution that is composed entirely of free and open-source software, most of which is under the GNU General Public License, and packaged by a group of individuals known as the Debian project.'
 badges="info:GNU/Linux"
 website="https://www.debian.org/"
-git="https://salsa.debian.org/qa/debsources"
 tor="http://sejnfjrq6szgca7v.onion"
+gitlab="https://salsa.debian.org/qa/debsources"
 %}
 
 <h3>Warning</h3>
diff --git a/_includes/sections/password-managers.html b/_includes/sections/password-managers.html
index 4efa0a13..aac8d968 100644
--- a/_includes/sections/password-managers.html
+++ b/_includes/sections/password-managers.html
@@ -13,14 +13,19 @@
   forum="https://forum.privacytools.io/t/discussion-bitwarden/1343"
   github="https://github.com/bitwarden"
   web="https://vault.bitwarden.com/#/"
-  linux="https://vault.bitwarden.com/download/?app=desktop&platform=linux"
-  mac="https://vault.bitwarden.com/download/?app=desktop&platform=macos"
+  windows="https://bitwarden.com/#download"
+  linux="https://bitwarden.com/#download"
+  freebsd="https://www.npmjs.com/package/@bitwarden/cli"
+  openbsd="https://www.npmjs.com/package/@bitwarden/cli"
+  netbsd="https://www.npmjs.com/package/@bitwarden/cli"
+  mac="https://bitwarden.com/#download"
   firefox="https://addons.mozilla.org/firefox/addon/bitwarden-password-manager/"
   chrome="https://chrome.google.com/webstore/detail/bitwarden-free-password-m/nngceckbapebfimnlniiiahkandclblb"
   safari="https://safari-extensions.apple.com/details/?id=com.bitwarden.safari-LTZ2PFU5D6"
   opera="https://addons.opera.com/extensions/details/bitwarden-free-password-manager/"
   edge="https://www.microsoft.com/store/apps/9P6KXL0SVNNL"
-  android="https://play.google.com/store/apps/details?id=com.x8bit.bitwarden"
+  fdroid="https://mobileapp.bitwarden.com/fdroid/"
+  googleplay="https://play.google.com/store/apps/details?id=com.x8bit.bitwarden"
   ios="https://itunes.apple.com/app/bitwarden-free-password-manager/id1137397744?mt=8"
 %}
 
@@ -32,10 +37,16 @@
   website="https://keepassxc.org/"
   forum="https://forum.privacytools.io/t/discussion-keepassxc/1344/2"
   github="https://github.com/keepassxreboot/keepassxc"
-  web="https://keepassxc.org/"
   windows="https://keepassxc.org/download/#windows"
   linux="https://keepassxc.org/download/#linux"
   mac="https://keepassxc.org/download/#mac"
+  freebsd="https://www.freshports.org/security/keepassxc/"
+  openbsd="http://openports.se/security/keepassxc"
+  netbsd="http://pkgsrc.se/security/keepassxc"
+  fdroid="https://f-droid.org/packages/com.kunzisoft.keepass.libre/"
+  googleplay="https://play.google.com/store/apps/details?id=com.kunzisoft.keepass.free"
+  firefox="https://addons.mozilla.org/en-US/firefox/addon/keepassxc-browser"
+  chrome="https://chrome.google.com/webstore/detail/keepassxc-browser/oboonakemofpalcgghocfoadofidjkkk"
 %}
 
 {%
@@ -46,9 +57,14 @@
   website="https://lesspass.com/"
   forum="https://forum.privacytools.io/t/discussion-keepassxc/1344/2"
   github="https://github.com/lesspass/lesspass"
+  windows="https://pypi.org/project/lesspass/"
+  mac="https://pypi.org/project/lesspass/"
+  linux="https://pypi.org/project/lesspass/"
+  freebsd="https://pypi.org/project/lesspass/"
   firefox="https://addons.mozilla.org/en-US/firefox/addon/lesspass/"
   chrome="https://chrome.google.com/webstore/detail/lesspass/lcmbpoclaodbgkbjafnkbbinogcbnjih"
-  android="https://play.google.com/store/apps/details?id=com.lesspass.android&hl=en"
+  fdroid="https://f-droid.org/packages/com.lesspass.android"
+  googleplay="https://play.google.com/store/apps/details?id=com.lesspass.android"
 %}
 
 <h3>Worth Mentioning</h3>
diff --git a/_includes/sections/productivity-tools.html b/_includes/sections/productivity-tools.html
index 8c95490d..9f9e2004 100644
--- a/_includes/sections/productivity-tools.html
+++ b/_includes/sections/productivity-tools.html
@@ -19,9 +19,13 @@
   website="https://etherpad.org/"
   forum="https://forum.privacytools.io/t/discussion-etherpad-productivity-tools/1538"
   github="https://github.com/ether/etherpad-lite"
-  windows="https://etherpad.org/#download"
-  linux="https://etherpad.org/#download"
-  mac="https://etherpad.org/#download"
+  web="https://github.com/ether/etherpad-lite/wiki/Sites-that-run-Etherpad"
+  windows="https://github.com/ether/etherpad-lite#windows"
+  linux="https://github.com/ether/etherpad-lite#installation"
+  mac="https://github.com/ether/etherpad-lite#gnulinux-and-other-unix-like-systems"
+  freebsd="https://github.com/ether/etherpad-lite#gnulinux-and-other-unix-like-systems"
+  openbsd="https://github.com/ether/etherpad-lite#gnulinux-and-other-unix-like-systems"
+  netbsd="https://github.com/ether/etherpad-lite#gnulinux-and-other-unix-like-systems"
 %}
 
 {%
@@ -33,11 +37,13 @@
   forum="https://forum.privacytools.io/t/discussion-write-as-productivity-tools/1539"
   tor="http://writeas7pm7rcdqg.onion"
   git="https://code.as/writeas"
-  web="https://write.as/apps"
+  web="https://write.as/pad"
+  windows="https://github.com/writeas/writeas-cli"
+  mac="https://github.com/writeas/writeas-cli"
   linux="https://write.as/apps"
   chrome="https://write.as/apps"
-  android="https://write.as/apps"
-  ios="https://write.as/apps"
+  googleplay="https://play.google.com/store/apps/details?id=com.abunchtell.writeas"
+  ios="https://itunes.apple.com/app/apple-store/id1000755153"
 %}
 
 <h1 id="metadata-removal-tools" class="anchor">
@@ -55,9 +61,12 @@
   website="https://0xacab.org/jvoisin/mat2"
   forum="https://forum.privacytools.io/t/discussion-mat/1559"
   gitlab="https://0xacab.org/jvoisin/mat2"
-  linux=""
-  mac=""
-  windows=""
+  windows="https://pypi.org/project/mat2/"
+  mac="https://pypi.org/project/mat2/"
+  linux="https://pypi.org/project/mat2/"
+  freebsd="https://pypi.org/project/mat2/"
+  openbsd="https://pypi.org/project/mat2/"
+  netbsd="https://pypi.org/project/mat2/"
 %}
 </div>
 
diff --git a/_includes/sections/router-firmware.html b/_includes/sections/router-firmware.html
index db043aea..1f785d5e 100644
--- a/_includes/sections/router-firmware.html
+++ b/_includes/sections/router-firmware.html
@@ -8,7 +8,6 @@ badges="info:Linux"
 labels="warning:contrib:This software may depend on or recommend non-free software."
 website="https://openwrt.org/"
 git="https://git.openwrt.org/"
-github="https://github.com/openwrt"
 %}
 
 {% include cardv2.html
diff --git a/_includes/sections/teamchat.html b/_includes/sections/teamchat.html
index 8196eba3..28649c53 100644
--- a/_includes/sections/teamchat.html
+++ b/_includes/sections/teamchat.html
@@ -13,11 +13,12 @@
   website="https://rocket.chat/"
   forum="https://forum.privacytools.io/t/discussion-rocket-chat/1223"
   github="https://github.com/rocketchat/"
-  android=""
-  ios=""
-  mac=""
-  windows=""
-  linux=""
+  windows="https://rocket.chat/install"
+  mac="https://itunes.apple.com/us/app/rocket-chat/id1086818840"
+  linux="https://rocket.chat/install"
+  fdroid="https://f-droid.org/packages/chat.rocket.android"
+  googleplay="https://play.google.com/store/apps/details?id=chat.rocket.android"
+  ios="https://itunes.apple.com/app/rocket-chat/id1148741252"
 %}
 
 {%
@@ -30,12 +31,15 @@
   forum="https://forum.privacytools.io/t/discussion-keybase/1224"
   tor="http://keybase5wmilwokqirssclfnsqrjdsi7jdir5wy7y7iu3tanwmtp6oid.onion/"
   github="https://github.com/Keybase"
-  android=""
-  ios=""
-  mac=""
-  windows=""
-  linux=""
-  web=""
+  windows="https://keybase.io/docs/the_app/install_windows"
+  mac="https://keybase.io/docs/the_app/install_macos"
+  linux="https://keybase.io/docs/the_app/install_linux"
+  freebsd="https://www.freshports.org/security/keybase/"
+  googleplay="https://play.google.com/store/apps/details?id=io.keybase.ossifrage&hl=en_US"
+  ios="https://keybase.io/_/download/keybase-for-ios"
+  firefox="https://addons.mozilla.org/en-US/firefox/addon/keybase-for-firefox/"
+  chrome="https://chrome.google.com/webstore/detail/keybase-for-reddit/ognfafcpbkogffpmmdglhbjboeojlefj"
+  web="https://keybase.io/"
 %}
 
 
diff --git a/_includes/sections/voice-video-messenger.html b/_includes/sections/voice-video-messenger.html
index 51f10040..13252fe7 100644
--- a/_includes/sections/voice-video-messenger.html
+++ b/_includes/sections/voice-video-messenger.html
@@ -11,12 +11,12 @@ website="https://www.linphone.org/"
 description="Linphone is an open source SIP Phone and a free voice over IP service, available on mobile and desktop environments and on web browsers. It supports ZRTP for end-to-end encrypted voice and video communication."
 forum="https://forum.privacytools.io/t/discussion-linphone/751"
 github="https://github.com/BelledonneCommunications"
-ios=""
-android=""
-windows=""
-linux=""
-mac=""
-web=""
+windows="https://www.linphone.org/technical-corner/linphone?qt-technical_corner=2#qt-technical_corner"
+linux="https://www.linphone.org/technical-corner/linphone?qt-technical_corner=2#qt-technical_corner"
+mac="https://www.linphone.org/technical-corner/linphone?qt-technical_corner=2#qt-technical_corner"
+fdroid="https://f-droid.org/packages/org.linphone"
+googleplay="https://play.google.com/store/apps/details?id=org.linphone"
+ios="https://itunes.apple.com/us/app/linphone/id360065638?mt=8"
 %}
 
 {% include cardv2.html
@@ -26,9 +26,11 @@ website="https://mumble.info/"
 description="Mumble is an open source, low-latency, high quality voice chat software primarily intended for use while gaming. Note that while Mumble doesn't log messages or record by default, <a href=\"https://github.com/mumble-voip/mumble/issues/1813\">it's missing end-to-end encryption</a>, so self-hosting is recommended."
 forum="https://forum.privacytools.io/t/discussion-mumble/1289"
 github="https://github.com/mumble-voip/"
-windows=""
-linux=""
-mac=""
+windows="https://www.mumble.info/downloads"
+linux="https://www.mumble.info/downloads"
+mac="https://www.mumble.info/downloads"
+android="https://www.mumble.info/downloads/#third-party-clients"
+ios="https://apps.apple.com/us/app/mumble/id443472808?ls=1"
 %}
 
 <h3>Worth Mentioning</h3>