Converted index.html to ejs

2022-09-18 17:03:54 +01:00 · 2022-09-18 17:03:54 +01:00 · 978e079307
parent 4c1099771c
commit 978e079307
39 changed files with 4066 additions and 4490 deletions
--- a/package.json
+++ b/package.json
@ -11,7 +11,8 @@
 		"test": "web-ext lint --source-dir ./src/ || true",
 		"pug": "pug ./src/pages/options/*.pug ./src/pages/popup/ -P -w",
 		"prettier": "npx prettier --write .",
-		"instances": "python3 src/instances/get_instances.py; git update-index --assume-unchanged src/instances/blacklist.json src/instances/data.json"
+		"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"
 	},
 	"repository": {
 		"type": "git",
--- a/src/assets/images/general-icon.svg
+++ b/src/assets/images/general-icon.svg
@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" enable-background="new 0 0 24 24" height="26px" viewBox="0 0 24 24" width="26px" fill="currentColor">
+  <path d="M19.14,12.94c0.04-0.3,0.06-0.61,0.06-0.94c0-0.32-0.02-0.64-0.07-0.94l2.03-1.58c0.18-0.14,0.23-0.41,0.12-0.61 l-1.92-3.32c-0.12-0.22-0.37-0.29-0.59-0.22l-2.39,0.96c-0.5-0.38-1.03-0.7-1.62-0.94L14.4,2.81c-0.04-0.24-0.24-0.41-0.48-0.41 h-3.84c-0.24,0-0.43,0.17-0.47,0.41L9.25,5.35C8.66,5.59,8.12,5.92,7.63,6.29L5.24,5.33c-0.22-0.08-0.47,0-0.59,0.22L2.74,8.87 C2.62,9.08,2.66,9.34,2.86,9.48l2.03,1.58C4.84,11.36,4.8,11.69,4.8,12s0.02,0.64,0.07,0.94l-2.03,1.58 c-0.18,0.14-0.23,0.41-0.12,0.61l1.92,3.32c0.12,0.22,0.37,0.29,0.59,0.22l2.39-0.96c0.5,0.38,1.03,0.7,1.62,0.94l0.36,2.54 c0.05,0.24,0.24,0.41,0.48,0.41h3.84c0.24,0,0.44-0.17,0.47-0.41l0.36-2.54c0.59-0.24,1.13-0.56,1.62-0.94l2.39,0.96 c0.22,0.08,0.47,0,0.59-0.22l1.92-3.32c0.12-0.22,0.07-0.47-0.12-0.61L19.14,12.94z M12,15.6c-1.98,0-3.6-1.62-3.6-3.6 s1.62-3.6,3.6-3.6s3.6,1.62,3.6,3.6S13.98,15.6,12,15.6z"></path>
+</svg>
--- a/src/assets/images/imdb-icon.svg
+++ b/src/assets/images/imdb-icon.svg
--- a/src/assets/images/imgur-icon.png
+++ b/src/assets/images/imgur-icon.png
--- a/src/assets/images/medium-icon.svg
+++ b/src/assets/images/medium-icon.svg
@ -1,5 +1,5 @@
-                <svg xmlns="http://www.w2.org/2000/svg" viewBox="0 0 1770 1000" fill="currentColor">
-                  <circle cx="499" cy="500" r="500"></circle>
-                  <ellipse ry="474" rx="250" cy="501" cx="1296"></ellipse>
-                  <ellipse cx="1681" cy="502" rx="88" ry="424"></ellipse>
-                </svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1770 1000" fill="currentColor">
+  <circle cx="500" cy="500" r="500"></circle>
+  <ellipse ry="475" rx="250" cy="501" cx="1296"></ellipse>
+  <ellipse cx="1682" cy="502" rx="88" ry="424"></ellipse>
+</svg>
--- a/src/assets/images/quora-icon.png
+++ b/src/assets/images/quora-icon.png
--- a/src/assets/images/reuters-icon.svg
+++ b/src/assets/images/reuters-icon.svg
--- a/src/assets/images/sendTargets-icon.svg
+++ b/src/assets/images/sendTargets-icon.svg
--- a/src/assets/images/youtube-music-icon.png
+++ b/src/assets/images/youtube-music-icon.png
--- a/src/assets/javascripts/services.js
+++ b/src/assets/javascripts/services.js
@ -11,7 +11,8 @@ async function getConfig() {
 		fetch("/config/config.json")
 			.then(response => response.text())
 			.then(data => {
-				config = JSON.parse(data)
+				const tmp = JSON.parse(data)
+				config = tmp.config
 				resolve()
 			})
 	})
--- a/src/assets/javascripts/utils.js
+++ b/src/assets/javascripts/utils.js
@ -23,6 +23,10 @@ function getRandomInstance(instances) {
 	return instances[~~(instances.length * Math.random())]
 }

+function camelCase(str) {
+	return str.charAt(0).toUpperCase() + str.slice(1)
+}
+
 let cloudflareBlackList = []
 let authenticateBlackList = []
 let offlineBlackList = []
