diff --git a/gluon b/gluon
index f0ee728..ba2989b 160000
--- a/gluon
+++ b/gluon
@@ -1 +1 @@
-Subproject commit f0ee728d0fe02c52985cf5f3ec6273514d218d9d
+Subproject commit ba2989bfa64b01e7d8b837fc78ce0bb2ef17926d
diff --git a/gluon.json b/gluon.json
index feaf695..3cf2b08 100644
--- a/gluon.json
+++ b/gluon.json
@@ -12,16 +12,24 @@
   },
   "addons": {
     "ublock": {
+      "platform": "github",
       "id": "uBlock0@raymondhill.net",
-      "url": "https://github.com/gorhill/uBlock/releases/download/1.43.0/uBlock0_1.43.0.firefox.signed.xpi"
+      "repo": "gorhill/uBlock",
+      "version": "1.43.0",
+      "fileGlob": "uBlock0_*.firefox.signed.xpi"
     },
     "tabliss": {
+      "platform": "amo",
       "id": "extension@tabliss.io",
-      "url": "https://addons.mozilla.org/firefox/downloads/file/3940751/tabliss-2.6.0.xpi"
+      "amoId": "850407",
+      "version": "2.6.0"
     },
     "firepicker": {
       "id": "fire-picker@browser.fushra.com",
-      "url": "https://github.com/pulse-browser/fire-picker/releases/download/v1.1.0/release.zip"
+      "platform": "github",
+      "repo": "pulse-browser/fire-picker",
+      "version": "v1.1.2",
+      "fileGlob": "release.zip"
     }
   },
   "brands": {
@@ -78,10 +86,8 @@
     }
   },
   "license": {
-    "ignoredFiles": [
-      ".*\\.json"
-    ],
+    "ignoredFiles": [".*\\.json"],
     "licenseType": "MPL-2.0"
   },
   "updateHostname": "updates.pulsebrowser.app"
-}
\ No newline at end of file
+}