Browser add-on cleanup (#1864)

_includes/sections/browser-addons.html

@@ -44,16 +44,11 @@ chrome="https://chrome.google.com/webstore/detail/decentraleyes/ldpochfccmkkmhdb
 opera="https://addons.opera.com/en/extensions/details/decentraleyes"
 %}
 
-{% include cardv2.html
-title="Cookie AutoDelete: Automatically Delete Cookies"
-image="/assets/img/png/3rd-party/cookie_autodelete.png"
-description="<strong>Cookie AutoDelete</strong> automatically removes cookies, lingering sessions, and other information that can be used to spy on you when they are no longer used by open browser tabs."
-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="https://addons.mozilla.org/en-US/firefox/addon/cookie-autodelete"
-chrome="https://chrome.google.com/webstore/detail/cookie-autodelete/fhcgjolkccmbidfldomjliifgaodjagh"
-%}
+<h2>Additional Functionality</h2>
+
+<div class="alert alert-secondary" role="alert">
+  These add-ons don't necessarily add to your privacy when browsing the web, but add additional functionality to your browser you may find useful.
+</div>
 
 {% include cardv2.html
 title="Terms of Service; Didn’t Read: Be Informed"
@@ -79,25 +74,23 @@ 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/svg/3rd-party/privacy_badger.svg"
-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"
-privacy-policy="https://www.eff.org/code/privacy/policy"
-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>
+<h2>For Advanced Users</h2>
 
 <div class="alert alert-warning" role="alert">
-  <strong>These addons require quite a lot of interaction from the user. Some sites may not work properly without careful configuration.</strong>
+  These addons require quite a lot of interaction from the user, and some of them completely replace the add-ons we've recommended above. Some sites may not work properly without careful configuration.
 </div>
 
+{% include cardv2.html
+title="Cookie AutoDelete: Automatically Delete Cookies"
+image="/assets/img/png/3rd-party/cookie_autodelete.png"
+description="<strong>Cookie AutoDelete</strong> automatically removes cookies, lingering sessions, and other information that can be used to spy on you when they are no longer used by open browser tabs."
+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="https://addons.mozilla.org/en-US/firefox/addon/cookie-autodelete"
+chrome="https://chrome.google.com/webstore/detail/cookie-autodelete/fhcgjolkccmbidfldomjliifgaodjagh"
+%}
+
 {% include cardv2.html
 title="uMatrix: Stop Cross-Site Requests"
 image="/assets/img/png/3rd-party/umatrix.png"
@@ -110,15 +103,3 @@ 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
-title="NoScript Security Suite: Be in total control"
-image="/assets/img/svg/3rd-party/noscript.svg"
-description="<strong>NoScript</strong> is a highly customizable plugin to selectively allow JavaScript, Java, and Flash to run only on websites you trust. Not for casual users, it requires technical knowledge to configure."
-website="https://noscript.net/"
-privacy-policy="https://addons.mozilla.org/en-US/firefox/addon/noscript/privacy/"
-forum="https://forum.privacytools.io/t/discussion-noscript-security-suite/272"
-github="https://github.com/hackademix/noscript"
-firefox="https://addons.mozilla.org/en-US/firefox/addon/noscript"
-chrome="https://chrome.google.com/webstore/detail/noscript/doojmbjmlfjjnbmnoijecmcbfeoakpjm"
-%}

_includes/sections/browser-fingerprint.html

@@ -1,7 +1,7 @@
 <h1 id="fingerprint" class="anchor"><a href="#fingerprint"><i class="fas fa-link anchor-icon"></i></a> Browser Fingerprint - Is your browser configuration unique?</h1>
 
 <div class="alert alert-warning" role="alert">
-  <strong>Your Browser sends information that makes you unique amongst millions of users and therefore easy to identify.</strong>
+  Your Browser sends information that makes you unique amongst millions of users and therefore easy to identify.
 </div>
 
 <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>

_includes/sections/browser-webrtc.html

@@ -1,7 +1,7 @@
 <h1 id="webrtc" class="anchor"><a href="#webrtc"><i class="fas fa-link anchor-icon"></i></a> WebRTC IP Leak Test - Is your IP address leaking?</h1>
 
 <div class="alert alert-danger" role="alert">
-  <strong>WebRTC is a new communication protocol that relies on JavaScript that can leak your actual IP address from behind your VPN.</strong>
+  WebRTC is a new communication protocol that relies on JavaScript that can leak your actual IP address from behind your VPN.
 </div>
 
 <p>While software like NoScript prevents this, it's probably a good idea to block this protocol directly as well, just to be safe. <b>Note:</b> This disables browser-based call functionality that is used for webapps like Discord, Hangouts, Jitsi, etc.</p>

assets/img/svg/3rd-party/noscript.svg

@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="128" height="128" version="1.1" viewBox="0 0 33.867 33.867" xmlns="http://www.w3.org/2000/svg"><defs><filter id="a" x="-.12917" y="-.098235" width="1.2583" height="1.1965" color-interpolation-filters="sRGB"><feFlood flood-color="#fff" result="flood"/><feComposite in="flood" in2="SourceGraphic" operator="out" result="composite1"/><feGaussianBlur in="composite1" result="blur" stdDeviation="1.0047711"/><feOffset dx="0" dy="0" result="offset"/><feComposite in="offset" in2="SourceGraphic" operator="atop" result="composite2"/></filter></defs><g transform="matrix(.5 0 0 .5 44.083 -34.4)" stroke="#000"><path d="m-45.85 92.603-0.7254-6.0796 3.6961 1.7617z" fill="#fff" stroke-width=".54713"/><path d="m-54.555 92.569 0.65631-6.5631-4.4906 0.58722z" fill="#fff" stroke-width=".54713"/><g transform="matrix(2.0679 0 0 2.0679 93.244 -145.01)" fill="#002fc8" filter="url(#a)" stroke-width=".52917"><path d="m-63.962 108.8v5.0078q-1.9492-0.87161-3.8034-1.3153-1.8542-0.44373-3.5023-0.44373-2.1869 0-3.2329 0.6022t-1.0459 1.87q0 0.95084 0.69729 1.4897 0.71314 0.52296 2.5673 0.9033l2.599 0.52297q3.946 0.79237 5.61 2.4088t1.664 4.5958q0 3.9143-2.3296 5.8319-2.3137 1.9017-7.0838 1.9017-2.2503 0-4.5165-0.42788t-4.5324-1.2678v-5.1504q2.2662 1.2044 4.3739 1.8225 2.1236 0.6022 4.0886 0.6022 1.9968 0 3.0586-0.66559 1.0618-0.6656 1.0618-1.9017 0-1.1093-0.72898-1.7115-0.71314-0.6022-2.8684-1.0776l-2.3613-0.52296q-3.5498-0.76068-5.198-2.4247-1.6323-1.664-1.6323-4.4848 0-3.534 2.282-5.4357t6.5608-1.9017q1.9492 0 4.0094 0.3011 2.0602 0.28526 4.263 0.87161z" fill="#00397e" stroke="#000" stroke-width=".52917"/></g><path d="m-39.064 79.977v10.356q-4.0308-1.8024-7.865-2.72t-7.2424-0.91759q-4.5224 0-6.6853 1.2453t-2.1629 3.867q0 1.9663 1.4419 3.0805 1.4747 1.0814 5.3089 1.8679l5.3744 1.0814q8.16 1.6385 11.601 4.9812 3.4409 3.3426 3.4409 9.5036 0 8.0944-4.8173 12.06-4.7846 3.9325-14.649 3.9325-4.6535 0-9.3397-0.88482-4.6862-0.88481-9.3725-2.6217v-10.651q4.6862 2.4906 9.0448 3.7687 4.3913 1.2453 8.4549 1.2453 4.1291 0 6.3248-1.3764t2.1957-3.9325q0-2.294-1.5075-3.5393-1.4747-1.2453-5.9315-2.2284l-4.8829-1.0814q-7.3407-1.573-10.749-5.014-3.3754-3.4409-3.3754-9.2742 0-7.3079 4.719-11.24 4.719-3.9325 13.567-3.9325 4.0308 0 8.291 0.62265 4.2602 0.58988 8.8154 1.8024z" fill="none" stroke="#000" stroke-width="1.0939"/><path d="m-54.297 69.063a33.603 33.603 0 0 0-33.604 33.604 33.603 33.603 0 0 0 33.604 33.603 33.603 33.603 0 0 0 33.603-33.603 33.603 33.603 0 0 0-33.603-33.604zm-0.46164 6.401a26.883 26.883 0 0 1 26.882 26.882 26.883 26.883 0 0 1-4.7073 15.196l-37.655-37.133a26.883 26.883 0 0 1 15.48-4.9445zm-21.711 11.077 36.65 38.129a26.883 26.883 0 0 1-14.939 4.5587 26.883 26.883 0 0 1-26.883-26.883 26.883 26.883 0 0 1 5.1721-15.805z" fill="#f00" stroke-width=".5269"/><ellipse cx="-44.197" cy="78.506" rx="4.855" ry="4.6251" fill="#fff" stroke-width=".57239"/><ellipse cx="-56.8" cy="78.433" rx="4.855" ry="4.6251" fill="#fff" stroke-width=".57239"/><g stroke-width=".54713"><path d="m-38.261 69.323 1.8075 3.1753-11.382 3.4684-0.73277-0.87933z"/><path d="m-63.182 69.197-1.8075 3.1753 11.382 3.4684 0.73277-0.87933z"/></g></g><circle cx="22.518" cy="5.5594" r="1.3441" stroke-width=".5"/><circle cx="16.128" cy="5.6111" r="1.3441" stroke-width=".5"/></svg>