@@ -7,10 +7,12 @@ import Settings from "../common/Settings.js";
 export default class Addon {
   constructor(info) {
     const { id } = info;
+    const path = document.getElementById("scratch-addons").getAttribute("data-path");
     this.self = {
       id,
-      dir: `${document.getElementById("scratch-addons").getAttribute("data-path")}addons/${id}`,
+      dir: `${path}addons/${id}`,
       browser: typeof InstallTrigger !== "undefined" ? "firefox" : "chrome",
+      lib: `${path}libraries`,
     };
     this.auth = new Auth(this);
     this.account = new Account();
 
@@ -17,7 +17,13 @@
       "url": "userscript.js"
     }
   ],
-  "tags": ["editor", "recommended"],
+  "userstyles": [
+    {
+      "url": "userscript.css",
+      "matches": ["https://scratch.mit.edu/projects/*"]
+    }
+  ],
+  "tags": ["editor", "community", "recommended"],
   "enabledByDefault": true,
   "l10n": true
 }
@@ -0,0 +1,3 @@
+.sa-animated-thumb-input {
+  display: none;
+}
@@ -1,3 +1,5 @@
+import ThumbSetter from "../../libraries/animated-thumb.js";
+
 export default async function ({ addon, global, console, msg }) {
   while (true) {
     let nav = await addon.tab.waitForElement("[class^='menu-bar_main-menu']", {
@@ -25,7 +27,9 @@ export default async function ({ addon, global, console, msg }) {
       thumbcontent.append(thumbspan);
       nav.append(setthumb);
       setthumb.addEventListener("click", function (e) {
-        addon.tab.loadScript("https://worldlanguages.github.io/animatedThumbnailsBookmarklet/code.js");
+        const setter = new ThumbSetter();
+        setter.addFileInput();
+        setter.showInput();
       });
     }
   }
 
@@ -1476,7 +1476,6 @@ export default async function ({ addon, global, console, msg, safeMsg: m }) {
         "beforeend",
         `
                 <div id="s3devToolBar">
-<!--                    <script src="https://cdnjs.cloudflare.com/ajax/libs/mathjs/6.2.1/math.min.js" type="text/javascript"></script>-->
                     <label class='title s3devLabel' id=s3devFindLabel>
                         <span>${m(
                           "find"
 
@@ -23,5 +23,6 @@
   ],
   "tags": ["forums", "community"],
   "enabledByDefault": false,
+  "libraries": ["scratchblocks"],
   "l10n": true
 }
@@ -191,7 +191,7 @@ function appendSearch(box, query, page, term, msg) {
 }
 
 export default async function ({ addon, global, console, msg }) {
-  await addon.tab.loadScript("https://scratchblocks.github.io/js/scratchblocks-v3.5-min.js");
+  await addon.tab.loadScript(addon.self.lib + "/scratchblocks-v3.5-min.js");
   // create the search bar
   let search = document.createElement("form");
   search.id = "forum-search-form";
 
@@ -1,5 +1,5 @@
 export default async function ({ addon, _global, _console }) {
-  await addon.tab.loadScript("https://cdn.jsdelivr.net/npm/moment@2.27.0/moment.min.js");
+  const { default: moment } = await import(addon.self.lib + "/moment.js");
 
   moment.locale(addon.auth.scratchLang == "en" ? "en-gb" : addon.auth.scratchLang);
   const forum_topic_id = parseInt(
 
@@ -1,7 +1,7 @@
 import textFieldEdit from "./text-field-edit.js"; //used for editing the forum text box without messing with the edit history
 
 export default async function ({ addon, global, console, msg, safeMsg }) {
-  await addon.tab.loadScript("https://cdn.jsdelivr.net/npm/js-md5@0.7.3/src/md5.min.js");
+  await addon.tab.loadScript(addon.self.lib + "/md5.min.js");
 
   var projectUpload = false;
   //console.log("use project thumbnails: " + projectUpload); //commented out because spammy in console
 
@@ -17,6 +17,7 @@
     }
   ],
   "tags": ["community"],
+  "libraries": ["linkify"],
   "enabledByDefault": false,
   "l10n": true
 }
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+.sa-animated-thumb-input {`
	`2`	`+ display: none;`
	`3`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -1476,7 +1476,6 @@ export default async function ({ addon, global, console, msg, safeMsg: m }) {`
`1476`	`1476`	`"beforeend",`
`1477`	`1477`	`
`1478`	`1478`	`<div id="s3devToolBar">`
`1479`		`-<!-- <script src="https://cdnjs.cloudflare.com/ajax/libs/mathjs/6.2.1/math.min.js" type="text/javascript"></script>-->`
`1480`	`1479`	`<label class='title s3devLabel' id=s3devFindLabel>`
`1481`	`1480`	`<span>${m(`
`1482`	`1481`	`"find"`
Original file line number	Diff line number	Diff line change
`@@ -23,5 +23,6 @@`
`23`	`23`	`],`
`24`	`24`	`"tags": ["forums", "community"],`
`25`	`25`	`"enabledByDefault": false,`
	`26`	`+ "libraries": ["scratchblocks"],`
`26`	`27`	`"l10n": true`
`27`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -191,7 +191,7 @@ function appendSearch(box, query, page, term, msg) {`
`191`	`191`	`}`
`192`	`192`
`193`	`193`	`export default async function ({ addon, global, console, msg }) {`
`194`		`- await addon.tab.loadScript("https://scratchblocks.github.io/js/scratchblocks-v3.5-min.js");`
	`194`	`+ await addon.tab.loadScript(addon.self.lib + "/scratchblocks-v3.5-min.js");`
`195`	`195`	`// create the search bar`
`196`	`196`	`let search = document.createElement("form");`
`197`	`197`	`search.id = "forum-search-form";`
Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,7 @@`
`17`	`17`	`}`
`18`	`18`	`],`
`19`	`19`	`"tags": ["community"],`
	`20`	`+ "libraries": ["linkify"],`
`20`	`21`	`"enabledByDefault": false,`
`21`	`22`	`"l10n": true`
`22`	`23`	`}`