diff --git a/_includes/sections/email-clients.html b/_includes/sections/email-clients.html
index 3310e8b6..a3ae4470 100644
--- a/_includes/sections/email-clients.html
+++ b/_includes/sections/email-clients.html
@@ -4,9 +4,9 @@
title="Thunderbird"
image="/assets/img/tools/Thunderbird.png"
description="Mozilla Thunderbird is a free, open source, cross-platform email, news, and chat client developed by the Mozilla Foundation. Thunderbird is an email, newsgroup, news feed, and chat (XMPP, IRC, Twitter) client."
-website="https://mozilla.org/thunderbird"
+website="https://www.thunderbird.net/"
forum="https://forum.privacytools.io/t/discussion-thunderbird/659"
-github="https://github.com/mozilla"
+github="https://github.com/thundernest"
windows=""
mac=""
linux=""
@@ -33,8 +33,8 @@ bsd=""
gpg4usb - A very easy to use and small portable editor to encrypt and decrypt any text-message or -file. For Windows and Linux. GPG tutorial.
Mailvelope - A browser extension that enables the exchange of encrypted emails following the OpenPGP encryption standard.
Enigmail - A security extension to Thunderbird and Seamonkey. It enables you to write and receive email messages signed and/or encrypted with the OpenPGP standard.
- TorBirdy - TorBirdy configures Thunderbird to make connections over the Tor anonymity network. This extension is in beta and should be considered experimental.
- Email Privacy Tester - This tool will send an Email to your address and perform privacy-related tests.
+ TorBirdy - TorBirdy configures Thunderbird to make connections over the Tor anonymity network. This extension is in beta and should be considered experimental.
+ Email Privacy Tester - This tool will send an Email to your address and perform privacy-related tests.
Worth Mentioning
diff --git a/_includes/sections/email-providers.html b/_includes/sections/email-providers.html
index fbea502f..0a043056 100644
--- a/_includes/sections/email-providers.html
+++ b/_includes/sections/email-providers.html
@@ -27,7 +27,7 @@
-
+
|
2013 |
@@ -76,7 +76,7 @@
-
+
|
2013 |
Belgium |
@@ -93,7 +93,7 @@
-
+
|
2014 |
Germany |
@@ -109,7 +109,7 @@
-
+
|
2009 |
Germany |
@@ -174,7 +174,7 @@
-
+
|
2010 |
Switzerland |
diff --git a/_includes/sections/instant-messenger.html b/_includes/sections/instant-messenger.html
index c9197567..fb912b82 100644
--- a/_includes/sections/instant-messenger.html
+++ b/_includes/sections/instant-messenger.html
@@ -10,7 +10,7 @@ title="Mobile: Signal"
image="/assets/img/tools/Signal.png"
description="Signal is a mobile app developed by Open Whisper Systems. The app provides instant messaging, as well as voice and video calling.
All communications are end-to-end encrypted. Signal is free and open source."
-website="https://signal.org"
+website="https://signal.org/"
forum="https://forum.privacytools.io/t/discussion-signal/664"
github="https://github.com/signalapp"
android=""
@@ -41,7 +41,7 @@ web=""
title="Wire"
image="/assets/img/tools/wire.png"
description='A free software End-to-End Encrypted chatting application that supports instant messaging, voice, and video calls. Full source code is available. experimental (more info)'
-website="https://get.wire.com/"
+website="https://wire.com/"
forum="https://forum.privacytools.io/t/discussion-wire/750"
github="https://github.com/wireapp/"
android=""
@@ -70,9 +70,9 @@ web=""
Monal (iOS, MacOS) - An XMPP client in active development.
Conversations (Android) - An open source Jabber/XMPP client for Android 4.4+ smartphones. Supports end-to-end encryption with either OMEMO or OpenPGP.
Gajim (Linux) - An open source fully featured XMPP client.
- List of OMEMO ready clients
+ List of OMEMO ready clients
- Kontalk - A community-driven instant messaging network. Supports end-to-end encryption. Both client-to-server and server-to-server channels are fully encrypted.
+ Kontalk - A community-driven instant messaging network. Supports end-to-end encryption. Both client-to-server and server-to-server channels are fully encrypted.
Status - Experimental A free and open-source, peer-to-peer, encrypted instant messanger with support for DAPPs.
diff --git a/_includes/sections/notebooks.html b/_includes/sections/notebooks.html
index bf67ae76..219f867a 100644
--- a/_includes/sections/notebooks.html
+++ b/_includes/sections/notebooks.html
@@ -9,7 +9,7 @@
{% include card.html color="success"
title="Joplin"
image="/assets/img/tools/Joplin.png"
- url="https://joplin.cozic.net/"
+ url="https://joplinapp.org/"
footer="OS: Windows, macOS, Linux, iOS, Android, Firefox/Chrome (Web Clipper)."
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."
%}
@@ -42,6 +42,6 @@
- Notable - The markdown-based note-taking app that doesn't suck.
- - Paperwork - Open source and self-hosted solution. For PHP / MySQL servers.
+ - Paperwork - Open source and self-hosted solution. For PHP / MySQL servers.
- Org-mode - 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.
diff --git a/_includes/sections/router-firmware.html b/_includes/sections/router-firmware.html
index a3ecc5d1..40395a7d 100644
--- a/_includes/sections/router-firmware.html
+++ b/_includes/sections/router-firmware.html
@@ -14,7 +14,7 @@
title="pfSense"
labels="warning:contrib:This software may depend on or recommend non-free software."
image="/assets/img/tools/pfSense.png"
- url="https://pfsense.org/"
+ url="https://www.pfsense.org/"
description="pfSense is an open source firewall/router computer software distribution based on FreeBSD. It is installed on a computer to make a dedicated firewall/router for a network and is noted for its reliability and offering features often only found in expensive commercial firewalls. pfSense is commonly deployed as a perimeter firewall, router, wireless access point, DHCP server, DNS server, and as a VPN endpoint."
%}