Merge branch 'master' into patch-3

author: Edward <contact@langdon.slmail.me> 2022-10-09 19:04:15 +0530
committer: GitHub <noreply@github.com> 2022-10-09 19:04:15 +0530
commit: 26abc5d2c9f671d359be8a7bf503632242abb2c2 (patch)
tree: ab05b3b2906fbc8423eea3abe1bd8efeccefa439 /src/pages/popup
parent: Update messages.json (diff)
parent: Merge pull request #404 from marcelocripe/patch-1 (diff)
download: libredirect-26abc5d2c9f671d359be8a7bf503632242abb2c2.zip
5 files changed, 449 insertions, 737 deletions
diff --git a/src/pages/popup/popup.ejs b/src/pages/popup/popup.ejs
new file mode 100644
index 00000000..e6cc6fca
--- /dev/null
+++ b/src/pages/popup/popup.ejs
@@ -0,0 +1,55 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <link href="../stylesheets/styles.css" rel="stylesheet">
+    <link href="./style.css" rel="stylesheet">
+  </head>
+  <body dir="auto">
+    <div class="current_site">
+      <div class="some-block" id="instance-div"><a class="title prevent">
+          <%- include('src/assets/images/instance-icon.svg', {services: services}) -%>
+          <h4 id="instance"></h4>
+        </a>
+        <span id="end"><input type="checkbox" id="instance-enabled"/></span>
+      </div>
+      <%- include('src/pages/widgets/switches', {services: services}) -%>
+      <div id="current_site_divider">
+        <hr>
+      </div>
+    </div>
+    <div class="all_sites">
+      <%- include('src/pages/widgets/switches', {services: services}) -%>
+    </div>
+    <hr>
+    <div class="some-block" id="change_instance_div"><a class="title button prevent" id="change_instance">
+        <h4 data-localise="__MSG_switchInstance__">Change Instance</h4>
+        <svg xmlns="http://www.w3.org/2000/svg" height="26px" viewBox="0 0 24 24" width="26px" fill="currentColor">
+          <path d="M12 4V1L8 5l4 4V6c3.31 0 6 2.69 6 6 0 1.01-.25 1.97-.7 2.8l1.46 1.46C19.54 15.03 20 13.57 20 12c0-4.42-3.58-8-8-8zm0 14c-3.31 0-6-2.69-6-6 0-1.01.25-1.97.7-2.8L5.24 7.74C4.46 8.97 4 10.43 4 12c0 4.42 3.58 8 8 8v3l4-4-4-4v3z"></path>
+        </svg></a></div>
+    <div class="some-block" id="copy_raw_div" title="Copy the original redirected link">        <a class="title button prevent" id="copy_raw">
+        <h4 data-localise="__MSG_copyRaw__">Copy Raw</h4>
+        <svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="currentColor">
+          <path d="M16 1H4c-1.1 0-2 .9-2 2v14h2V3h12V1zm3 4H8c-1.1 0-2 .9-2 2v14c0 1.1.9 2 2 2h11c1.1 0 2-.9 2-2V7c0-1.1-.9-2-2-2zm0 16H8V7h11v14z"></path>
+        </svg></a></div>
+    <div class="some-block" id="unify_div" title="Unify preferences across all selected instances"><a class="title button prevent" id="unify">
+        <h4 data-localise="__MSG_unifySettings__">Unify Settings</h4>
+        <svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="currentColor">
+          <path d="M3.9 12c0-1.71 1.39-3.1 3.1-3.1h4V7H7c-2.76 0-5 2.24-5 5s2.24 5 5 5h4v-1.9H7c-1.71 0-3.1-1.39-3.1-3.1zM8 13h8v-2H8v2zm9-6h-4v1.9h4c1.71 0 3.1 1.39 3.1 3.1s-1.39 3.1-3.1 3.1h-4V17h4c2.76 0 5-2.24 5-5s-2.24-5-5-5z"></path>
+        </svg></a></div>
+    <div class="some-block"><a class="title button prevent" id="more-options">
+        <h4 data-localise="__MSG_settings__">Settings</h4>
+        <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></div>
+    <div class="some-block"><a class="title button" id="about" href="/pages/options/index.html#about">
+        <h4 data-localise="__MSG_about__">About</h4>
+        <svg xmlns="http://www.w3.org/2000/svg" height="24" width="24" fill="currentColor">
+          <path d="M11 17h2v-6h-2Zm1-8q.425 0 .713-.288Q13 8.425 13 8t-.287-.713Q12.425 7 12 7t-.712.287Q11 7.575 11 8t.288.712Q11.575 9 12 9Zm0 13q-2.075 0-3.9-.788-1.825-.787-3.175-2.137-1.35-1.35-2.137-3.175Q2 14.075 2 12t.788-3.9q.787-1.825 2.137-3.175 1.35-1.35 3.175-2.138Q9.925 2 12 2t3.9.787q1.825.788 3.175 2.138 1.35 1.35 2.137 3.175Q22 9.925 22 12t-.788 3.9q-.787 1.825-2.137 3.175-1.35 1.35-3.175 2.137Q14.075 22 12 22Zm0-2q3.35 0 5.675-2.325Q20 15.35 20 12q0-3.35-2.325-5.675Q15.35 4 12 4 8.65 4 6.325 6.325 4 8.65 4 12q0 3a.35 2.325 5.675Q8.65 20 12 20Zm0-8Z"></path>
+        </svg></a></div>
+    <div class="space"></div>
+    <script type="module" src="../options/init.js"></script>
+    <script type="module" src="./popup.js"></script>
+  </body>
+</html>
diff --git a/src/pages/popup/popup.html b/src/pages/popup/popup.html
index 1c3f6ea2..6dc48478 100644
--- a/src/pages/popup/popup.html
+++ b/src/pages/popup/popup.html
@@ -8,189 +8,245 @@
   </head>
   <body dir="auto">
     <div class="current_site">
