diff --git a/_includes/sections/browser-addons.html b/_includes/sections/browser-addons.html
index 3c3245bc..1628bac6 100644
--- a/_includes/sections/browser-addons.html
+++ b/_includes/sections/browser-addons.html
@@ -74,12 +74,52 @@ firefox="https://addons.mozilla.org/en-US/firefox/addon/torproject-snowflake"
 chrome="https://chrome.google.com/webstore/detail/snowflake/mafpmfcccpbjnhfhjnllmmalhifmlcie"
 %}
 
-<h2>For Advanced Users</h2>
+<h2>Persistent storage management</h2>
+
+<h3>Desktop</h3>
 
 <div class="alert alert-warning" role="alert">
-  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.
+  These add-ons are the preferred method for controlling persistent storage data that various websites and web-apps may create on your computer.
 </div>
 
+{% include cardv2.html
+title="Temporary Containers"
+image="/assets/img/svg/3rd-party/temporary_containers.svg"
+image-dark="/assets/img/svg/3rd-party/temporary_containers-dark.svg"
+description="<strong>Temporary Containers</strong> allow you to open tabs, websites, and links in automatically managed disposable containers. Containers isolate data websites store (cookies, storage, and more) from each other, enhancing your privacy and security while you browse: <a href=https://medium.com/@stoically/enhance-your-privacy-in-firefox-with-temporary-containers-33925cd6cd21>Enhance your privacy in Firefox with Temporary Containers.</a>"
+website="https://addons.mozilla.org/firefox/addon/temporary-containers/"
+privacy-policy="https://addons.mozilla.org/firefox/addon/temporary-containers/privacy/"
+forum=""
+github="https://github.com/stoically/temporary-containers"
+firefox="https://addons.mozilla.org/firefox/addon/temporary-containers/"
+%}
+
+{% include cardv2.html
+title="Firefox Multi-Account Containers"
+image="/assets/img/svg/3rd-party/firefox_multi_account_containers.svg"
+description="<strong>Firefox Multi-Account Containers</strong> allow you to create containers for specific websites. These containers are isolated from eachother. This add-on can be used in conjunctiuon with Temporary Containers to allow persistent logins to websites you specify."
+website="https://support.mozilla.org/kb/containers"
+forum=""
+github="https://github.com/mozilla/multi-account-containers"
+firefox="https://addons.mozilla.org/firefox/addon/multi-account-containers/"
+%}
+
+<h3>Android</h3>
+
+<div class="alert alert-warning" role="alert">
+  Unfortunately the Android version of Firefox <a href="https://bugzilla.mozilla.org/show_bug.cgi?id=1398097">doesn't support managing tabs as containers</a>. The recommended extensions below are a substitute, however as APIs do not exist for clearing <a href="https://en.wikipedia.org/wiki/Indexed_Database_API">IndexedDB</a>, <a href="https://en.wikipedia.org/wiki/Progressive_web_application#Service_workers">Service Workers</a> cache, <a href="https://en.wikipedia.org/wiki/Progressive_web_application#AppCache_(obsolete)">appCache</a>, or cache by host. As a result they are not as good as the above Temporary Container suggestions.
+</div>
+
+{% include cardv2.html
+title="ETag Stoppa"
+image="/assets/img/svg/3rd-party/etag_stoppa.svg"
+description="<strong>ETag Stoppa</strong> Prevents Firefox from storing entity tags by removing ETag response headers unconditionally and without exceptions."
+website="https://addons.mozilla.org/firefox/addon/etag-stoppa/"
+forum=""
+github="https://github.com/claustromaniac/etag-stoppa"
+firefox="https://addons.mozilla.org/firefox/addon/etag-stoppa/"
+%}
+
 {% include cardv2.html
 title="Cookie AutoDelete: Automatically Delete Cookies"
 image="/assets/img/png/3rd-party/cookie_autodelete.png"
@@ -91,6 +131,12 @@ firefox="https://addons.mozilla.org/en-US/firefox/addon/cookie-autodelete"
 chrome="https://chrome.google.com/webstore/detail/cookie-autodelete/fhcgjolkccmbidfldomjliifgaodjagh"
 %}
 
+<h2>For Advanced Users</h2>
+
+<div class="alert alert-warning" role="alert">
+  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="uMatrix: Stop Cross-Site Requests"
 image="/assets/img/png/3rd-party/umatrix.png"
