diff --git a/_includes/sections/browser-addons.html b/_includes/sections/browser-addons.html
index 3c3245bc..f216a664 100644
--- a/_includes/sections/browser-addons.html
+++ b/_includes/sections/browser-addons.html
@@ -103,3 +103,14 @@ 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/"
+privacy-policy="https://addons.mozilla.org/firefox/addon/canvasblocker/privacy/"
+forum="https://forum.privacytools.io/t/discussion-canvasblocker/3352"
+github="https://github.com/kkapsner/CanvasBlocker/"
+firefox="https://addons.mozilla.org/firefox/addon/canvasblocker/"
+%}
diff --git a/_includes/sections/browser-fingerprint.html b/_includes/sections/browser-fingerprint.html
index 4469aca4..4c67f2ed 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> to regain control. 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..bf32c76b
--- /dev/null
+++ b/assets/img/svg/3rd-party/canvasblocker.svg
@@ -0,0 +1,2 @@
+<?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" xmlns:xlink="http://www.w3.org/1999/xlink"><defs><linearGradient id="linearGradient3865" x1="68.339" x2="68.847" y1="3.2463" y2="93.958" gradientTransform="matrix(-.28077 0 0 .26458 35.21 6.0933)" gradientUnits="userSpaceOnUse"><stop stop-color="#f60007" stop-opacity="0" offset="0"/><stop stop-color="#f00" stop-opacity=".49804" offset=".64554"/><stop stop-color="#f00" offset=".87873"/><stop stop-color="#f00" offset="1"/></linearGradient></defs><g transform="matrix(1.3333 0 0 1.3333 -12.045 -8.2651)"><g><rect x="9.5628" y="6.728" width="24.342" height="24.342" rx="5.77" ry="5.77" fill="#f5f5f5" stroke-width="0"/><path d="m17.008 28.113c0.12055 0.0072 0.29303-0.0431 0.37336-0.10886 0.03672-0.03015 0.15012-0.14568 0.25213-0.25704 0.49783-0.54345 0.9378-0.76688 1.3077-0.66406 0.28018 0.07787 0.62016 0.61104 0.91828 1.4401 0.17744 0.49351 0.26915 0.60207 0.54971 0.65078 0.17098 0.02956 0.41724-0.05565 0.51555-0.17858 0.20802-0.26019 0.19678-0.41874-0.07856-1.1103-0.30164-0.75755-0.56033-1.188-0.92162-1.5336-0.14738-0.141-0.18207-0.16212-0.47395-0.28894-0.29502-0.12728-0.3306-0.13666-0.55104-0.15208-0.32289-0.02085-0.52158 0.0094-0.84559 0.12866-0.43028 0.15838-0.84066 0.45336-1.2527 0.90032-0.22119 0.23999-0.29 0.34584-0.31906 0.49089-0.0662 0.33027 0.18985 0.66272 0.52581 0.68276zm-1.8907-1.6056c0.16669-0.0032 0.71765-0.16086 1.1071-0.31682 0.78329-0.31366 1.3914-0.75201 1.8369-1.3241 0.45814-0.58829 0.7318-1.459 0.67049-2.1334-0.03696-0.40662-0.30981-0.64148-0.67737-0.58303-0.30559 0.04856-0.4884 0.302-0.47477 0.65817 0.01325 0.34507-0.02974 0.56189-0.17863 0.90129-0.10185 0.23186-0.16336 0.34128-0.26354 0.46777-0.16361 0.20659-0.46754 0.47193-0.72813 0.63572-0.25406 0.15968-0.82413 0.39884-1.1957 0.5016-0.4528 0.12525-0.55704 0.1976-0.64 0.44418-0.12287 0.36526 0.16085 0.75606 0.54364 0.74869zm7.5775 3.0468c0.20589 0.03268 0.4264-0.04686 0.54562-0.19661 0.0948-0.11907 0.15173-0.32246 0.12772-0.45636-0.01229-0.06844-0.14164-0.32376-0.32945-0.65025-1.3991-2.4326-2.4907-4.9625-2.9161-6.7587-0.16175-0.68297-0.23994-1.3753-0.21208-1.8778 0.0393-0.70866 0.2564-1.1581 0.77894-1.6126 0.46605-0.40537 1.0181-0.50549 1.5417-0.2796 0.46104 0.19891 0.81387 0.63691 0.94475 1.1728 0.03043 0.12466 0.06669 0.49352 0.0877 0.89242 0.10606 2.014 0.46989 3.2155 1.5547 5.1338 0.36501 0.64552 1.3186 2.2151 1.3917 2.2909 0.10648 0.11027 0.35654 0.19086 0.50771 0.16409 0.31665-0.05669 0.5319-0.3855 0.45731-0.69862-0.0126-0.05263-0.17425-0.3462-0.35929-0.65207-1.1553-1.9099-1.5675-2.674-1.8606-3.4486-0.33122-0.8752-0.46343-1.5828-0.53512-2.8641-0.04256-0.76022-0.08516-1.034-0.219-1.4075-0.29087-0.81156-0.98595-1.5024-1.7438-1.7332-0.59421-0.18091-1.1164-0.16461-1.6798 0.0525-0.62661 0.24148-1.1397 0.67344-1.5422 1.2984-0.16902 0.26244-0.32299 0.64564-0.39878 0.99244-0.20223 0.92528-0.04312 2.3044 0.4477 3.8804 0.44692 1.4351 1.2377 3.2433 2.2086 5.0502 0.34793 0.64753 0.76486 1.3754 0.85307 1.4893 0.0811 0.10476 0.23428 0.20096 0.34891 0.2191zm-9.2253-5.311c0.38255 0.01672 0.79518-0.01797 1.1069-0.09306 0.96367-0.23201 1.859-0.95559 2.5782-2.0836 0.43234-0.67803 0.61324-1.1963 0.92834-2.6595 0.31008-1.4398 0.55806-2.108 0.98311-2.6488 0.47076-0.59903 1.1963-1.0012 2.0771-1.1513 0.66671-0.11367 1.294-0.03868 1.9131 0.22861 0.62209 0.26857 1.0925 0.66798 1.4784 1.2553 0.4904 0.74639 0.71434 1.5561 0.77563 2.8043 0.01759 0.35782 0.05357 0.77208 0.08 0.92052 0.18293 1.0278 0.75909 2.3534 1.5664 3.6039 0.24232 0.37533 0.31933 0.46184 0.46875 0.5263 0.43608 0.18814 0.91622-0.23331 0.77217-0.67777-0.0201-0.06184-0.12002-0.24043-0.2221-0.39665-0.73924-1.1315-1.2797-2.346-1.45-3.2582-0.02163-0.11596-0.04362-0.3497-0.04885-0.51951-0.03427-1.1105-0.1553-1.8237-0.43533-2.5656-0.44792-1.1867-1.1858-2.0504-2.2384-2.6201-0.99951-0.54102-2.29-0.65044-3.4785-0.29503-1.4298 0.42761-2.4065 1.3749-2.9167 2.8289-0.16074 0.45812-0.26586 0.85464-0.44768 1.6887-0.20932 0.96009-0.28272 1.2298-0.45173 1.6602-0.13122 0.33406-0.1782 0.42813-0.32442 0.64921-0.52394 0.79215-1.0196 1.2571-1.586 1.4879-0.31487 0.12831-0.6037 0.17233-1.0677 0.16276-0.38419-0.0079-0.47613 0.01004-0.60836 0.11906-0.19568 0.16133-0.26444 0.42085-0.17132 0.64656 0.1109 0.26881 0.29594 0.36836 0.71896 0.38683zm11.409 4.6884c0.13571-0.0038 0.25837-0.05352 0.3839-0.15551 0.08765-0.0712 0.17744-0.30647 0.16783-0.43983-0.01044-0.14464-0.04186-0.21208-0.29848-0.64119-1.2696-2.1227-2.263-4.4231-2.7037-6.2609-0.17364-0.72401-0.25848-1.2758-0.29395-1.9115-0.02051-0.36781-0.03345-0.4419-0.09406-0.5392-0.05715-0.09162-0.09905-0.12708-0.22402-0.1896-0.10077-0.05065-0.18753-0.07494-0.24924-0.07766-0.31463-0.0034-0.56818 0.23926-0.59035 0.56488-0.01141 0.16724 0.02873 0.76835 0.07343 1.1005 0.29921 2.223 1.3921 5.0313 3.0524 7.844 0.1505 0.25495 0.30991 0.50001 0.35425 0.54459 0.11193 0.11244 0.25293 0.16647 0.42189 0.16171zm-11.986-6.5601c0.15513-0.0085 0.7254-0.23129 1.1338-0.44296 0.50582-0.26217 0.99002-0.62261 1.2898-0.96016 0.25967-0.29238 0.37758-0.48272 0.55493-0.8958 0.19377-0.45181 0.23605-0.58978 0.56724-1.8596 0.33658-1.2905 0.42316-1.5727 0.63011-2.054 0.19952-0.46391 0.30604-0.63085 0.59574-0.93358 0.1835-0.19173 0.5353-0.49777 0.76595-0.6663 0.6601-0.48234 1.5681-0.86621 2.3386-0.98878 1.7823-0.28343 3.8507 0.4641 4.9726 1.7971 0.33769 0.40124 0.60277 0.8481 0.83178 1.4022 0.26459 0.64013 0.4098 1.2337 0.57839 2.3641 0.08844 0.59316 0.18398 1.0103 0.33202 1.4495 0.23828 0.70703 0.71566 1.5574 0.96494 1.7188 0.19547 0.12675 0.51182 0.09788 0.6885-0.06245 0.04686-0.04257 0.1076-0.13046 0.13757-0.19924 0.09408-0.21526 0.06557-0.40665-0.09182-0.61845-0.15655-0.21073-0.379-0.62987-0.5107-0.96225-0.21084-0.53211-0.29469-0.89098-0.43706-1.8707-0.24775-1.7048-0.7719-2.979-1.64-3.9868-0.5818-0.67537-1.2179-1.1528-2.0798-1.5612-1.5132-0.71696-3.1229-0.87211-4.6541-0.4487-1.2026 0.33257-2.4985 1.1653-3.2699 2.1011-0.2639 0.32018-0.33772 0.44992-0.58817 1.0338-0.2667 0.62238-0.31757 0.7837-0.66165 2.1096-0.39887 1.537-0.5291 1.9085-0.78392 2.2368-0.30702 0.39548-0.84862 0.75787-1.6144 1.0803-0.4511 0.1899-0.54057 0.25118-0.61347 0.42014-0.1705 0.39519 0.13029 0.82137 0.56294 0.79764zm0.43824-2.2042c0.12792 0.01457 0.26944-0.0193 0.38122-0.09174 0.1604-0.10391 0.2304-0.25776 0.32378-0.71172 0.36082-1.7534 0.99592-3.2956 1.8105-4.3966 0.1586-0.21436 0.25407-0.32491 0.47435-0.54927 0.26532-0.27023 0.32085-0.47775 0.19892-0.74355-0.16247-0.35432-0.59739-0.43509-0.91529-0.17011-0.2447 0.20398-0.64857 0.69478-0.95952 1.166-0.68195 1.0335-1.2549 2.408-1.6092 3.8605-0.12023 0.49286-0.21578 0.98765-0.21184 1.097 0.0095 0.26346 0.2399 0.50863 0.50704 0.53948zm16.337-0.68842c0.25425 0.03711 0.47513-0.08294 0.5979-0.32507 0.08605-0.16968 0.0812-0.26478-0.05009-0.99118-0.24228-1.3404-0.6524-2.6499-1.0811-3.4521-0.69967-1.3093-1.7002-2.3293-3.0737-3.1338-0.3821-0.22399-1.3083-0.64576-1.7062-0.77733-1.6349-0.54029-3.3483-0.56468-5.1567-0.0735-0.77709 0.21108-2.0891 0.77233-2.5451 1.0887-0.25544 0.17724-0.33828 0.45464-0.21414 0.71704 0.1403 0.29655 0.42671 0.41264 0.71864 0.29153 0.08353-0.03469 0.29102-0.14003 0.46108-0.23404 0.37523-0.20746 1.324-0.5911 1.7822-0.72056 1.9402-0.54832 3.7317-0.43383 5.375 0.34348 1.3848 0.65481 2.3447 1.4592 3.0522 2.5565 0.57394 0.89026 0.9667 2.0271 1.2464 3.6076 0.13882 0.78449 0.13945 0.78691 0.23262 0.89389 0.11277 0.12954 0.21243 0.18717 0.36099 0.20891zm0.93512-3.8873c0.27789-0.0012 0.52682-0.20066 0.57595-0.46148 0.03101-0.16464-0.02799-0.40436-0.21737-0.88331-0.54924-1.3891-1.5162-2.6509-2.7914-3.6424-1.1419-0.88795-2.6384-1.5867-4.1731-1.9486-0.9897-0.23339-2.1705-0.31635-3.1863-0.22387-0.48554 0.04422-1.2062 0.16989-1.683 0.29352-0.40251 0.10436-0.53298 0.18755-0.62205 0.39648-0.15233 0.35727 0.10157 0.7732 0.48654 0.79705 0.05193 0.00329 0.27417-0.038042 0.49386-0.091703 0.96171-0.23495 1.8364-0.3216 2.7157-0.26906 1.9343 0.11559 3.9719 0.89906 5.4245 2.0856 1.1132 0.90938 1.99 2.1404 2.376 3.3363 0.07189 0.22271 0.13323 0.36201 0.18406 0.41799 0.08942 0.0985 0.29535 0.19415 0.41677 0.19355z" fill="#5c5c5c" stroke-width=".26458"/><path d="m21.734 6.9926v23.812h-5.782c-3.3921 0-6.1242-2.5747-6.1242-5.7712v-12.27c0-3.1966 2.7321-5.7712 6.1242-5.7712z" fill="url(#linearGradient3865)" opacity=".6" stroke-width="0"/><path d="m27.869 6.9926c3.1966 0 5.7712 2.5747 5.7712 5.7712v12.27c0 3.1966-2.5747 5.7712-5.7712 5.7712h-6.135v-23.812z" fill="#f00" opacity=".6" stroke-width="0"/></g><rect x="9.5628" y="6.728" width="24.342" height="24.342" rx="5.77" ry="5.77" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.0583"/></g></svg>