diff --git a/_includes/sections/browser-addons.html b/_includes/sections/browser-addons.html
index 3c3245bc..78a48280 100644
--- a/_includes/sections/browser-addons.html
+++ b/_includes/sections/browser-addons.html
@@ -44,12 +44,6 @@ chrome="https://chrome.google.com/webstore/detail/decentraleyes/ldpochfccmkkmhdb
 opera="https://addons.opera.com/en/extensions/details/decentraleyes"
 %}
 
-<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"
 image="/assets/img/svg/3rd-party/terms_of_service_didnt_read.svg"
@@ -103,3 +97,12 @@ 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="CanvasBlocker"
+image="/assets/img/svg/3rd-party/canvasblocker.svg"
+description="<strong>CanvasBlocker</strong> allows users to prevent websites from using some Javascript APIs to fingerprint them. Users can choose to block the APIs entirely on some or all websites (which may break some websites) or just block or fake its fingerprinting-friendly readout API."
+website="https://github.com/kkapsner/CanvasBlocker/"
+github="https://github.com/kkapsner/CanvasBlocker/"
+firefox="https://addons.mozilla.org/firefox/addon/canvasblocker/"
+%}
\ No newline at end of file
diff --git a/_includes/sections/browser-fingerprint.html b/_includes/sections/browser-fingerprint.html
index 28303f3a..99c9bb2f 100644
--- a/_includes/sections/browser-fingerprint.html
+++ b/_includes/sections/browser-fingerprint.html
@@ -16,12 +16,6 @@
 
 <p>Modern web browsers have not been architected to assure personal web privacy. Rather than worrying about being fingerprinted, it seems more practical to use <a href="#addons"><i class="fas fa-link"></i> free software plugins</a> like Privacy Badger and uBlock Origin. They not only respect your freedom, but your privacy also. You can get much further with these than trying to manipulate your browser's fingerprint.</p>
 
-
-<h3>Firefox Addon: CanvasBlocker</h3>
-<ul>
-	<li><a href="https://addons.mozilla.org/firefox/addon/canvasblocker/">addons.mozilla.org</a> - <strong>CanvasBlocker</strong> allows users to prevent websites from using some Javascript APIs to fingerprint them. Users can choose to block the APIs entirely on some or all websites (which may break some websites) or just block or fake its fingerprinting-friendly readout API.</li>
-</ul>
-
 <h3>Related Information</h3>
 
 <ul>
