diff --git a/_includes/card.html b/_includes/card.html
index c6d0e0e7..cf3d56c9 100644
--- a/_includes/card.html
+++ b/_includes/card.html
@@ -11,7 +11,7 @@
{{include.description}}
- Website:
+ Website:
{% if include.website %}
{{include.website}}
{% else %}
@@ -19,7 +19,11 @@
{% endif %}
{% if include.tor %}
- 
+
+ {% endif %}
+
+ {% if include.extra_button %}
+ {{include.extra_button}}
{% endif %}
{% if include.footer %}
diff --git a/css/custom.css b/css/custom.css
index 9e375811..df927b0b 100644
--- a/css/custom.css
+++ b/css/custom.css
@@ -8,17 +8,17 @@
/* todo */
}
-/* .card-success, .card-success .card-header {
+/*.card-success, */ .card-success .card-header {
border-color: rgba(40, 167, 69, 0.5) !important;
}
-.card-primary, .card-primary .card-header {
+/*.card-primary, */ .card-primary .card-header {
border-color: rgba(0, 123, 255, 0.5) !important;
}
-.card-warning, .card-warning .card-header {
+/*.card-warning, */ .card-warning .card-header {
border-color: rgba(255, 193, 7, 0.5) !important;
-} */
+}
diff --git a/index.html b/index.html
index d29da8bf..48722441 100644
--- a/index.html
+++ b/index.html
@@ -1317,62 +1317,29 @@ layout: default
+ {% include card.html color="success"
+ title="searx"
+ image="img/provider/searx.jpg"
+ url="ttps://searx.me/"
+ tor="http://ulrn6sryqaifefld.onion"
+ extra_button='
List of Instances'
+ description='An
open source metasearch engine, aggregating the results of other search engines while not storing information about its users. No logs, no ads and no tracking.'
+ %}
-
-
-
-
searx
-
-
-
An open source metasearch engine, aggregating the results of other search engines while not storing information about its users. No logs, no ads and no tracking.
+ {% include card.html color="primary"
+ title="StartPage"
+ image="img/provider/StartPage.png"
+ url="https://www.startpage.com/"
+ description="Google search results, with complete privacy protection. Behind StartPage is an european company that has been obsessive about privacy since 2006."
+ %}
-
- Website: searx.me
- List of Instances
-
-
-
-
-
-
-
-
-
-
-
-
-
-
StartPage
-
-
-
Google search results, with complete privacy protection. Behind StartPage is an european company that has been obsessive about privacy since 2006.
-
-
-
- Website: startpage.com
-
-
-
-
-
-
-
+ {% include card.html color="warning"
+ title="DuckDuckGo"
+ image="img/provider/DuckDuckGo.jpg"
+ url="https://duckduckgo.com/"
+ tor="http://3g2upl4pq6kufc4m.onion"
+ description='The search engine that doesn\'t track you. Some of DuckDuckGo\'s code is free software hosted at
GitHub, but the core is proprietary.
The company is based in the USA.'
+ %}
Firefox Addon
@@ -1411,67 +1378,36 @@ layout: default
-
-
-
-
Mobile: Signal
-
-
-
- 
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, enabling anyone to verify its security by auditing the code. The development team is supported by community donations and grants. There are no advertisements,
- and it doesn't cost anything to use.
- Warning: Requires a mobile number to register but you can securely use a disposable number.
-
-
-
- Download: signal.org
-
-
-
OS: Android, iOS, macOS, Windows, Debian-based Linux
-
-
-
+ {% include card.html color="success"
+ title="Mobile: Signal"
+ image="img/tools/Signal.png"
+ url="https://signal.org"
+ footer="OS: Android, iOS, macOS, Windows, Linux, Web"
+ 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, enabling anyone to verify its security by auditing the code. The development team is supported by community donations and grants. There are no advertisements,
+ and it doesn't cost anything to use."
+ %}
-
-
-
-
Wire
-
-
-
Wire is an app developed by Wire Swiss GmbH.
- The Wire app allows users to exchange end-to-end encrypted instant messages, as well as make voice and video calls. Wire is free and open source, enabling anyone to verify its security by auditing the code.
- The development team is backed by Iconical and they will monetize in the future with premium features/services.
- Caution: The company keeps a list of all the users you contact until you delete your account.
-
-
- Download: get.wire.com
-
-
-
OS: Android, iOS, macOS, Windows, Linux, Web
-
-
-
+ {% include card.html color="primary"
+ title="Wire"
+ image="img/tools/wire.png"
+ url="https://get.wire.com"
+ footer="OS: Android, iOS, macOS, Windows, Linux, Web"
+ description="Wire is an app developed by Wire Swiss GmbH.
+ The Wire app allows users to exchange end-to-end encrypted instant messages, as well as make voice and video calls. Wire is free and open source, enabling anyone to verify its security by auditing the code.
+ The development team is backed by Iconical and they will monetize in the future with premium features/services.
+
Caution: The company keeps a list of all the users you contact until you delete your account."
+ %}
-
-
-
-
-
Desktop: Ricochet
-
-
-
Ricochet uses the Tor network to reach your contacts without relying on messaging servers. It creates a hidden service, which is used to rendezvous with
- your contacts without revealing your location or IP address. Instead of a username, you get a unique address that looks like ricochet:rs7ce36jsj24ogfw. Other Ricochet users can use this address to send a contact request - asking to be
- added to your contacts list.
-
-
- Download: ricochet.im
-
-
-
OS: Windows, macOS, Linux.
-
-
-
+ {% include card.html color="warning"
+ title="Desktop: Ricochet"
+ image="img/tools/Ricochet.png"
+ url="https://ricochet.im/"
+ footer="OS: Windows, macOS, Linux."
+ description='Ricochet uses the
Tor network to reach your contacts without relying on messaging servers. It creates a hidden service, which is used to rendezvous with
+ your contacts without revealing your location or IP address. Instead of a username, you get a unique address that looks like
ricochet:rs7ce36jsj24ogfw. Other Ricochet users can use this address to send a contact request - asking to be
+ added to your contacts list.'
+ %}
Worth Mentioning
@@ -1502,63 +1438,34 @@ layout: default
If you are currently using an Video & Voice Messenger like Skype, Viber or Google Hangouts you should pick an alternative here.
-
-
-
-
Mobile: Signal
-
+ {% include card.html color="success"
+ title="Mobile: Signal"
+ image="img/tools/Signal.png"
+ url="https://signal.org"
+ footer="OS: Android, iOS, macOS, Windows, Linux, Web"
+ 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, enabling anyone to verify its security by auditing the code. The development team is supported by community donations and grants. There are no advertisements,
+ and it doesn't cost anything to use."
+ %}
-
-
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, enabling anyone to verify its security by auditing the code. The development team is supported by community donations and grants. There are no advertisements,
- and it doesn't cost anything to use.
-
-
- Download: signal.org
-
-
-
OS: iOS, Android.
-
-
-
+ {% include card.html color="primary"
+ title="Wire"
+ image="img/tools/wire.png"
+ url="https://get.wire.com"
+ footer="OS: Android, iOS, macOS, Windows, Linux, Web"
+ description="Wire is an app developed by Wire Swiss GmbH.
+ The Wire app allows users to exchange end-to-end encrypted instant messages, as well as make voice and video calls. Wire is free and open source, enabling anyone to verify its security by auditing the code.
+ The development team is backed by Iconical and they will monetize in the future with premium features/services.
+
Caution: The company keeps a list of all the users you contact until you delete your account."
+ %}
-
-
-
-
Wire
-
-
-
Wire is an app developed by Wire Swiss GmbH.
- The Wire app allows users to exchange end-to-end encrypted instant messages, as well as make voice and video calls. Wire is free and open source, enabling anyone to verify its security by auditing the code.
- The development team is backed by Iconical and they will monetize in the future with premium features/services.
- Caution: The company keeps a list of all the users you contact until you delete your account.
-
-
- Download: get.wire.com
-
-
-
OS: Android, iOS, macOS, Windows, Linux, Web
-
-
-
-
-
-
-
-
Linphone
-
-
-
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.
-
-
- Download: linphone.org
-
-
-
OS: iOS, Android, Windows Phone, Linux, Windows, macOS, Browser (Web)
-
-
-
+ {% include card.html color="warning"
+ title="Linphone"
+ image="img/tools/Linphone.png"
+ url="http://www.linphone.org/"
+ footer="OS: iOS, Android, Windows Phone, Linux, Windows, macOS, Browser (Web)"
+ 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."
+ %}
File Sharing
- {% include card.html
- color="success"
+ {% include card.html color="success"
title="OnionShare"
image="img/tools/OnionShare.png"
url="https://onionshare.org/"
@@ -1591,8 +1497,8 @@ layout: default
footer="OS: Windows, macOS, Linux."
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. It doesn't require setting up a server on the internet somewhere or using a third party filesharing service. You host the file on your own computer and use a Tor onion service to make it temporarily accessible over the internet."
%}
- {% include card.html
- color="primary"
+
+ {% include card.html color="primary"
title="Magic Wormhole"
image="img/tools/Magic-Wormhole.png"
url="http://magic-wormhole.io/"
The search engine that doesn't track you. Some of DuckDuckGo's code is free software hosted at GitHub, but the core is proprietary. The company is based in the USA.