@ -107,9 +111,6 @@ function protocolHost(url) {
 }

 async function processDefaultCustomInstances(target, name, protocol, document) {
-	function camelCase(str) {
-		return str.charAt(0).toUpperCase() + str.slice(1)
-	}
 	let latencyKey = `${name}Latency`
 	let instancesLatency
 	let nameProtocolElement = document.getElementById(name).getElementsByClassName(protocol)[0]
--- a/src/config/config.json
+++ b/src/config/config.json
@ -1,439 +1,459 @@
 {
-	"networks": {
-		"clearnet": {
-			"tld": "org",
-			"name": "Clearnet"
+	"config": {
+		"networks": {
+			"clearnet": {
+				"tld": "org",
+				"name": "Clearnet"
+			},
+			"tor": {
+				"tld": "onion",
+				"name": "Tor"
+			},
+			"i2p": {
+				"tld": "i2p",
+				"name": "I2P"
+			},
+			"loki": {
+				"tld": "loki",
+				"name": "Lokinet"
+			}
 		},
-		"tor": {
-			"tld": "onion",
-			"name": "Tor"
-		},
-		"i2p": {
-			"tld": "i2p",
-			"name": "I2P"
-		},
-		"loki": {
-			"tld": "loki",
-			"name": "Lokinet"
-		}
-	},
-	"services": {
-		"youtube": {
-			"frontends": {
-				"invidious": {
-					"preferences": {
-						"cookies": ["PREFS"]
+		"services": {
+			"youtube": {
+				"frontends": {
+					"invidious": {
+						"preferences": {
+							"cookies": ["PREFS"]
+						}
+					},
+					"piped": {
+						"preferences": {
+							"localstorage": [
+								"bufferGoal",
+								"comments",
+								"disableLBRY",
+								"enabledCodecs",
+								"hl",
+								"homepage",
+								"instance",
+								"listen",
+								"minimizeDescription",
+								"playerAutoPlay",
+								"proxyLBRY",
+								"quality",
+								"region",
+								"selectedSkip",
+								"sponsorblock",
+								"theme",
+								"volume",
+								"watchHistory"
+							]
+						}
+					},
+					"pipedMaterial": {
+						"preferences": {
+							"localstorage": ["PREFERENCES"]
+						}
+					},
+					"cloudtube": {
+						"preferences": {
+							"token": "token",
+							"fetchEndpoint": "/api/settings",
+							"setEndpoint": "/settings"
+						}
 					}
 				},
-				"piped": {
-					"preferences": {
-						"localstorage": [
-							"bufferGoal",
-							"comments",
-							"disableLBRY",
-							"enabledCodecs",
-							"hl",
-							"homepage",
-							"instance",
-							"listen",
-							"minimizeDescription",
-							"playerAutoPlay",
-							"proxyLBRY",
-							"quality",
-							"region",
-							"selectedSkip",
-							"sponsorblock",
-							"theme",
-							"volume",
-							"watchHistory"
-						]
+				"singleInstanceFrontends": ["freetube", "yatte"],
+				"targets": [
+					"^https?:\\/{2}(www\\.|music\\.|m\\.|)youtube.com(\\(?!iframe_api)/.*|$)",
+					"^https?:\\/{2}img\\.youtube.com\\/vi\\/.*\\/..*",
+					"^https?:\\/{2}(i|s)\\.ytimg.com\\/vi\\/.*\\/..*",
+					"^https?:\\/{2}(www\\.|music\\.|)youtube.com\\/watch?v=..*",
+					"^https?:\\/{2}youtu\\.be\\/..*",
+					"^https?:\\/{2}(www\\.|)(youtube|youtube-nocookie)\\.com\\/embed\\/..*"
+				],
+				"name": "Youtube",
+				"options": {
+					"disabled": false,
+					"redirectType": "both",
+					"frontend": "invidious",
+					"embedFrontend": "invidious"
+				},
+				"imageType": "png",
+				"embeddable": true
+			},
+			"youtubeMusic": {
+				"frontends": {
+					"beatbump": {
+						"preferences": {
+							"localstorage": ["settings"],
+							"indexeddb": "beatbump"
+						}
+					},
+					"hyperpipe": {
+						"preferences": {
+							"localstorage": ["api", "authapi", "codec", "locale", "next", "pipedapi", "quality", "theme", "vol"],
+							"indexeddb": ["hyperpipedb"]
+						}
 					}
 				},
-				"pipedMaterial": {
-					"preferences": {
-						"localstorage": ["PREFERENCES"]
+				"targets": ["^https?:\\/{2}music\\.youtube\\.com(\\/.*|$)"],
+				"name": "YT Music",
+				"options": {
+					"disabled": false,
+					"frontend": "beatbump"
+				},
+				"imageType": "png",
+				"embeddable": false
+			},
+			"twitter": {
+				"frontends": {
+					"nitter": {
+						"preferences": {
+							"cookies": [
+								"theme",
+								"infiniteScroll",
+								"stickyProfile",
+								"bidiSupport",
+								"hideTweetStats",
+								"hideBanner",
+								"hidePins",
+								"hideReplies",
+								"squareAvatars",
+								"mp4Playback",
+								"hlsPlayback",
+								"proxyVideos",
+								"muteVideos",
+								"autoplayGifs",
+								"replaceInstagram",
+								"replaceReddit",
+								"replaceTwitter",
+								"replaceYouTube"
+							]
+						}
 					}
 				},
-				"cloudtube": {
-					"preferences": {
-						"token": "token",
-						"fetchEndpoint": "/api/settings",
-						"setEndpoint": "/settings"
-					}
-				}
+				"targets": ["^https?:\\/{2}(www\\.|mobile\\.|)twitter\\.com", "^https?:\\/{2}(pbs\\.|video\\.|)twimg\\.com", "^https?:\\/{2}platform\\.twitter\\.com/embed", "^https?:\\/{2}t\\.co"],
+				"name": "Twitter",
+				"options": {
+					"disabled": false,
+					"redirectType": "both"
+				},
+				"imageType": "png",
+				"embeddable": true
 			},
-			"singleInstanceFrontends": ["freetube", "yatte"],
-			"targets": [
-				"^https?:\\/{2}(www\\.|music\\.|m\\.|)youtube.com(\\(?!iframe_api)/.*|$)",
-				"^https?:\\/{2}img\\.youtube.com\\/vi\\/.*\\/..*",
-				"^https?:\\/{2}(i|s)\\.ytimg.com\\/vi\\/.*\\/..*",
-				"^https?:\\/{2}(www\\.|music\\.|)youtube.com\\/watch?v=..*",
-				"^https?:\\/{2}youtu\\.be\\/..*",
-				"^https?:\\/{2}(www\\.|)(youtube|youtube-nocookie)\\.com\\/embed\\/..*"
-			],
-			"name": "Youtube",
-			"options": {
-				"disabled": false,
-				"redirectType": "both",
-				"frontend": "invidious",
-				"embedFrontend": "invidious"
-			},
-			"imageType": "png",
-			"embeddable": true
-		},
-		"youtubeMusic": {
-			"frontends": {
-				"beatbump": {},
-				"hyperpipe": {}
-			},
-			"targets": ["^https?:\\/{2}music\\.youtube\\.com(\\/.*|$)"],
-			"name": "YT Music",
-			"options": {
-				"disabled": false,
-				"frontend": "beatbump"
-			},
-			"imageType": "png",
-			"embeddable": false
-		},
-		"twitter": {
-			"frontends": {
-				"nitter": {
-					"preferences": {
-						"cookies": [
-							"theme",
-							"infiniteScroll",
-							"stickyProfile",
-							"bidiSupport",
-							"hideTweetStats",
-							"hideBanner",
-							"hidePins",
-							"hideReplies",
-							"squareAvatars",
-							"mp4Playback",
-							"hlsPlayback",
-							"proxyVideos",
-							"muteVideos",
-							"autoplayGifs",
-							"replaceInstagram",
-							"replaceReddit",
-							"replaceTwitter",
-							"replaceYouTube"
-						]
-					}
-				}
-			},
-			"targets": ["^https?:\\/{2}(www\\.|mobile\\.|)twitter\\.com", "^https?:\\/{2}(pbs\\.|video\\.|)twimg\\.com", "^https?:\\/{2}platform\\.twitter\\.com/embed", "^https?:\\/{2}t\\.co"],
-			"name": "Twitter",
-			"options": {
-				"disabled": false,
-				"redirectType": "both"
-			},
-			"imageType": "png",
-			"embeddable": true
-		},
-		"instagram": {
-			"frontends": {
-				"bibliogram": {
-					"preferences": {
-						"token": "token",
-						"fetchEndpoint": "/settings.json",
-						"setEndpoint": "/applysettings"
-					}
-				}
-			},
-			"targets": ["^https?:\\/{2}(www\\.)?instagram\\.com"],
-			"name": "Instagram",
-			"options": { "disabled": false },
-			"imageType": "png",
-			"embeddable": false
-		},
-		"tiktok": {
-			"frontends": {
-				"proxiTok": {}
-			},
-			"targets": ["^https?:\\/{2}(www\\.|)tiktok\\.com.*"],
-			"name": "TikTok",
-			"options": { "disabled": false },
-			"imageType": "png",
-			"embeddable": false
-		},
-		"reddit": {
-			"frontends": {
-				"libreddit": {
-					"preferences": {
-						"cookies": ["theme", "front_page", "layout", "wide", "post_sort", "comment_sort", "show_nsfw", "autoplay_videos", "use_hls", "hide_hls_notification", "subscriptions", "filters"]
+			"instagram": {
+				"frontends": {
+					"bibliogram": {
+						"preferences": {
+							"token": "token",
+							"fetchEndpoint": "/settings.json",
+							"setEndpoint": "/applysettings"
+						}
 					}
 				},
-				"teddit": {
-					"preferences": {
-						"cookies": [
-							"collapse_child_comments",
-							"domain_instagram",
-							"domain_twitter",
-							"domain_youtube",
-							"flairs",
-							"highlight_controversial",
-							"nsfw_enabled",
-							"post_media_max_height",
-							"show_upvoted_percentage",
-							"show_upvotes",
-							"theme",
-							"videos_muted"
-						]
-					}
-				}
+				"targets": ["^https?:\\/{2}(www\\.)?instagram\\.com"],
+				"name": "Instagram",
+				"options": { "disabled": false },
+				"imageType": "png",
+				"embeddable": false
 			},
-			"targets": ["^https?:\\/{2}(www\\.|old\\.|np\\.|new\\.|amp\\.|)reddit\\.com", "^https?:\\/{2}(i\\.|preview\\.)redd\\.it"],
-			"name": "Reddit",
-			"options": {
-				"disabled": false,
-				"frontend": "libreddit"
-			},
-			"imageType": "png",
-			"embeddable": false
-		},
-		"imgur": {
-			"frontends": {
-				"rimgo": {
-					"preferences": {}
-				}
-			},
-			"targets": ["^https?:\\/{2}([im]\\.)?imgur\\.(com|io)(\\/|$)"],
-			"name": "Imgur",
-			"options": { "disabled": false },
-			"imageType": "png",
-			"embeddable": false
-		},
-		"wikipedia": {
-			"frontends": {
-				"wikiless": {
-					"preferences": {
-						"cookies": ["theme", "default_lang"]
-					}
-				}
-			},
-			"targets": ["^https?:\\/{2}([a-z]+\\.)*wikipedia\\.org"],
-			"name": "Wikipedia",
-			"options": { "disabled": true },
-			"imageType": "svg",
-			"embeddable": false
-		},
-		"medium": {
-			"frontends": {
-				"scribe": {
-					"preferences": {}
-				}
-			},
-			"targets": [
-				"(?:.*\\.)*(?<!(link\\.|cdn\\-images\\-\\d+\\.))medium\\.com(\\/.*)?$",
-				"^towardsdatascience\\.com",
-				"^uxdesign\\.cc",
-				"^uxplanet\\.org",
-				"^betterprogramming\\.pub",
-				"^aninjusticemag\\.com",
-				"^betterhumans\\.pub",
-				"^psiloveyou\\.xyz",
-				"^entrepreneurshandbook\\.co",
-				"^blog\\.coinbase\\.com",
-				"^levelup\\.gitconnected\\.com ",
-				"^javascript\\.plainenglish\\.io ",
-				"^blog\\.bitsrc\\.io ",
-				"^itnext\\.io ",
-				"^codeburst\\.io ",
-				"^infosecwriteups\\.com ",
-				"^blog\\.devgenius\\.io ",
-				"^writingcooperative\\.com "
-			],
-			"name": "Medium",
-			"options": { "disabled": false },
-			"imageType": "svg",
-			"embeddable": false
-		},
-		"quora": {
-			"frontends": {
-				"quetre": {
-					"preferences": {}
-				}
-			},
-			"targets": ["^https?:\\/{2}([a-z]+\\.)*quora\\.com.*"],
-			"name": "Quora",
-			"options": { "disabled": false },
-			"imageType": "png",
-			"embeddable": false
-		},
-		"imdb": {
-			"frontends": {
-				"libremdb": {
-					"preferences": {}
-				}
-			},
-			"targets": ["^https?:\\/{2}(?:www\\.|)imdb\\.com.*"],
-			"name": "IMDb",
-			"options": { "disabled": true },
-			"imageType": "svg",
-			"embeddable": false
-		},
-		"reuters": {
-			"frontends": {
-				"neuters": {
-					"preferences": {}
-				}
-			},
-			"targets": ["^https?:\\/{2}(www\\.|)reuters\\.com.*"],
-			"name": "Reuters",
-			"options": { "disabled": true },
-			"imageType": "svg",
-			"embeddable": false
-		},
-		"peertube": {
-			"frontends": {
-				"simpleertube": {
-					"preferences": {}
-				}
-			},
-			"targets": "datajson",
-			"name": "PeerTube",
-			"options": { "disabled": true },
-			"imageType": "svg",
-			"embeddable": false
-		},
-		"lbry": {
-			"frontends": {
-				"librarian": {
-					"preferences": {
-						"cookies": ["nsfw", "theme"],
-						"localstorage": ["autoplay", "autoplayNextVid", "collapseComments", "plyr", "sb_categories", "showRelated"]
-					}
-				}
-			},
-			"singleInstanceFrontends": ["lbryDesktop"],
-			"targets": ["^https?:\\/{2}odysee\\.com", "^https?:\\/{2}lbry\\.tv"],
-			"name": "LBRY",
-			"options": {
-				"disabled": true,
-				"frontend": "librarian",
-				"redirectType": "both"
-			},
-			"imageType": "png",
-			"embeddable": true
-		},
-		"search": {
-			"frontends": {
-				"searx": {
-					"preferences": {
-						"cookies": [
-							"advanced_search",
-							"autocomplete",
-							"categories",
-							"disabled_engines",
-							"disabled_plugins",
-							"doi_resolver",
-							"enabled_engines",
-							"enabled_plugins",
-							"image_proxy",
-							"language",
-							"locale",
-							"method",
-							"oscar-style",
-							"results_on_new_tab",
-							"safesearch",
-							"theme",
-							"tokens"
-						]
+			"tiktok": {
+				"frontends": {
+					"proxiTok": {
+						"preferences": {
+							"cookies": ["api-test_endpoints", "theme"]
+						}
 					}
 				},
-				"searxng": {
-					"preferences": {
-						"cookies": [
-							"autocomplete",
-							"categories",
-							"disabled_engines",
-							"disabled_plugins",
-							"doi_resolver",
-							"enabled_plugins",
-							"enabled_engines",
-							"image_proxy",
-							"infinite_scroll",
-							"language",
-							"locale",
-							"maintab",
-							"method",
-							"query_in_title",
-							"results_on_new_tab",
-							"safesearch",
-							"simple_style",
-							"theme",
-							"tokens"
-						]
+				"targets": ["^https?:\\/{2}(www\\.|)tiktok\\.com.*"],
+				"name": "TikTok",
+				"options": { "disabled": false },
+				"imageType": "png",
+				"embeddable": false
+			},
+			"reddit": {
+				"frontends": {
+					"libreddit": {
+						"preferences": {
+							"cookies": ["theme", "front_page", "layout", "wide", "post_sort", "comment_sort", "show_nsfw", "autoplay_videos", "use_hls", "hide_hls_notification", "subscriptions", "filters"]
+						}
+					},
+					"teddit": {
+						"preferences": {
+							"cookies": [
+								"collapse_child_comments",
+								"domain_instagram",
+								"domain_twitter",
+								"domain_youtube",
+								"flairs",
+								"highlight_controversial",
+								"nsfw_enabled",
+								"post_media_max_height",
+								"show_upvoted_percentage",
+								"show_upvotes",
+								"theme",
+								"videos_muted"
+							]
+						}
 					}
 				},
-				"whoogle": {
-					"preferences": {}
+				"targets": ["^https?:\\/{2}(www\\.|old\\.|np\\.|new\\.|amp\\.|)reddit\\.com", "^https?:\\/{2}(i\\.|preview\\.)redd\\.it"],
+				"name": "Reddit",
+				"options": {
+					"disabled": false,
+					"frontend": "libreddit"
 				},
-				"librex": {
-					"preferences": {
-						"cookies": ["bibliogram", "disable_special", "invidious", "libreddit", "nitter", "proxitok", "theme", "wikiless"]
-					}
-				}
+				"imageType": "png",
+				"embeddable": false
 			},
-			"targets": ["^https?:\\/{2}search\\.libredirect\\.invalid"],
-			"name": "Search",
-			"options": {
-				"disabled": false,
-				"frontend": "searxng"
-			},
-			"imageType": "svg",
-			"embeddable": false
-		},
-		"translate": {
-			"frontends": {
-				"simplyTranslate": {
-					"preferences": {
-						"cookies": ["from_lang", "to_lang", "tts_enabled", "use_text_fields"]
+			"imgur": {
+				"frontends": {
+					"rimgo": {
+						"preferences": {}
 					}
 				},
-				"lingva": {
-					"preferences": {
-						"localstorage": ["isauto", "source", "target"]
+				"targets": ["^https?:\\/{2}([im]\\.)?imgur\\.(com|io)(\\/|$)"],
+				"name": "Imgur",
+				"options": { "disabled": false },
+				"imageType": "png",
+				"embeddable": false
+			},
+			"wikipedia": {
+				"frontends": {
+					"wikiless": {
+						"preferences": {
+							"cookies": ["theme", "default_lang"]
+						}
 					}
-				}
+				},
+				"targets": ["^https?:\\/{2}([a-z]+\\.)*wikipedia\\.org"],
+				"name": "Wikipedia",
+				"options": { "disabled": true },
+				"imageType": "svg",
+				"embeddable": false
 			},
-			"targets": ["^https?:\\/{2}translate\\.google(\\.[a-z]{2,3}){1,2}\\/"],
-			"name": "Translate",
-			"options": {
-				"disabled": false,
-				"frontend": "simplyTranslate"
+			"medium": {
+				"frontends": {
+					"scribe": {
+						"preferences": {}
+					}
+				},
+				"targets": [
+					"(?:.*\\.)*(?<!(link\\.|cdn\\-images\\-\\d+\\.))medium\\.com(\\/.*)?$",
+					"^towardsdatascience\\.com",
+					"^uxdesign\\.cc",
+					"^uxplanet\\.org",
+					"^betterprogramming\\.pub",
+					"^aninjusticemag\\.com",
+					"^betterhumans\\.pub",
+					"^psiloveyou\\.xyz",
+					"^entrepreneurshandbook\\.co",
+					"^blog\\.coinbase\\.com",
+					"^levelup\\.gitconnected\\.com ",
+					"^javascript\\.plainenglish\\.io ",
+					"^blog\\.bitsrc\\.io ",
+					"^itnext\\.io ",
+					"^codeburst\\.io ",
+					"^infosecwriteups\\.com ",
+					"^blog\\.devgenius\\.io ",
+					"^writingcooperative\\.com "
+				],
+				"name": "Medium",
+				"options": { "disabled": false },
+				"imageType": "svg",
+				"embeddable": false
 			},
-			"imageType": "svg",
-			"embeddable": false
-		},
-		"maps": {
-			"frontends": {
-				"facil": {
-					"preferences": {}
-				}
+			"quora": {
+				"frontends": {
+					"quetre": {
+						"preferences": {
+							"localstorage": ["theme"]
+						}
+					}
+				},
+				"targets": ["^https?:\\/{2}([a-z]+\\.)*quora\\.com.*"],
+				"name": "Quora",
+				"options": { "disabled": false },
+				"imageType": "png",
+				"embeddable": false
 			},
-			"singleInstanceFrontends": ["osm"],
-			"targets": ["^https?:\\/{2}(((www|maps)\\.)?(google\\.).*(\\/maps)|maps\\.(google\\.).*)"],
-			"name": "Maps",
-			"options": {
-				"disabled": false,
-				"frontend": "osm"
+			"imdb": {
+				"frontends": {
+					"libremdb": {
+						"preferences": {
+							"localstorage": ["theme"]
+						}
+					}
+				},
+				"targets": ["^https?:\\/{2}(?:www\\.|)imdb\\.com.*"],
+				"name": "IMDb",
+				"options": { "disabled": true },
+				"imageType": "svg",
+				"embeddable": false
 			},
-			"imageType": "svg",
-			"embeddable": false
-		},
-		"sendTargets": {
-			"frontends": {
-				"send": {
-					"preferences": {}
-				}
+			"reuters": {
+				"frontends": {
+					"neuters": {
+						"preferences": {}
+					}
+				},
+				"targets": ["^https?:\\/{2}(www\\.|)reuters\\.com.*"],
+				"name": "Reuters",
+				"options": { "disabled": true },
+				"imageType": "svg",
+				"embeddable": false
 			},
-			"targets": ["^https?:\\/{2}send\\.libredirect\\.invalid\\/$", "^https?:\\/{2}send\\.firefox\\.com\\/$", "^https?:\\/{2}sendfiles\\.online\\/$"],
-			"name": "Send Files",
-			"options": { "disabled": false },
-			"imageType": "svg",
-			"embeddable": false
+			"peertube": {
+				"frontends": {
+					"simpleertube": {
+						"preferences": {}
+					}
+				},
+				"targets": "datajson",
+				"name": "PeerTube",
+				"options": { "disabled": true },
+				"imageType": "svg",
+				"embeddable": false
+			},
+			"lbry": {
+				"frontends": {
+					"librarian": {
+						"preferences": {
+							"cookies": ["nsfw", "theme"],
+							"localstorage": ["autoplay", "autoplayNextVid", "collapseComments", "plyr", "sb_categories", "showRelated"]
+						}
+					}
+				},
+				"singleInstanceFrontends": ["lbryDesktop"],
+				"targets": ["^https?:\\/{2}odysee\\.com", "^https?:\\/{2}lbry\\.tv"],
+				"name": "LBRY",
+				"options": {
+					"disabled": true,
+					"frontend": "librarian",
+					"redirectType": "both"
+				},
+				"imageType": "png",
+				"embeddable": true
+			},
+			"search": {
+				"frontends": {
+					"searx": {
+						"preferences": {
+							"cookies": [
+								"advanced_search",
+								"autocomplete",
+								"categories",
+								"disabled_engines",
+								"disabled_plugins",
+								"doi_resolver",
+								"enabled_engines",
+								"enabled_plugins",
+								"image_proxy",
+								"language",
+								"locale",
+								"method",
+								"oscar-style",
+								"results_on_new_tab",
+								"safesearch",
+								"theme",
+								"tokens"
+							]
+						}
+					},
+					"searxng": {
+						"preferences": {
+							"cookies": [
+								"autocomplete",
+								"categories",
+								"disabled_engines",
+								"disabled_plugins",
+								"doi_resolver",
+								"enabled_plugins",
+								"enabled_engines",
+								"image_proxy",
+								"infinite_scroll",
+								"language",
+								"locale",
+								"maintab",
+								"method",
+								"query_in_title",
+								"results_on_new_tab",
+								"safesearch",
+								"simple_style",
+								"theme",
+								"tokens"
+							]
+						}
+					},
+					"whoogle": {
+						"preferences": {}
+					},
+					"librex": {
+						"preferences": {
+							"cookies": ["bibliogram", "disable_special", "invidious", "libreddit", "nitter", "proxitok", "theme", "wikiless"]
+						}
+					}
+				},
+				"targets": ["^https?:\\/{2}search\\.libredirect\\.invalid"],
+				"name": "Search",
+				"options": {
+					"disabled": false,
+					"frontend": "searxng"
+				},
+				"imageType": "svg",
+				"embeddable": false
+			},
+			"translate": {
+				"frontends": {
+					"simplyTranslate": {
+						"preferences": {
+							"cookies": ["from_lang", "to_lang", "tts_enabled", "use_text_fields"]
+						}
+					},
+					"lingva": {
+						"preferences": {
+							"localstorage": ["isauto", "source", "target"]
+						}
+					}
+				},
+				"targets": ["^https?:\\/{2}translate\\.google(\\.[a-z]{2,3}){1,2}\\/"],
+				"name": "Translate",
+				"options": {
+					"disabled": false,
+					"frontend": "simplyTranslate"
+				},
+				"imageType": "svg",
+				"embeddable": false
+			},
+			"maps": {
+				"frontends": {
+					"facil": {
+						"preferences": {}
+					}
+				},
+				"singleInstanceFrontends": ["osm"],
+				"targets": ["^https?:\\/{2}(((www|maps)\\.)?(google\\.).*(\\/maps)|maps\\.(google\\.).*)"],
+				"name": "Maps",
+				"options": {
+					"disabled": false,
+					"frontend": "osm"
+				},
+				"imageType": "svg",
+				"embeddable": false
+			},
+			"sendTargets": {
+				"frontends": {
+					"send": {
+						"preferences": {}
+					}
+				},
+				"targets": ["^https?:\\/{2}send\\.libredirect\\.invalid\\/$", "^https?:\\/{2}send\\.firefox\\.com\\/$", "^https?:\\/{2}sendfiles\\.online\\/$"],
+				"name": "Send Files",
+				"options": { "disabled": false },
+				"imageType": "svg",
+				"embeddable": false
+			}
 		}
 	}
 }
--- a/src/pages/options/index.ejs
+++ b/src/pages/options/index.ejs
@ -1,12 +1,12 @@
 <!DOCTYPE html>
 <html id="elementToShowWithJavaScript" lang="en">
-  <%- include('../widgets/head') %>
+  <%- include('src/pages/widgets/head') %>
  <body class="option" dir="auto">
+  <%- include('src/pages/widgets/links', {config: config}) %>
    <div id="pages">
-      <%- include('../widgets/links', {config: config}) %>
-      <%- include('widgets/general', {config: config}) %>
-      <%- include('widgets/services', {config: config}) %>
-      <%- include('widgets/about') %>
+      <%- include('src/pages/options/widgets/general', {config: config}) %>
+      <%- include('src/pages/options/widgets/services', {config: config}) %>
+      <%- include('src/pages/options/widgets/about') %>
    </div>
  </body>
  <script type="module" src="./index.js"></script>
--- a/src/pages/options/index.html
+++ b/src/pages/options/index.html
--- a/src/pages/options/index.pug
+++ b/src/pages/options/index.pug
@ -1,36 +0,0 @@
-doctype html
-html#elementToShowWithJavaScript(lang="en")
-    head
-        meta(charset='utf-8')
-        meta(name="viewport" content="width=device-width, initial-scale=1")
-        link(rel="icon" type="image/x-icon" href="../../../assets/images/libredirect.svg")
-        link(href="../stylesheets/styles.css" rel="stylesheet")
-        title General
-
-        script(type="module" src="./init.js")
-    body.option(dir="auto")
-        include ../widgets/links.pug
-        +links('general')
-        div#pages
-            include ./widgets/general.pug
-            include ./widgets/youtube.pug
-            include ./widgets/youtubeMusic.pug
-            include ./widgets/twitter.pug
-            include ./widgets/instagram.pug
-            include ./widgets/tiktok.pug
-            include ./widgets/reddit.pug
-            include ./widgets/imgur.pug
-            include ./widgets/wikipedia.pug
-            include ./widgets/medium.pug
-            include ./widgets/quora.pug
-            include ./widgets/imdb.pug
-            include ./widgets/reuters.pug
-            include ./widgets/peertube.pug
-            include ./widgets/lbry.pug
-            include ./widgets/search.pug
-            include ./widgets/translate.pug
-            include ./widgets/maps.pug
-            include ./widgets/sendTargets.pug
-            include ./widgets/about.pug
-
-    script(type="module" src="./index.js")
--- a/src/pages/options/widgets/about.pug
+++ b/src/pages/options/widgets/about.pug
@ -1,17 +0,0 @@
-section#about_page.option-block 
-  .some-block.option-block
-    h1(data-localise="__MSG_about__") About
-  hr
-  .about
-    .some-block.option-block
-      h4 Donate: ♥️
-      h4 <a href='https://libredirect.github.io/donate'>https://libredirect.github.io/donate</a> 
-    .some-block.option-block
-      h4 FAQ:
-      h4 <a href='https://libredirect.github.io/faq'>https://libredirect.github.io/faq</a>
-    .some-block.option-block
-      h4 Docs:
-      h4 <a href='https://libredirect.github.io/docs'>https://libredirect.github.io/docs</a>
-    .some-block.option-block
-      h4 Source Code:
-      h4 <a href='https://libredirect.github.io/source_code'>https://libredirect.github.io/source_code</a>
--- a/src/pages/options/widgets/general.ejs
+++ b/src/pages/options/widgets/general.ejs
@ -0,0 +1,97 @@
+<section class="option-block" id="general_page">
+  <div class="some-block option-block">
+    <h1 data-localise="__MSG_general__">General</h1>
+  </div>
+  <hr>
+  <div class="some-block option-block">
+    <h4 data-localise="__MSG_theme__">Theme</h4>
+    <select id="theme">
+      <option value="DEFAULT" data-localise="__MSG_system__">System</option>
+      <option value="light" data-localise="__MSG_light__">Light</option>
+      <option value="dark" data-localise="__MSG_dark__">Dark</option>
+    </select>
+  </div>
+  <div class="some-block option-block">
+    <h4 data-localise="__MSG_protocol__"></h4>
+    <select id="protocol">
+      <% for (const network in config.networks) { %>
+      <option value="<%= network %>"><%= config.networks[network].name %></option>
+      <% }; %>
+    </select>
+  </div>
+  <div id="protocol-fallback">
+    <div class="some-block option-block">
+      <h4 data-localise="__MSG_protocolFallback__">Fallback to normal if no instances are available for the current protocol</h4>
+      <input id="protocol-fallback-checkbox" type="checkbox">
+    </div>
+  </div>
+  <div class="some-block option-block">
+    <h4 data-localise="__MSG_autoRedirect__"></h4>
+    <input id="auto-redirect" type="checkbox">
+  </div>
+  <form>
+    <div class="some-block option-block">
+      <h4 data-localise="__MSG_latencyThreshold">Latency Threshold</h4>
+      <output id="latency-output" for="latencyInput" name="latencyOutput"></output>
+      <input id="latency-input" type="range" min="50" max="5000" value="1000" name="latencyInput" step="50">
+    </div>
+  </form>
+  <div class="some-block option-block">
+    <h4 data-localise="__MSG_exceptions__"></h4>
+  </div>
+  <form id="custom-exceptions-instance-form">
+    <div class="some-block option-block">
+      <div class="some-block" style="padding:0;">
+        <input id="exceptions-custom-instance" placeholder="https://www.google.com" type="url">&nbsp;
+        <select id="exceptions-custom-instance-type">
+          <option value="url">URL</option>
+          <option value="regex">Regex</option>
+        </select>&nbsp;
+      </div>
+      <button class="add" id="exceptions-add-instance" type="submit">
+        <svg xmlns="http://www.w3.org/2000/svg" height="20px" viewBox="0 0 24 24" width="20px" fill="currentColor">
+          <path d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"></path>
+        </svg>
+      </button>
+    </div>
+  </form>
+  <div class="checklist" id="exceptions-custom-checklist"></div>
+  <div class="buttons buttons-inline"><a class="button button-inline" id="update-instances">
+      <svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="currentColor">
+        <path d="M19 9h-4V3H9v6H5l7 7 7-7zM5 18v2h14v-2H5z"></path>
+      </svg>
+      <x data-localise="__MSG_updateInstances__">Update Instances</x></a>&nbsp; &nbsp;</div>
+  <div class="buttons buttons-inline">  
+    <label class="button button-inline" id="import_settings_text" for="import-settings"> 
+      <svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="currentColor">
+        <path d="M19 19H5V5h7V3H5c-1.11 0-2 .9-2 2v14c0 1.1.89 2 2 2h14c1.1 0 2-.9 2-2v-7h-2v7zM14 3v2h3.59l-9.83 9.83 1.41 1.41L19 6.41V10h2V3h-7z"></path>
+      </svg>&nbsp;
+      <x data-localise="__MSG_importSettings__">Import Settings</x>
+    </label>
+    <input class="button button-inline" id="import-settings" type="file" style="display:none;">&nbsp; &nbsp;<a class="button button-inline" id="export-settings">
+      <svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="currentColor">
+        <path d="M10.09 15.59L11.5 17l5-5-5-5-1.41 1.41L12.67 11H3v2h9.67l-2.58 2.59zM19 3H5c-1.11 0-2 .9-2 2v4h2V5h14v14H5v-4H3v4c0 1.1.89 2 2 2h14c1.1 0 2-.9 2-2V5c0-1.1-.9-2-2-2z"></path>
+      </svg>&nbsp;
+      <x data-localise="__MSG_exportSettings__">Export Settings</x></a>&nbsp; &nbsp;<a class="button button-inline" id="reset-settings">
+      <svg xmlns="http://www.w3.org/2000/svg" enable-background="new 0 0 24 24" height="24px" viewBox="0 0 24 24" width="24px" fill="currentColor">
+        <path d="M12,5V2L8,6l4,4V7c3.31,0,6,2.69,6,6c0,2.97-2.17,5.43-5,5.91v2.02c3.95-0.49,7-3.85,7-7.93C20,8.58,16.42,5,12,5z"></path>
+        <path d="M6,13c0-1.65,0.67-3.15,1.76-4.24L6.34,7.34C4.9,8.79,4,10.79,4,13c0,4.08,3.05,7.44,7,7.93v-2.02 C8.17,18.43,6,15.97,6,13z"></path>
+      </svg>
+      <x data-localise="__MSG_resetSettings__">Reset Settings</x></a>
+  </div>
+  <hr>
+  <div class="some-block option-block">
+    <h4 data-localise="__MSG_customPopup__">Customize Popup</h4>
+  </div>
+  <div class="checklist-popup" id="popup-frontends-checklist">
+    <% for (const service in config.services) { %>
+    <div>
+      <div><img src="../../../assets/images/<%= service %>-icon.<%= config.services[service].imageType %>">
+        <x data-localise="__MSG_<%= service %>__"><%= service %></x>
+      </div>
+      <input id="<%= service %>" type="checkbox">
+    </div>
+    <% }; %>
+  </div>
+  <script type="module" src="./widgets/general.js"></script>
+</section>
--- a/src/pages/options/widgets/general.pug
+++ b/src/pages/options/widgets/general.pug
@ -1,210 +0,0 @@
-section#general_page.option-block
-    .some-block.option-block
-        h1(data-localise="__MSG_general__") General
-    hr
-
-    .some-block.option-block
-        h4(data-localise="__MSG_theme__") Theme
-        select#theme
-            option(value="DEFAULT" data-localise="__MSG_system__") System
-            option(value="light" data-localise="__MSG_light__") Light
-            option(value="dark" data-localise="__MSG_dark__") Dark
-
-    //- .some-block.option-block
-        h4 Tor Browser
-        input#firstPartyIsolate(type="checkbox")
-
-    .some-block.option-block
-        h4(data-localise="__MSG_protocol__")
-        select#protocol
-            option(value="clearnet" data-localise="__MSG_normal__") Clearnet
-            option(value="tor") Tor
-            option(value="i2p") I2P
-            option(value="loki") Lokinet
-
-    #protocol-fallback
-        .some-block.option-block
-            h4(data-localise="__MSG_protocolFallback__") Fallback to normal if no instances are available for the current protocol
-            input#protocol-fallback-checkbox(type="checkbox")
-
-    .some-block.option-block
-        h4(data-localise="__MSG_autoRedirect__")
-        input#auto-redirect(type="checkbox")
-
-    form
-        .some-block.option-block
-            h4(data-localise="__MSG_latencyThreshold") Latency Threshold
-            output#latency-output(for="latencyInput" name="latencyOutput")
-            input#latency-input(type="range" min="50" max="5000" value="1000" name="latencyInput" step="50")
-
-    .some-block.option-block
-        h4(data-localise="__MSG_exceptions__")
-
-    form#custom-exceptions-instance-form
-        .some-block.option-block
-            .some-block(style="padding:0;")
-                input#exceptions-custom-instance(placeholder="https://www.google.com" type="url")
-                |&nbsp;
-                select#exceptions-custom-instance-type
-                    option(value="url") URL
-                    option(value="regex") Regex
-                |&nbsp;
-            button#exceptions-add-instance.add(type="submit")
-                svg(xmlns="http://www.w3.org/2000/svg" height="20px" viewBox="0 0 24 24" width="20px" fill="currentColor")
-                    path(d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z")
-
-    #exceptions-custom-checklist.checklist
-
-    .buttons.buttons-inline
-        a#update-instances.button.button-inline
-            svg(xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="currentColor")
-                path(d="M19 9h-4V3H9v6H5l7 7 7-7zM5 18v2h14v-2H5z")
-            x(data-localise="__MSG_updateInstances__") Update Instances
-
-        |&nbsp; &nbsp;
-
-    .buttons.buttons-inline   
-
-        label#import_settings_text.button.button-inline(for="import-settings") 
-            svg(xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="currentColor")
-                path(d="M19 19H5V5h7V3H5c-1.11 0-2 .9-2 2v14c0 1.1.89 2 2 2h14c1.1 0 2-.9 2-2v-7h-2v7zM14 3v2h3.59l-9.83 9.83 1.41 1.41L19 6.41V10h2V3h-7z")
-            |&nbsp;
-            x(data-localise="__MSG_importSettings__") Import Settings
-        input#import-settings.button.button-inline(type="file" style="display:none;")
-
-        |&nbsp; &nbsp;
-
-        a#export-settings.button.button-inline
-            svg(xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="currentColor")
-                path(d="M10.09 15.59L11.5 17l5-5-5-5-1.41 1.41L12.67 11H3v2h9.67l-2.58 2.59zM19 3H5c-1.11 0-2 .9-2 2v4h2V5h14v14H5v-4H3v4c0 1.1.89 2 2 2h14c1.1 0 2-.9 2-2V5c0-1.1-.9-2-2-2z")
-            |&nbsp;
-            x(data-localise="__MSG_exportSettings__") Export Settings
-
-        |&nbsp; &nbsp;
-
-        a#reset-settings.button.button-inline
-            svg(xmlns="http://www.w3.org/2000/svg" enable-background="new 0 0 24 24" height="24px" viewBox="0 0 24 24" width="24px" fill="currentColor")
-                path(d="M12,5V2L8,6l4,4V7c3.31,0,6,2.69,6,6c0,2.97-2.17,5.43-5,5.91v2.02c3.95-0.49,7-3.85,7-7.93C20,8.58,16.42,5,12,5z")
-                path(d="M6,13c0-1.65,0.67-3.15,1.76-4.24L6.34,7.34C4.9,8.79,4,10.79,4,13c0,4.08,3.05,7.44,7,7.93v-2.02 C8.17,18.43,6,15.97,6,13z")
-            x(data-localise="__MSG_resetSettings__") Reset Settings
-    hr
-
-    .some-block.option-block
-        h4(data-localise="__MSG_customPopup__") Customize Popup
-
-    #popup-frontends-checklist.checklist-popup
-        div
-            div
-                img(src="../../../assets/images/youtube-icon.png")
-                x(data-localise="__MSG_youtube__") YouTube
-            input#youtube(type="checkbox")
-        div
-            div
-                img(src="../../../assets/images/youtube-music-icon.png")
-                x(data-localise="__MSG_ytmusic__") YoutubeMusic
-            input#youtubeMusic(type="checkbox")
-        div
-            div
-                img(src="../../../assets/images/twitter-icon.png")
-                x(data-localise="__MSG_twitter__") Twitter
-            input#twitter(type="checkbox")
-
-        div
-            div 
-                img(src="../../../assets/images/instagram-icon.png")
-                x(data-localise="__MSG_instagram__") Instagram
-            input#instagram(type="checkbox")
-
-        div 
-            div 
-                img(src="../../../assets/images/tiktok-icon.png")
-                x(data-localise="__MSG_tiktok__") TikTok
-            input#tiktok(type="checkbox")
-
-        div 
-            div 
-                img(src="../../../assets/images/imgur.png")
-                x(data-localise="__MSG_imgur__") Imgur
-            input#imgur(type="checkbox")
-
-        div 
-            div 
-                img(src="../../../assets/images/reddit-icon.png")
-                x(data-localise="__MSG_reddit__") Reddit
-            input#reddit(type="checkbox")
-
-        div 
-            div 
-                svg(xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor")
-                    path(d="M15.5 14h-.79l-.28-.27C15.41 12.59 16 11.11 16 9.5 16 5.91 13.09 3 9.5 3S3 5.91 3 9.5 5.91 16 9.5 16c1.61 0 3.09-.59 4.23-1.57l.27.28v.79l5 4.99L20.49 19l-4.99-5zm-6 0C7.01 14 5 11.99 5 9.5S7.01 5 9.5 5 14 7.01 14 9.5 11.99 14 9.5 14z")
-                x(data-localise="__MSG_search__") Search
-            input#search(type="checkbox")
-
-        div 
-            div 
-                svg(xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor")
-                    path(d="M12.87 15.07l-2.54-2.51.03-.03c1.74-1.94 2.98-4.17 3.71-6.53H17V4h-7V2H8v2H1v1.99h11.17C11.5 7.92 10.44 9.75 9 11.35 8.07 10.32 7.3 9.19 6.69 8h-2c.73 1.63 1.73 3.17 2.98 4.56l-5.09 5.02L4 19l5-5 3.11 3.11.76-2.04zM18.5 10h-2L12 22h2l1.12-3h4.75L21 22h2l-4.5-12zm-2.62 7l1.62-4.33L19.12 17h-3.24z")
-                x(data-localise="__MSG_translate__") Translate
-            input#translate(type="checkbox")
-
-        div 
-            div 
-                svg(xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor")
-                    path(d="M20.5 3l-.16.03L15 5.1 9 3 3.36 4.9c-.21.07-.36.25-.36.48V20.5c0 .28.22.5.5.5l.16-.03L9 18.9l6 2.1 5.64-1.9c.21-.07.36-.25.36-.48V3.5c0-.28-.22-.5-.5-.5zM10 5.47l4 1.4v11.66l-4-1.4V5.47zm-5 .99l3-1.01v11.7l-3 1.16V6.46zm14 11.08l-3 1.01V6.86l3-1.16v11.84z")
-                x(data-localise="__MSG_maps__") Maps
-            input#maps(type="checkbox")
-
-        div 
-            div 
-                img(src="../../../assets/images/wikipedia-icon.svg")
-                x(data-localise="__MSG_wikipedia__") Wikipedia
-            input#wikipedia(type="checkbox")
-
-        div 
-            div 
-                svg(xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1770 1000" fill="currentColor")
-                    circle(cx="500" cy="500" r="500")
-                    ellipse(ry="475" rx="250" cy="501" cx="1296")
-                    ellipse(cx="1682" cy="502" rx="88" ry="424")
-                x(data-localise="__MSG_medium__") Medium
-            input#medium(type="checkbox")
-
-        div 
-            div 
-                img(src="../../../assets/images/quora.png")
-                x(data-localise="__MSG_quora__") Quora
-            input#quora(type="checkbox")
-
-        div 
-            div 
-                img(src="../../../assets/images/imdb.svg")
-                x(data-localise="__MSG_imdb__") IMDb
-            input#imdb(type="checkbox")
-
-        div 
-            div 
-                img(src="../../../assets/images/reuters.svg")
-                x(data-localise="__MSG_reuters__") Reuters
-            input#reuters(type="checkbox")
-
-        div 
-            div 
-                img(src="../../../assets/images/peertube-icon.svg")
-                x(data-localise="__MSG_peertube__") PeerTube
-            input#peertube(type="checkbox")
-
-        div 
-            div 
-                img(src="../../../assets/images/lbry-icon.png")
-                x(data-localise="__MSG_lbry__") LBRY
-            input#lbry(type="checkbox")
-
-        div 
-            div 
-                svg(xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="currentColor")
-                    path(d="M19.35 10.04C18.67 6.59 15.64 4 12 4 9.11 4 6.6 5.64 5.35 8.04 2.34 8.36 0 10.91 0 14c0 3.31 2.69 6 6 6h13c2.76 0 5-2.24 5-5 0-2.64-2.05-4.78-4.65-4.96zM14 13v4h-4v-4H7l5-5 5 5h-3z")
-                x(data-localise="__MSG_sendFiles__") Send Files
-            input#sendTargets(type="checkbox")
-
-
-    script(type="module" src="./widgets/general.js")
--- a/src/pages/options/widgets/imdb.pug
+++ b/src/pages/options/widgets/imdb.pug
@ -1,26 +0,0 @@
-section#imdb_page.option-block
-    .some-block.option-block
-        h1(data-localise="__MSG_imdb__") IMDb
-    hr
-    .some-block.option-block
-        h4(data-localise="__MSG_enable__") Enable
-        input#imdb-enable(type="checkbox")
-
-    #libremdb
-        hr
-        .clearnet
-            include ../../widgets/instances.pug
-            +instances('https://libremdb.com')
-            include ../../widgets/latency.pug
-            +latency('libremdb')
-        .tor
-            include ../../widgets/instances.pug
-            +instances('http://libremdb.onion')
-        .i2p
-            include ../../widgets/instances.pug
-            +instances('http://libremdb.i2p')
-        .loki
-            include ../../widgets/instances.pug
-            +instances('http://libremdb.loki')
-
-    script(type="module" src="./widgets/imdb.js")
--- a/src/pages/options/widgets/imgur.pug
+++ b/src/pages/options/widgets/imgur.pug
@ -1,27 +0,0 @@
-section#imgur_page.option-block
-    .some-block.option-block
-        h1(data-localise="__MSG_imgur__") Imgur
-    hr
-
-    .some-block.option-block
-        h4(data-localise="__MSG_enable__") Enable
-        input#imgur-enable(type="checkbox")
-
-    #rimgo
-        hr
-        .clearnet
-            include ../../widgets/instances.pug
-            +instances('https://rimgo.com')
-            include ../../widgets/latency.pug
-            +latency('rimgo')
-        .tor
-            include ../../widgets/instances.pug
-            +instances('http://rimgo.onion')
-        .i2p
-            include ../../widgets/instances.pug
-            +instances('http://rimgo.onion')
-        .loki
-            include ../../widgets/instances.pug
-            +instances('http://rimgo.loki')
-
-    script(type="module" src="./widgets/imgur.js")
--- a/src/pages/options/widgets/instagram.pug
+++ b/src/pages/options/widgets/instagram.pug
@ -1,27 +0,0 @@
-section#instagram_page.option-block
-    .some-block.option-block
-        h1(data-localise="__MSG_instagram__") Instagram
-    hr
-
-    .some-block.option-block
-        h4(data-localise="__MSG_enable__") Enable
-        input#instagram-enable(type="checkbox")
-
-    #bibliogram
-        hr
-        .clearnet
-            include ../../widgets/instances.pug
-            +instances('https://bibliogram.com')
-            include ../../widgets/latency.pug
-            +latency('bibliogram')
-        .tor
-            include ../../widgets/instances.pug
-            +instances('https://bibliogram.onion')
-        .i2p
-            include ../../widgets/instances.pug
-            +instances('http://bibliogram.onion')
-        .loki
-            include ../../widgets/instances.pug
-            +instances('http://bibliogram.loki')
-
-    script(type="module" src="./widgets/instagram.js")
--- a/src/pages/options/widgets/lbry.pug
+++ b/src/pages/options/widgets/lbry.pug
@ -1,39 +0,0 @@
-section#lbry_page.option-block
-    .some-block.option-block
-        h1(data-localise="__MSG_lbry__") LBRY
-    hr
-    .some-block.option-block
-        h4(data-localise="__MSG_enable__") Enable
-        input#lbry-enable(type="checkbox")
-
-    .some-block.option-block
-        h4(data-localise="__MSG_frontend__") Frontend
-        select#lbry-frontend
-            option(value="librarian") Librarian
-            option(value="lbryDesktop" data-localise="__MSG_lbryDesktop__") LBRY Desktop
-
-    .some-block.option-block
-        h4(data-localise="__MSG_redirectType__") Redirect Type
-        select#lbry-redirect_type
-            option(value="both" data-localise="__MSG_both__") both
-            option(value="sub_frame" data-localise="__MSG_onlyEmbedded__") Only Embedded
-            option(value="main_frame" data-localise="__MSG_onlyNotEmbedded__") Only Not Embedded
-
-    #librarian
-        hr
-        .clearnet
-            include ../../widgets/instances.pug
-            +instances('https://librarian.com')
-            include ../../widgets/latency.pug
-            +latency('librarian')
-        .tor
-            include ../../widgets/instances.pug
-            +instances('https://librarian.onion')
-        .i2p
-            include ../../widgets/instances.pug
-            +instances('http://librarian.onion')
-        .loki
-            include ../../widgets/instances.pug
-            +instances('http://librarian.loki')
-
-    script(type="module" src="./widgets/lbry.js")
--- a/src/pages/options/widgets/maps.pug
+++ b/src/pages/options/widgets/maps.pug
@ -1,32 +0,0 @@
-section#maps_page.option-block
-    .some-block.option-block
-        h1(data-localise="__MSG_maps__") Maps
-    hr
-    .some-block.option-block
-        h4(data-localise="__MSG_enable__") Enable
-        input#maps-enable(type="checkbox")
-
-    .some-block.option-block
-        h4(data-localise="__MSG_frontend__") Frontend
-        select#maps-frontend
-            option(value="osm") OpenStreetMap
-            option(value="facil") Facil Map
-
-    #facil
-        hr
-        .clearnet
-            include ../../widgets/instances.pug
-            +instances('https://facilmap.com')
-            include ../../widgets/latency.pug
-            +latency('facil')
-        .tor
-            +instances('http://facilmap.onion')
-            include ../../widgets/instances.pug
-        .i2p
-            include ../../widgets/instances.pug
-            +instances('http://facilmap.i2p')
-        .loki
-            include ../../widgets/instances.pug
-            +instances('http://facilmap.loki')
-
-    script(type="module" src="./widgets/maps.js")
--- a/src/pages/options/widgets/medium.pug
+++ b/src/pages/options/widgets/medium.pug
@ -1,26 +0,0 @@
-section#medium_page.option-block
-    .some-block.option-block
-        h1(data-localise="__MSG_medium__") Medium
-    hr
-    .some-block.option-block
-        h4(data-localise="__MSG_enable__") Enable
-        input#medium-enable(type="checkbox")
-
-    #scribe
-        hr
-        .clearnet
-            include ../../widgets/instances.pug
-            +instances('https://scribe.com')
-            include ../../widgets/latency.pug
-            +latency('scribe')
-        .tor
-            include ../../widgets/instances.pug
-            +instances('http://scribe.onion')
-        .i2p
-            include ../../widgets/instances.pug
-            +instances('http://scribe.i2p')
-        .loki
-            include ../../widgets/instances.pug
-            +instances('http://scribe.loki')
-
-    script(type="module" src="./widgets/medium.js")
--- a/src/pages/options/widgets/peertube.pug
+++ b/src/pages/options/widgets/peertube.pug
@ -1,26 +0,0 @@
-section#peertube_page.option-block
-    .some-block.option-block
-        h1(data-localise="__MSG_peertube__") PeerTube
-    hr
-    .some-block.option-block
-        h4(data-localise="__MSG_enable__") Enable
-        input#peertube-enable(type="checkbox")
-
-    #simpleertube
-        hr
-        .clearnet
-            include ../../widgets/instances.pug
-            +instances('https://simpleertube.com')
-            include ../../widgets/latency.pug
-            +latency('simpleertube')
-        .tor
-            include ../../widgets/instances.pug
-            +instances('http://simpleertube.onion')
-        .i2p
-            include ../../widgets/instances.pug
-            +instances('http://simpleertube.i2p')
-        .loki
-            include ../../widgets/instances.pug
-            +instances('http://simpleertube.loki')
-
-    script(type="module" src="./widgets/peertube.js")
--- a/src/pages/options/widgets/quora.pug
+++ b/src/pages/options/widgets/quora.pug
@ -1,26 +0,0 @@
-section#quora_page.option-block
-    .some-block.option-block
-        h1(data-localise="__MSG_quora__") Quora
-    hr
-    .some-block.option-block
-        h4(data-localise="__MSG_enable__") Enable
-        input#quora-enable(type="checkbox")
-
-    #quetre
-        hr
-        .clearnet
-            include ../../widgets/instances.pug
-            +instances('https://quetre.com')
-            include ../../widgets/latency.pug
-            +latency('quetre')
-        .tor
-            include ../../widgets/instances.pug
-            +instances('http://quetre.onion')
-        .i2p
-            include ../../widgets/instances.pug
-            +instances('http://quetre.i2p')
-        .loki
-            include ../../widgets/instances.pug
-            +instances('http://quetre.loki')
-
-    script(type="module" src="./widgets/quora.js")
--- a/src/pages/options/widgets/reddit.pug
+++ b/src/pages/options/widgets/reddit.pug
@ -1,48 +0,0 @@
-section#reddit_page.option-block
-    .some-block.option-block
-        h1(data-localise="__MSG_reddit__") Reddit
-    hr
-    .some-block.option-block
-        h4(data-localise="__MSG_enable__") Enable
-        input#reddit-enable(type="checkbox")
-
-    .some-block.option-block
-        h4#frontend(data-localise="__MSG_frontend__") Frontend
-        select#reddit-frontend
-            option(value="libreddit") Libreddit
-            option(value="teddit") Teddit
-
-    #libreddit
-        hr
-        .clearnet
-            include ../../widgets/instances.pug
-            +instances('https://libreddit.com')
-            include ../../widgets/latency.pug
-            +latency('libreddit')
-        .tor
-            include ../../widgets/instances.pug
-            +instances('http://libreddit.onion')
-        .i2p
-            include ../../widgets/instances.pug
-            +instances('http://libreddit.i2p')
-        .loki
-            include ../../widgets/instances.pug
-            +instances('http://libreddit.loki')
-
-    #teddit
-        hr
-        .clearnet
-            include ../../widgets/instances.pug
-            +instances('https://teddit.com')
-            +latency('teddit')
-        .tor
-            include ../../widgets/instances.pug
-            +instances('http://teddit.onion')
-        .i2p
-            include ../../widgets/instances.pug
-            +instances('http://teddit.i2p')
-        .loki
-            include ../../widgets/instances.pug
-            +instances('http://teddit.loki')
-
-    script(type="module" src="./widgets/reddit.js")
--- a/src/pages/options/widgets/reuters.pug
+++ b/src/pages/options/widgets/reuters.pug
@ -1,26 +0,0 @@
-section#reuters_page.option-block
-    .some-block.option-block
-        h1(data-localise="__MSG_reuters__") Reuters
-    hr
-    .some-block.option-block
-        h4(data-localise="__MSG_enable__") Enable
-        input#reuters-enable(type="checkbox")
-
-    #neuters
-        hr
-        .clearnet
-            include ../../widgets/instances.pug
-            +instances('https://neuters.com')
-            include ../../widgets/latency.pug
-            +latency('neuters')
-        .tor
-            include ../../widgets/instances.pug
-            +instances('http://neuters.onion')
-        .i2p
-            include ../../widgets/instances.pug
-            +instances('http://neuters.i2p')
-        .loki
-            include ../../widgets/instances.pug
-            +instances('http://neuters.loki')
-
-    script(type="module" src="./widgets/reuters.js")
--- a/src/pages/options/widgets/search.pug
+++ b/src/pages/options/widgets/search.pug
@ -1,85 +0,0 @@
-section#search_page.option-block
-    .some-block.option-block
-        h1(data-localise="__MSG_search__") Search
-    hr
-    .some-block.option-block
-        h4(data-localise="__MSG_enable__") Enable
-        input#search-enable(type="checkbox")
-
-    .some-block.option-block
-        h4(data-localise="__MSG_frontend__") Frontend
-        select#search-frontend
-            option(value="searxng") SearXNG
-            option(value="searx") SearX
-            option(value="whoogle") Whoogle
-            option(value="librex") LibreX
-
-    .some-block
-        h4(data-localise="__MSG_searchNote__") Note: To use Search, make LibRedirect the Default Search Engine
-
-    #searx
-        hr
-        .clearnet
-            include ../../widgets/instances.pug
-            +instances('https://searx.com')
-            include ../../widgets/latency.pug
-            +latency('searx')
-        .tor
-            include ../../widgets/instances.pug
-            +instances('http://searx.onion')
-        .i2p
-            include ../../widgets/instances.pug
-            +instances('http://searx.i2p')
-        .loki
-            include ../../widgets/instances.pug
-            +instances('http://searx.loki')
-
-    #searxng
-        hr
-        .clearnet
-            include ../../widgets/instances.pug
-            +instances('https://searxng.com')
-            +latency('searxng')
-        .tor
-            include ../../widgets/instances.pug
-            +instances('http://searxng.onion')
-        .i2p
-            include ../../widgets/instances.pug
-            +instances('http://searxng.i2p')
-        .loki
-            include ../../widgets/instances.pug
-            +instances('http://searxng.loki')
-
-    #whoogle
-        hr
-        .clearnet
-            include ../../widgets/instances.pug
-            +instances('https://whoogle.com')
-            +latency('whoogle')
-        .tor
-            include ../../widgets/instances.pug
-            +instances('http://whoogle.onion')
-        .i2p
-            include ../../widgets/instances.pug
-            +instances('http://whoogle.i2p')
-        .loki
-            include ../../widgets/instances.pug
-            +instances('http://whoogle.loki')
-
-    #librex
-        hr
-        .clearnet
-            include ../../widgets/instances.pug
-            +instances('https://librex.com')
-            +latency('librex')
-        .tor
-            include ../../widgets/instances.pug
-            +instances('http://librex.onion')
-        .i2p
-            include ../../widgets/instances.pug
-            +instances('http://librex.i2p')
-        .loki
-            include ../../widgets/instances.pug
-            +instances('http://librex.loki')
-
-    script(type="module" src="./widgets/search.js")
--- a/src/pages/options/widgets/sendTargets.pug
+++ b/src/pages/options/widgets/sendTargets.pug
@ -1,26 +0,0 @@
-section#sendTargets_page.option-block
-    .some-block.option-block
-        h1(data-localise="__MSG_sendFiles__") Send Files
-    hr
-    .some-block.option-block
-        h4(data-localise="__MSG_enable__") Enable
-        input#sendTargets-enable(type="checkbox")
-
-    #send
-        hr
-        .clearnet
-            include ../../widgets/instances.pug
-            +instances('https://send.com')
-            include ../../widgets/latency.pug
-            +latency('send')
-        .tor
-            include ../../widgets/instances.pug
-            +instances('http://send.onion')
-        .i2p
-            include ../../widgets/instances.pug
-            +instances('http://send.i2p')
-        .loki
-            include ../../widgets/instances.pug
-            +instances('http://send.loki')
-
-    script(type="module" src="./widgets/sendTargets.js")
--- a/src/pages/options/widgets/services.ejs
+++ b/src/pages/options/widgets/services.ejs
@ -1,5 +1,5 @@
-<% config.services.forEach(service=>{ %>
-<section class="option-block" id="<%= service %>_page"</section>
+<% for (const service in config.services) { %>
+<section class="option-block" id="<%= service %>_page">
  <div class="some-block option-block">
    <h1 data-localise="__MSG_<%= service %>__"><%= config.services[service].name %></h1>
  </div>
@ -8,33 +8,35 @@
    <h4 data-localise="__MSG_enable__">Enable</h4>
    <input id="<%= service %>-enable" type="checkbox">
  </div>
+  <% if ((Object.keys(config.services[service].frontends).length > 1) || config.services[service].singleInstanceFrontends) { %>
  <div class="some-block option-block">
  <h4 data-localise="__MSG_frontend__">Frontend</h4>
  <select id="<%= service %>-frontend">
-    <% config.services[service].frontends.forEach(frontend=>{ %>
+    <% for (const frontend in config.services[service].frontends) { %>
    <option value="<%= frontend %>"><%= frontend %></option>
-    <% }); %>
-    <% config.services[service].singleInstanceFrontends.forEach(frontend=>{ %>
-    <option value="<%= frontend %>"><%= frontend %></option>
-    <% }); %>
+    <% }; %>
+    <% for (const frontend in config.services[service].singleInstanceFrontends){ %>
+    <option value="<%= config.services[service].singleInstanceFrontends[frontend] %>"><%= config.services[service].singleInstanceFrontends[frontend] %></option>
+    <% }; %>
  </select>
  </div>
-  <% if (config.services[service].embeddable) { %>
-  <% if (config.services[service].singleInstanceFrontends) { %>
+  <% } %>
+  <% if ((config.services[service].singleInstanceFrontends) && (Object.keys(config.services[service].frontends).length > 1)) { %>
  <div id="<%= service %>-embedded_frontend">
    <div class="some-block option-block">
-      <h4 data-localise="__MSG_embeddedVids__">Embedded Videos Frontend</h4>
+      <h4 data-localise="__MSG_embed_frontend__">Embed Frontend</h4>
      <select id="<%= service %>-embed_frontend">
-        <% config.services[service].frontends.forEach(frontend=>{ %>
-        <option value="frontend">frontend</option>
-        <% }); %>
+        <% for (const frontend in config.services[service].frontends) { %>
+        <option value="<%= frontend %>"><%= frontend %></option>
+        <% }; %>
      </select>
    </div>
  </div>
  <% } %>
+  <% if (config.services[service].embeddable) { %>
  <div class="some-block option-block">
    <h4 data-localise="__MSG_redirectType__">Redirect Type</h4>
-    <select id="<%= service =%-redirect_type">
+    <select id="<%= service %>-redirect_type">
      <option value="both" data-localise="__MSG_both__">both</option>
      <option value="onlyEmbedded" data-localise="__MSG_onlyEmbedded__">Only Embedded</option>
      <option value="onlyNotEmbedded" data-localise="__MSG_onlyNotEmbedded__">Only Not Embedded</option>
@ -42,9 +44,9 @@
  </div>
  <% } %>
  <hr>
-  <% config.services[service].frontends.forEach(frontend=>{ %>
+  <% for (const frontend in config.services[service].frontends) { %>
  <div id="<%= frontend %>">
-    <% config.networks.forEach(network=>{ %>
+    <% for (const network in config.networks) { %>
    <div class="<%= network %>">
      <div class="some-block option-block">
        <h4 data-localise="__MSG_defaultInstances__">Default Instances</h4>
@ -56,7 +58,7 @@
      </div>
      <form class="custom-instance-form">
        <div class="some-block option-block">
-          <input class="custom-instance" placeholder="http://<%= frontend %>.<%= config[network].tld %>" type="url">
+          <input class="custom-instance" placeholder="http://<%= frontend %>.<%= config.networks[network].tld %>" type="url">
          <button class="add add-instance" type="submit">
            <svg xmlns="https://www.w3.org/2000/svg" height="20px" viewBox="0 0 24 24" width="20px" fill="currentColor">
              <path d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"></path>
@ -77,8 +79,9 @@
      </div>
      <% } %>
    </div>
-    <% }); %>
-  <% }); %>
+    <% }; %>
+  </div>
+  <% }; %>
 </section>
-<% }); %>
+<% }; %>
 <script type="module" src="./widgets/services.js"></script>
--- a/src/pages/options/widgets/services.js
+++ b/src/pages/options/widgets/services.js
@ -12,7 +12,8 @@ async function getConfig() {
 		fetch("/config/config.json")
 			.then(response => response.text())
 			.then(data => {
-				config = JSON.parse(data)
+				const tmp = JSON.parse(data)
+				config = tmp.config
 				resolve()
 			})
 	})
--- a/src/pages/options/widgets/tiktok.pug
+++ b/src/pages/options/widgets/tiktok.pug
@ -1,26 +0,0 @@
-section#tiktok_page.option-block
-    .some-block.option-block
-        h1(data-localise="__MSG_tiktok__") TikTok
-    hr
-    .some-block.option-block
-        h4(data-localise="__MSG_enable__") Enable
-        input#tiktok-enable(type="checkbox")
-
-    #proxiTok
-        hr
-        .clearnet
-            include ../../widgets/instances.pug
-            +instances('https://proxitok.com')
-            include ../../widgets/latency.pug
-            +latency('proxiTok')
-        .tor
-            include ../../widgets/instances.pug
-            +instances('http://proxitok.onion')
-        .i2p
-            include ../../widgets/instances.pug
-            +instances('http://proxitok.i2p')
-        .loki
-            include ../../widgets/instances.pug
-            +instances('http://proxitok.loki')
-
-    script(type="module" src="./widgets/tiktok.js")
--- a/src/pages/options/widgets/translate.pug
+++ b/src/pages/options/widgets/translate.pug
@ -1,48 +0,0 @@
-section#translate_page.option-block
-    .some-block.option-block
-        h1(data-localise="__MSG_translate__") Translate
-    hr
-    .some-block.option-block
-        h4(data-localise="__MSG_enable__") Enable
-        input#translate-enable(type="checkbox")
-
-    .some-block.option-block
-        h4(data-localise="__MSG_frontend__") Frontend
-        select#translate-frontend
-            option(value="simplyTranslate") SimplyTranslate
-            option(value="lingva") Lingva
-
-    hr
-    #simplyTranslate
-        .clearnet
-            include ../../widgets/instances.pug
-            +instances('https://simplytranslate.org')
-            include ../../widgets/latency.pug
-            +latency('simplyTranslate')
-        .tor
-            include ../../widgets/instances.pug
-            +instances('http://hxecvvetgrznmprg.onion')
-        .i2p
-            include ../../widgets/instances.pug
-            +instances('http://simplytranslate.i2p')
-        .loki
-            include ../../widgets/instances.pug
-            +instances('http://simplytranslate.loki')
-            
-    #lingva
-        .clearnet
-            include ../../widgets/instances.pug
-            +instances('https://lingvatranslate.com')
-            +latency('lingva')
-        .tor
-            include ../../widgets/instances.pug
-            +instances('http://lingvatranslate.onion')
-        .i2p
-            include ../../widgets/instances.pug
-            +instances('http://lingvatranslate.i2p')
-        .loki
-            include ../../widgets/instances.pug
-            +instances('http://lingvatranslate.loki')
-       
-
-    script(type="module" src="./widgets/translate.js")
--- a/src/pages/options/widgets/twitter.pug
+++ b/src/pages/options/widgets/twitter.pug
@ -1,33 +0,0 @@
-section#twitter_page.option-block
-    .some-block.option-block
-        h1(data-localise="__MSG_twitter__") Twitter
-    hr
-    .some-block.option-block
-        h4(data-localise="__MSG_enable__") Enable
-        input#twitter-enable(type="checkbox")
-
-    .some-block.option-block
-        h4(data-localise="__MSG_redirectType__") Redirect Type
-        select#twitter-redirect_type
-            option(value="both" data-localise="__MSG_both__") both
-            option(value="sub_frame" data-localise="__MSG_onlyEmbedded__") Only Embedded
-            option(value="main_frame" data-localise="__MSG_onlyNotEmbedded__") Only Not Embedded
-
-    #nitter
-        hr
-        .clearnet
-            include ../../widgets/instances.pug
-            +instances('https://nitter.com')
-            include ../../widgets/latency.pug
-            +latency('nitter')
-        .tor
-            include ../../widgets/instances.pug
-            +instances('http://nitter.onion')
-        .i2p
-            include ../../widgets/instances.pug
-            +instances('http://nitter.i2p')
-        .loki
-            include ../../widgets/instances.pug
-            +instances('http://nitter.loki')
-
-    script(type="module" src="./widgets/twitter.js")
--- a/src/pages/options/widgets/wikipedia.pug
+++ b/src/pages/options/widgets/wikipedia.pug
@ -1,26 +0,0 @@
-section#wikipedia_page.option-block
-    .some-block.option-block
-        h1(data-localise="__MSG_wikipedia__") Wikipedia
-    hr
-    .some-block.option-block
-        h4(data-localise="__MSG_enable__") Enable
-        input#wikipedia-enable(type="checkbox")
-
-    #wikiless
-        hr
-        .clearnet
-            include ../../widgets/instances.pug
-            +instances('https://wikiless.com')
-            include ../../widgets/latency.pug
-            +latency('wikiless')
-        .tor
-            include ../../widgets/instances.pug
-            +instances('http://wikiless.onion')
-        .i2p
-            include ../../widgets/instances.pug
-            +instances('https://wikiless.i2p')
-        .loki
-            include ../../widgets/instances.pug
-            +instances('http://wikiless.loki')
-
-    script(type="module" src="./widgets/wikipedia.js")
--- a/src/pages/options/widgets/youtube.pug
+++ b/src/pages/options/widgets/youtube.pug
@ -1,103 +0,0 @@
-section#youtube_page.option-block
-    .some-block.option-block
-        h1(data-localise="__MSG_youtube__") YouTube
-    hr
-    .some-block.option-block
-        h4(data-localise="__MSG_enable__") Enable
-        input#youtube-enable(type="checkbox")
-
-    .some-block.option-block
-        h4(data-localise="__MSG_frontend__") Frontend
-        select#youtube-frontend
-            option(value="invidious") Invidious
-            option(value="piped") Piped
-            option(value="pipedMaterial") Piped-Material
-            option(value="cloudtube") CloudTube
-            option(value="freetube") FreeTube
-            option(value="yatte") Yattee
-
-    #youtube-embedded_frontend
-        .some-block.option-block
-            h4(data-localise="__MSG_embeddedVids__") Embedded Videos Frontend
-            select#youtube-embed_frontend
-                option(value="invidious") Invidious
-                option(value="piped") Piped
-                option(value="pipedMaterial") Piped-Material
-                option(value="cloudtube") CloudTube
-
-    .some-block.option-block
-        h4(data-localise="__MSG_redirectType__") Redirect Type
-        select#youtube-redirect_type
-            option(value="both" data-localise="__MSG_both__") both
-            option(value="onlyEmbedded" data-localise="__MSG_onlyEmbedded__") Only Embedded
-            option(value="onlyNotEmbedded" data-localise="__MSG_onlyNotEmbedded__") Only Not Embedded
-
-    #invidious
-        hr
-        .clearnet
-            include ../../widgets/instances.pug
-            +instances('http://invidious.com')
-            include ../../widgets/latency.pug
-            +latency('invidious')
-        .tor
-            include ../../widgets/instances.pug
-            +instances('http://invidious.onion')
-        .i2p
-            include ../../widgets/instances.pug
-            +instances('http://invidious.i2p')
-        .loki
-            include ../../widgets/instances.pug
-            +instances('http://invidious.loki')
-
-    #piped
-        hr
-        .clearnet
-            include ../../widgets/instances.pug
-            +instances('https://piped.com')
-            include ../../widgets/latency.pug
-            +latency('piped')
-        .tor
-            +instances('http://piped.onion')
-            include ../../widgets/instances.pug
-        .i2p
-            include ../../widgets/instances.pug
-            +instances('http://piped.i2p')
-        .loki
-            include ../../widgets/instances.pug
-            +instances('http://piped.loki')
-
-    #pipedMaterial
-        hr
-        .clearnet
-            include ../../widgets/instances.pug
-            +instances('https://piped-material.com')
-            include ../../widgets/latency.pug
-            +latency('pipedMaterial')
-        .tor
-            +instances('http://piped-material.onion')
-            include ../../widgets/instances.pug
-        .i2p
-            include ../../widgets/instances.pug
-            +instances('http://piped-material.i2p')
-        .loki
-            include ../../widgets/instances.pug
-            +instances('http://piped-material.loki')
-
-    #cloudtube
-        hr
-        .clearnet
-            include ../../widgets/instances.pug
-            +instances('https://cloudtube.com')
-            include ../../widgets/latency.pug
-            +latency('cloudtube')
-        .tor
-            +instances('http://cloudtube.onion')
-            include ../../widgets/instances.pug
-        .i2p
-            include ../../widgets/instances.pug
-            +instances('http://cloudtube.i2p')
-        .loki
-            include ../../widgets/instances.pug
-            +instances('http://cloudtube.loki')
-
-    script(type="module" src="./widgets/youtube.js")
--- a/src/pages/options/widgets/youtubeMusic.pug
+++ b/src/pages/options/widgets/youtubeMusic.pug
@ -1,49 +0,0 @@
-section#youtubeMusic_page.option-block
-    .some-block.option-block
-        h1(data-localise="__MSG_ytmusic__") YouTube Music
-    hr
-    .some-block.option-block
-        h4(data-localise="__MSG_enable__") Enable
-        input#youtubeMusic-enable(type="checkbox")
-
-    .some-block.option-block
-        h4(data-localise="__MSG_frontend__") Frontend
-        select#youtubeMusic-frontend
-            option(value="beatbump") Beatbump
-            option(value="hyperpipe") Hyperpipe
-
-    #beatbump
-        hr
-        .clearnet
-            include ../../widgets/instances.pug
-            +instances('https://beatbump.org')
-            include ../../widgets/latency.pug
-            +latency('beatbump')
-        .tor
-            +instances('http://beatbump.onion')
-            include ../../widgets/instances.pug
-        .i2p
-            include ../../widgets/instances.pug
-            +instances('http://beatbump.i2p')
-        .loki
-            include ../../widgets/instances.pug
-            +instances('http://beatbump.loki')
-
-    #hyperpipe
-        hr
-        .clearnet
-            include ../../widgets/instances.pug
-            +instances('https://hyperpipe.org')
-            include ../../widgets/latency.pug
-            +latency('hyperpipe')
-        .tor
-            +instances('http://hyperpipe.onion')
-            include ../../widgets/instances.pug
-        .i2p
-            include ../../widgets/instances.pug
-            +instances('http://hyperpipe.i2p')
-        .loki
-            include ../../widgets/instances.pug
-            +instances('http://hyperpipe.loki')
-
-    script(type="module" src="./widgets/youtubeMusic.js")
--- a/src/pages/widgets/links.ejs
+++ b/src/pages/widgets/links.ejs
@ -1,7 +1,7 @@
 <section class="links" id="links">
  <div class="title"><img src="../../../assets/images/general-icon.svg"><a href="#general" data-localise="__MSG_general__">General</a></div>
-  <% config.services.forEach(service=>{ %>
+  <% for (const service in config.services) { %>
  <div class="title"><img src="../../../assets/images/<%= service %>-icon.<%= config.services[service].imageType %>"><a href="#<%= service %>" data-localise="__MSG_<%= service %>__"><%= service %></a></div>
-  <% }); %>
+  <% }; %>
  <div class="title"><img src="../../../assets/images/about-icon.svg"><a href="#about" data-localise="__MSG_about__">About</a></div>
 </section>