diff --git a/assets/img/svg/3rd-party/canvasblocker.svg b/assets/img/svg/3rd-party/canvasblocker.svg
new file mode 100644
index 00000000..eaa7e802
--- /dev/null
+++ b/assets/img/svg/3rd-party/canvasblocker.svg
@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   width="96"
+   height="96"
+   id="svg2"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="icon.svg">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1600"
+     inkscape:window-height="848"
+     id="namedview9"
+     showgrid="false"
+     inkscape:zoom="3.4766083"
+     inkscape:cx="38.131512"
+     inkscape:cy="53.605992"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2" />
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient3859">
+      <stop
+         style="stop-color:#f60007;stop-opacity:0;"
+         offset="0"
+         id="stop3861" />
+      <stop
+         id="stop3867"
+         offset="0.64554304"
+         style="stop-color:#ff0000;stop-opacity:0.49803922;" />
+      <stop
+         style="stop-color:#ff0000;stop-opacity:1;"
+         offset="0.87873006"
+         id="stop3761" />
+      <stop
+         style="stop-color:#ff0000;stop-opacity:1;"
+         offset="1"
+         id="stop3863" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3859"
+       id="linearGradient3865"
+       x1="68.338982"
+       y1="3.2462919"
+       x2="68.846931"
+       y2="93.958153"
+       gradientUnits="userSpaceOnUse"
+       spreadMethod="pad"
+       gradientTransform="matrix(-1.0611643,0,0,1,98.935885,-0.398835)" />
+  </defs>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <rect
+     style="fill:#f5f5f5;fill-opacity:1;stroke:#ff0000;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+     id="rect3826"
+     width="92"
+     height="92"
+     x="2"
+     y="2"
+     rx="21.807747"
+     ry="21.807745" />
+  <path
+     style="fill:#fa1111;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+     d="M -131.78125 -21.0625 C -158.01477 -21.0625 -179.28125 0.20397478 -179.28125 26.4375 C -179.28125 52.671026 -158.01477 73.9375 -131.78125 73.9375 C -105.54772 73.9375 -84.28125 52.671026 -84.28125 26.4375 C -84.28125 0.20397478 -105.54772 -21.0625 -131.78125 -21.0625 z M -131.78125 -9.03125 C -112.18912 -9.03125 -96.3125 6.8453718 -96.3125 26.4375 C -96.3125 34.841578 -99.272257 42.546819 -104.15625 48.625 L -151.46875 -3.0625 C -145.83667 -6.8257691 -139.06333 -9.03125 -131.78125 -9.03125 z M -159.4375 4.21875 L -112.09375 55.9375 C -117.73013 59.709623 -124.48982 61.90625 -131.78125 61.90625 C -151.37337 61.90625 -167.28125 46.029628 -167.28125 26.4375 C -167.28125 18.024661 -164.33068 10.299837 -159.4375 4.21875 z "
+     id="path2987" />
+  <path
+     d="m 30.140599,82.82566 c 0.455632,0.02729 1.107526,-0.162911 1.411138,-0.411456 0.138801,-0.113963 0.56738,-0.550615 0.952932,-0.971501 1.881546,-2.053978 3.544449,-2.898446 4.942329,-2.509842 1.058957,0.294326 2.343919,2.309448 3.470654,5.442758 0.670656,1.865245 1.017272,2.275556 2.077649,2.459632 0.646227,0.111727 1.576963,-0.210319 1.948521,-0.674957 0.78622,-0.98338 0.74373,-1.582627 -0.296912,-4.196315 -1.140069,-2.863166 -2.11777,-4.490159 -3.483306,-5.796363 -0.557036,-0.532919 -0.688137,-0.612744 -1.791318,-1.092073 -1.115051,-0.481078 -1.249499,-0.516512 -2.082683,-0.574786 -1.220368,-0.0788 -1.971342,0.03547 -3.195924,0.486276 -1.626241,0.598615 -3.177315,1.713486 -4.734512,3.402804 -0.835992,0.90704 -1.096045,1.307123 -1.205889,1.855324 -0.250222,1.248264 0.717546,2.504774 1.987321,2.580499 z m -7.145952,-6.068422 c 0.629998,-0.01197 2.71237,-0.607978 4.184493,-1.197448 2.960478,-1.185484 5.258786,-2.842233 6.942603,-5.004547 1.731541,-2.223458 2.765839,-5.514452 2.534128,-8.063388 -0.139693,-1.53683 -1.170929,-2.424476 -2.56013,-2.203595 -1.154999,0.183526 -1.84594,1.14141 -1.794397,2.487579 0.05008,1.304216 -0.112414,2.123679 -0.67513,3.406452 -0.384931,0.876323 -0.617428,1.289879 -0.996039,1.767947 -0.618378,0.780796 -1.767081,1.783676 -2.751978,2.402727 -0.960234,0.603504 -3.114828,1.507446 -4.519343,1.895797 -1.711364,0.47338 -2.105367,0.746816 -2.418898,1.678786 -0.464401,1.380502 0.607946,2.857556 2.054691,2.82969 z m 28.639406,11.515278 c 0.778151,0.123499 1.611571,-0.177095 2.062191,-0.743092 0.358297,-0.450036 0.573461,-1.218756 0.482724,-1.724812 -0.04643,-0.258673 -0.535321,-1.223677 -1.245159,-2.457632 -5.287924,-9.193902 -9.413657,-18.755858 -11.021494,-25.544749 -0.611352,-2.581318 -0.906849,-5.197956 -0.80155,-7.097344 0.148532,-2.678391 0.969053,-4.377128 2.944043,-6.095021 1.761447,-1.532103 3.847828,-1.910524 5.82675,-1.056751 1.742522,0.751792 3.076049,2.407219 3.570725,4.432478 0.115006,0.471137 0.25204,1.865256 0.331443,3.372914 0.400854,7.611953 1.775981,12.152887 5.876144,19.403403 1.379571,2.439759 4.983537,8.372158 5.260053,8.65853 0.402432,0.416782 1.34756,0.721379 1.9189,0.620172 1.196793,-0.214265 2.010322,-1.457021 1.728408,-2.640454 -0.04761,-0.198901 -0.658579,-1.308472 -1.357931,-2.464526 -4.36639,-7.218615 -5.924379,-10.106306 -7.03237,-13.0342 -1.251856,-3.307855 -1.751549,-5.98234 -2.022517,-10.824911 -0.16086,-2.873277 -0.321867,-3.907932 -0.827732,-5.319614 -1.099344,-3.067302 -3.726439,-5.678414 -6.590596,-6.55085 -2.245827,-0.683772 -4.219277,-0.62216 -6.348855,0.198421 -2.368275,0.912663 -4.307519,2.5453 -5.828763,4.907346 -0.638803,0.991888 -1.220758,2.440215 -1.507218,3.750962 -0.764323,3.497107 -0.162961,8.709574 1.692089,14.665903 1.689147,5.423942 4.677974,12.258199 8.347507,19.087447 1.315012,2.447364 2.890791,5.198456 3.224197,5.629031 0.306522,0.39595 0.885488,0.759519 1.318702,0.828116 z M 16.766727,68.199281 c 1.445843,0.06318 3.005392,-0.06791 4.18343,-0.351718 3.642202,-0.876904 7.025982,-3.61167 9.744557,-7.875187 1.634032,-2.562631 2.31775,-4.521332 3.508675,-10.051476 1.171945,-5.44194 2.109204,-7.967209 3.715703,-10.011385 1.779239,-2.264062 4.521441,-3.783942 7.850364,-4.351239 2.519831,-0.429604 4.890584,-0.146182 7.230539,0.864032 2.351219,1.015078 4.129034,2.524656 5.587646,4.744526 1.853459,2.821004 2.699886,5.881471 2.931526,10.598928 0.06649,1.352375 0.202462,2.918095 0.302371,3.479129 0.691381,3.884469 2.869015,8.894672 5.920223,13.621157 0.915855,1.418566 1.20691,1.745521 1.771658,1.989179 1.64816,0.711076 3.462899,-0.881799 2.918444,-2.561648 -0.07598,-0.233709 -0.453634,-0.908704 -0.839437,-1.499156 -2.793986,-4.276398 -4.836822,-8.866761 -5.480209,-12.314421 -0.08176,-0.438267 -0.164869,-1.321695 -0.18461,-1.963508 -0.12953,-4.197019 -0.586975,-6.892564 -1.645338,-9.696771 -1.692936,-4.485015 -4.481952,-7.749376 -8.460164,-9.902593 -3.777659,-2.044789 -8.655278,-2.458349 -13.147006,-1.115069 -5.404017,1.616168 -9.09561,5.196639 -11.02361,10.691899 -0.607507,1.731487 -1.004807,3.230125 -1.692037,6.382325 -0.791137,3.628676 -1.068546,4.648239 -1.707333,6.274789 -0.495955,1.262587 -0.6735,1.618114 -1.226139,2.453696 -1.980246,2.993967 -3.853433,4.751268 -5.994374,5.623613 -1.190072,0.484936 -2.281681,0.651334 -4.035396,0.61517 -1.452064,-0.02996 -1.799549,0.03795 -2.299311,0.450009 -0.73956,0.609759 -0.999457,1.590601 -0.647521,2.443687 0.41913,1.015961 1.118525,1.392217 2.717344,1.462031 z m 43.118878,17.720016 c 0.512923,-0.0144 0.976511,-0.202287 1.450976,-0.587757 0.331269,-0.26912 0.670649,-1.158323 0.634323,-1.662348 -0.03946,-0.546684 -0.158203,-0.801563 -1.128118,-2.423386 C 56.044257,73.223025 52.289675,64.52855 50.623954,57.58239 c -0.656264,-2.7364 -0.97695,-4.822051 -1.110982,-7.224527 -0.07753,-1.390143 -0.126437,-1.670191 -0.35549,-2.037905 -0.216015,-0.346287 -0.374351,-0.480304 -0.846699,-0.7166 -0.38088,-0.191428 -0.708788,-0.283223 -0.941992,-0.293535 -1.189142,-0.01269 -2.147456,0.904305 -2.23123,2.134981 -0.04311,0.632097 0.108578,2.904006 0.277533,4.159279 1.13086,8.401708 5.261308,19.015989 11.536731,29.646723 0.568822,0.963601 1.171316,1.889797 1.338902,2.058282 0.423043,0.424991 0.955964,0.629175 1.594546,0.611186 z M 14.583522,61.125351 c 0.586334,-0.03218 2.741656,-0.87417 4.285147,-1.674198 1.911744,-0.990876 3.741819,-2.353171 4.874922,-3.628956 0.981428,-1.105061 1.42709,-1.824459 2.097375,-3.38572 0.732358,-1.707639 0.892162,-2.22909 2.143909,-7.02836 1.272092,-4.877417 1.599326,-5.944126 2.38153,-7.763016 0.754084,-1.753368 1.156703,-2.384315 2.251608,-3.528476 0.693547,-0.724662 2.023195,-1.881331 2.894919,-2.518285 2.494861,-1.823014 5.926613,-3.273882 8.838929,-3.73712 6.736148,-1.071241 14.553759,1.754059 18.794094,6.79218 1.276299,1.516501 2.278171,3.205398 3.143723,5.299681 1.00003,2.419377 1.548871,4.662618 2.186053,8.93507 0.334248,2.241863 0.695377,3.818468 1.254894,5.478398 0.900576,2.672234 2.704849,5.886083 3.647016,6.496215 0.738782,0.47904 1.934425,0.369939 2.602211,-0.236017 0.1771,-0.160878 0.40666,-0.493067 0.519956,-0.753047 0.355579,-0.813577 0.247823,-1.536937 -0.347039,-2.337465 C 75.561081,56.739774 74.720347,55.155614 74.222578,53.899374 73.425694,51.888228 73.108794,50.531875 72.570707,46.828913 71.634326,40.385476 69.653274,35.569812 66.372103,31.760542 64.173181,29.207956 61.769192,27.403386 58.511594,25.859994 52.792286,23.150227 46.70865,22.563815 40.921419,24.16411 c -4.545269,1.256965 -9.4432,4.404124 -12.358711,7.941241 -0.997439,1.210144 -1.27642,1.700503 -2.223014,3.907236 -1.007996,2.352292 -1.200257,2.962018 -2.500729,7.973267 -1.507539,5.808969 -1.999732,7.213392 -2.962829,8.453921 -1.160411,1.494745 -3.207368,2.864389 -6.101738,4.082912 -1.704957,0.717717 -2.043091,0.94933 -2.318611,1.587935 -0.644399,1.493628 0.492432,3.104381 2.127657,3.014698 z m 1.656332,-8.330781 c 0.483473,0.05505 1.018343,-0.07294 1.440811,-0.34673 0.606254,-0.392737 0.870819,-0.974197 1.223754,-2.689981 1.363741,-6.627137 3.764087,-12.455957 6.842955,-16.617083 0.599454,-0.810185 0.960258,-1.227991 1.792833,-2.075995 1.002794,-1.021335 1.212653,-1.805672 0.75181,-2.81028 -0.614068,-1.339164 -2.257845,-1.644444 -3.45938,-0.64292 -0.924841,0.770957 -2.45127,2.625931 -3.62653,4.407105 -2.577453,3.906263 -4.742976,9.10128 -6.082071,14.590756 -0.454399,1.862789 -0.81553,3.732849 -0.800638,4.146114 0.0358,0.995762 0.906707,1.922379 1.916379,2.03898 z m 61.74699,-2.601905 c 0.960928,0.140269 1.795758,-0.313471 2.259775,-1.228598 0.325225,-0.641325 0.306907,-1.000745 -0.189325,-3.746213 -0.915678,-5.06609 -2.465736,-10.015503 -4.086021,-13.047242 -2.644435,-4.948355 -6.42587,-8.803673 -11.617126,-11.844407 -1.444151,-0.846578 -4.944825,-2.440649 -6.448604,-2.937935 -6.179021,-2.042035 -12.655119,-2.134223 -19.48975,-0.277787 -2.937031,0.797783 -7.895639,2.919041 -9.619201,4.114825 -0.965444,0.669902 -1.27855,1.718314 -0.809358,2.710055 0.530256,1.120805 1.612747,1.559601 2.716133,1.10185 0.315685,-0.131115 1.099931,-0.529235 1.742684,-0.884549 1.418204,-0.784094 5.004237,-2.234088 6.735845,-2.723357 7.333079,-2.072388 14.103915,-1.639684 20.314818,1.298199 5.233979,2.474873 8.862038,5.514899 11.53583,9.662226 2.169212,3.364748 3.653669,7.661598 4.710636,13.635065 0.52469,2.965002 0.527043,2.97414 0.879201,3.378498 0.426229,0.489583 0.802881,0.707403 1.364375,0.789573 z m 3.534314,-14.692266 c 1.050299,-0.0046 1.991128,-0.758397 2.176808,-1.744157 0.117185,-0.622255 -0.105787,-1.528298 -0.821543,-3.338496 C 80.800574,25.167651 77.145987,20.39872 72.326196,16.651053 68.010195,13.295033 62.354244,10.653913 56.553687,9.2860925 52.813078,8.4039905 48.350389,8.0904276 44.511008,8.4399775 c -1.835111,0.167131 -4.559013,0.642121 -6.361033,1.109355 -1.52129,0.394414 -2.014425,0.7088365 -2.351061,1.4985255 -0.575718,1.350318 0.383877,2.922317 1.838889,3.01249 0.196268,0.01242 1.036231,-0.143782 1.866551,-0.346595 3.634812,-0.888003 6.94076,-1.215512 10.2641,-1.01691 7.310625,0.436879 15.01196,3.398039 20.501917,7.882562 4.207551,3.437007 7.521077,8.089724 8.980028,12.609479 0.271723,0.841737 0.503546,1.368232 0.695656,1.579811 0.337965,0.372267 1.116301,0.733806 1.575183,0.731527 z"
+     id="path4138"
+     inkscape:connector-curvature="0"
+     style="fill:#5c5c5c;fill-opacity:1" />
+  <path
+     style="opacity:0.75;fill:#ff0000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.99999988;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
+     d="m -133.04574,101.6335 c -1.12862,-0.0337 -2.27838,0.34586 -3.16899,1.18476 l -2.19188,2.07703 c -1.78122,1.6778 -1.85292,4.44717 -0.17494,6.22823 l 24.56885,26.07532 -23.64986,26.49444 c -1.63008,1.82501 -1.47317,4.61953 0.35146,6.25001 l 2.24975,2.01419 c 1.82462,1.63048 4.59031,1.47395 6.22039,-0.35106 l 22.98852,-25.72513 23.470716,24.89248 c 1.677985,1.78106 4.47625,1.88156 6.257471,0.20376 l 2.191875,-2.07703 c 1.781222,-1.67779 1.852927,-4.44717 0.174942,-6.22822 l -24.183188,-25.67158 23.707888,-26.52449 c 1.630078,-1.82501 1.473172,-4.61953 -0.351454,-6.25001 l -2.249748,-2.01419 c -1.824627,-1.63049 -4.590317,-1.47395 -6.220396,0.35106 l -23.046136,25.7844 -23.85679,-25.32545 c -0.83899,-0.89053 -1.95987,-1.35483 -3.08848,-1.38852 z"
+     id="rect3795-1"
+     inkscape:connector-curvature="0"
+     inkscape:transform-center-x="6.3789923"
+     inkscape:transform-center-y="2.4991519" />
+  <path
+     style="opacity:0.59999999999999998;fill:url(#linearGradient3865);fill-opacity:1;stroke:#ff0000;stroke-width:0;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+     d="M 47.999998,3.0000001 47.999998,93 26.146646,93 C 13.326198,93 2.9999999,83.26899 2.9999999,71.1875 l 0,-46.375 c 0,-12.081491 10.3261981,-21.8124999 23.1466461,-21.8124999 l 21.853352,0 z"
+     id="rect3826-9"
+     inkscape:connector-curvature="0" />
+  <path
+     style="opacity:0.6;fill:#ff0000;fill-opacity:1;stroke:#ff0000;stroke-width:0;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+     d="M 71.1875,3 C 83.268992,3 93,12.731009 93,24.8125 l 0,46.375 C 93,83.268991 83.268992,93 71.1875,93 L 48,93 48,3 71.1875,3 z"
+     id="rect3826-4"
+     inkscape:connector-curvature="0" />
+  <rect
+     style="fill:none;stroke:#000000;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+     id="rect3826-0"
+     width="92"
+     height="92"
+     x="2"
+     y="2"
+     rx="21.807747"
+     ry="21.807745" />
+</svg>