-      <div class="youtube some-block"><a class="title" href="https://youtube.com"><img src="../../assets/images/youtube-icon.png"/>
-          <h4 data-localise="__MSG_youtube__">YouTube</h4></a>
-        <input class="disable-youtube" type="checkbox"/>
-      </div>
-      <div class="youtubeMusic some-block"><a class="title" href="https://music.youtube.com"><img src="../../assets/images/youtube-music-icon.png"/>
-          <h4 data-localise="__MSG_ytmusic__">YT Music</h4></a>
-        <input class="disable-youtubeMusic" type="checkbox"/>
-      </div>
-      <div class="twitter some-block"><a class="title" href="https://twitter.com"><img src="../../assets/images/twitter-icon.png"/>
-          <h4 data-localise="__MSG_twitter__">Twitter</h4></a>
-        <input class="disable-nitter" type="checkbox"/>
-      </div>
-      <div class="instagram some-block"><a class="title" href="https://instagram.com"><img src="../../assets/images/instagram-icon.png"/>
-          <h4 data-localise="__MSG_instagram__">Instagram</h4></a>
-        <input class="disable-bibliogram" type="checkbox"/>
-      </div>
-      <div class="tiktok some-block"><a class="title" href="https://tiktok.com"><img src="../../assets/images/tiktok-icon.png"/>
-          <h4 data-localise="__MSG_tiktok__">TikTok</h4></a>
-        <input class="disable-tiktok" type="checkbox"/>
-      </div>
-      <div class="imgur some-block"><a class="title" href="https://imgur.com"><img src="../../assets/images/imgur.png"/>
-          <h4 data-localise="__MSG_imgur__">Imgur</h4></a>
-        <input class="disable-imgur" type="checkbox"/>
-      </div>
-      <div class="reddit some-block"><a class="title" href="https://reddit.com"><img src="../../assets/images/reddit-icon.png"/>
-          <h4 data-localise="__MSG_reddit__">Reddit</h4></a>
-        <input class="disable-reddit" type="checkbox"/>
-      </div>
-      <div class="wikipedia some-block"><a class="title" href="https://wikipedia.com"><img src="../../assets/images/wikipedia-icon.svg"/>
-          <h4 data-localise="__MSG_wikipedia__">Wikipedia</h4></a>
-        <input class="disable-wikipedia" type="checkbox"/>
-      </div>
-      <div class="medium some-block"><a class="title" href="https://medium.com">
-          <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>
-          <h4 data-localise="__MSG_medium__">Medium</h4></a>
-        <input class="disable-medium" type="checkbox"/>
-      </div>
-      <div class="quora some-block"><a class="title" href="https://quora.com"><img src="../../assets/images/quora.png"/>
-          <h4>Quora</h4></a>
-        <input class="disable-quora" type="checkbox"/>
-      </div>
-      <div class="imdb some-block"><a class="title" href="https://imdb.com"><img src="../../assets/images/imdb.svg"/>
-          <h4>IMDb</h4></a>
-        <input class="disable-imdb" type="checkbox"/>
-      </div>
-      <div class="reuters some-block"><a class="title" href="https://reuters.com"><img src="../../assets/images/reuters.svg"/>
-          <h4>Reuters</h4></a>
-        <input class="disable-reuters" type="checkbox"/>
-      </div>
-      <div class="peertube some-block"><a class="title" href="https://search.joinpeertube.org"><img src="../../assets/images/peertube-icon.svg"/>
-          <h4 data-localise="__MSG_peertube__">PeerTube</h4></a>
-        <input class="disable-peertube" type="checkbox"/>
-      </div>
-      <div class="lbry some-block"><a class="title" href="https://odysee.com/"><img src="../../assets/images/lbry-icon.png"/>
-          <h4 data-localise="__MSG_lbry__">LBRY</h4></a>
-        <input class="disable-lbry" type="checkbox"/>
-      </div>
-      <div class="search some-block"><a class="title" href="https://search.libredirect.invalid">
-          <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"></path>
-          </svg>
-          <h4 data-localise="__MSG_search__">Search</h4></a>
-        <input class="disable-search" type="checkbox"/>
-      </div>
-      <div class="translate some-block"><a class="title" href="https://translate.google.com">
-          <svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" 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"></path>
-          </svg>
-          <h4 data-localise="__MSG_translate__">Translate</h4></a>
-        <input class="disable-translate" type="checkbox"/>
-      </div>
-      <div class="maps some-block"><a class="title" href="https://www.openstreetmap.org">
-          <svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" 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"></path>
-          </svg>
-          <h4 data-localise="__MSG_maps__">Maps</h4></a>
-        <input class="disable-osm" type="checkbox"/>
-      </div>
-      <div class="sendTargets some-block"><a class="title" href="https://send.libredirect.invalid">
-          <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"></path>
-          </svg>
-          <h4 data-localise="__MSG_sendFiles__">Send Files</h4></a>
-        <input class="disable-sendTargets" type="checkbox"/>
-      </div>
+      <div class="some-block" id="instance-div"><a class="title prevent">
+          <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="M11.99 2C6.47 2 2 6.48 2 12s4.47 10 9.99 10C17.52 22 22 17.52 22 12S17.52 2 11.99 2zm6.93 6h-2.95c-.32-1.25-.78-2.45-1.38-3.56 1.84.63 3.37 1.91 4.33 3.56zM12 4.04c.83 1.2 1.48 2.53 1.91 3.96h-3.82c.43-1.43 1.08-2.76 1.91-3.96zM4.26 14C4.1 13.36 4 12.69 4 12s.1-1.36.26-2h3.38c-.08.66-.14 1.32-.14 2 0 .68.06 1.34.14 2H4.26zm.82 2h2.95c.32 1.25.78 2.45 1.38 3.56-1.84-.63-3.37-1.9-4.33-3.56zm2.95-8H5.08c.96-1.66 2.49-2.93 4.33-3.56C8.81 5.55 8.35 6.75 8.03 8zM12 19.96c-.83-1.2-1.48-2.53-1.91-3.96h3.82c-.43 1.43-1.08 2.76-1.91 3.96zM14.34 14H9.66c-.09-.66-.16-1.32-.16-2 0-.68.07-1.35.16-2h4.68c.09.65.16 1.32.16 2 0 .68-.07 1.34-.16 2zm.25 5.56c.6-1.11 1.06-2.31 1.38-3.56h2.95c-.96 1.65-2.49 2.93-4.33 3.56zM16.36 14c.08-.66.14-1.32.14-2 0-.68-.06-1.34-.14-2h3.38c.16.64.26 1.31.26 2s-.1 1.36-.26 2h-3.38z"></path>
+</svg>
+          <h4 id="instance"></h4>
+        </a>
+        <span id="end"><input type="checkbox" id="instance-enabled"/></span>
+      </div>
+      <div class="youtube some-block"><a class="title" href="https://youtube.com">
+    <img src="../../assets/images/youtube-icon.png"/>
+    <h4 data-localise="__MSG_youtube__">Youtube</h4></a>
+  <input class="youtube-enabled" type="checkbox"/>
+</div>
+<div class="youtubeMusic some-block"><a class="title" href="https://music.youtube.com">
+    <img src="../../assets/images/youtubeMusic-icon.png"/>
+    <h4 data-localise="__MSG_youtubeMusic__">YT Music</h4></a>
+  <input class="youtubeMusic-enabled" type="checkbox"/>
+</div>
+<div class="twitter some-block"><a class="title" href="https://twitter.com">
+    <img src="../../assets/images/twitter-icon.png"/>
+    <h4 data-localise="__MSG_twitter__">Twitter</h4></a>
+  <input class="twitter-enabled" type="checkbox"/>
+</div>
+<div class="instagram some-block"><a class="title" href="https://instagram.com">
+    <img src="../../assets/images/instagram-icon.png"/>
+    <h4 data-localise="__MSG_instagram__">Instagram</h4></a>
+  <input class="instagram-enabled" type="checkbox"/>
+</div>
+<div class="tiktok some-block"><a class="title" href="https://tiktok.com">
+    <img src="../../assets/images/tiktok-icon.png"/>
+    <h4 data-localise="__MSG_tiktok__">TikTok</h4></a>
+  <input class="tiktok-enabled" type="checkbox"/>
+</div>
+<div class="reddit some-block"><a class="title" href="https://reddit.com">
+    <img src="../../assets/images/reddit-icon.png"/>
+    <h4 data-localise="__MSG_reddit__">Reddit</h4></a>
+  <input class="reddit-enabled" type="checkbox"/>
+</div>
+<div class="imgur some-block"><a class="title" href="https://imgur.com">
+    <img src="../../assets/images/imgur-icon.png"/>
+    <h4 data-localise="__MSG_imgur__">Imgur</h4></a>
+  <input class="imgur-enabled" type="checkbox"/>
+</div>
+<div class="wikipedia some-block"><a class="title" href="https://wikipedia.org">
+    <img src="../../assets/images/wikipedia-icon.svg"/>
+    <h4 data-localise="__MSG_wikipedia__">Wikipedia</h4></a>
+  <input class="wikipedia-enabled" type="checkbox"/>
+</div>
+<div class="medium some-block"><a class="title" href="https://medium.com">
+    <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>
+
+    <h4 data-localise="__MSG_medium__">Medium</h4></a>
+  <input class="medium-enabled" type="checkbox"/>
+</div>
+<div class="quora some-block"><a class="title" href="https://quora.com">
+    <img src="../../assets/images/quora-icon.png"/>
+    <h4 data-localise="__MSG_quora__">Quora</h4></a>
+  <input class="quora-enabled" type="checkbox"/>
+</div>
+<div class="imdb some-block"><a class="title" href="https://imdb.com">
+    <img src="../../assets/images/imdb-icon.svg"/>
+    <h4 data-localise="__MSG_imdb__">IMDb</h4></a>
+  <input class="imdb-enabled" type="checkbox"/>
+</div>
+<div class="reuters some-block"><a class="title" href="https://reuters.com">
+    <img src="../../assets/images/reuters-icon.svg"/>
+    <h4 data-localise="__MSG_reuters__">Reuters</h4></a>
+  <input class="reuters-enabled" type="checkbox"/>
+</div>
+<div class="fandom some-block"><a class="title" href="https://fandom.com">
+    <img src="../../assets/images/fandom-icon.svg"/>
+    <h4 data-localise="__MSG_fandom__">Fandom</h4></a>
+  <input class="fandom-enabled" type="checkbox"/>
+</div>
+<div class="peertube some-block"><a class="title" href="https://joinpeertube.org">
+    <img src="../../assets/images/peertube-icon.svg"/>
+    <h4 data-localise="__MSG_peertube__">PeerTube</h4></a>
+  <input class="peertube-enabled" type="checkbox"/>
+</div>
+<div class="lbry some-block"><a class="title" href="https://odysee.com">
+    <img src="../../assets/images/lbry-icon.png"/>
+    <h4 data-localise="__MSG_lbry__">LBRY</h4></a>
+  <input class="lbry-enabled" type="checkbox"/>
+</div>
+<div class="search some-block"><a class="title" href="https://search.libredirect.invalid">
+    <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"></path>
+</svg>
+
+    <h4 data-localise="__MSG_search__">Search</h4></a>
+  <input class="search-enabled" type="checkbox"/>
+</div>
+<div class="translate some-block"><a class="title" href="https://translate.libredirect.invalid">
+    <svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" 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"></path>
+</svg>
+
+    <h4 data-localise="__MSG_translate__">Translate</h4></a>
+  <input class="translate-enabled" type="checkbox"/>
+</div>
+<div class="maps some-block"><a class="title" href="https://maps.libredirect.invalid">
+    <svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" 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"></path>
+</svg>
+
+    <h4 data-localise="__MSG_maps__">Maps</h4></a>
+  <input class="maps-enabled" type="checkbox"/>
+</div>
+<div class="sendFiles some-block"><a class="title" href="https://send.libredirect.invalid">
+    <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"></path>
+</svg>
+
+    <h4 data-localise="__MSG_sendFiles__">Send Files</h4></a>
+  <input class="sendFiles-enabled" type="checkbox"/>
+</div>
+
       <div id="current_site_divider">
         <hr>
       </div>
     </div>
     <div class="all_sites">
