diff --git a/src/ext/lib/comms/Comms.js b/src/ext/lib/comms/Comms.js
deleted file mode 100644
index 1c5428b..0000000
--- a/src/ext/lib/comms/Comms.js
+++ /dev/null
@@ -1,31 +0,0 @@
-import Debug from '../../conf/Debug';
-import BrowserDetect from '../../conf/BrowserDetect';
-
-if (process.env.CHANNEL !== 'stable'){
-  console.info("Loading Comms");
-}
-
-class Comms {
-  static async sendMessage(message){
-
-    if(BrowserDetect.firefox){
-      return browser.runtime.sendMessage(message);
-    } else {
-      return new Promise((resolve, reject) => {
-        chrome.runtime.sendMessage(message, function(response){
-          // Chrome/js shittiness mitigation — remove this line and an empty array will be returned
-          var r = response; 
-          resolve(r);
-          return true;
-        });
-      });
-    }
-  }
-
-}
-
-if (process.env.CHANNEL !== 'stable'){
-  console.info("Comms loaded");
-}
-
-export default Comms;
diff --git a/src/ext/lib/comms/Comms.ts b/src/ext/lib/comms/Comms.ts
new file mode 100644
index 0000000..a174d3c
--- /dev/null
+++ b/src/ext/lib/comms/Comms.ts
@@ -0,0 +1,19 @@
+import Debug from '../../conf/Debug';
+import BrowserDetect from '../../conf/BrowserDetect';
+import { browser } from 'webextension-polyfill-ts';
+
+if (process.env.CHANNEL !== 'stable'){
+  console.info("Loading Comms");
+}
+
+class Comms {
+  static async sendMessage(message){
+    browser.runtime.sendMessage(message);
+  }
+}
+
+if (process.env.CHANNEL !== 'stable'){
+  console.info("Comms loaded");
+}
+
+export default Comms;