2 files changed, 22 insertions, 43 deletions
diff --git a/src/pages/options/peertube/peertube.html b/src/pages/options/peertube/peertube.html
index dd034bed..1a4bfa66 100644
--- a/src/pages/options/peertube/peertube.html
+++ b/src/pages/options/peertube/peertube.html
@@ -23,7 +23,6 @@
       <div class="title"> <img src="../../../assets/images/tiktok-icon.png"><a href="../tiktok/tiktok.html" data-localise="__MSG_tiktok__">TikTok</a></div>
       <div class="title"> <img src="../../../assets/images/reddit-icon.png"><a href="../reddit/reddit.html" data-localise="__MSG_reddit__">Reddit</a></div>
       <div class="title"> <img src="../../../assets/images/imgur-icon.png"><a href="../imgur/imgur.html" data-localise="__MSG_imgur__">Imgur</a></div>
-      <div class="title"> <img src="../../../assets/images/pixiv-icon.svg"><a href="../pixiv/pixiv.html" data-localise="__MSG_pixiv__">Pixiv</a></div>
       <div class="title"> <img src="../../../assets/images/librespeed-icon.svg"><a href="../speedtest/speedtest.html" data-localise="__MSG_speedtest__">Speedtest</a></div>
       <div class="title"> <img src="../../../assets/images/spotify-icon.png"><a href="../spotify/spotify.html" data-localise="__MSG_spotify__">Spotify</a></div>
       <div class="title"> <img src="../../../assets/images/wikipedia-icon.svg"><a href="../wikipedia/wikipedia.html" data-localise="__MSG_wikipedia__">Wikipedia</a></div>
diff --git a/src/pages/options/peertube/peertube.js b/src/pages/options/peertube/peertube.js
index 0b7a09e6..419523d0 100644
--- a/src/pages/options/peertube/peertube.js
+++ b/src/pages/options/peertube/peertube.js
@@ -2,18 +2,31 @@ import peertubeHelper from "../../../assets/javascripts/helpers/peertube.js";
 import commonHelper from "../../../assets/javascripts/helpers/common.js";
 
 let disablePeertubeElement = document.getElementById("disable-peertube");
-disablePeertubeElement.addEventListener("change",
-    (event) => peertubeHelper.setDisable(!event.target.checked)
-);
-
 let protocolElement = document.getElementById("protocol")
-protocolElement.addEventListener("change",
-    (event) => {
-        let protocol = event.target.options[protocolElement.selectedIndex].value
-        peertubeHelper.setProtocol(protocol);
+browser.storage.local.get(
+    [
+        "disablePeertubeTargets",
+        "peertubeTargetsProtocol"
+    ],
+    r => {
+        disablePeertubeElement.checked = !r.disablePeertubeTargets;
+
+        let protocol = peertubeTargetsProtocol;
+        protocolElement.value = protocol;
         changeProtocolSettings(protocol);
+
+        commonHelper.processDefaultCustomInstances('simpleertube', 'normal', peertubeHelper, document);
+        commonHelper.processDefaultCustomInstances('simpleertube', 'tor', peertubeHelper, document)
     }
-);
+)
+
+document.addEventListener("change", async () => {
+    await browser.storage.local.set({
+        disablePeertubeTargets: !disablePeertubeElement.checked,
+        peertubeTargetsProtocol: protocolElement.value
+    })
+    changeProtocolSettings(protocolElement.value);
+})
 
 function changeProtocolSettings(protocol) {
     let normalDiv = document.getElementsByClassName("normal")[0];
@@ -28,39 +41,6 @@ function changeProtocolSettings(protocol) {
     }
 }
 
-peertubeHelper.init().then(() => {
-    disablePeertubeElement.checked = !peertubeHelper.getDisable();
-
-    let protocol = peertubeHelper.getProtocol();
-    protocolElement.value = protocol;
-    changeProtocolSettings(protocol);
-
-    browser.storage.local.get("simpleertubeLatency").then(r => {
-        commonHelper.processDefaultCustomInstances(
-            'simpleertube',
-            'normal',
-            peertubeHelper,
-            document,
-            peertubeHelper.getSimpleertubeNormalRedirectsChecks,
-            peertubeHelper.setSimpleertubeNormalRedirectsChecks,
-            peertubeHelper.getSimpleertubeNormalCustomRedirects,
-            peertubeHelper.setSimpleertubeNormalCustomRedirects
-        );
-    })
-
-    commonHelper.processDefaultCustomInstances(
-        'simpleertube',
-        'tor',
-        peertubeHelper,
-        document,
-        peertubeHelper.getSimpleertubeTorRedirectsChecks,
-        peertubeHelper.setSimpleertubeTorRedirectsChecks,
-        peertubeHelper.getSimpleertubeTorCustomRedirects,
-        peertubeHelper.setSimpleertubeTorCustomRedirects
-    )
-})
-
-
 let latencyElement = document.getElementById("latency");
 let latencyLabel = document.getElementById("latency-label");
 latencyElement.addEventListener("click",