-      <div class="youtube some-block"><a class="title" href="https://youtube.com"><img src="../../assets/images/youtube-icon.png"/>
-          <h4 data-localise="__MSG_youtube__">YouTube</h4></a>
-        <input class="disable-youtube" type="checkbox"/>
-      </div>
-      <div class="youtubeMusic some-block"><a class="title" href="https://music.youtube.com"><img src="../../assets/images/youtube-music-icon.png"/>
-          <h4 data-localise="__MSG_ytmusic__">YT Music</h4></a>
-        <input class="disable-youtubeMusic" type="checkbox"/>
-      </div>
-      <div class="twitter some-block"><a class="title" href="https://twitter.com"><img src="../../assets/images/twitter-icon.png"/>
-          <h4 data-localise="__MSG_twitter__">Twitter</h4></a>
-        <input class="disable-nitter" type="checkbox"/>
-      </div>
-      <div class="instagram some-block"><a class="title" href="https://instagram.com"><img src="../../assets/images/instagram-icon.png"/>
-          <h4 data-localise="__MSG_instagram__">Instagram</h4></a>
-        <input class="disable-bibliogram" type="checkbox"/>
-      </div>
-      <div class="tiktok some-block"><a class="title" href="https://tiktok.com"><img src="../../assets/images/tiktok-icon.png"/>
-          <h4 data-localise="__MSG_tiktok__">TikTok</h4></a>
-        <input class="disable-tiktok" type="checkbox"/>
-      </div>
-      <div class="imgur some-block"><a class="title" href="https://imgur.com"><img src="../../assets/images/imgur.png"/>
-          <h4 data-localise="__MSG_imgur__">Imgur</h4></a>
-        <input class="disable-imgur" type="checkbox"/>
-      </div>
-      <div class="reddit some-block"><a class="title" href="https://reddit.com"><img src="../../assets/images/reddit-icon.png"/>
-          <h4 data-localise="__MSG_reddit__">Reddit</h4></a>
-        <input class="disable-reddit" type="checkbox"/>
-      </div>
-      <div class="wikipedia some-block"><a class="title" href="https://wikipedia.com"><img src="../../assets/images/wikipedia-icon.svg"/>
-          <h4 data-localise="__MSG_wikipedia__">Wikipedia</h4></a>
-        <input class="disable-wikipedia" type="checkbox"/>
-      </div>
-      <div class="medium some-block"><a class="title" href="https://medium.com">
-          <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>
-          <h4 data-localise="__MSG_medium__">Medium</h4></a>
-        <input class="disable-medium" type="checkbox"/>
-      </div>
-      <div class="quora some-block"><a class="title" href="https://quora.com"><img src="../../assets/images/quora.png"/>
-          <h4>Quora</h4></a>
-        <input class="disable-quora" type="checkbox"/>
-      </div>
-      <div class="imdb some-block"><a class="title" href="https://imdb.com"><img src="../../assets/images/imdb.svg"/>
-          <h4>IMDb</h4></a>
-        <input class="disable-imdb" type="checkbox"/>
-      </div>
-      <div class="reuters some-block"><a class="title" href="https://reuters.com"><img src="../../assets/images/reuters.svg"/>
-          <h4>Reuters</h4></a>
-        <input class="disable-reuters" type="checkbox"/>
-      </div>
-      <div class="peertube some-block"><a class="title" href="https://search.joinpeertube.org"><img src="../../assets/images/peertube-icon.svg"/>
-          <h4 data-localise="__MSG_peertube__">PeerTube</h4></a>
-        <input class="disable-peertube" type="checkbox"/>
-      </div>
-      <div class="lbry some-block"><a class="title" href="https://odysee.com/"><img src="../../assets/images/lbry-icon.png"/>
-          <h4 data-localise="__MSG_lbry__">LBRY</h4></a>
-        <input class="disable-lbry" type="checkbox"/>
-      </div>
-      <div class="search some-block"><a class="title" href="https://search.libredirect.invalid">
-          <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"></path>
-          </svg>
-          <h4 data-localise="__MSG_search__">Search</h4></a>
-        <input class="disable-search" type="checkbox"/>
-      </div>
-      <div class="translate some-block"><a class="title" href="https://translate.google.com">
-          <svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" 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"></path>
-          </svg>
-          <h4 data-localise="__MSG_translate__">Translate</h4></a>
-        <input class="disable-translate" type="checkbox"/>
-      </div>
-      <div class="maps some-block"><a class="title" href="https://www.openstreetmap.org">
-          <svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" 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"></path>
-          </svg>
-          <h4 data-localise="__MSG_maps__">Maps</h4></a>
-        <input class="disable-osm" type="checkbox"/>
-      </div>
-      <div class="sendTargets some-block"><a class="title" href="https://send.libredirect.invalid">
-          <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"></path>
-          </svg>
-          <h4 data-localise="__MSG_sendFiles__">Send Files</h4></a>
-        <input class="disable-sendTargets" type="checkbox"/>
-      </div>
+      <div class="youtube some-block"><a class="title" href="https://youtube.com">
+    <img src="../../assets/images/youtube-icon.png"/>
+    <h4 data-localise="__MSG_youtube__">Youtube</h4></a>
+  <input class="youtube-enabled" type="checkbox"/>
+</div>
+<div class="youtubeMusic some-block"><a class="title" href="https://music.youtube.com">
+    <img src="../../assets/images/youtubeMusic-icon.png"/>
+    <h4 data-localise="__MSG_youtubeMusic__">YT Music</h4></a>
+  <input class="youtubeMusic-enabled" type="checkbox"/>
+</div>
+<div class="twitter some-block"><a class="title" href="https://twitter.com">
+    <img src="../../assets/images/twitter-icon.png"/>
+    <h4 data-localise="__MSG_twitter__">Twitter</h4></a>
+  <input class="twitter-enabled" type="checkbox"/>
+</div>
+<div class="instagram some-block"><a class="title" href="https://instagram.com">
+    <img src="../../assets/images/instagram-icon.png"/>
+    <h4 data-localise="__MSG_instagram__">Instagram</h4></a>
+  <input class="instagram-enabled" type="checkbox"/>
+</div>
+<div class="tiktok some-block"><a class="title" href="https://tiktok.com">
+    <img src="../../assets/images/tiktok-icon.png"/>
+    <h4 data-localise="__MSG_tiktok__">TikTok</h4></a>
+  <input class="tiktok-enabled" type="checkbox"/>
+</div>
+<div class="reddit some-block"><a class="title" href="https://reddit.com">
+    <img src="../../assets/images/reddit-icon.png"/>
+    <h4 data-localise="__MSG_reddit__">Reddit</h4></a>
+  <input class="reddit-enabled" type="checkbox"/>
+</div>
+<div class="imgur some-block"><a class="title" href="https://imgur.com">
+    <img src="../../assets/images/imgur-icon.png"/>
+    <h4 data-localise="__MSG_imgur__">Imgur</h4></a>
+  <input class="imgur-enabled" type="checkbox"/>
+</div>
+<div class="wikipedia some-block"><a class="title" href="https://wikipedia.org">
+    <img src="../../assets/images/wikipedia-icon.svg"/>
+    <h4 data-localise="__MSG_wikipedia__">Wikipedia</h4></a>
+  <input class="wikipedia-enabled" type="checkbox"/>
+</div>
+<div class="medium some-block"><a class="title" href="https://medium.com">
+    <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>
+
+    <h4 data-localise="__MSG_medium__">Medium</h4></a>
+  <input class="medium-enabled" type="checkbox"/>
+</div>
+<div class="quora some-block"><a class="title" href="https://quora.com">
+    <img src="../../assets/images/quora-icon.png"/>
+    <h4 data-localise="__MSG_quora__">Quora</h4></a>
+  <input class="quora-enabled" type="checkbox"/>
+</div>
+<div class="imdb some-block"><a class="title" href="https://imdb.com">
+    <img src="../../assets/images/imdb-icon.svg"/>
+    <h4 data-localise="__MSG_imdb__">IMDb</h4></a>
+  <input class="imdb-enabled" type="checkbox"/>
+</div>
+<div class="reuters some-block"><a class="title" href="https://reuters.com">
+    <img src="../../assets/images/reuters-icon.svg"/>
+    <h4 data-localise="__MSG_reuters__">Reuters</h4></a>
+  <input class="reuters-enabled" type="checkbox"/>
+</div>
+<div class="fandom some-block"><a class="title" href="https://fandom.com">
+    <img src="../../assets/images/fandom-icon.svg"/>
+    <h4 data-localise="__MSG_fandom__">Fandom</h4></a>
+  <input class="fandom-enabled" type="checkbox"/>
+</div>
+<div class="peertube some-block"><a class="title" href="https://joinpeertube.org">
+    <img src="../../assets/images/peertube-icon.svg"/>
+    <h4 data-localise="__MSG_peertube__">PeerTube</h4></a>
+  <input class="peertube-enabled" type="checkbox"/>
+</div>
+<div class="lbry some-block"><a class="title" href="https://odysee.com">
+    <img src="../../assets/images/lbry-icon.png"/>
+    <h4 data-localise="__MSG_lbry__">LBRY</h4></a>
+  <input class="lbry-enabled" type="checkbox"/>
+</div>
+<div class="search some-block"><a class="title" href="https://search.libredirect.invalid">
+    <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"></path>
+</svg>
+
+    <h4 data-localise="__MSG_search__">Search</h4></a>
+  <input class="search-enabled" type="checkbox"/>
+</div>
+<div class="translate some-block"><a class="title" href="https://translate.libredirect.invalid">
+    <svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" 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"></path>
+</svg>
+
+    <h4 data-localise="__MSG_translate__">Translate</h4></a>
+  <input class="translate-enabled" type="checkbox"/>
+</div>
+<div class="maps some-block"><a class="title" href="https://maps.libredirect.invalid">
+    <svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" 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"></path>
+</svg>
+
+    <h4 data-localise="__MSG_maps__">Maps</h4></a>
+  <input class="maps-enabled" type="checkbox"/>
+</div>
+<div class="sendFiles some-block"><a class="title" href="https://send.libredirect.invalid">
+    <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"></path>
+</svg>
+
+    <h4 data-localise="__MSG_sendFiles__">Send Files</h4></a>
+  <input class="sendFiles-enabled" type="checkbox"/>
+</div>
+
     </div>
     <hr>
     <div class="some-block" id="change_instance_div"><a class="title button prevent" id="change_instance">
