diff --git a/_includes/cardv2.html b/_includes/cardv2.html
index c246f9a2..9efa14de 100644
--- a/_includes/cardv2.html
+++ b/_includes/cardv2.html
@@ -5,16 +5,44 @@
+
+ {% if include.labels %}
+ {% assign labels = include.labels | replace:", ", "," | split:"," %}
+
+ {% for label in labels %}
+ {% assign label_data = label | split:":" %}
+ {% assign color = label_data[0] %}
+ {% assign text = label_data[1] %}
+ {% assign tooltip = label_data[2] | default: "" %}
+ {% assign help_icon = '' %}
+ {{text}} {{ help_icon
+ }}
+ {% else %}
+ >{{text}}
+ {% endif %}
+
+ {% endfor %}
+
+ {% endif %}
+
{{include.description}}
+
Website
- {% if include.discussion %}
-
Forum
+ {% if include.forum %}
+
Forum
{% endif %}
{% if include.tor %}
{% endif %}
+
+ {% if include.windows %}
{% endif %}
+ {% if include.mac %}
{% endif %}
+ {% if include.linux %}
{% endif %}
+ {% if include.bsd %}
{% endif %}
+ {% if include.web %}
{% endif %}
+
{% if include.firefox %}
{% endif %}
{% if include.chrome %}
{% endif %}
{% if include.safari %}
{% endif %}
@@ -25,18 +53,16 @@
{% if include.ios %}
{% endif %}
{% if include.fire %}
{% endif %}
- {% if include.windows %}
{% endif %}
- {% if include.mac %}
{% endif %}
- {% if include.linux %}
{% endif %}
- {% if include.bsd %}
{% endif %}
- {% if include.web %}
{% endif %}
+ {{include.icon1}}
+ {{include.icon2}}
+ {{include.icon3}}
{% if include.github %}
{% endif %}
{% if include.gitlab %}
{% endif %}
{% if include.git %}
{% endif %}
- {{include.icon1}}{{include.icon2}}{{include.icon3}}
+
+{% include cardv2.html
+title="Tor Browser"
+image="/assets/img/tools/Tor-Browser.png"
+description="Tor Browser is your choice if you need an extra layer of anonymity. It's a modified version of Firefox, it comes with pre-installed privacy add-ons, encryption and an advanced proxy."
+website="https://www.torproject.org/"
+forum="https://forum.privacytools.io/t/discussion-tor-browser/278"
+git="https://trac.torproject.org/projects/tor"
+windows=""
+mac=""
+linux=""
+android=""
+ios=""
+bsd=""
+%}
- {% include card.html color="success"
- title="Tor Browser"
- image="/assets/img/tools/Tor-Browser.png"
- url="https://www.torproject.org/"
- tor="http://expyuzz4wqqyqhjn.onion"
- footer='OS: Windows, macOS, Linux,
iOS,
Android,
OpenBSD.'
- description="Tor Browser is your choice if you need an extra layer of anonymity. It's a modified version of Firefox, it comes with pre-installed privacy add-ons, encryption and an advanced proxy."
- %}
+{% include cardv2.html
+title="Mozilla Firefox"
+image="/assets/img/tools/Firefox.png"
+description='Firefox is fast, reliable, open source and respects your privacy. Don\'t forget to adjust the settings according to our
+recommendations:
WebRTC and
about:config and get the
privacy add-ons.'
+website="https://www.firefox.com/"
+forum="https://forum.privacytools.io/t/discussion-firefox/279"
+github="https://github.com/mozilla"
+windows=""
+mac=""
+linux=""
+android=""
+ios=""
+bsd=""
+%}
- {% include card.html color="primary"
- title="Mozilla Firefox"
- image="/assets/img/tools/Firefox.png"
- url="https://www.firefox.com/"
- footer="OS: Windows, macOS, Linux, Android, iOS, BSD."
- description='Firefox is fast, reliable, open source and respects your privacy. Don\'t forget to adjust the settings according to our
- recommendations:
WebRTC and
about:config and get the
privacy add-ons.'
- %}
-
- {% include card.html color="warning"
- title="Brave"
- labels="warning:experimental:Brave is a good choice if you want to use a Chromium-based browser. But at this point in Brave's development, it's not as good as Firefox with privacy addons."
- image="/assets/img/tools/Brave.png"
- url="https://www.brave.com/"
- footer="OS: Windows, macOS, Linux, Android, iOS."
- description="The new open source browser \"Brave\" automatically blocks ads and trackers, making it faster and safer than your current browser. Brave is based on Chromium."
- %}
-
-
+{% include cardv2.html
+title="Brave Browser"
+image="/assets/img/tools/Brave.png"
+description="The new open source browser \"Brave\" automatically blocks ads and trackers, making it faster and safer than your current browser. Brave is based on Chromium."
+labels="warning:experimental:Brave is a good choice if you want to use a Chromium-based browser. But at this point in Brave's development, it's not as good as Firefox with privacy addons."
+website="https://www.torproject.org/"
+forum="https://forum.privacytools.io/t/discussion-brave-browser/280"
+github="https://github.com/brave"
+windows=""
+mac=""
+linux=""
+android=""
+ios=""
+%}
\ No newline at end of file