diff --git a/Appendix-B:-Firefox-Add-ons.md b/Appendix-B:-Firefox-Add-ons.md
index 1509742..e28f032 100644
--- a/Appendix-B:-Firefox-Add-ons.md
+++ b/Appendix-B:-Firefox-Add-ons.md
@@ -33,17 +33,17 @@ These are all, where applicable, best configured to `deny-all` and whitelist.
 * :green_heart: [Decentraleyes](https://addons.mozilla.org/firefox/addon/decentraleyes/) | [GitHub](https://github.com/Synzvato/decentraleyes) | [Web Extension](https://github.com/Synzvato/decentraleyes/tree/experimental)
 * :green_heart: [CanvasBlocker](https://addons.mozilla.org/firefox/addon/canvasblocker/) | [GitHub](https://github.com/kkapsner/CanvasBlocker) | [Web Extension](https://github.com/kkapsner/CanvasBlocker/issues/112)
 * :green_heart: [HTTPS Everywhere](https://addons.mozilla.org/firefox/addon/https-everywhere/) | [GitHub](https://github.com/EFForg/https-everywhere)
-* :purple_heart: [HTTPS by default](https://addons.mozilla.org/firefox/addon/https-by-default/) | [GitHub](https://github.com/Rob--W/https-by-default) | [Web Extension](https://github.com/Rob--W/https-by-default/issues/12) & [Bugzilla](https://bugzilla.mozilla.org/show_bug.cgi?id=1370388)
+* :purple_heart: [HTTPS by default](https://addons.mozilla.org/firefox/addon/https-by-default/) | [GitHub](https://github.com/Rob--W/https-by-default) | [Web Extension](https://github.com/Rob--W/https-by-default/issues/12) & [1370388](https://bugzilla.mozilla.org/show_bug.cgi?id=1370388)
   * changes the behavior for schemeless URLs typed in the location bar
-* :purple_heart: [Cookie Controller](https://addons.mozilla.org/firefox/addon/cookie-controller/) <sup>1</sup> | [Web Extension](http://forums.mozillazine.org/viewtopic.php?p=14752435&sid=d2aab789f2ab81917c1c9eb46236e940#p14752435) & [Bugzilla](https://bugzilla.mozilla.org/show_bug.cgi?id=1356277)
 * :purple_heart: [Greasemonkey](https://addons.mozilla.org/firefox/addon/greasemonkey/) | [GitHub](https://github.com/greasemonkey/greasemonkey) | [Web Extension](https://github.com/greasemonkey/greasemonkey/milestones)
   * Allows you to run [User Scripts](https://github.com/ghacksuserjs/ghacks-user.js/wiki/3.1-User-Scripts) which can do neat things
 * :purple_heart: [QuickJava](https://addons.mozilla.org/firefox/addon/quickjava/) | [GitHub](https://github.com/ThatOneGuyDotNet/QuickJava) | [Web Extension](https://github.com/ThatOneGuyDotNet/QuickJava/issues/44)
   * Configurable toggle buttons for JS, ~~Java~~, Flash, images and more
 * [Pure URL](https://addons.mozilla.org/firefox/addon/pure-url/)
    * Started to break in various ways since 53.02 (review) and definitely 54 (Thorin)
+* :broken_heart: [Cookie Controller](https://addons.mozilla.org/firefox/addon/cookie-controller/) <sup>1</sup> | [Web Extension](http://forums.mozillazine.org/viewtopic.php?p=14752435&sid=d2aab789f2ab81917c1c9eb46236e940#p14752435) & [1356277](https://bugzilla.mozilla.org/show_bug.cgi?id=1356277), [1329745](https://bugzilla.mozilla.org/show_bug.cgi?id=1329745), [1333050](https://bugzilla.mozilla.org/show_bug.cgi?id=1333050), [1340511](https://bugzilla.mozilla.org/show_bug.cgi?id=1340511)
 * :broken_heart: [No Resource URI Leak](https://addons.mozilla.org/firefox/addon/no-resource-uri-leak/) | [Cannot be ported to WE](https://addons.mozilla.org/firefox/addon/no-resource-uri-leak/reviews/860958/)
-  * note: FF53+ [issue #89](https://github.com/ghacksuserjs/ghacks-user.js/issues/89), FF55+ [stopped working](https://notabug.org/desktopd/no-resource-uri-leak/issues/14), FF57+ cannot be ported but see bugzilla [863246](https://bugzilla.mozilla.org/show_bug.cgi?id=863246)
+  * note: FF53+ [issue #89](https://github.com/ghacksuserjs/ghacks-user.js/issues/89), FF55+ [stopped working](https://notabug.org/desktopd/no-resource-uri-leak/issues/14), FF57+ cannot be ported but see [863246](https://bugzilla.mozilla.org/show_bug.cgi?id=863246)
 * :pushpin: [Self-Destructing Cookies](https://addons.mozilla.org/firefox/addon/self-destructing-cookies/) <sup>1</sup>
 * :pushpin: :triangular_flag_on_post: [Smart Referer](https://addons.mozilla.org/firefox/addon/smart-referer/)
   * [WebExtension](https://github.com/meh/smart-referer/tree/wext) under development
@@ -55,7 +55,7 @@ These are all, where applicable, best configured to `deny-all` and whitelist.
 
 These add-ons will not mask or alter any data sent or received, but may be useful depending on your needs
 
-* :broken_heart: [SSleuth](https://addons.mozilla.org/firefox/addon/ssleuth/) | [GitHub](https://github.com/sibiantony/ssleuth) | [Web Extension not likely](https://github.com/sibiantony/ssleuth/issues/78) & [Bugzilla](https://bugzilla.mozilla.org/show_bug.cgi?id=1322748)
+* :broken_heart: [SSleuth](https://addons.mozilla.org/firefox/addon/ssleuth/) | [GitHub](https://github.com/sibiantony/ssleuth) | [Web Extension not likely](https://github.com/sibiantony/ssleuth/issues/78) & [1322748](https://bugzilla.mozilla.org/show_bug.cgi?id=1322748)
    * Visual urlbar color/rating and one-click information on ciphers, PFS, SSL/TLS and CAs
 * [SSLPersonas](https://addons.mozilla.org/firefox/addon/sslpersonas/) | [GitHub](https://github.com/SSLPersonas/SSLPersonas) | [Website](https://sslpersonas.tobitobi.de/)
    * An alternative to SSleuth, changes Firefox's (lightweight) theme according to the security status of the currently opened web site