@@ -203,7 +259,7 @@
         <svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="currentColor">
           <path d="M16 1H4c-1.1 0-2 .9-2 2v14h2V3h12V1zm3 4H8c-1.1 0-2 .9-2 2v14c0 1.1.9 2 2 2h11c1.1 0 2-.9 2-2V7c0-1.1-.9-2-2-2zm0 16H8V7h11v14z"></path>
         </svg></a></div>
-    <div class="some-block" id="unify_div" title="Unify cookies across all selected instances"><a class="title button prevent" id="unify">
+    <div class="some-block" id="unify_div" title="Unify preferences across all selected instances"><a class="title button prevent" id="unify">
         <h4 data-localise="__MSG_unifySettings__">Unify Settings</h4>
         <svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="currentColor">
           <path d="M3.9 12c0-1.71 1.39-3.1 3.1-3.1h4V7H7c-2.76 0-5 2.24-5 5s2.24 5 5 5h4v-1.9H7c-1.71 0-3.1-1.39-3.1-3.1zM8 13h8v-2H8v2zm9-6h-4v1.9h4c1.71 0 3.1 1.39 3.1 3.1s-1.39 3.1-3.1 3.1h-4V17h4c2.76 0 5-2.24 5-5s-2.24-5-5-5z"></path>
@@ -222,4 +278,4 @@
     <script type="module" src="../options/init.js"></script>
     <script type="module" src="./popup.js"></script>
   </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/src/pages/popup/popup.js b/src/pages/popup/popup.js
index 465080c5..78e50004 100644
--- a/src/pages/popup/popup.js
+++ b/src/pages/popup/popup.js
@@ -2,41 +2,23 @@
 window.browser = window.browser || window.chrome
 
 import utils from "../../assets/javascripts/utils.js"
