diff --git a/scripts/manifests/thunderbirdmanifest.json b/scripts/manifests/thunderbirdmanifest.json
index a7974b0..0478ce8 100644
--- a/scripts/manifests/thunderbirdmanifest.json
+++ b/scripts/manifests/thunderbirdmanifest.json
@@ -2,7 +2,7 @@
   "manifest_version": 2,
   "name": "__MSG_extensionName__",
   "short_name": "__MSG_extensionNameShort__",
-  "version": "0.1",
+  "version": "0.5",
   "author": "Teal Dulcet, rugk",
 
   "description": "__MSG_extensionDescription__",
@@ -45,7 +45,7 @@
   "applications": {
     "gecko": {
       "id": "unicodify@rugk.github.io",
-      "strict_min_version": "78.0"
+      "strict_min_version": "87.0"
     }
   }
 }
diff --git a/src/content_scripts/autocorrect.js b/src/content_scripts/autocorrect.js
index 1fa9d3b..274b9ec 100644
--- a/src/content_scripts/autocorrect.js
+++ b/src/content_scripts/autocorrect.js
@@ -47,10 +47,6 @@ let symbolpatterns = null;
 // Exceptions, do not autocorrect for these patterns
 let antipatterns = null;
 
-// Thunderbird
-// https://bugzilla.mozilla.org/show_bug.cgi?id=1641573
-const IS_THUNDERBIRD = typeof messenger !== "undefined";
-
 // Chrome
 // Adapted from: https://github.com/mozilla/webextension-polyfill/blob/master/src/browser-polyfill.js
 const IS_CHROME = Object.getPrototypeOf(browser) !== Object.prototype;
@@ -63,7 +59,7 @@ const IS_CHROME = Object.getPrototypeOf(browser) !== Object.prototype;
  */
 function getCaretPosition(target) {
     // ContentEditable elements
-    if (target.isContentEditable || IS_THUNDERBIRD) {
+    if (target.isContentEditable || document.designMode === "on") {
         target.focus();
         const _range = document.getSelection().getRangeAt(0);
         if (!_range.collapsed) {
diff --git a/src/options/modules/ManualAdjustments.js b/src/options/modules/ManualAdjustments.js
index 9155847..4e4a4e1 100644
--- a/src/options/modules/ManualAdjustments.js
+++ b/src/options/modules/ManualAdjustments.js
@@ -10,7 +10,7 @@ import { getBrowserValue } from "/common/modules/BrowserCompat.js";
 export function init() {
     getBrowserValue({
         firefox: "https://addons.mozilla.org/firefox/addon/awesome-emoji-picker/?utm_source=unicodify-addon&utm_medium=addon&utm_content=unicodify-addon-settings-inline&utm_campaign=unicodify-addon-settings-inline",
-        thunderbird: "https://addons.thunderbird.net/thunderbird/addon/awesome-emoji-picker/reviews/?utm_source=unicodify-addon&utm_medium=addon&utm_content=unicodify-addon-settings-inline&utm_campaign=unicodify-addon-settings-inline",
+        thunderbird: "https://addons.thunderbird.net/thunderbird/addon/awesome-emoji-picker/?utm_source=unicodify-addon&utm_medium=addon&utm_content=unicodify-addon-settings-inline&utm_campaign=unicodify-addon-settings-inline",
         chrome: "https://chrome.google.com/webstore/detail/awesome-emoji-picker/",
     }).then((browserUrl) => {
         document.getElementById("link-awesome-emoji").href = browserUrl;