diff --git a/.gitignore b/.gitignore
index 09e0ce2..44170d1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,4 +3,6 @@ web-ext-artifacts/
nod
node_modules
package-lock.json
-.vscode
\ No newline at end of file
+.vscode
+src/pages/options/index.html
+src/pages/popup/popup.html
diff --git a/.prettierignore b/.prettierignore
index e10fcaa..d789b74 100644
--- a/.prettierignore
+++ b/.prettierignore
@@ -5,7 +5,5 @@ node_modules
package-lock.json
src/instances/data.json
src/instances/blacklist.json
-src/pages/options/*.html
-src/pages/popup/*.html
src/_locales/
.vscode
diff --git a/README.md b/README.md
index 72074f7..099717a 100644
--- a/README.md
+++ b/README.md
@@ -71,11 +71,11 @@ npm update
npm install
```
-If you are modifying `config.json` or any files ending with .ejs, you need to run the following command to render html:
-
+To generate html that uses `config.json` (needed to develop/build the extention), run:
```
npm run ejs
```
+Afterwards, you will need to run it if you modify `config.json` or any files ending with .ejs.
### Build the extention zip archive:
diff --git a/package.json b/package.json
index 01db7c3..7df440f 100644
--- a/package.json
+++ b/package.json
@@ -10,7 +10,7 @@
"build": "web-ext build",
"test": "web-ext lint",
"instances": "python3 src/instances/get_instances.py && git update-index --assume-unchanged src/instances/blacklist.json src/instances/data.json",
- "ejs": "npx ejs src/pages/options/index.ejs -f src/config/config.json -o src/pages/options/index.html && npx ejs src/pages/popup/popup.ejs -f src/config/config.json -o src/pages/popup/popup.html"
+ "ejs": "ejs src/pages/options/index.ejs -f src/config/config.json -o src/pages/options/index.html && ejs src/pages/popup/popup.ejs -f src/config/config.json -o src/pages/popup/popup.html && prettier -w src/pages/options/index.html src/pages/popup/popup.html"
},
"repository": {
"type": "git",
diff --git a/src/pages/options/index.html b/src/pages/options/index.html
deleted file mode 100644
index e1c0e38..0000000
--- a/src/pages/options/index.html
+++ /dev/null
@@ -1,3543 +0,0 @@
-
-
-
-
-
-
-
General
-
-
-
-
Theme
-
-
-
-
Network
-
-
-
-
-
Fallback to clearnet if no instances are available for the current network
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Customize Popup
-
-
-
-
-
-
-
Youtube
-
-
-
-
Enable
-
-
-
-
-
Frontend
-
-
-
-
Embed Frontend
-
-
-
-
Redirect Type
-
-
-
-
-
-
-
Default Instances
-
-
-
-
-
Custom Instances
-
-
-
-
-
-
-
-
Default Instances
-
-
-
-
-
Custom Instances
-
-
-
-
-
-
-
Default Instances
-
-
-
-
-
Custom Instances
-
-
-
-
-
-
-
Default Instances
-
-
-
-
-
Custom Instances
-
-
-
-
-
-
-
-
-
-
Default Instances
-
-
-
-
-
Custom Instances
-
-
-
-
-
-
-
-
Default Instances
-
-
-
-
-
Custom Instances
-
-
-
-
-
-
-
Default Instances
-
-
-
-
-
Custom Instances
-
-
-
-
-
-
-
Default Instances
-
-
-
-
-
Custom Instances
-
-
-
-
-
-
-
-
-
-
Default Instances
-
-
-
-
-
Custom Instances
-
-
-
-
-
-
-
-
Default Instances
-
-
-
-
-
Custom Instances
-
-
-
-
-
-
-
Default Instances
-
-
-
-
-
Custom Instances
-
-
-
-
-
-
-
Default Instances
-
-
-
-
-
Custom Instances
-
-
-
-
-
-
-
-
-
-
Default Instances
-
-
-
-
-
Custom Instances
-
-
-
-
-
-
-
-
Default Instances
-
-
-
-
-
Custom Instances
-
-
-
-
-
-
-
Default Instances
-
-
-
-
-
Custom Instances
-
-
-
-
-
-
-
Default Instances
-
-
-
-
-
Custom Instances
-
-
-
-
-
-
-
-
-
-
-
YT Music
-
-
-
-
Enable
-
-
-
-
-
Frontend
-
-
-
-
-
-
-
Default Instances
-
-
-
-
-
Custom Instances
-
-
-
-
-
-
-
-
Default Instances
-
-
-
-
-
Custom Instances
-
-
-
-
-
-
-
Default Instances
-
-
-
-
-
Custom Instances
-
-
-
-
-
-
-
Default Instances
-
-
-
-
-
Custom Instances
-
-
-
-
-
-
-
-
-
-
Default Instances
-
-
-
-
-
Custom Instances
-
-
-
-
-
-
-
-
Default Instances
-
-
-
-
-
Custom Instances
-
-
-
-
-
-
-
Default Instances
-
-
-
-
-
Custom Instances
-
-
-
-
-
-
-
Default Instances
-
-
-
-
-
Custom Instances
-
-
-
-
-
-
-
-
-
-
-
-
Instagram
-
-
-
-
Enable
-
-
-
-
-
-
-
Default Instances
-
-
-
-
-
Custom Instances
-
-
-
-
-
-
-
-
Default Instances
-
-
-
-
-
Custom Instances
-
-
-
-
-
-
-
Default Instances
-
-
-
-
-
Custom Instances
-
-
-
-
-
-
-
Default Instances
-
-
-
-
-
Custom Instances
-
-
-
-
-
-
-
-
-
-
-
TikTok
-
-
-
-
Enable
-
-
-
-
-
-
-
Default Instances
-
-
-
-
-
Custom Instances
-
-
-
-
-
-
-
-
Default Instances
-
-
-
-
-
Custom Instances
-
-
-
-
-
-
-
Default Instances
-
-
-
-
-
Custom Instances
-
-
-
-
-
-
-
Default Instances
-
-
-
-
-
Custom Instances
-
-
-
-
-
-
-
-
-
-
-
Reddit
-
-
-
-
Enable
-
-
-
-
-
Frontend
-
-
-
-
-
-
-
Default Instances
-
-
-
-
-
Custom Instances
-
-
-
-
-
-
-
-
Default Instances
-
-
-
-
-
Custom Instances
-
-
-
-
-
-
-
Default Instances
-
-
-
-
-
Custom Instances
-
-
-
-
-
-
-
Default Instances
-
-
-
-
-
Custom Instances
-
-
-
-
-
-
-
-
-
-
Default Instances
-
-
-
-
-
Custom Instances
-
-
-
-
-
-
-
-
Default Instances
-
-
-
-
-
Custom Instances
-
-
-
-
-
-
-
Default Instances
-
-
-
-
-
Custom Instances
-
-
-
-
-
-
-
Default Instances
-
-
-
-
-
Custom Instances
-
-
-
-
-
-
-
-
-
-
-
Imgur
-
-
-
-
Enable
-
-
-
-
Redirect Type
-
-
-
-
-
-
-
Default Instances
-
-
-
-
-
Custom Instances
-
-
-
-
-
-
-
-
Default Instances
-
-
-
-
-
Custom Instances
-
-
-
-
-
-
-
Default Instances
-
-
-
-
-
Custom Instances
-
-
-
-
-
-
-
Default Instances
-
-
-
-
-
Custom Instances
-
-
-
-
-
-
-
-
-
-
-
Wikipedia
-
-
-
-
Enable
-
-
-
-
-
-
-
Default Instances
-
-
-
-
-
Custom Instances
-
-
-
-
-
-
-
-
Default Instances
-
-
-
-
-
Custom Instances
-
-
-
-
-
-
-
Default Instances
-
-
-
-
-
Custom Instances
-
-
-
-
-
-
-
Default Instances
-
-
-
-
-
Custom Instances
-
-
-
-
-
-
-
-
-
-
-
Medium
-
-
-
-
Enable
-
-
-
-
-
-
-
Default Instances
-
-
-
-
-
Custom Instances
-
-
-
-
-
-
-
-
Default Instances
-
-
-
-
-
Custom Instances
-
-
-
-
-
-
-
Default Instances
-
-
-
-
-
Custom Instances
-
-
-
-
-
-
-
Default Instances
-
-
-
-
-
Custom Instances
-
-
-
-
-
-
-
-
-
-
-
Quora
-
-
-
-
Enable
-
-
-
-
-
-
-
Default Instances
-
-
-
-
-
Custom Instances
-
-
-
-
-
-
-
-
Default Instances
-
-
-
-
-
Custom Instances
-
-
-
-
-
-
-
Default Instances
-
-
-
-
-
Custom Instances
-
-
-
-
-
-
-
Default Instances
-
-
-
-
-
Custom Instances
-
-
-
-
-
-
-
-
-
-
-
IMDb
-
-
-
-
Enable
-
-
-
-
-
-
-
Default Instances
-
-
-
-
-
Custom Instances
-
-
-
-
-
-
-
-
Default Instances
-
-
-
-
-
Custom Instances
-
-
-
-
-
-
-
Default Instances
-
-
-
-
-
Custom Instances
-
-
-
-
-
-
-
Default Instances
-
-
-
-
-
Custom Instances
-
-
-
-
-
-
-
-
-
-
-
Reuters
-
-
-
-
Enable
-
-
-
-
-
-
-
Default Instances
-
-
-
-
-
Custom Instances
-
-
-
-
-
-
-
-
Default Instances
-
-
-
-
-
Custom Instances
-
-
-
-
-
-
-
Default Instances
-
-
-
-
-
Custom Instances
-
-
-
-
-
-
-
Default Instances
-
-
-
-
-
Custom Instances
-
-
-
-
-
-
-
-
-
-
-
Fandom
-
-
-
-
Enable
-
-
-
-
-
-
-
Default Instances
-
-
-
-
-
Custom Instances
-
-
-
-
-
-
-
-
Default Instances
-
-
-
-
-
Custom Instances
-
-
-
-
-
-
-
Default Instances
-
-
-
-
-
Custom Instances
-
-
-
-
-
-
-
Default Instances
-
-
-
-
-
Custom Instances
-
-
-
-
-
-
-
-
-
-
-
PeerTube
-
-
-
-
Enable
-
-
-
-
-
-
-
Default Instances
-
-
-
-
-
Custom Instances
-
-
-
-
-
-
-
-
Default Instances
-
-
-
-
-
Custom Instances
-
-
-
-
-
-
-
Default Instances
-
-
-
-
-
Custom Instances
-
-
-
-
-
-
-
Default Instances
-
-
-
-
-
Custom Instances
-
-
-
-
-
-
-
-
-
-
-
LBRY
-
-
-
-
Enable
-
-
-
-
-
Frontend
-
-
-
-
Embed Frontend
-
-
-
-
Redirect Type
-
-
-
-
-
-
-
Default Instances
-
-
-
-
-
Custom Instances
-
-
-
-
-
-
-
-
Default Instances
-
-
-
-
-
Custom Instances
-
-
-
-
-
-
-
Default Instances
-
-
-
-
-
Custom Instances
-
-
-
-
-
-
-
Default Instances
-
-
-
-
-
Custom Instances
-
-
-
-
-
-
-
-
-
-
-
Search
-
-
-
-
Enable
-
-
-
-
-
Frontend
-
-
-
-
-
-
-
Default Instances
-
-
-
-
-
Custom Instances
-
-
-
-
-
-
-
-
Default Instances
-
-
-
-
-
Custom Instances
-
-
-
-
-
-
-
Default Instances
-
-
-
-
-
Custom Instances
-
-
-
-
-
-
-
Default Instances
-
-
-
-
-
Custom Instances
-
-
-
-
-
-
-
-
-
-
Default Instances
-
-
-
-
-
Custom Instances
-
-
-
-
-
-
-
-
Default Instances
-
-
-
-
-
Custom Instances
-
-
-
-
-
-
-
Default Instances
-
-
-
-
-
Custom Instances
-
-
-
-
-
-
-
Default Instances
-
-
-
-
-
Custom Instances
-
-
-
-
-
-
-
-
-
-
Default Instances
-
-
-
-
-
Custom Instances
-
-
-
-
-
-
-
-
Default Instances
-
-
-
-
-
Custom Instances
-
-
-
-
-
-
-
Default Instances
-
-
-
-
-
Custom Instances
-
-
-
-
-
-
-
Default Instances
-
-
-
-
-
Custom Instances
-
-
-
-
-
-
-
-
-
-
Default Instances
-
-
-
-
-
Custom Instances
-
-
-
-
-
-
-
-
Default Instances
-
-
-
-
-
Custom Instances
-
-
-
-
-
-
-
Default Instances
-
-
-
-
-
Custom Instances
-
-
-
-
-
-
-
Default Instances
-
-
-
-
-
Custom Instances
-
-
-
-
-
-
-
-
-
-
-
Translate
-
-
-
-
Enable
-
-
-
-
-
Frontend
-
-
-
-
-
-
-
Default Instances
-
-
-
-
-
Custom Instances
-
-
-
-
-
-
-
-
Default Instances
-
-
-
-
-
Custom Instances
-
-
-
-
-
-
-
Default Instances
-
-
-
-
-
Custom Instances
-
-
-
-
-
-
-
Default Instances
-
-
-
-
-
Custom Instances
-
-
-
-
-
-
-
-
-
-
Default Instances
-
-
-
-
-
Custom Instances
-
-
-
-
-
-
-
-
Default Instances
-
-
-
-
-
Custom Instances
-
-
-
-
-
-
-
Default Instances
-
-
-
-
-
Custom Instances
-
-
-
-
-
-
-
Default Instances
-
-
-
-
-
Custom Instances
-
-
-
-
-
-
-
-
-
-
Default Instances
-
-
-
-
-
Custom Instances
-
-
-
-
-
-
-
-
Default Instances
-
-
-
-
-
Custom Instances
-
-
-
-
-
-
-
Default Instances
-
-
-
-
-
Custom Instances
-
-
-
-
-
-
-
Default Instances
-
-
-
-
-
Custom Instances
-
-
-
-
-
-
-
-
-
-
-
Maps
-
-
-
-
Enable
-
-
-
-
-
Frontend
-
-
-
-
-
-
-
Default Instances
-
-
-
-
-
Custom Instances
-
-
-
-
-
-
-
-
Default Instances
-
-
-
-
-
Custom Instances
-
-
-
-
-
-
-
Default Instances
-
-
-
-
-
Custom Instances
-
-
-
-
-
-
-
Default Instances
-
-
-
-
-
Custom Instances
-
-
-
-
-
-
-
-
-
-
-
Send Files
-
-
-
-
Enable
-
-
-
-
-
-
-
Default Instances
-
-
-
-
-
Custom Instances
-
-
-
-
-
-
-
-
Default Instances
-
-
-
-
-
Custom Instances
-
-
-
-
-
-
-
Default Instances
-
-
-
-
-
Custom Instances
-
-
-
-
-
-
-
Default Instances
-
-
-
-
-
Custom Instances
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/pages/popup/popup.html b/src/pages/popup/popup.html
deleted file mode 100644
index 6dc4847..0000000
--- a/src/pages/popup/popup.html
+++ /dev/null
@@ -1,281 +0,0 @@
-
-
-
-