3 files changed, 166 insertions, 9 deletions
diff --git a/src/pages/options/youtube/piped.js b/src/pages/options/youtube/piped.js
index 0425ae79..015c97d8 100644
--- a/src/pages/options/youtube/piped.js
+++ b/src/pages/options/youtube/piped.js
@@ -17,9 +17,9 @@ function selectSkipModify(value, boolean) {
     youtubeHelper.setPipedSelectedSkip(selectSkip)
 }
 
-let pipedSelectedSkipSponsorElement = document.getElementById("piped-selectedSkip-sponsor");
+let pipedSelectedSkipSponsorElement = document.getElementById("piped-selectedSkip-sponsors");
 pipedSelectedSkipSponsorElement.addEventListener("change",
-    event => selectSkipModify('sponsor', event.target.checked)
+    event => selectSkipModify('sponsors', event.target.checked)
 );
 
 let pipedSelectedSkipIntroElement = document.getElementById("piped-selectedSkip-intro");
@@ -122,12 +122,83 @@ pipedProxyLBRYElement.addEventListener("change",
     event => youtubeHelper.setPipedProxyLBRY(event.target.checked)
 );
 
+let pipedMaterialListenElement = document.getElementById("pipedMaterial-listen");
+pipedMaterialListenElement.addEventListener("change",
+    event => youtubeHelper.setYoutubeListen(event.target.checked)
+);
+
+let pipedMaterialDisableLBRYElement = document.getElementById("pipedMaterial-disableLBRY");
+pipedMaterialDisableLBRYElement.addEventListener("change",
+    event => youtubeHelper.setPipedDisableLBRY(event.target.checked)
+);
+
+let pipedMaterialProxyLBRYElement = document.getElementById("pipedMaterial-proxyLBRY");
+pipedMaterialProxyLBRYElement.addEventListener("change",
+    event => youtubeHelper.setPipedProxyLBRY(event.target.checked)
+);
+
+let pipedMaterialSponsorblockElement = document.getElementById("pipedMaterial-sponsorblock");
+pipedMaterialSponsorblockElement.addEventListener("change",
+    event => youtubeHelper.setPipedSponsorblock(event.target.checked)
+);
+
+let pipedMaterialSkipToLastPointElement = document.getElementById("pipedMaterial-skipToLastPoint");
+pipedMaterialSkipToLastPointElement.addEventListener("change",
+    event => youtubeHelper.setPipedMaterialSkipToLastPoint(event.target.checked)
+);
+
+
+let pipedMaterialSelectedSkipSponsorElement = document.getElementById("pipedMaterial-selectedSkip-sponsors");
+pipedMaterialSelectedSkipSponsorElement.addEventListener("change",
+    event => selectSkipModify('sponsors', event.target.checked)
+);
+
+let pipedMaterialSelectedSkipIntroElement = document.getElementById("pipedMaterial-selectedSkip-intro");
+pipedMaterialSelectedSkipIntroElement.addEventListener("change",
+    event => selectSkipModify('intro', event.target.checked)
+);
+
+let pipedMaterialSelectedSkipOutroElement = document.getElementById("pipedMaterial-selectedSkip-outro");
+pipedMaterialSelectedSkipOutroElement.addEventListener("change",
+    event => selectSkipModify('outro', event.target.checked)
+);
+
+let pipedMaterialSelectedSkipPreviewElement = document.getElementById("pipedMaterial-selectedSkip-preview");
+pipedMaterialSelectedSkipPreviewElement.addEventListener("change",
+    event => selectSkipModify('preview', event.target.checked)
+);
+
+let pipedMaterialSelectedSkipInteractionElement = document.getElementById("pipedMaterial-selectedSkip-interaction");
+pipedMaterialSelectedSkipInteractionElement.addEventListener("change",
+    event => selectSkipModify('interaction', event.target.checked)
+);
+
+let pipedMaterialSelectedSkipSelfpromoElement = document.getElementById("pipedMaterial-selectedSkip-selfpromo");
+pipedMaterialSelectedSkipSelfpromoElement.addEventListener("change",
+    event => selectSkipModify('selfpromo', event.target.checked)
+);
+
+let pipedMaterialSelectedSkipMusicOfftopicElement = document.getElementById("pipedMaterial-selectedSkip-music_offtopic");
+pipedMaterialSelectedSkipMusicOfftopicElement.addEventListener("change",
+    event => selectSkipModify('music_offtopic', event.target.checked)
+);
+
+let pipedMaterialSelectedSkipPoiHighlightElement = document.getElementById("pipedMaterial-selectedSkip-poi_highlight");
+pipedMaterialSelectedSkipPoiHighlightElement.addEventListener("change",
+    event => selectSkipModify('poi_highlight', event.target.checked)
+);
+
+let pipedMaterialSelectedSkipFillerElement = document.getElementById("pipedMaterial-selectedSkip-filler");
+pipedMaterialSelectedSkipFillerElement.addEventListener("change",
+    event => selectSkipModify('filler', event.target.checked)
+);
+
 let selectSkip = [];
 youtubeHelper.init().then(() => {
 
     pipedSponsorblockElement.checked = youtubeHelper.getPipedSponsorblock();
     selectSkip = youtubeHelper.getPipedSelectedSkip();
-    pipedSelectedSkipSponsorElement.checked = selectSkip.includes('sponsor');
+    pipedSelectedSkipSponsorElement.checked = selectSkip.includes('sponsors');
     pipedSelectedSkipIntroElement.checked = selectSkip.includes('intro');
     pipedSelectedSkipOutroElement.checked = selectSkip.includes('outro');
     pipedSelectedSkipPreviewElement.checked = selectSkip.includes('preview');
@@ -148,6 +219,20 @@ youtubeHelper.init().then(() => {
     pipedDisableLBRYElement.checked = youtubeHelper.getPipedDisableLBRY();
     pipedProxyLBRYElement.checked = youtubeHelper.getPipedProxyLBRY();
 
+    pipedMaterialListenElement.checked = youtubeHelper.getYoutubeListen();
+    pipedMaterialDisableLBRYElement.checked = youtubeHelper.getPipedDisableLBRY();
+    pipedMaterialProxyLBRYElement.checked = youtubeHelper.getPipedProxyLBRY();
+    pipedMaterialSponsorblockElement.checked = youtubeHelper.getPipedSponsorblock()
+    pipedMaterialSkipToLastPointElement.checked = youtubeHelper.getPipedMaterialSkipToLastPoint();
+    pipedMaterialSelectedSkipSponsorElement.checked = selectSkip.includes('sponsors');
+    pipedMaterialSelectedSkipIntroElement.checked = selectSkip.includes('intro');
+    pipedMaterialSelectedSkipOutroElement.checked = selectSkip.includes('outro');
+    pipedMaterialSelectedSkipPreviewElement.checked = selectSkip.includes('preview');
+    pipedMaterialSelectedSkipInteractionElement.checked = selectSkip.includes('interaction');
+    pipedMaterialSelectedSkipSelfpromoElement.checked = selectSkip.includes('selfpromo');
+    pipedMaterialSelectedSkipMusicOfftopicElement.checked = selectSkip.includes('music_offtopic');
+    pipedMaterialSelectedSkipPoiHighlightElement.checked = selectSkip.includes('poi_highlight');
+    pipedMaterialSelectedSkipFillerElement.checked = selectSkip.includes('filler');
 
     commonHelper.processDefaultCustomInstances(
         'piped',
diff --git a/src/pages/options/youtube/youtube.html b/src/pages/options/youtube/youtube.html
index 61350fc0..a88f9581 100644
--- a/src/pages/options/youtube/youtube.html
+++ b/src/pages/options/youtube/youtube.html
@@ -165,7 +165,7 @@
 
         <div class="some-block option-block">
           <h4>Autoplay Video</h4>
-          <input id="invidious-autoplay" type="checkbox" />
+          <input id="invidious-youtubeAutoplay" type="checkbox" />
         </div>
 
         <div class="some-block option-block">
@@ -767,7 +767,7 @@
 
         <div class="some-block option-block">
           <h4>Skip Sponsors</h4>
-          <input id="piped-selectedSkip-sponsor" type="checkbox" />
+          <input id="piped-selectedSkip-sponsors" type="checkbox" />
         </div>
 
         <div class="some-block option-block">
@@ -1134,6 +1134,80 @@
     <div id="pipedMaterial">
       <hr>
 
+      <div class="custom-settings">
+        <div class="some-block option-block">
+          <h4>Audio Only</h4>
+          <input id="pipedMaterial-listen" type="checkbox" />
+        </div>
+
+        <div class="some-block option-block">
+          <h4>Disable LBRY</h4>
+          <input id="pipedMaterial-disableLBRY" type="checkbox" />
+        </div>
+
+        <div class="some-block option-block">
+          <h4>Proxy LBRY videos</h4>
+          <input id="pipedMaterial-proxyLBRY" type="checkbox" />
+        </div>
+
+        <div class="some-block option-block">
+          <h4>Enable Sponsorblock</h4>
+          <input id="pipedMaterial-sponsorblock" type="checkbox" />
+        </div>
+
+        <div class="some-block option-block">
+          <h4>Skip to the last watched point when encountering a video already seen</h4>
+          <input id="pipedMaterial-skipToLastPoint" type="checkbox" />
+        </div>
+
+        <div class="some-block option-block">
+          <h4>Skip Sponsors</h4>
+          <input id="pipedMaterial-selectedSkip-sponsors" type="checkbox" />
+        </div>
+
+        <div class="some-block option-block">
+          <h4>Skip Intermission/Intro Animation</h4>
+          <input id="pipedMaterial-selectedSkip-intro" type="checkbox" />
+        </div>
+
+        <div class="some-block option-block">
+          <h4>Skip Endcards/Credits</h4>
+          <input id="pipedMaterial-selectedSkip-outro" type="checkbox" />
+        </div>
+
+        <div class="some-block option-block">
+          <h4>Skip Preview/Recap</h4>
+          <input id="pipedMaterial-selectedSkip-preview" type="checkbox" />
+        </div>
+
+        <div class="some-block option-block">
+          <h4>Skip Interaction Reminder (Subscribe)</h4>
+          <input id="pipedMaterial-selectedSkip-interaction" type="checkbox" />
+        </div>
+
+        <div class="some-block option-block">
+          <h4>Skip Unpaid/Self Promotion</h4>
+          <input id="pipedMaterial-selectedSkip-selfpromo" type="checkbox" />
+        </div>
+
+        <div class="some-block option-block">
+          <h4>Skip Music: Non-Music Section</h4>
+          <input id="pipedMaterial-selectedSkip-music_offtopic" type="checkbox" />
+        </div>
+
+        <div class="some-block option-block">
+          <h4>Skip Highlight</h4>
+          <input id="pipedMaterial-selectedSkip-poi_highlight" type="checkbox" />
+        </div>
+
+        <div class="some-block option-block">
+          <h4>Skip Filler Tangent</h4>
+          <input id="pipedMaterial-selectedSkip-filler" type="checkbox" />
+        </div>
+        <hr>
+
+      </div>
+
       <div id="pipedMaterial-normal">
         <div class="some-block option-block">
           <h4>Default Instances</h4>
diff --git a/src/pages/options/youtube/youtube.js b/src/pages/options/youtube/youtube.js
index e3b8c5e7..c6e6fb52 100644
--- a/src/pages/options/youtube/youtube.js
+++ b/src/pages/options/youtube/youtube.js
@@ -9,10 +9,8 @@ let freetubeYatteeDivElement = document.getElementById("freetube-yatte");
 let customSettingsDivElement = document.getElementsByClassName("custom-settings");
 
 function changeFrontendsSettings() {
-    console.log('changeFrontendsSettings()');
     let frontend = youtubeFrontendElement.value;
 
-    console.log("customSettingsDivElement", customSettingsDivElement[0].style.display);
     if (enableYoutubeCustomSettingsElement.checked)
         for (const item of customSettingsDivElement) item.style.display = 'block';
     else
@@ -106,7 +104,7 @@ volumeElement.addEventListener("input",
     }
 );
 
-let autoplayElement = document.getElementById("invidious-autoplay");
+let autoplayElement = document.getElementById("invidious-youtubeAutoplay");
 autoplayElement.addEventListener("change",
     event => youtubeHelper.setAutoplay(event.target.checked)
 );
@@ -169,7 +167,7 @@ youtubeHelper.init().then(() => {
     volumeValueElement.textContent = `${youtubeHelper.getVolume()}%`;
     OnlyEmbeddedVideoElement.value = youtubeHelper.getOnlyEmbeddedVideo();
     bypassWatchOnYoutubeElement.checked = youtubeHelper.getBypassWatchOnYoutube();
-    autoplayElement.value = youtubeHelper.getAutoplay();
+    autoplayElement.checked = youtubeHelper.getAutoplay();
     let frontend = youtubeHelper.getFrontend();
     youtubeFrontendElement.value = frontend;
     changeFrontendsSettings();