Fixing things and refining design

39 files changed, 155 insertions, 47 deletions

diff --git a/src/assets/javascripts/helpers/search.js b/src/assets/javascripts/helpers/search.js
index 511fc53b..9bd9c132 100644
--- a/src/assets/javascripts/helpers/search.js
+++ b/src/assets/javascripts/helpers/search.js
@@ -79,7 +79,7 @@ function initSearxCookies(test, from) {
           ...r.searxTorCustomRedirects,
           ...r.searxI2pRedirectsChecks,
           ...r.searxI2pCustomRedirects,
-        ].includes(protocolHost)) return;
+        ].includes(protocolHost)) { resolve(); return; }
 
         if (!test) {
           let checkedInstances;
@@ -125,7 +125,7 @@ function setSearxCookies() {
         "searxTorCustomRedirects",
       ],
       r => {
-        if (r.disableSearch || r.searchFrontend != 'searx', r.searchProtocol === undefined) { resolve(); return; }
+        if (r.disableSearch || r.searchFrontend != 'searx') { resolve(); return; }
         let checkedInstances;
         if (r.searchProtocol == 'normal') checkedInstances = [...r.searxNormalRedirectsChecks, ...r.searxNormalCustomRedirects]
         else if (r.searchProtocol == 'tor') checkedInstances = [...r.searxTorRedirectsChecks, ...r.searxTorCustomRedirects]
@@ -175,7 +175,7 @@ function initSearxngCookies(test, from) {
           ...r.searxngTorCustomRedirects,
           ...r.searxngI2pRedirectsChecks,
           ...r.searxngI2pCustomRedirects,
-        ].includes(protocolHost)) return;
+        ].includes(protocolHost)) { resolve(); return; }
 
         if (!test) {
           let checkedInstances;
diff --git a/src/assets/javascripts/helpers/translate/translate.js b/src/assets/javascripts/helpers/translate/translate.js
index 7ad1f33a..996f0ee3 100644
--- a/src/assets/javascripts/helpers/translate/translate.js
+++ b/src/assets/javascripts/helpers/translate/translate.js
@@ -126,14 +126,11 @@ function initSimplyTranslateCookies(test, from) {
           ...r.simplyTranslateNormalCustomRedirects,
           ...r.simplyTranslateTorRedirectsChecks,
           ...r.simplyTranslateTorCustomRedirects,
-          ...r.simplyTranslateI2pRedirectsChecks,
-          ...r.simplyTranslateI2pCustomRedirects,
         ].includes(protocolHost)) { resolve(); return; }
         if (!test) {
           let checkedInstances;
           if (r.translateProtocol == 'normal') checkedInstances = [...r.simplyTranslateNormalRedirectsChecks, ...r.simplyTranslateNormalCustomRedirects]
           else if (r.translateProtocol == 'tor') checkedInstances = [...r.simplyTranslateTorRedirectsChecks, ...r.simplyTranslateTorCustomRedirects]
-          else if (r.translateProtocol == 'i2p') checkedInstances = [...r.simplyTranslateI2pRedirectsChecks, ...r.simplyTranslateI2pCustomRedirects]
           for (const to of checkedInstances) {
             utils.copyCookie('simplyTranslate', from, to, 'from_lang');
             utils.copyCookie('simplyTranslate', from, to, 'to_lang');
diff --git a/src/pages/background/background.js b/src/pages/background/background.js
index 9eedc308..5a6dc820 100644
--- a/src/pages/background/background.js
+++ b/src/pages/background/background.js
@@ -85,8 +85,8 @@ browser.webRequest.onBeforeRequest.addListener(
     else if (details.initiator)
       initiator = new URL(details.initiator);
 
-    let newUrl = await youtubeHelper.redirect(url, details, initiator)
-    if (!newUrl) newUrl = await youtubeMusicHelper.redirect(url, details.type)
+    let newUrl = await youtubeMusicHelper.redirect(url, details.type)
+    if (!newUrl) newUrl = await youtubeHelper.redirect(url, details, initiator)
     if (!newUrl) newUrl = await twitterHelper.redirect(url, initiator);
     if (!newUrl) newUrl = await instagramHelper.redirect(url, details.type, initiator);
     if (!newUrl) newUrl = await mapsHelper.redirect(url, initiator);
diff --git a/src/pages/options/general/general.html b/src/pages/options/general/general.html
index 8239f7c8..8dd60184 100644
--- a/src/pages/options/general/general.html
+++ b/src/pages/options/general/general.html
@@ -55,6 +55,10 @@
     </section>
   <section class="option-block">
     <div class="some-block option-block">
+      <h1>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>
@@ -195,7 +199,6 @@
         </div>
         <input id="sendTargets" type="checkbox">
       </div>
-      <hr>
     </div>
     <script type="module" src="../init.js"></script>
     <script type="module" src="./general.js"></script>
diff --git a/src/pages/options/general/general.pug b/src/pages/options/general/general.pug
index 0cef8025..3d35c311 100644
--- a/src/pages/options/general/general.pug
+++ b/src/pages/options/general/general.pug
@@ -8,6 +8,10 @@ body.option(dir="auto")
 
     section.option-block
         .some-block.option-block
+            h1 General
+        hr
+
+        .some-block.option-block
             h4(data-localise="__MSG_theme__") Theme
             select#theme
                 option(value="DEFAULT" data-localise="__MSG_system__") System
@@ -167,9 +171,6 @@ body.option(dir="auto")
                     |Send Files
                 input#sendTargets(type="checkbox")
 
-            hr
-
-
         script(type="module" src="../init.js")
         script(type="module" src="./general.js")
         script(type="module" src="../../../assets/javascripts/localise.js")
\ No newline at end of file
diff --git a/src/pages/options/imgur/imgur.html b/src/pages/options/imgur/imgur.html
index 6194fbb3..78730edc 100644
--- a/src/pages/options/imgur/imgur.html
+++ b/src/pages/options/imgur/imgur.html
@@ -5,7 +5,7 @@
     <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</title>
+    <title>Imgur</title>
   </head>
 </html>
 <script type="module" src="../../../assets/javascripts/localise.js"></script>
@@ -56,6 +56,10 @@
     </section>
   <section class="option-block">
     <div class="some-block option-block">
+      <h1>Imgur</h1>
+    </div>
+    <hr>
+    <div class="some-block option-block">
       <h4 data-localise="__MSG_enable__">Enable</h4>
       <input id="disable-imgur" type="checkbox">
     </div>
diff --git a/src/pages/options/imgur/imgur.pug b/src/pages/options/imgur/imgur.pug
index f195ca66..3dacdec8 100644
--- a/src/pages/options/imgur/imgur.pug
+++ b/src/pages/options/imgur/imgur.pug
@@ -1,7 +1,7 @@
 doctype html
 html(lang="en")
     include ../../widgets/head.pug
-        title General
+        title Imgur
 script(type="module" src="../../../assets/javascripts/localise.js")
 body.option(dir="auto")
     include ../../widgets/links.pug
@@ -9,6 +9,10 @@ body.option(dir="auto")
 
     section.option-block
         .some-block.option-block
+            h1 Imgur
+        hr
+
+        .some-block.option-block
             h4(data-localise="__MSG_enable__") Enable
             input#disable-imgur(type="checkbox")
 
diff --git a/src/pages/options/instagram/instagram.html b/src/pages/options/instagram/instagram.html
index dfb58722..2524f909 100644
--- a/src/pages/options/instagram/instagram.html
+++ b/src/pages/options/instagram/instagram.html
@@ -5,7 +5,7 @@
     <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</title>
+    <title>Instagram</title>
   </head>
 </html>
 <script type="module" src="../../../assets/javascripts/localise.js"></script>
@@ -56,6 +56,10 @@
     </section>
   <section class="option-block">
     <div class="some-block option-block">
+      <h1>Instagram</h1>
+    </div>
+    <hr>
+    <div class="some-block option-block">
       <h4 data-localise="__MSG_enable__">Enable</h4>
       <input id="disable-bibliogram" type="checkbox">
     </div>
diff --git a/src/pages/options/instagram/instagram.pug b/src/pages/options/instagram/instagram.pug
index 6e1ef19a..6acc2c6e 100644
--- a/src/pages/options/instagram/instagram.pug
+++ b/src/pages/options/instagram/instagram.pug
@@ -1,7 +1,7 @@
 doctype html
 html(lang="en")
     include ../../widgets/head.pug
-        title General
+        title Instagram
 script(type="module" src="../../../assets/javascripts/localise.js")
 body.option(dir="auto")
     include ../../widgets/links.pug
@@ -9,6 +9,10 @@ body.option(dir="auto")
 
     section.option-block
         .some-block.option-block
+            h1 Instagram
+        hr
+
+        .some-block.option-block
             h4(data-localise="__MSG_enable__") Enable
             input#disable-bibliogram(type="checkbox")
 
diff --git a/src/pages/options/lbry/lbry.html b/src/pages/options/lbry/lbry.html
index 3802a149..4c24239c 100644
--- a/src/pages/options/lbry/lbry.html
+++ b/src/pages/options/lbry/lbry.html
@@ -5,7 +5,7 @@
     <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</title>
+    <title>LBRY/Odysee</title>
   </head>
 </html>
 <script type="module" src="../../../assets/javascripts/localise.js"></script>
@@ -56,6 +56,10 @@
     </section>
   <section class="option-block">
     <div class="some-block option-block">
+      <h1>LBRY/Odysee</h1>
+    </div>
+    <hr>
+    <div class="some-block option-block">
       <h4 data-localise="__MSG_enable__">Enable</h4>
       <input id="disable-lbry" type="checkbox">
     </div>
diff --git a/src/pages/options/lbry/lbry.pug b/src/pages/options/lbry/lbry.pug
index aca0d489..e579de32 100644
--- a/src/pages/options/lbry/lbry.pug
+++ b/src/pages/options/lbry/lbry.pug
@@ -1,7 +1,7 @@
 doctype html
 html(lang="en")
     include ../../widgets/head.pug
-        title General
+        title LBRY/Odysee
 script(type="module" src="../../../assets/javascripts/localise.js")
 body.option(dir="auto")
     include ../../widgets/links.pug
@@ -9,6 +9,9 @@ body.option(dir="auto")
 
     section.option-block
         .some-block.option-block
+            h1 LBRY/Odysee
+        hr
+        .some-block.option-block
             h4(data-localise="__MSG_enable__") Enable
             input#disable-lbry(type="checkbox")
 
diff --git a/src/pages/options/maps/maps.html b/src/pages/options/maps/maps.html
index af7d0729..596289b8 100644
--- a/src/pages/options/maps/maps.html
+++ b/src/pages/options/maps/maps.html
@@ -5,7 +5,7 @@
     <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</title>
+    <title>Maps</title>
   </head>
 </html>
 <script type="module" src="../../../assets/javascripts/localise.js"></script>
@@ -56,6 +56,10 @@
     </section>
   <section class="option-block">
     <div class="some-block option-block">
+      <h1>Maps</h1>
+    </div>
+    <hr>
+    <div class="some-block option-block">
       <h4 data-localise="__MSG_enable__">Enable</h4>
       <input id="disable-osm" type="checkbox">
     </div>
diff --git a/src/pages/options/maps/maps.pug b/src/pages/options/maps/maps.pug
index 2da94a43..ab51f875 100644
--- a/src/pages/options/maps/maps.pug
+++ b/src/pages/options/maps/maps.pug
@@ -1,7 +1,7 @@
 doctype html
 html(lang="en")
     include ../../widgets/head.pug
-        title General
+        title Maps
 script(type="module" src="../../../assets/javascripts/localise.js")
 body.option(dir="auto")
     include ../../widgets/links.pug
@@ -9,6 +9,9 @@ body.option(dir="auto")
 
     section.option-block
         .some-block.option-block
+            h1 Maps
+        hr
+        .some-block.option-block
             h4(data-localise="__MSG_enable__") Enable
             input#disable-osm(type="checkbox")
 
diff --git a/src/pages/options/medium/medium.html b/src/pages/options/medium/medium.html
index 87aff725..cf9bab82 100644
--- a/src/pages/options/medium/medium.html
+++ b/src/pages/options/medium/medium.html
@@ -5,7 +5,7 @@
     <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</title>
+    <title>Medium</title>
   </head>
 </html>
 <script type="module" src="../../../assets/javascripts/localise.js"></script>
@@ -56,6 +56,10 @@
     </section>
   <section class="option-block">
     <div class="some-block option-block">
+      <h1>Medium</h1>
+    </div>
+    <hr>
+    <div class="some-block option-block">
       <h4 data-localise="__MSG_enable__">Enable</h4>
       <input id="disable-medium" type="checkbox">
     </div>
diff --git a/src/pages/options/medium/medium.pug b/src/pages/options/medium/medium.pug
index f5b698d2..eb640c46 100644
--- a/src/pages/options/medium/medium.pug
+++ b/src/pages/options/medium/medium.pug
@@ -1,7 +1,7 @@
 doctype html
 html(lang="en")
     include ../../widgets/head.pug
-        title General
+        title Medium
 script(type="module" src="../../../assets/javascripts/localise.js")
 body.option(dir="auto")
     include ../../widgets/links.pug
@@ -9,6 +9,9 @@ body.option(dir="auto")
 
     section.option-block
         .some-block.option-block
+            h1 Medium
+        hr
+        .some-block.option-block
             h4(data-localise="__MSG_enable__") Enable
             input#disable-medium(type="checkbox")
 
diff --git a/src/pages/options/peertube/peertube.html b/src/pages/options/peertube/peertube.html
index 1ddc26ac..384c90bf 100644
--- a/src/pages/options/peertube/peertube.html
+++ b/src/pages/options/peertube/peertube.html
@@ -5,7 +5,7 @@
     <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</title>
+    <title>PeerTube</title>
   </head>
 </html>
 <script type="module" src="../../../assets/javascripts/localise.js"></script>
@@ -56,6 +56,10 @@
     </section>
   <section class="option-block">
     <div class="some-block option-block">
+      <h1>PeerTube</h1>
+    </div>
+    <hr>
+    <div class="some-block option-block">
       <h4 data-localise="__MSG_enable__">Enable</h4>
       <input id="disable-peertube" type="checkbox">
     </div>
diff --git a/src/pages/options/peertube/peertube.pug b/src/pages/options/peertube/peertube.pug
index d9b25bbc..a30be4db 100644
--- a/src/pages/options/peertube/peertube.pug
+++ b/src/pages/options/peertube/peertube.pug
@@ -1,7 +1,7 @@
 doctype html
 html(lang="en")
     include ../../widgets/head.pug
-        title General
+        title PeerTube
 script(type="module" src="../../../assets/javascripts/localise.js")
 body.option(dir="auto")
     include ../../widgets/links.pug
@@ -9,6 +9,9 @@ body.option(dir="auto")
 
     section.option-block
         .some-block.option-block
+            h1 PeerTube
+        hr
+        .some-block.option-block
             h4(data-localise="__MSG_enable__") Enable
             input#disable-peertube(type="checkbox")
 
diff --git a/src/pages/options/reddit/reddit.html b/src/pages/options/reddit/reddit.html
index 754314eb..20a26f6c 100644
--- a/src/pages/options/reddit/reddit.html
+++ b/src/pages/options/reddit/reddit.html
@@ -5,7 +5,7 @@
     <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</title>
+    <title>Reddit</title>
   </head>
 </html>
 <script type="module" src="../../../assets/javascripts/localise.js"></script>
@@ -56,6 +56,10 @@
     </section>
   <section class="option-block">
     <div class="some-block option-block">
+      <h1>Reddit</h1>
+    </div>
+    <hr>
+    <div class="some-block option-block">
       <h4 data-localise="__MSG_enable__">Enable</h4>
       <input id="disable-reddit" type="checkbox">
     </div>
diff --git a/src/pages/options/reddit/reddit.pug b/src/pages/options/reddit/reddit.pug
index ba23df83..c522af29 100644
--- a/src/pages/options/reddit/reddit.pug
+++ b/src/pages/options/reddit/reddit.pug
@@ -1,7 +1,7 @@
 doctype html
 html(lang="en")
     include ../../widgets/head.pug
-        title General
+        title Reddit
 script(type="module" src="../../../assets/javascripts/localise.js")
 body.option(dir="auto")
     include ../../widgets/links.pug
@@ -9,6 +9,9 @@ body.option(dir="auto")
 
     section.option-block
         .some-block.option-block
+            h1 Reddit
+        hr
+        .some-block.option-block
             h4(data-localise="__MSG_enable__") Enable
             input#disable-reddit(type="checkbox")
 
diff --git a/src/pages/options/search/search.html b/src/pages/options/search/search.html
index 8b22e43a..e7107d7b 100644
--- a/src/pages/options/search/search.html
+++ b/src/pages/options/search/search.html
@@ -5,7 +5,7 @@
     <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</title>
+    <title>Search</title>
   </head>
 </html>
 <script type="module" src="../../../assets/javascripts/localise.js"></script>
@@ -56,6 +56,10 @@
     </section>
   <section class="option-block">
     <div class="some-block option-block">
+      <h1>Search</h1>
+    </div>
+    <hr>
+    <div class="some-block option-block">
       <h4 data-localise="__MSG_enable__">Enable</h4>
       <input id="disable-search" type="checkbox">
     </div>
diff --git a/src/pages/options/search/search.pug b/src/pages/options/search/search.pug
index 3bdc6d7e..a9001243 100644
--- a/src/pages/options/search/search.pug
+++ b/src/pages/options/search/search.pug
@@ -1,7 +1,7 @@
 doctype html
 html(lang="en")
     include ../../widgets/head.pug
-        title General
+        title Search
 script(type="module" src="../../../assets/javascripts/localise.js")
 body.option(dir="auto")
     include ../../widgets/links.pug
@@ -9,6 +9,9 @@ body.option(dir="auto")
 
     section.option-block
         .some-block.option-block
+            h1 Search
+        hr
+        .some-block.option-block
             h4(data-localise="__MSG_enable__") Enable
             input#disable-search(type="checkbox")
 
diff --git a/src/pages/options/sendTargets/sendTargets.html b/src/pages/options/sendTargets/sendTargets.html
index f372b3b0..f9f72efc 100644
--- a/src/pages/options/sendTargets/sendTargets.html
+++ b/src/pages/options/sendTargets/sendTargets.html
@@ -5,7 +5,7 @@
     <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</title>
+    <title>Send Files</title>
   </head>
 </html>
 <script type="module" src="../../../assets/javascripts/localise.js"></script>
@@ -56,6 +56,10 @@
     </section>
   <section class="option-block">
     <div class="some-block option-block">
+      <h1>Send Files</h1>
+    </div>
+    <hr>
+    <div class="some-block option-block">
       <h4 data-localise="__MSG_enable__">Enable</h4>
       <input id="disable-sendTargets" type="checkbox">
     </div>
diff --git a/src/pages/options/sendTargets/sendTargets.pug b/src/pages/options/sendTargets/sendTargets.pug
index 3017fa87..027aee79 100644
--- a/src/pages/options/sendTargets/sendTargets.pug
+++ b/src/pages/options/sendTargets/sendTargets.pug
@@ -1,7 +1,7 @@
 doctype html
 html(lang="en")
     include ../../widgets/head.pug
-        title General
+        title Send Files
 script(type="module" src="../../../assets/javascripts/localise.js")
 body.option(dir="auto")
     include ../../widgets/links.pug
@@ -9,6 +9,9 @@ body.option(dir="auto")
 
     section.option-block
         .some-block.option-block
+            h1 Send Files
+        hr
+        .some-block.option-block
             h4(data-localise="__MSG_enable__") Enable
             input#disable-sendTargets(type="checkbox")
 
diff --git a/src/pages/options/tiktok/tiktok.html b/src/pages/options/tiktok/tiktok.html
index 89a14ba6..b4fb1d2a 100644
--- a/src/pages/options/tiktok/tiktok.html
+++ b/src/pages/options/tiktok/tiktok.html
@@ -5,7 +5,7 @@
     <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</title>
+    <title>TikTok</title>
   </head>
 </html>
 <script type="module" src="../../../assets/javascripts/localise.js"></script>
@@ -56,6 +56,10 @@
     </section>
   <section class="option-block">
     <div class="some-block option-block">
+      <h1>TikTok</h1>
+    </div>
+    <hr>
+    <div class="some-block option-block">
       <h4 data-localise="__MSG_enable__">Enable</h4>
       <input id="disable-tiktok" type="checkbox">
     </div>
diff --git a/src/pages/options/tiktok/tiktok.pug b/src/pages/options/tiktok/tiktok.pug
index 528f6ae2..db765c45 100644
--- a/src/pages/options/tiktok/tiktok.pug
+++ b/src/pages/options/tiktok/tiktok.pug
@@ -1,7 +1,7 @@
 doctype html
 html(lang="en")
     include ../../widgets/head.pug
-        title General
+        title TikTok
 script(type="module" src="../../../assets/javascripts/localise.js")
 body.option(dir="auto")
     include ../../widgets/links.pug
@@ -9,6 +9,9 @@ body.option(dir="auto")
 
     section.option-block
         .some-block.option-block
+            h1 TikTok
+        hr
+        .some-block.option-block
             h4(data-localise="__MSG_enable__") Enable
             input#disable-tiktok(type="checkbox")
 
diff --git a/src/pages/options/translate/translate.html b/src/pages/options/translate/translate.html
index c62ea5a6..879917bd 100644
--- a/src/pages/options/translate/translate.html
+++ b/src/pages/options/translate/translate.html
@@ -5,7 +5,7 @@
     <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</title>
+    <title>Translate</title>
   </head>
 </html>
 <script type="module" src="../../../assets/javascripts/localise.js"></script>
@@ -56,6 +56,10 @@
     </section>
   <section class="option-block">
     <div class="some-block option-block">
+      <h1>Translate</h1>
+    </div>
+    <hr>
+    <div class="some-block option-block">
       <h4 data-localise="__MSG_enable__">Enable</h4>
       <input id="disable-simplyTranslate" type="checkbox">
     </div>
diff --git a/src/pages/options/translate/translate.pug b/src/pages/options/translate/translate.pug
index 42afcdf1..a1689e29 100644
--- a/src/pages/options/translate/translate.pug
+++ b/src/pages/options/translate/translate.pug
@@ -1,7 +1,7 @@
 doctype html
 html(lang="en")
     include ../../widgets/head.pug
-        title General
+        title Translate
 script(type="module" src="../../../assets/javascripts/localise.js")
 body.option(dir="auto")
     include ../../widgets/links.pug
@@ -9,6 +9,9 @@ body.option(dir="auto")
 
     section.option-block
         .some-block.option-block
+            h1 Translate
+        hr
+        .some-block.option-block
             h4(data-localise="__MSG_enable__") Enable
             input#disable-simplyTranslate(type="checkbox")
 
diff --git a/src/pages/options/twitter/twitter.html b/src/pages/options/twitter/twitter.html
index 2a477e60..384ba9da 100644
--- a/src/pages/options/twitter/twitter.html
+++ b/src/pages/options/twitter/twitter.html
@@ -5,7 +5,7 @@
     <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</title>
+    <title>Twitter</title>
   </head>
 </html>
 <script type="module" src="../../../assets/javascripts/localise.js"></script>
@@ -56,6 +56,10 @@
     </section>
   <section class="option-block">
     <div class="some-block option-block">
+      <h1>Twitter</h1>
+    </div>
+    <hr>
+    <div class="some-block option-block">
       <h4 data-localise="__MSG_enable__">Enable</h4>
       <input id="disable-nitter" type="checkbox">
     </div>
diff --git a/src/pages/options/twitter/twitter.pug b/src/pages/options/twitter/twitter.pug
index 517a2727..092c3e45 100644
--- a/src/pages/options/twitter/twitter.pug
+++ b/src/pages/options/twitter/twitter.pug
@@ -1,7 +1,7 @@
 doctype html
 html(lang="en")
     include ../../widgets/head.pug
-        title General
+        title Twitter
 script(type="module" src="../../../assets/javascripts/localise.js")
 body.option(dir="auto")
     include ../../widgets/links.pug
@@ -9,6 +9,9 @@ body.option(dir="auto")
 
     section.option-block
         .some-block.option-block
+            h1 Twitter
+        hr
+        .some-block.option-block
             h4(data-localise="__MSG_enable__") Enable
             input#disable-nitter(type="checkbox")
 
diff --git a/src/pages/options/wikipedia/wikipedia.html b/src/pages/options/wikipedia/wikipedia.html
index ba22bc31..fe735ac5 100644
--- a/src/pages/options/wikipedia/wikipedia.html
+++ b/src/pages/options/wikipedia/wikipedia.html
@@ -56,6 +56,10 @@
     </section>
   <section class="option-block">
     <div class="some-block option-block">
+      <h1>Wikipedia</h1>
+    </div>
+    <hr>
+    <div class="some-block option-block">
       <h4 data-localise="__MSG_enable__">Enable</h4>
       <input id="disable-wikipedia" type="checkbox">
     </div>
diff --git a/src/pages/options/wikipedia/wikipedia.pug b/src/pages/options/wikipedia/wikipedia.pug
index 54ca8730..d08431db 100644
--- a/src/pages/options/wikipedia/wikipedia.pug
+++ b/src/pages/options/wikipedia/wikipedia.pug
@@ -9,6 +9,9 @@ body.option(dir="auto")
 
     section.option-block
         .some-block.option-block
+            h1 Wikipedia
+        hr
+        .some-block.option-block
             h4(data-localise="__MSG_enable__") Enable
             input#disable-wikipedia(type="checkbox")
 
diff --git a/src/pages/options/youtube/youtube.html b/src/pages/options/youtube/youtube.html
index 6a2036a1..2938ccd1 100644
--- a/src/pages/options/youtube/youtube.html
+++ b/src/pages/options/youtube/youtube.html
@@ -5,7 +5,7 @@
     <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>Document</title>
+    <title>YouTube</title>
   </head>
 </html>
 <script type="module" src="../../../assets/javascripts/localise.js"></script>
@@ -56,6 +56,10 @@
     </section>
   <section class="option-block">
     <div class="some-block option-block">
+      <h1>YouTube</h1>
+    </div>
+    <hr>
+    <div class="some-block option-block">
       <h4 data-localise="__MSG_enable__">Enable</h4>
       <input id="disable-invidious" type="checkbox">
     </div>
diff --git a/src/pages/options/youtube/youtube.pug b/src/pages/options/youtube/youtube.pug
index 39235b0c..6d5d2469 100644
--- a/src/pages/options/youtube/youtube.pug
+++ b/src/pages/options/youtube/youtube.pug
@@ -1,7 +1,7 @@
 doctype html
 html(lang="en")
     include ../../widgets/head.pug
-        title Document
+        title YouTube
 script(type="module" src="../../../assets/javascripts/localise.js")
 body.option(dir="auto")
     include ../../widgets/links.pug
@@ -9,6 +9,9 @@ body.option(dir="auto")
 
     section.option-block
         .some-block.option-block
+            h1 YouTube
+        hr
+        .some-block.option-block
             h4(data-localise="__MSG_enable__") Enable
             input#disable-invidious(type="checkbox")
 
diff --git a/src/pages/options/youtubeMusic/youtubeMusic.html b/src/pages/options/youtubeMusic/youtubeMusic.html
index 845ec44a..b77a2a88 100644
--- a/src/pages/options/youtubeMusic/youtubeMusic.html
+++ b/src/pages/options/youtubeMusic/youtubeMusic.html
@@ -5,7 +5,7 @@
     <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>Document</title>
+    <title>YouTube Music</title>
   </head>
 </html>
 <script type="module" src="../../../assets/javascripts/localise.js"></script>
@@ -56,6 +56,10 @@
     </section>
   <section class="option-block">
     <div class="some-block option-block">
+      <h1>YouTube Music</h1>
+    </div>
+    <hr>
+    <div class="some-block option-block">
       <h4 data-localise="__MSG_enable__">Enable</h4>
       <input id="disable-beatbump" type="checkbox">
     </div>
diff --git a/src/pages/options/youtubeMusic/youtubeMusic.pug b/src/pages/options/youtubeMusic/youtubeMusic.pug
index 10d2deef..ad3271d4 100644
--- a/src/pages/options/youtubeMusic/youtubeMusic.pug
+++ b/src/pages/options/youtubeMusic/youtubeMusic.pug
@@ -1,7 +1,7 @@
 doctype html
 html(lang="en")
     include ../../widgets/head.pug
-        title Document
+        title YouTube Music
 script(type="module" src="../../../assets/javascripts/localise.js")
 body.option(dir="auto")
     include ../../widgets/links.pug
@@ -9,6 +9,9 @@ body.option(dir="auto")
 
     section.option-block
         .some-block.option-block
+            h1 YouTube Music
+        hr
+        .some-block.option-block
             h4(data-localise="__MSG_enable__") Enable
             input#disable-beatbump(type="checkbox")
 
diff --git a/src/pages/popup/popup.html b/src/pages/popup/popup.html
index ffc1c864..3eb6ba19 100644
--- a/src/pages/popup/popup.html
+++ b/src/pages/popup/popup.html
@@ -48,11 +48,11 @@
         <h4>Medium</h4></a>
       <input id="disable-medium" type="checkbox">
     </div>
-    <div class="some-block" id="peertube"><a class="title" href="https://peertube.com"><img src="../../assets/images/peertube-icon.svg">
+    <div class="some-block" id="peertube"><a class="title" href="https://search.joinpeertube.org"><img src="../../assets/images/peertube-icon.svg">
         <h4>PeerTube</h4></a>
       <input id="disable-peertube" type="checkbox">
     </div>
-    <div class="some-block" id="lbry"><a class="title" href="https://lbry.com"><img src="../../assets/images/lbry-icon.png">
+    <div class="some-block" id="lbry"><a class="title" href="https://odysee.com/"><img src="../../assets/images/lbry-icon.png">
         <h4>LBRY</h4></a>
       <input id="disable-lbry" type="checkbox">
     </div>
@@ -108,6 +108,5 @@
     <div class="space"></div>
     <script type="module" src="../options/init.js"></script>
     <script type="module" src="./popup.js"></script>
-    <script src="../../assets/javascripts/localise.js"></script>
   </body>
 </html>
\ No newline at end of file
diff --git a/src/pages/popup/popup.js b/src/pages/popup/popup.js
index 824f178b..58d45d6a 100644
--- a/src/pages/popup/popup.js
+++ b/src/pages/popup/popup.js
@@ -94,6 +94,7 @@ utils.unify(true).then(r => {
   if (!r) document.getElementById('unify_div').style.display = 'none';
   else {
     const unify = document.getElementById('unify');
+    console.log('addlistner');
     unify.addEventListener("click", () => utils.unify(false, unify));
   }
 })
diff --git a/src/pages/popup/popup.pug b/src/pages/popup/popup.pug
index 5e067f3f..94f65eae 100644
--- a/src/pages/popup/popup.pug
+++ b/src/pages/popup/popup.pug
@@ -63,13 +63,13 @@ html(lang="en")
             input#disable-medium(type="checkbox")
 
         #peertube.some-block
-            a.title(href="https://peertube.com")
+            a.title(href="https://search.joinpeertube.org")
                 img(src="../../assets/images/peertube-icon.svg")
                 h4 PeerTube
             input#disable-peertube(type="checkbox")
 
         #lbry.some-block
-            a.title(href="https://lbry.com")
+            a.title(href="https://odysee.com/")
                 img(src="../../assets/images/lbry-icon.png")
                 h4 LBRY
             input#disable-lbry(type="checkbox")
@@ -124,4 +124,4 @@ html(lang="en")
 
         script(type="module" src="../options/init.js")
         script(type="module" src="./popup.js")
-        script(src="../../assets/javascripts/localise.js")
\ No newline at end of file
+        //- script(src="../../assets/javascripts/localise.js")
\ No newline at end of file
diff --git a/src/pages/stylesheets/styles.css b/src/pages/stylesheets/styles.css
index 4421aa83..f4027c28 100644
--- a/src/pages/stylesheets/styles.css
+++ b/src/pages/stylesheets/styles.css
@@ -211,7 +211,7 @@ div.option-block h4 {
 div.option-block h1 {
   margin: 0;
   font-size: 28px;
-  color: var(--active);
+  color: var(--text);
 }
 
 div.option-block div {