-import generalHelper from "../../assets/javascripts/general.js"
-
-import youtubeHelper from "../../assets/javascripts/youtube/youtube.js"
-import youtubeMusicHelper from "../../assets/javascripts/youtubeMusic.js"
-import twitterHelper from "../../assets/javascripts/twitter.js"
-import instagramHelper from "../../assets/javascripts/instagram.js"
-import redditHelper from "../../assets/javascripts/reddit.js"
-import searchHelper from "../../assets/javascripts/search.js"
-import translateHelper from "../../assets/javascripts/translate/translate.js"
-import mapsHelper from "../../assets/javascripts/maps.js"
-import wikipediaHelper from "../../assets/javascripts/wikipedia.js"
-import mediumHelper from "../../assets/javascripts/medium.js"
-import quoraHelper from "../../assets/javascripts/quora.js"
-import libremdbHelper from "../../assets/javascripts/imdb.js"
-import reutersHelper from "../../assets/javascripts/reuters.js"
-import imgurHelper from "../../assets/javascripts/imgur.js"
-import tiktokHelper from "../../assets/javascripts/tiktok.js"
-import sendTargetsHelper from "../../assets/javascripts/sendTargets.js"
-import peertubeHelper from "../../assets/javascripts/peertube.js"
-import lbryHelper from "../../assets/javascripts/lbry.js"
-
-utils.unify(true).then(r => {
-	if (!r) document.getElementById("unify_div").style.display = "none"
-	else {
-		const unify = document.getElementById("unify")
-		const textElement = document.getElementById("unify").getElementsByTagName("h4")[0]
-		unify.addEventListener("click", () => {
-			const oldHtml = textElement.innerHTML
-			textElement.innerHTML = "..."
-			browser.runtime.sendMessage({ function: "unify" }, response => {
-				if (response && response.response) textElement.innerHTML = oldHtml
+import serviceHelper from "../../assets/javascripts/services.js"
+
+let config,
+	divs = {}
+
+async function getConfig() {
+	return new Promise(resolve => {
+		fetch("/config/config.json")
+			.then(response => response.text())
+			.then(data => {
+				config = JSON.parse(data)
+				resolve()
 			})
-		})
-	}
-})
+	})
+}
+
+await getConfig()
 
 utils.switchInstance(true).then(r => {
 	if (!r) document.getElementById("change_instance_div").style.display = "none"
@@ -55,386 +37,120 @@ document.getElementById("more-options").addEventListener("click", () => browser.
 const allSites = document.getElementsByClassName("all_sites")[0]
 const currSite = document.getElementsByClassName("current_site")[0]
 
-const disableTwitterCurrentSite = currSite.getElementsByClassName("disable-nitter")[0]
-const disableTwitterAllSites = allSites.getElementsByClassName("disable-nitter")[0]
-
-const disableYoutubeCurrentSite = currSite.getElementsByClassName("disable-youtube")[0]
-const disableYoutubeAllSites = allSites.getElementsByClassName("disable-youtube")[0]
-
-const disableYoutubeMusicCurrentSite = currSite.getElementsByClassName("disable-youtubeMusic")[0]
-const disableYoutubeMusicAllSites = allSites.getElementsByClassName("disable-youtubeMusic")[0]
-
-const disableInstagramCurrentSite = currSite.getElementsByClassName("disable-bibliogram")[0]
-const disableInstagramAllSites = allSites.getElementsByClassName("disable-bibliogram")[0]
-
-const disableMapsCurrentSite = currSite.getElementsByClassName("disable-osm")[0]
-const disableMapsAllSites = allSites.getElementsByClassName("disable-osm")[0]
-
-const disableRedditCurrentSite = currSite.getElementsByClassName("disable-reddit")[0]
-const disableRedditAllSites = allSites.getElementsByClassName("disable-reddit")[0]
-
-const disableSearchCurrentSite = currSite.getElementsByClassName("disable-search")[0]
-const disableSearchAllSites = allSites.getElementsByClassName("disable-search")[0]
-
-const disableTranslateCurrentSite = currSite.getElementsByClassName("disable-translate")[0]
-const disableTranslateAllSites = allSites.getElementsByClassName("disable-translate")[0]
-
-const disableWikipediaCurrentSite = currSite.getElementsByClassName("disable-wikipedia")[0]
-const disableWikipediaAllSites = allSites.getElementsByClassName("disable-wikipedia")[0]
-
-const disableMediumCurrentSite = currSite.getElementsByClassName("disable-medium")[0]
-const disableMediumAllSites = allSites.getElementsByClassName("disable-medium")[0]
-
-const disableQuoraCurrentSite = currSite.getElementsByClassName("disable-quora")[0]
-const disableQuoraAllSites = allSites.getElementsByClassName("disable-quora")[0]
-
-const disableImdbCurrentSite = currSite.getElementsByClassName("disable-imdb")[0]
-const disableImdbAllSites = allSites.getElementsByClassName("disable-imdb")[0]
-
-const disableReutersCurrentSite = currSite.getElementsByClassName("disable-reuters")[0]
-const disableReutersAllSites = allSites.getElementsByClassName("disable-reuters")[0]
-
-const disablePeertubeTargetsCurrentSite = currSite.getElementsByClassName("disable-peertube")[0]
-const disablePeertubeTargetsAllSites = allSites.getElementsByClassName("disable-peertube")[0]
-
-const disableLbryTargetsCurrentSite = currSite.getElementsByClassName("disable-lbry")[0]
-const disableLbryTargetsAllSites = allSites.getElementsByClassName("disable-lbry")[0]
-
-const disableSendTargetsCurrentSite = currSite.getElementsByClassName("disable-sendTargets")[0]
-const disableSendTargetsAllSites = allSites.getElementsByClassName("disable-sendTargets")[0]
-
-const disableImgurCurrentSite = currSite.getElementsByClassName("disable-imgur")[0]
-const disableImgurAllSites = allSites.getElementsByClassName("disable-imgur")[0]
+function setDivs() {
+	return new Promise(resolve => {
+		divs.instance = document.getElementById("instance")
+		for (const service in config.services) {
+			divs[service] = {}
+			divs[service].toggle = {}
+			divs[service].current = currSite.getElementsByClassName(service)[0]
+			divs[service].all = allSites.getElementsByClassName(service)[0]
+			divs[service].toggle.current = currSite.getElementsByClassName(service + "-enabled")[0]
+			divs[service].toggle.all = allSites.getElementsByClassName(service + "-enabled")[0]
+		}
+		resolve()
+	})
+}
 
-const disableTiktokCurrentSite = currSite.getElementsByClassName("disable-tiktok")[0]
-const disableTiktokAllSites = allSites.getElementsByClassName("disable-tiktok")[0]
+await setDivs()
 
 const currentSiteIsFrontend = document.getElementById("current_site_divider")
 
-browser.storage.local.get(
-	[
-		"disableTwitter",
-		"disableYoutube",
-		"disableYoutubeMusic",
-		"disableInstagram",
-		"disableMaps",
-		"disableReddit",
-		"disableSearch",
-		"translateDisable",
-		"disableWikipedia",
-		"disableImgur",
-		"disableTiktok",
-		"disableMedium",
-		"disableQuora",
-		"disableImdb",
-		"disableReuters",
-		"disablePeertubeTargets",
-		"disableLbryTargets",
-		"disableSendTarget",
-		"popupFrontends",
-	],
-	r => {
-		disableTwitterCurrentSite.checked = !r.disableTwitter
-		disableTwitterAllSites.checked = !r.disableTwitter
-		disableYoutubeCurrentSite.checked = !r.disableYoutube
-		disableYoutubeAllSites.checked = !r.disableYoutube
-		disableYoutubeMusicCurrentSite.checked = !r.disableYoutubeMusic
-		disableYoutubeMusicAllSites.checked = !r.disableYoutubeMusic
-		disableInstagramCurrentSite.checked = !r.disableInstagram
-		disableInstagramAllSites.checked = !r.disableInstagram
-		disableMapsCurrentSite.checked = !r.disableMaps
-		disableMapsAllSites.checked = !r.disableMaps
-		disableRedditCurrentSite.checked = !r.disableReddit
-		disableRedditAllSites.checked = !r.disableReddit
-		disableSearchCurrentSite.checked = !r.disableSearch
-		disableSearchAllSites.checked = !r.disableSearch
-		disableTranslateCurrentSite.checked = !r.translateDisable
-		disableTranslateAllSites.checked = !r.translateDisable
-		disableWikipediaCurrentSite.checked = !r.disableWikipedia
-		disableWikipediaAllSites.checked = !r.disableWikipedia
-		disableImgurCurrentSite.checked = !r.disableImgur
-		disableImgurAllSites.checked = !r.disableImgur
-		disableTiktokCurrentSite.checked = !r.disableTiktok
-		disableTiktokAllSites.checked = !r.disableTiktok
-		disableMediumCurrentSite.checked = !r.disableMedium
-		disableMediumAllSites.checked = !r.disableMedium
-		disableQuoraCurrentSite.checked = !r.disableQuora
-		disableQuoraAllSites.checked = !r.disableQuora
-		disableImdbCurrentSite.checked = !r.disableImdb
-		disableImdbAllSites.checked = !r.disableImdb
-		disableReutersCurrentSite.checked = !r.disableReuters
-		disableReutersAllSites.checked = !r.disableReuters
-		disablePeertubeTargetsCurrentSite.checked = !r.disablePeertubeTargets
-		disablePeertubeTargetsAllSites.checked = !r.disablePeertubeTargets
-		disableLbryTargetsCurrentSite.checked = !r.disableLbryTargets
-		disableLbryTargetsAllSites.checked = !r.disableLbryTargets
-		disableSendTargetsCurrentSite.checked = !r.disableSendTarget
-		disableSendTargetsAllSites.checked = !r.disableSendTarget
+browser.storage.local.get(["options", "redirects"], r => {
+	browser.tabs.query({ active: true, currentWindow: true }, async tabs => {
+		document.getElementById("instance-div").classList.add("hide")
+		for (const service in config.services) {
+			if (!r.options.popupServices.includes(service)) allSites.getElementsByClassName(service)[0].classList.add("hide")
+			else allSites.getElementsByClassName(service)[0].classList.remove("hide")
+			currSite.getElementsByClassName(service)[0].classList.add("hide")
+		}
 
-		browser.tabs.query({ active: true, currentWindow: true }, async tabs => {
-			for (const frontend of generalHelper.allPopupFrontends) {
-				if (!r.popupFrontends.includes(frontend)) allSites.getElementsByClassName(frontend)[0].classList.add("hide")
-				else allSites.getElementsByClassName(frontend)[0].classList.remove("hide")
-				currSite.getElementsByClassName(frontend)[0].classList.add("hide")
-			}
+		for (const service in config.services) {
+			divs[service].toggle.all.checked = r.options[service].enabled
+			divs[service].toggle.current.checked = r.options[service].enabled
+		}
 
-			let url
-			try {
-				url = new URL(tabs[0].url)
-			} catch {
-				currentSiteIsFrontend.classList.add("hide")
-				return
-			}
+		let url
+		try {
+			url = new URL(tabs[0].url)
+		} catch {
+			currentSiteIsFrontend.classList.add("hide")
+			document.getElementById("unify_div").style.display = "none"
+			return
+		}
 
-			if (youtubeMusicHelper.redirect(url, "main_frame", false, true) || (await youtubeMusicHelper.switchInstance(url, true))) {
-				currSite.getElementsByClassName("youtubeMusic")[0].classList.remove("hide")
-				allSites.getElementsByClassName("youtubeMusic")[0].classList.add("hide")
-			} else if (twitterHelper.redirect(url, "main_frame", false, true) || (await twitterHelper.switchInstance(url, "main_frame", false, true))) {
-				currSite.getElementsByClassName("twitter")[0].classList.remove("hide")
-				allSites.getElementsByClassName("twitter")[0].classList.add("hide")
-			} else if (instagramHelper.redirect(url, "main_frame", false, true) || (await instagramHelper.switchInstance(url, "main_frame", false, true))) {
-				currSite.getElementsByClassName("instagram")[0].classList.remove("hide")
-				allSites.getElementsByClassName("instagram")[0].classList.add("hide")
-			} else if (mapsHelper.redirect(url, false)) {
-				currSite.getElementsByClassName("maps")[0].classList.remove("hide")
-				allSites.getElementsByClassName("maps")[0].classList.add("hide")
-			} else if (redditHelper.redirect(url, "main_frame", false, true) || (await redditHelper.switchInstance(url, "main_frame", false, true))) {
-				currSite.getElementsByClassName("reddit")[0].classList.remove("hide")
-				allSites.getElementsByClassName("reddit")[0].classList.add("hide")
-			} else if (mediumHelper.redirect(url, "main_frame", false, true) || (await mediumHelper.switchInstance(url, "main_frame", false, true))) {
-				currSite.getElementsByClassName("medium")[0].classList.remove("hide")
-				allSites.getElementsByClassName("medium")[0].classList.add("hide")
-			} else if (quoraHelper.redirect(url, "main_frame", false, true) || (await quoraHelper.switchInstance(url, "main_frame", false, true))) {
-				currSite.getElementsByClassName("quora")[0].classList.remove("hide")
-				allSites.getElementsByClassName("quora")[0].classList.add("hide")
-			} else if (libremdbHelper.redirect(url, "main_frame", false, true) || (await libremdbHelper.switchInstance(url, "main_frame", false, true))) {
-				currSite.getElementsByClassName("imdb")[0].classList.remove("hide")
-				allSites.getElementsByClassName("imdb")[0].classList.add("hide")
-			} else if (reutersHelper.redirect(url, "main_frame", false, true)) {
-				currSite.getElementsByClassName("reuters")[0].classList.remove("hide")
-				allSites.getElementsByClassName("reuters")[0].classList.add("hide")
-			} else if (imgurHelper.redirect(url, "main_frame", false, true) || (await imgurHelper.switchInstance(url, "main_frame", false, true))) {
-				currSite.getElementsByClassName("imgur")[0].classList.remove("hide")
-				allSites.getElementsByClassName("imgur")[0].classList.add("hide")
-			} else if (tiktokHelper.redirect(url, "main_frame", false, true) || (await tiktokHelper.switchInstance(url, "main_frame", false, true))) {
-				currSite.getElementsByClassName("tiktok")[0].classList.remove("hide")
-				allSites.getElementsByClassName("tiktok")[0].classList.add("hide")
-			} else if (sendTargetsHelper.redirect(url, "main_frame", false, true) || (await sendTargetsHelper.switchInstance(url, "main_frame", false, true))) {
-				currSite.getElementsByClassName("sendTargets")[0].classList.remove("hide")
-				allSites.getElementsByClassName("sendTargets")[0].classList.add("hide")
-			} else if (peertubeHelper.redirect(url, "main_frame", false, true) || (await peertubeHelper.switchInstance(url, true))) {
-				currSite.getElementsByClassName("peertube")[0].classList.remove("hide")
-				allSites.getElementsByClassName("peertube")[0].classList.add("hide")
-			} else if (lbryHelper.redirect(url, "main_frame", false, true) || (await lbryHelper.switchInstance(url, "main_frame", false, true))) {
-				currSite.getElementsByClassName("lbry")[0].classList.remove("hide")
-				allSites.getElementsByClassName("lbry")[0].classList.add("hide")
-			} else if (translateHelper.redirect(url, true) || (await translateHelper.switchInstance(url, true))) {
-				currSite.getElementsByClassName("translate")[0].classList.remove("hide")
-				allSites.getElementsByClassName("translate")[0].classList.add("hide")
-			} else if (searchHelper.redirect(url, true) || (await searchHelper.switchInstance(url, true))) {
-				currSite.getElementsByClassName("search")[0].classList.remove("hide")
-				allSites.getElementsByClassName("search")[0].classList.add("hide")
-			} else if (wikipediaHelper.redirect(url, true) || (await wikipediaHelper.switchInstance(url, true))) {
-				currSite.getElementsByClassName("wikipedia")[0].classList.remove("hide")
-				allSites.getElementsByClassName("wikipedia")[0].classList.add("hide")
-			} else if (youtubeHelper.redirect(url, "main_frame", false, true) || (await youtubeHelper.switchInstance(url, "main_frame", false, true))) {
-				currSite.getElementsByClassName("youtube")[0].classList.remove("hide")
-				allSites.getElementsByClassName("youtube")[0].classList.add("hide")
-			} else {
-				currentSiteIsFrontend.classList.add("hide")
+		let service = await serviceHelper.computeService(url, true)
+		let frontend
+		let instance
+		if (service) {
+			if (typeof service != "string") {
+				instance = service[2]
+				frontend = service[1]
+				service = service[0]
+				divs.instance.innerHTML = instance.replace(/https?:\/{2}/, "")
+				let tmp
+				let instanceNetwork
+				for (const network in config.networks) {
+					tmp = r.redirects[frontend][network].indexOf(instance)
+					if (tmp > -1) {
+						const instanceDiv = document.getElementById("instance-enabled")
+						tmp = r.options[frontend][network].enabled.indexOf(instance)
+						if (tmp > -1) instanceDiv.checked = true
+						else instanceDiv.checked = false
+						instanceNetwork = network
+						instanceDiv.addEventListener("change", () => {
+							browser.storage.local.get("options", r => {
+								// Although options would be avaliable in this context, it is fetched again to make sure it is up to date
+								let options = r.options
+								if (instanceDiv.checked) options[frontend][instanceNetwork].enabled.push(instance)
+								else options[frontend][instanceNetwork].enabled.splice(options[frontend][instanceNetwork].enabled.indexOf(instance), 1)
+								browser.storage.local.set({ options })
+							})
+						})
+						break
+					}
+				}
+				document.getElementById("instance-div").classList.remove("hide")
 			}
-		})
-	}
-)
-
-document.addEventListener("change", () => {
-	browser.storage.local.get(
-		[
-			"disableTwitter",
-			"disableYoutube",
-			"disableYoutubeMusic",
-			"disableInstagram",
-			"disableMaps",
-			"disableReddit",
-			"disableSearch",
-			"translateDisable",
-			"disableWikipedia",
-			"disableImgur",
-			"disableTiktok",
-			"disableMedium",
-			"disableQuora",
-			"disableImdb",
-			"disableReuters",
-			"disablePeertubeTargets",
-			"disableLbryTargets",
-			"disableSendTarget",
-		],
-		r => {
-			if (!r.disableTwitter != disableTwitterCurrentSite.checked)
-				browser.storage.local.set({
-					disableTwitter: !disableTwitterCurrentSite.checked,
-				})
-			else if (!r.disableTwitter != disableTwitterAllSites.checked)
-				browser.storage.local.set({
-					disableTwitter: !disableTwitterAllSites.checked,
-				})
-
-			if (!r.disableYoutube != disableYoutubeCurrentSite.checked)
-				browser.storage.local.set({
-					disableYoutube: !disableYoutubeCurrentSite.checked,
-				})
-			else if (!r.disableYoutube != disableYoutubeAllSites.checked)
-				browser.storage.local.set({
-					disableYoutube: !disableYoutubeAllSites.checked,
-				})
-
-			if (!r.disableYoutubeMusic != disableYoutubeMusicCurrentSite.checked)
-				browser.storage.local.set({
-					disableYoutubeMusic: !disableYoutubeMusicCurrentSite.checked,
-				})
-			else if (!r.disableYoutubeMusic != disableYoutubeMusicAllSites.checked)
-				browser.storage.local.set({
-					disableYoutubeMusic: !disableYoutubeMusicAllSites.checked,
-				})
-
-			if (!r.disableInstagram != disableInstagramCurrentSite.checked)
-				browser.storage.local.set({
-					disableInstagram: !disableInstagramCurrentSite.checked,
-				})
-			else if (!r.disableInstagram != disableInstagramAllSites.checked)
-				browser.storage.local.set({
-					disableInstagram: !disableInstagramAllSites.checked,
-				})
-
-			if (!r.disableMaps != disableMapsCurrentSite.checked)
-				browser.storage.local.set({
-					disableMaps: !disableMapsCurrentSite.checked,
-				})
-			else if (!r.disableMaps != disableMapsAllSites.checked)
-				browser.storage.local.set({
-					disableMaps: !disableMapsAllSites.checked,
-				})
-
-			if (!r.disableReddit != disableRedditCurrentSite.checked)
-				browser.storage.local.set({
-					disableReddit: !disableRedditCurrentSite.checked,
-				})
-			else if (!r.disableReddit != disableRedditAllSites.checked)
-				browser.storage.local.set({
-					disableReddit: !disableRedditAllSites.checked,
-				})
-
-			if (!r.disableSearch != disableSearchCurrentSite.checked)
-				browser.storage.local.set({
-					disableSearch: !disableSearchCurrentSite.checked,
-				})
-			else if (!r.disableSearch != disableSearchAllSites.checked)
-				browser.storage.local.set({
-					disableSearch: !disableSearchAllSites.checked,
-				})
-
-			if (!r.translateDisable != disableTranslateCurrentSite.checked)
-				browser.storage.local.set({
-					translateDisable: !disableTranslateCurrentSite.checked,
-				})
-			else if (!r.translateDisable != disableTranslateAllSites.checked)
-				browser.storage.local.set({
-					translateDisable: !disableTranslateAllSites.checked,
-				})
-
-			if (!r.disableWikipedia != disableWikipediaCurrentSite.checked)
-				browser.storage.local.set({
-					disableWikipedia: !disableWikipediaCurrentSite.checked,
-				})
-			else if (!r.disableWikipedia != disableWikipediaAllSites.checked)
-				browser.storage.local.set({
-					disableWikipedia: !disableWikipediaAllSites.checked,
-				})
-
-			if (!r.disableImgur != disableImgurCurrentSite.checked)
-				browser.storage.local.set({
-					disableImgur: !disableImgurCurrentSite.checked,
-				})
-			else if (!r.disableImgur != disableImgurAllSites.checked)
-				browser.storage.local.set({
-					disableImgur: !disableImgurAllSites.checked,
-				})
-
-			if (!r.disableTiktok != disableTiktokCurrentSite.checked)
-				browser.storage.local.set({
-					disableTiktok: !disableTiktokCurrentSite.checked,
-				})
-			else if (!r.disableTiktok != disableTiktokAllSites.checked)
-				browser.storage.local.set({
-					disableTiktok: !disableTiktokAllSites.checked,
-				})
-
-			if (!r.disableMedium != disableMediumCurrentSite.checked)
-				browser.storage.local.set({
-					disableMedium: !disableMediumCurrentSite.checked,
-				})
-			else if (!r.disableMedium != disableMediumAllSites.checked)
-				browser.storage.local.set({
-					disableMedium: !disableMediumAllSites.checked,
-				})
-
-			if (!r.disableQuora != disableQuoraCurrentSite.checked)
-				browser.storage.local.set({
-					disableQuora: !disableQuoraCurrentSite.checked,
-				})
-			else if (!r.disableQuora != disableQuoraAllSites.checked)
-				browser.storage.local.set({
-					disableQuora: !disableQuoraAllSites.checked,
-				})
-
-			if (!r.disableImdb != disableImdbCurrentSite.checked)
-				browser.storage.local.set({
-					disableImdb: !disableImdbCurrentSite.checked,
-				})
-			else if (!r.disableImdb != disableImdbAllSites.checked)
-				browser.storage.local.set({
-					disableImdb: !disableImdbAllSites.checked,
-				})
-
-			if (!r.disableReuters != disableReutersCurrentSite.checked)
-				browser.storage.local.set({
-					disableReuters: !disableReutersCurrentSite.checked,
-				})
-			else if (!r.disableReuters != disableReutersAllSites.checked)
-				browser.storage.local.set({
-					disableReuters: !disableReutersAllSites.checked,
-				})
-
-			if (!r.disablePeertubeTargets != disablePeertubeTargetsCurrentSite.checked)
-				browser.storage.local.set({
-					disablePeertubeTargets: !disablePeertubeTargetsCurrentSite.checked,
-				})
-			else if (!r.disablePeertubeTargets != disablePeertubeTargetsAllSites.checked)
-				browser.storage.local.set({
-					disablePeertubeTargets: !disablePeertubeTargetsAllSites.checked,
-				})
-
-			if (!r.disableLbryTargets != disableLbryTargetsCurrentSite.checked)
-				browser.storage.local.set({
-					disableLbryTargets: !disableLbryTargetsCurrentSite.checked,
-				})
-			else if (!r.disableLbryTargets != disableLbryTargetsAllSites.checked)
-				browser.storage.local.set({
-					disableLbryTargets: !disableLbryTargetsAllSites.checked,
-				})
-
-			if (!r.disableSendTarget != disableSendTargetsCurrentSite.checked)
-				browser.storage.local.set({
-					disableSendTarget: !disableSendTargetsCurrentSite.checked,
-				})
-			else if (!r.disableSendTarget != disableSendTargetsAllSites.checked)
-				browser.storage.local.set({
-					disableSendTarget: !disableSendTargetsAllSites.checked,
+			divs[service].current.classList.remove("hide")
+			divs[service].all.classList.add("hide")
+			if (frontend && config.services[service].frontends[frontend].preferences && !config.services[service].frontends[frontend].preferences.token) {
+				const unify = document.getElementById("unify")
+				const textElement = document.getElementById("unify").getElementsByTagName("h4")[0]
+				unify.addEventListener("click", () => {
+					const oldHtml = textElement.innerHTML
+					textElement.innerHTML = "..."
+					browser.runtime.sendMessage({ function: "unify" }, response => {
+						if (response && response.response) textElement.innerHTML = oldHtml
+					})
 				})
+			} else {
+				document.getElementById("unify_div").style.display = "none"
+			}
+		} else {
+			currentSiteIsFrontend.classList.add("hide")
+			document.getElementById("unify_div").style.display = "none"
 		}
-	)
+	})
 })
 
+for (const service in config.services) {
+	divs[service].toggle.all.addEventListener("change", () => {
+		browser.storage.local.get("options", r => {
+			let options = r.options
+			options[service].enabled = divs[service].toggle.all.checked
+			browser.storage.local.set({ options })
+		})
+	})
+	divs[service].toggle.current.addEventListener("change", () => {
+		browser.storage.local.get("options", r => {
+			let options = r.options
+			options[service].enabled = divs[service].toggle.current.checked
+			browser.storage.local.set({ options })
+		})
+	})
+}
+
 for (const a of document.getElementsByTagName("a")) {
 	a.addEventListener("click", e => {
 		if (!a.classList.contains("prevent")) {
diff --git a/src/pages/popup/popup.pug b/src/pages/popup/popup.pug
deleted file mode 100644
index cc7fc7a2..00000000
--- a/src/pages/popup/popup.pug
+++ /dev/null
@@ -1,155 +0,0 @@
-include ../widgets/icons.pug
-
-mixin services
-    .youtube.some-block
-        a.title(href="https://youtube.com")
-            img(src="../../assets/images/youtube-icon.png")
-            h4(data-localise="__MSG_youtube__") YouTube
-        input.disable-youtube(type="checkbox")
-
-    .youtubeMusic.some-block
-        a.title(href="https://music.youtube.com")
-            img(src="../../assets/images/youtube-music-icon.png")
-            h4(data-localise="__MSG_ytmusic__") YT Music
-        input.disable-youtubeMusic(type="checkbox")
-
-    .twitter.some-block
-        a.title(href="https://twitter.com")
-            img(src="../../assets/images/twitter-icon.png")
-            h4(data-localise="__MSG_twitter__") Twitter
-        input.disable-nitter(type="checkbox")
-
-    .instagram.some-block
-        a.title(href="https://instagram.com")
-            img(src="../../assets/images/instagram-icon.png")
-            h4(data-localise="__MSG_instagram__") Instagram
-        input.disable-bibliogram(type="checkbox")
-
-    .tiktok.some-block
-        a.title(href="https://tiktok.com")
-            img(src="../../assets/images/tiktok-icon.png")
-            h4(data-localise="__MSG_tiktok__") TikTok
-        input.disable-tiktok(type="checkbox")
-
-    .imgur.some-block
-        a.title(href="https://imgur.com")
-            img(src="../../assets/images/imgur.png")
-            h4(data-localise="__MSG_imgur__") Imgur
-        input.disable-imgur(type="checkbox")
-
-    .reddit.some-block
-        a.title(href="https://reddit.com")
-            img(src="../../assets/images/reddit-icon.png")
-            h4(data-localise="__MSG_reddit__") Reddit
-        input.disable-reddit(type="checkbox")
-
-    .wikipedia.some-block
-        a.title(href="https://wikipedia.com")
-            img(src="../../assets/images/wikipedia-icon.svg")
-            h4(data-localise="__MSG_wikipedia__") Wikipedia
-        input.disable-wikipedia(type="checkbox")
-
-    .medium.some-block
-        a.title(href="https://medium.com")
-            +medium
-            h4(data-localise="__MSG_medium__") Medium
-        input.disable-medium(type="checkbox")
-
-    .quora.some-block
-        a.title(href="https://quora.com")
-            img(src="../../assets/images/quora.png")
-            h4() Quora
-        input.disable-quora(type="checkbox")
-    
-    .imdb.some-block
-        a.title(href="https://imdb.com")
-            img(src="../../assets/images/imdb.svg")
-            h4() IMDb
-        input.disable-imdb(type="checkbox")
-
-    .reuters.some-block
-        a.title(href="https://reuters.com")
-            img(src="../../assets/images/reuters.svg")
-            h4() Reuters
-        input.disable-reuters(type="checkbox")
-
-    .peertube.some-block
-        a.title(href="https://search.joinpeertube.org")
-            img(src="../../assets/images/peertube-icon.svg")
-            h4(data-localise="__MSG_peertube__") PeerTube
-        input.disable-peertube(type="checkbox")
-
-    .lbry.some-block
-        a.title(href="https://odysee.com/")
-            img(src="../../assets/images/lbry-icon.png")
-            h4(data-localise="__MSG_lbry__") LBRY
-        input.disable-lbry(type="checkbox")
-
-    .search.some-block
-        a.title(href="https://search.libredirect.invalid")
-            +search
-            h4(data-localise="__MSG_search__") Search
-        input.disable-search(type="checkbox")
-
-    .translate.some-block
-        a.title(href="https://translate.google.com")
-            +translate
-            h4(data-localise="__MSG_translate__") Translate
-        input.disable-translate(type="checkbox")
-
-    .maps.some-block
-        a.title(href="https://www.openstreetmap.org")
-            +maps
-            h4(data-localise="__MSG_maps__") Maps
-        input.disable-osm(type="checkbox")
-
-    .sendTargets.some-block
-        a.title(href="https://send.libredirect.invalid")
-            +send
-            h4(data-localise="__MSG_sendFiles__") Send Files
-        input.disable-sendTargets(type="checkbox")
-
-doctype html
-html(lang="en")
-    head
-        meta(charset="utf-8")
-        meta(name="viewport" content="width=device-width, initial-scale=1")
-        link(href="../stylesheets/styles.css" rel="stylesheet")
-        link(href="./style.css" rel="stylesheet")
-    body(dir="auto")
-        .current_site
-            +services
-            #current_site_divider
-                hr
-        .all_sites
-            +services
-        hr
-        #change_instance_div.some-block
-            a#change_instance.title.button.prevent
-                h4(data-localise="__MSG_switchInstance__") Change Instance
-                +change_instance
-
-        #copy_raw_div.some-block(title="Copy the original redirected link")         
-            a#copy_raw.title.button.prevent
-                h4(data-localise="__MSG_copyRaw__") Copy Raw
-                +copy_raw
-
-        #unify_div.some-block(title="Unify cookies across all selected instances")
-            a#unify.title.button.prevent
-                h4(data-localise="__MSG_unifySettings__") Unify Settings
-                +unify
-
-        .some-block
-            a#more-options.title.button.prevent
-                h4(data-localise="__MSG_settings__") Settings
-                +settings
-
-        .some-block
-            a#about.title.button(href="/pages/options/index.html#about")
-                h4(data-localise="__MSG_about__") About
-                +about
-
-        .space
-
-        script(type="module" src="../options/init.js")
-        script(type="module" src="./popup.js")
diff --git a/src/pages/popup/style.css b/src/pages/popup/style.css
index 0cb27912..53589738 100644
--- a/src/pages/popup/style.css
+++ b/src/pages/popup/style.css
@@ -22,3 +22,43 @@ body {
 .space {
 	height: 10px;
 }
+
+input {
+	height: 23px;
+	width: 46px;
+}
+
+#instance {
+	max-width: 110px;
+	max-height: 22px;
+	overflow-x: scroll;
+	white-space: nowrap;
+	scrollbar-width: none;
+	-ms-overflow-style: none;
+}
+
+#instance::-webkit-scrollbar {
+	display: none;
+}
+
+#instance::before {
+	background-image: linear-gradient(to right, rgba(0, 0, 0, 1), rgba(0, 0, 0, 0));
+	position: absolute;
+	width: 5px;
+	height: 22px;
+	content: "";
+	display: block;
+	pointer-events: none;
+}
+
+#end::before {
+	background-image: linear-gradient(to left, rgba(0, 0, 0, 1), rgba(0, 0, 0, 0));
+	position: absolute;
+	width: 5px;
+	height: 22px;
+	content: "";
+	display: block;
+	pointer-events: none;
+	top: 14px;
+	left: 156px;
+}
author	Edward <contact@langdon.slmail.me>	2022-10-09 19:04:15 +0530
committer	GitHub <noreply@github.com>	2022-10-09 19:04:15 +0530
commit	26abc5d2c9f671d359be8a7bf503632242abb2c2 (patch)
tree	ab05b3b2906fbc8423eea3abe1bd8efeccefa439 /src/pages/popup
parent	Update messages.json (diff)
parent	Merge pull request #404 from marcelocripe/patch-1 (diff)
download	libredirect-26abc5d2c9f671d359be8a7bf503632242abb2c2.zip