diff --git a/assets/img/svg/3rd-party/etag_stoppa.svg b/assets/img/svg/3rd-party/etag_stoppa.svg
new file mode 100644
index 00000000..69cf0ce6
--- /dev/null
+++ b/assets/img/svg/3rd-party/etag_stoppa.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"><path d="m32.638 23.419-9.1858 9.2052-13.004 0.013762-9.2052-9.1858-0.013762-13.004 9.1858-9.2052 13.004-0.013762 9.2052 9.1858z" fill="#ad0006" stroke="#fff" stroke-linejoin="round" stroke-width="1.3229" style="paint-order:stroke fill markers"/><g fill="#fff" stroke-width=".40382" aria-label="ETAG"><path d="m2.3735 10.549h5.5368v2.5555h-2.2163v2.4214h2.0743v2.4293h-2.0743v2.8078h2.4371v2.5555h-5.7577z"/><path d="m15.561 10.549v2.5555h-1.9718v10.214h-3.3205v-10.214h-1.9639v-2.5555z"/><path d="m21.405 10.549 1.9008 12.769h-3.3994l-0.16563-2.2952h-1.191l-0.19718 2.2952h-3.4388l1.6879-12.769zm-1.7588 8.2106q-0.25239-2.169-0.50478-5.3554-0.50478 3.6597-0.63098 5.3554z"/><path d="m31.493 15.249h-3.3205v-1.1594q0-1.0963-0.09465-1.3724-0.09465-0.27605-0.44957-0.27605-0.3076 0-0.41802 0.23662-0.11042 0.23662-0.11042 1.2146v6.1284q0 0.85971 0.11042 1.1358 0.11042 0.26816 0.44168 0.26816 0.36281 0 0.48901-0.3076 0.13408-0.3076 0.13408-1.1989v-1.5143h-0.67041v-1.9403h3.8884v6.854h-2.0901l-0.3076-0.91492q-0.33915 0.59154-0.85971 0.89126-0.51267 0.29183-1.2146 0.29183-0.83604 0-1.5696-0.40225-0.72562-0.41014-1.1042-1.0096-0.37859-0.59943-0.47323-1.2541-0.09465-0.66253-0.09465-1.9797v-3.7937q0-1.8298 0.19718-2.658 0.19718-0.82816 1.1279-1.5143 0.93858-0.69408 2.4214-0.69408 1.4591 0 2.4214 0.59943t1.2541 1.4276q0.29183 0.82027 0.29183 2.3898z"/></g></svg>
diff --git a/assets/img/svg/3rd-party/firefox_multi_account_containers.svg b/assets/img/svg/3rd-party/firefox_multi_account_containers.svg
new file mode 100644
index 00000000..c3c72cf5
--- /dev/null
+++ b/assets/img/svg/3rd-party/firefox_multi_account_containers.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"><defs><linearGradient id="a" x2="500" y2="500" gradientUnits="userSpaceOnUse"><stop stop-color="#3186c7" offset="0"/><stop stop-color="#4c5eb0" offset="1"/></linearGradient></defs><g transform="scale(.067733)"><path d="m0 0h500v500h-500z" fill="url(#a)"/><path d="m393.32 106.68v-52.802c0-12.498-10.132-22.629-22.629-22.629-12.498 0-22.629 10.131-22.629 22.629v52.802h-52.802c-12.498 0-22.629 10.131-22.629 22.629 0 12.498 10.131 22.629 22.629 22.629h52.802v52.802c0 12.498 10.132 22.629 22.629 22.629 12.498 0 22.629-10.131 22.629-22.629v-52.802h52.802c12.498 0 22.629-10.131 22.629-22.629 0-12.498-10.132-22.629-22.629-22.629zm-362.07 194.89c0-15.982 12.868-28.938 28.938-28.938h138.24c15.982 0 28.938 12.868 28.938 28.938v138.24c0 15.982-12.868 28.938-28.938 28.938h-138.24c-15.982 0-28.938-12.868-28.938-28.938zm241.38 0c0-15.982 12.868-28.938 28.938-28.938h138.24c15.982 0 28.938 12.868 28.938 28.938v138.24c0 15.982-12.868 28.938-28.938 28.938h-138.24c-15.982 0-28.938-12.868-28.938-28.938zm-241.38-241.38c0-15.982 12.868-28.938 28.938-28.938h138.24c15.982 0 28.938 12.868 28.938 28.938v138.24c0 15.982-12.868 28.938-28.938 28.938h-138.24c-15.982 0-28.938-12.868-28.938-28.938z" fill="#ebf0f8" stroke-width="29.167"/></g></svg>
diff --git a/assets/img/svg/3rd-party/temporary_containers-dark.svg b/assets/img/svg/3rd-party/temporary_containers-dark.svg
new file mode 100644
index 00000000..0991ebcc
--- /dev/null
+++ b/assets/img/svg/3rd-party/temporary_containers-dark.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"><g fill="#fff"><path d="m10.059 2.6825-2.1795-2.5149-7.7122 6.371 2.1795 2.5149zm23.64 3.8561-7.7122-6.5386-2.1795 2.5149 7.7122 6.5386zm-16.766-2.8502c-8.3828 0-15.089 6.7063-15.089 15.089s6.7063 15.089 15.089 15.089c8.3828 0 15.089-6.7063 15.089-15.089s-6.7063-15.089-15.089-15.089zm0 26.825c-6.5386 0-11.736-5.1974-11.736-11.736s5.1974-11.736 11.736-11.736c6.5386 0 11.736 5.1974 11.736 11.736s-5.1974 11.736-11.736 11.736zm1.6766-18.442h-3.3531v5.0297h-5.0297v3.3531h5.0297v5.0297h3.3531v-5.0297h5.0297v-3.3531h-5.0297z" fill-rule="evenodd" stroke-width="1.6766"/><path d="m15.008 33.713c-5.0456-0.64895-9.4614-3.8378-11.644-8.4085-1.9677-4.1212-1.9644-8.9637 0.008894-13.053 0.73828-1.5298 1.5335-2.6803 2.6994-3.9055 5.0082-5.2627 13.194-6.1307 19.29-2.0454 5.0399 3.3779 7.524 9.4838 6.3115 15.513-1.0007 4.9758-4.5419 9.1656-9.2983 11.001-1.0333 0.39877-2.2173 0.70467-3.3513 0.86587-0.86505 0.12297-3.1655 0.14112-4.0163 0.03169zm4.2738-3.3964c5.8515-1.1902 9.8262-6.4603 9.3732-12.428-0.0844-1.1118-0.2386-1.888-0.57834-2.911-0.57626-1.7353-1.479-3.1814-2.8273-4.529-1.7714-1.7706-3.8506-2.8459-6.3175-3.2673-0.8001-0.13667-1.1484-0.15416-2.3726-0.11912-1.5785 0.04518-2.4375 0.19986-3.737 0.67295-5.6372 2.0523-8.7688 8.0784-7.2782 14.005 1.1622 4.6211 5.03 8.0479 9.8408 8.7187 0.8176 0.11402 3.034 0.03291 3.8969-0.14259z" stroke-width=".13229"/></g></svg>
diff --git a/assets/img/svg/3rd-party/temporary_containers.svg b/assets/img/svg/3rd-party/temporary_containers.svg
new file mode 100644
index 00000000..aa699686
--- /dev/null
+++ b/assets/img/svg/3rd-party/temporary_containers.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"><g transform="translate(3.698 25.515)"><path d="m6.3614-22.832-2.1795-2.5149-7.7122 6.371 2.1795 2.5149zm23.64 3.8561-7.7122-6.5386-2.1795 2.5149 7.7122 6.5386zm-16.766-2.8502c-8.3828 0-15.089 6.7063-15.089 15.089 0 8.3828 6.7063 15.089 15.089 15.089 8.3828 0 15.089-6.7063 15.089-15.089 0-8.3828-6.7063-15.089-15.089-15.089zm0 26.825c-6.5386 0-11.736-5.1974-11.736-11.736 0-6.5386 5.1974-11.736 11.736-11.736 6.5386 0 11.736 5.1974 11.736 11.736 0 6.5386-5.1974 11.736-11.736 11.736zm1.6766-18.442h-3.3531v5.0297h-5.0297v3.3531h5.0297v5.0297h3.3531v-5.0297h5.0297v-3.3531h-5.0297z" fill-rule="evenodd" stroke-width="1.6766"/><path d="m11.31 8.1983c-5.0456-0.64895-9.4614-3.8378-11.644-8.4085-1.9677-4.1212-1.9644-8.9637 0.008894-13.053 0.73828-1.5298 1.5335-2.6803 2.6994-3.9055 5.0082-5.2627 13.194-6.1307 19.29-2.0454 5.0399 3.3779 7.524 9.4838 6.3115 15.513-1.0007 4.9758-4.5419 9.1656-9.2983 11.001-1.0333 0.39877-2.2173 0.70467-3.3513 0.86587-0.86505 0.12297-3.1655 0.14112-4.0163 0.031695zm4.2738-3.3964c5.8515-1.1902 9.8262-6.4603 9.3732-12.428-0.0844-1.1118-0.2386-1.888-0.57834-2.911-0.57626-1.7353-1.479-3.1814-2.8273-4.529-1.7714-1.7706-3.8506-2.8459-6.3175-3.2673-0.8001-0.13667-1.1484-0.15416-2.3726-0.11912-1.5785 0.04518-2.4375 0.19986-3.737 0.67295-5.6372 2.0523-8.7688 8.0784-7.2782 14.005 1.1622 4.6211 5.03 8.0479 9.8408 8.7187 0.8176 0.11401 3.034 0.032915 3.8969-0.14259z" stroke-width=".13229"/></g></svg>