diff --git a/CHANGELOG.md b/CHANGELOG.md
index cb040815..dd48cf68 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,7 +6,7 @@ All notable changes to this project will be documented in this file.
           <h2>Changelog</h2>
           <div>
             <div class="line flex">
-              <h2>1.0.65</h2>
+              <h2>1.0.66</h2>
               <ul>
                 <li>fixed Netflix ad skip: skips too far</li>
                 <li>added IMDB rating to Disney</li>
diff --git a/chrome/cr.js b/chrome/cr.js
index dce804db..25b738f6 100644
--- a/chrome/cr.js
+++ b/chrome/cr.js
@@ -1,7 +1,7 @@
 const defaultSettings = {
   settings: {
     Amazon: { skipIntro: true, skipCredits: true, watchCredits: false, skipAd: true, blockFreevee: true, speedSlider: true, filterPaid: false, showRating: true, streamLinks: true },
-    Netflix: { skipIntro: true, skipRecap: true, skipCredits: true, watchCredits: false, skipBlocked: true, NetflixAds: true, speedSlider: true, profile: true, showRating: true },
+    Netflix: { skipIntro: true, skipRecap: true, skipCredits: true, watchCredits: false, skipBlocked: true, skipAd: true, speedSlider: true, profile: true, showRating: true },
     Disney: { skipIntro: true, skipCredits: true, watchCredits: false, speedSlider: true, showRating: true },
     Crunchyroll: { skipIntro: true, speedSlider: true, releaseCalendar: true },
     Video: { playOnFullScreen: true },
diff --git a/chrome/manifest.json b/chrome/manifest.json
index 6689cf3e..572eeac5 100644
--- a/chrome/manifest.json
+++ b/chrome/manifest.json
@@ -2,7 +2,7 @@
   "manifest_version": 3,
   "name": "__MSG_extensionName__",
   "description": "__MSG_extensionDescription__",
-  "version": "1.0.65",
+  "version": "1.0.66",
 
   "homepage_url": "https://github.com/Dreamlinerm/Netflix-Prime-Auto-Skip",
   "icons": {
@@ -36,7 +36,6 @@
     }
   ],
   "permissions": ["storage"],
-  "host_permissions": ["https://apis.justwatch.com/*"],
   "action": {
     "default_icon": {
       "16": "icons/NetflixAmazon Auto-Skip--16.png",
diff --git a/chrome/popup/popup.html b/chrome/popup/popup.html
index e5141ffc..6f008939 100644
--- a/chrome/popup/popup.html
+++ b/chrome/popup/popup.html
@@ -29,7 +29,7 @@
           <img class="Logo" src="../icons/NetflixAmazon Auto-Skip.svg" />
           <div class="flex-center flex-col">
             <h2 class="title" i18n>pageTitle</h2>
-            <p style="color: grey; font-size: 1em">v.1.0.65</p>
+            <p style="color: grey; font-size: 1em">v.1.0.66</p>
           </div>
         </div>
         <a
@@ -267,6 +267,43 @@ <h2 id="openDisneySettings" i18n>PageSpecificTitle;Disney+</h2>
         <!-- show on click -->
         <div id="DisneySettings" style="display: none"></div>
       </div>
+      <div class="categoryCrunchyroll">
+        <div id="openCrunchyrollSettings" class="flex flex-between" style="padding: 5px 5px">
+          <h2 id="openCrunchyrollSettings" i18n>PageSpecificTitle;Crunchyroll</h2>
+          <div class="flex">
+            <div class="line flex-align" id="openCrunchyrollSettings">
+              <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 40 20" height="1em" id="openCrunchyrollSettings" class="CrunchyrollDownArrow">
+                <path d="M0 0 40 0 20 20 0 0" fill="white" id="openCrunchyrollSettings" />
+              </svg>
+              <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 40 20" height="1em" id="openCrunchyrollSettings" class="CrunchyrollUpArrow hidden">
+                <path d="M20 0 40 20 0 20 20 0" fill="white" id="openCrunchyrollSettings" />
+              </svg>
+            </div>
+            <label class="switch">
+              <input type="checkbox" id="CrunchyrollSkips" />
+              <span class="slider round"></span>
+            </label>
+          </div>
+        </div>
+
+        <!-- show on click -->
+        <div id="CrunchyrollSettings" style="display: none">
+          <div class="line flex">
+            <p i18n>IntroSwitch</p>
+            <label class="switch">
+              <input type="checkbox" id="CrunchyrollSkipIntro" />
+              <span class="slider round"></span>
+            </label>
+          </div>
+          <div class="line flex">
+            <p i18n>ReleaseCalendarSwitch</p>
+            <label class="switch">
+              <input type="checkbox" id="CrunchyrollReleaseCalendar" />
+              <span class="slider round"></span>
+            </label>
+          </div>
+        </div>
+      </div>
       <div class="flex flex-between flex-align" id="openStatistics">
         <h2 id="openStatistics" style="margin-left: 10px" i18n>StatisticPageTitle</h2>
         <div class="flex" style="margin-right: 75px">
diff --git a/chrome/popup/settings.css b/chrome/popup/settings.css
index 9cd28da8..e4bf6907 100644
--- a/chrome/popup/settings.css
+++ b/chrome/popup/settings.css
@@ -149,9 +149,13 @@ p {
 .categoryDisney {
   background-color: #000c7d;
 }
+.categoryCrunchyroll {
+  background-color: #f78b24;
+}
 .categoryPrime,
 .categoryNetflix,
-.categoryDisney {
+.categoryDisney,
+.categoryCrunchyroll {
   margin-top: 5px;
   margin-left: 5px;
   margin-right: 5px;
diff --git a/chrome/popup/settings.html b/chrome/popup/settings.html
index e99f8393..36c49767 100644
--- a/chrome/popup/settings.html
+++ b/chrome/popup/settings.html
@@ -29,7 +29,7 @@
           <img class="Logo" src="../icons/NetflixAmazon Auto-Skip.svg" />
           <div class="flex-center flex-col">
             <h2 class="title" i18n>pageTitle</h2>
-            <p style="font-size: 1em">v.1.0.65</p>
+            <p style="font-size: 1em">v.1.0.66</p>
           </div>
         </div>
         <a
@@ -75,6 +75,20 @@ <h2 class="title" i18n>pageTitle</h2>
           </svg>
           Disney+
         </a>
+        <a id="MenuCrunchyroll" href="#Crunchyroll" class="menuButton flex">
+          <svg id="MenuCrunchyroll" class="icon" viewBox="1.8 1.581 247.263 220" xmlns="http://www.w3.org/2000/svg">
+            <!-- #f78b24 -->
+            <g fill="white">
+              <path
+                d="m115.377 209.8c-3.54-.33-12.852-1.943-16.306-2.825-29.863-7.625-55.154-28.074-68.537-55.418-7.337-14.99-10.395-28.396-10.383-45.52.012-17.144 3.117-30.818 10.335-45.52 5.406-11.01 11.625-19.636 20.453-28.37 16.513-16.336 37.43-26.45 61.124-29.552 7.746-1.014 24.143-.684 31.377.631 15.045 2.737 28.553 8.112 40.658 16.178 25.149 16.76 41.461 42.39 45.714 71.828.91 6.303 1.437 19.42.824 20.515-.335.598-.508-.028-.727-2.62-1.086-12.843-6.642-28.373-14.307-39.991-23.298-35.313-66.767-50.295-107.013-36.883-31.064 10.352-54.41 36.615-60.818 68.416-3.169 15.725-2.218 31.139 2.86 46.355 8.953 26.836 30.382 48.274 57.558 57.584 6.41 2.196 14.64 4.026 20.068 4.461 6.5.522 4.861 1.018-3.157.956-4.376-.033-8.75-.135-9.723-.225z"
+              />
+              <path
+                d="m137.695 196.826c-33.594-2.447-61.427-27.495-67.236-60.507-1.057-6.008-1.261-17.24-.413-22.769 5.036-32.827 30.288-57.733 63.23-62.362 6.676-.938 18.574-.61 24.969.69 5.562 1.13 11.728 3.138 16.572 5.394l3.757 1.75-3.536 1.669c-12.758 6.025-20.633 20.118-18.784 33.619 1.851 13.52 11.2 24.13 24.622 27.945 4.832 1.374 12.22 1.373 17.054 0 6.25-1.777 11.152-4.682 15.613-9.254 1.506-1.544 2.835-2.648 2.954-2.455.119.194.463 2.322.765 4.73.745 5.939.308 17.238-.886 22.88-3.803 17.967-13.386 33.049-28.08 44.192-13.907 10.546-32.305 15.81-50.601 14.478z"
+              />
+            </g>
+          </svg>
+          Crunchyroll
+        </a>
         <a id="MenuOther" href="#Other" class="menuButton flex">
           <svg id="MenuOther" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" class="icon">
             <path
@@ -173,6 +187,7 @@ <h2 i18n>SharedPageTitle</h2>
               <th>Netflix</th>
               <th>Prime</th>
               <th>Disney+</th>
+              <th>Crunchyroll</th>
             </tr>
             <tr>
               <td>
@@ -193,6 +208,12 @@ <h2 i18n>SharedPageTitle</h2>
                   <span class="slider round"></span>
                 </label>
               </td>
+              <td>
+                <label class="switch">
+                  <input type="checkbox" id="CrunchyrollSkipIntro" />
+                  <span class="slider round"></span>
+                </label>
+              </td>
             </tr>
           </table>
           <p class="description" i18n>SharedIntroDescription</p>
@@ -284,7 +305,7 @@ <h2 i18n>SharedPageTitle</h2>
             <tr>
               <td>
                 <label class="switch">
-                  <input type="checkbox" id="NetflixNetflixAds" />
+                  <input type="checkbox" id="NetflixSkipAd" />
                   <span class="slider round"></span>
                 </label>
               </td>
@@ -341,6 +362,7 @@ <h2 i18n>SharedPageTitle</h2>
               <th>Netflix</th>
               <th>Prime</th>
               <th>Disney+</th>
+              <th>Crunchyroll</th>
             </tr>
             <tr>
               <td>
@@ -361,6 +383,12 @@ <h2 i18n>SharedPageTitle</h2>
                   <span class="slider round"></span>
                 </label>
               </td>
+              <td>
+                <label class="switch">
+                  <input type="checkbox" id="CrunchyrollSpeedSlider" />
+                  <span class="slider round"></span>
+                </label>
+              </td>
             </tr>
           </table>
           <p class="description" i18n>SliderSwitchDescription</p>
@@ -550,7 +578,7 @@ <h2 i18n>PageSpecificTitle;Netflix</h2>
                 <div class="line flex">
                   <p i18n>AdsSwitch</p>
                   <label class="switch">
-                    <input type="checkbox" id="NetflixNetflixAds" />
+                    <input type="checkbox" id="NetflixSkipAd" />
                     <span class="slider round"></span>
                   </label>
                 </div>
@@ -604,6 +632,32 @@ <h2 i18n>PageSpecificTitle;Disney+</h2>
                   </label>
                 </div> -->
         </div>
+        <div class="categoryCrunchyroll hidden" style="margin-top: 0; background-color: unset" id="CrunchyrollSettings">
+          <div class="flex flex-between" style="padding: 5px 5px; color: #f78b24">
+            <h2 i18n>PageSpecificTitle;Crunchyroll</h2>
+            <label class="switch">
+              <input type="checkbox" id="CrunchyrollSkips" />
+              <span class="slider round"></span>
+            </label>
+          </div>
+          <hr />
+          <div class="line flex">
+            <p i18n>IntroSwitch</p>
+            <label class="switch">
+              <input type="checkbox" id="CrunchyrollSkipIntro" />
+              <span class="slider round"></span>
+            </label>
+          </div>
+          <hr />
+          <div class="line flex">
+            <p i18n>ReleaseCalendarSwitch</p>
+            <label class="switch">
+              <input type="checkbox" id="CrunchyrollReleaseCalendar" />
+              <span class="slider round"></span>
+            </label>
+          </div>
+          <p class="description" i18n>ReleaseCalendarDescription</p>
+        </div>
         <div id="StatisticsSettings" class="hidden">
           <h2 i18n>SkippedTime</h2>
           <div class="line flex flex-between">
@@ -653,7 +707,16 @@ <h2 i18n>ImportSettings</h2>
           <h2>Changelog</h2>
           <div>
             <div class="line flex">
-              <h2>1.0.65</h2>
+              <h2>1.0.66</h2>
+              <ul>
+                <li>added Streaming Service Crunchyroll</li>
+                <li>fixed Netflix SpeedSlider was conflicting with netflix ad Skip</li>
+                <li>added Portuguese (BR) as a Language</li>
+                <li>simplified Code substantially(min. 600 LOC less)</li>
+              </ul>
+            </div>
+            <div class="line flex">
+              <p>1.0.65</p>
               <ul>
                 <li>fixed Netflix SpeedSlider was conflicting with netflix ad Skip</li>
                 <li>added Portuguese (BR) as a Language</li>
diff --git a/chrome/popup/settings.js b/chrome/popup/settings.js
index c04ade17..c6dbf723 100644
--- a/chrome/popup/settings.js
+++ b/chrome/popup/settings.js
@@ -50,7 +50,7 @@ if (url.includes("#")) Menu(url.split("#")[1]);
 const defaultSettings = {
   settings: {
     Amazon: { skipIntro: true, skipCredits: true, watchCredits: false, skipAd: true, blockFreevee: true, speedSlider: true, filterPaid: false, showRating: true, streamLinks: true },
-    Netflix: { skipIntro: true, skipRecap: true, skipCredits: true, watchCredits: false, skipBlocked: true, NetflixAds: true, speedSlider: true, profile: true, showRating: true },
+    Netflix: { skipIntro: true, skipRecap: true, skipCredits: true, watchCredits: false, skipBlocked: true, skipAd: true, speedSlider: true, profile: true, showRating: true },
     Disney: { skipIntro: true, skipCredits: true, watchCredits: false, speedSlider: true, showRating: true },
     Crunchyroll: { skipIntro: true, speedSlider: true, releaseCalendar: true },
     Video: { playOnFullScreen: true },
@@ -82,6 +82,16 @@ chrome.storage.sync.get("settings", function (result) {
         }
       }
     }
+    // delete every setting that is not in defaultSettings
+    for (const key in settings) {
+      for (const subkey in settings[key]) {
+        if (typeof defaultSettings.settings[key][subkey] === "undefined") {
+          console.log("delete Setting:", key, subkey);
+          changedSettings = true;
+          delete settings[key][subkey];
+        }
+      }
+    }
     setCheckboxesToSettings();
     if (changedSettings) {
       chrome.storage.sync.set({ settings });
@@ -115,11 +125,25 @@ function getTimeFormatted(sec = 0) {
 }
 // for all services get the shared boolean of the category
 function getBooleanOfCategory(category) {
-  return settings?.Amazon[category] && settings?.Netflix[category] && settings?.Disney[category];
+  let bool = true;
+  if (settings?.Amazon?.[category] !== undefined) bool &= settings?.Amazon[category];
+  if (settings?.Netflix?.[category] !== undefined) bool &= settings?.Netflix[category];
+  if (settings?.Disney?.[category] !== undefined) bool &= settings?.Disney[category];
+  if (settings?.Crunchyroll?.[category] !== undefined) bool &= settings?.Crunchyroll[category];
+  return bool;
+}
+function setCategoryToBoolean(category, bool) {
+  if (settings?.Amazon?.[category] !== undefined) settings.Amazon[category] = bool;
+  if (settings?.Netflix?.[category] !== undefined) settings.Netflix[category] = bool;
+  if (settings?.Disney?.[category] !== undefined) settings.Disney[category] = bool;
+  if (settings?.Crunchyroll?.[category] !== undefined) settings.Crunchyroll[category] = bool;
 }
 function capitalizeFirstLetter(str) {
   return str.charAt(0).toUpperCase() + str.slice(1);
 }
+function lowerCaseFirstLetter(str) {
+  return str.charAt(0).toLowerCase() + str.slice(1);
+}
 function setCheckboxesOfService(service) {
   Object.keys(settings[service]).forEach((key) => {
     const buttons = document.querySelectorAll("#" + service + capitalizeFirstLetter(key));
@@ -132,7 +156,12 @@ function setCheckboxesOfService(service) {
     });
   });
 }
-
+function setButtonChecked(id, condition) {
+  const buttons = document.querySelectorAll(`#${id}`);
+  buttons.forEach((button) => {
+    button.checked = condition;
+  });
+}
 function setCheckboxesToSettings() {
   let button;
   button = document.querySelector("#VideoSkips");
@@ -142,43 +171,30 @@ function setCheckboxesToSettings() {
       getBooleanOfCategory("skipCredits") &&
       // Ads
       settings?.Amazon.blockFreevee &&
-      settings?.Netflix.NetflixAds &&
+      settings?.Netflix.skipAd &&
       getBooleanOfCategory("showRating") &&
       getBooleanOfCategory("speedSlider") &&
       // playOnFullScreen
       settings?.Video.playOnFullScreen;
-  button = document.querySelector("#VideoSkipIntro");
-  if (button) button.checked = settings?.Amazon.skipIntro && settings?.Netflix.skipIntro && settings?.Disney.skipIntro;
-  button = document.querySelector("#VideoSkipCredits");
-  if (button) button.checked = settings?.Amazon.skipCredits && settings?.Netflix.skipCredits && settings?.Disney.skipCredits;
-  button = document.querySelectorAll("#VideoWatchCredits");
-  for (const b of button) {
-    b.checked = settings?.Amazon.watchCredits && settings?.Netflix.watchCredits && settings?.Disney.watchCredits;
-  }
-  button = document.querySelector("#VideoAds");
-  if (button) button.checked = settings?.Amazon.blockFreevee && settings?.Netflix.NetflixAds;
-  button = document.querySelector("#VideoShowRating");
-  if (button) button.checked = settings?.Netflix.showRating && settings?.Disney.showRating;
-  button = document.querySelector("#VideoSpeedSlider");
-  if (button) button.checked = settings?.Amazon.speedSlider && settings?.Netflix.speedSlider && settings?.Disney.speedSlider;
-  button = document.querySelector("#VideoFullScreen");
-  if (button) button.checked = settings?.Video.playOnFullScreen;
-
+  let VideoCheckboxes = ["skipIntro", "skipCredits", "watchCredits", "showRating", "speedSlider"];
+  VideoCheckboxes.forEach((key) => {
+    setButtonChecked("Video" + capitalizeFirstLetter(key), getBooleanOfCategory(key));
+  });
+  setButtonChecked("VideoAds", settings?.Amazon.blockFreevee && settings?.Netflix.skipAd);
+  setButtonChecked("VideoFullScreen", settings?.Video.playOnFullScreen);
   //  -------------      Default        ---------------------------------------
-  button = document.querySelector("#DefaultSkips");
-  if (button) button.checked = settings?.Amazon.filterPaid;
+  setButtonChecked("DefaultSkips", settings?.Amazon.filterPaid);
   // -------------      global buttons        ---------------------------------------
-  button = document.querySelector("#AmazonSkips");
-  if (button) button.checked = settings?.Amazon.skipAd && settings?.Amazon.filterPaid && settings?.Amazon.streamLinks;
-  button = document.querySelector("#NetflixSkips");
-  if (button) button.checked = settings?.Netflix.skipRecap && settings?.Netflix.skipBlocked && settings?.Netflix.profile;
-  button = document.querySelector("#DisneySkips");
-  if (button) button.checked = settings?.Disney.skipIntro;
+  setButtonChecked("AmazonSkips", settings?.Amazon.skipAd && settings?.Amazon.filterPaid && settings?.Amazon.streamLinks);
+  setButtonChecked("NetflixSkips", settings?.Netflix.skipRecap && settings?.Netflix.skipBlocked && settings?.Netflix.profile);
+  setButtonChecked("DisneySkips", settings?.Disney.skipIntro);
+  setButtonChecked("CrunchyrollSkips", settings?.Crunchyroll.skipIntro && settings?.Crunchyroll.releaseCalendar);
   //  -------------      Individual Checkboxes        ---------------------------------------
   setCheckboxesOfService("Amazon");
   setCheckboxesOfService("Netflix");
   setCheckboxesOfService("Disney");
   setCheckboxesOfService("Statistics");
+  setCheckboxesOfService("Crunchyroll");
   //  -------------      Netflix other        ---------------------------------------
   button = document.querySelector("#profileName");
   if (button) button.textContent = settings?.General.profileName;
@@ -236,6 +252,20 @@ function setSettings(log) {
   console.log(log, settings);
   chrome.storage.sync.set({ settings });
 }
+/**
+ * for inverse Settings
+ * @param {*} setting  the setting that should be set
+ * @param {*} target   the setting that should be unset if setting is set
+ */
+function toggleSetting(service, target, setting) {
+  settings[service][setting] = !settings[service]?.[setting];
+  if (settings[service][setting]) settings[service][target] = false;
+}
+function toggleCategoryBoolean(target, setting) {
+  const value = getBooleanOfCategory(setting);
+  setCategoryToBoolean(setting, !value);
+  if (!value) setCategoryToBoolean(target, false);
+}
 function listenForClicks() {
   let listener = document.addEventListener("click", (e) => {
     if (e.target.classList.contains("reset")) {
@@ -290,99 +320,48 @@ function listenForClicks() {
           getBooleanOfCategory("skipCredits") &&
           // Ads
           settings?.Amazon.blockFreevee &&
-          settings?.Netflix.NetflixAds &&
+          settings?.Netflix.skipAd &&
           getBooleanOfCategory("showRating") &&
           getBooleanOfCategory("speedSlider") &&
           // playOnFullScreen
           settings?.Video.playOnFullScreen
         );
-        settings.Amazon.skipIntro =
-          settings.Netflix.skipIntro =
-          settings.Disney.skipIntro =
-          // Credits
-          settings.Amazon.skipCredits =
-          settings.Netflix.skipCredits =
-          settings.Disney.skipCredits =
-          // Ads
-          settings.Amazon.blockFreevee =
-          settings.Netflix.NetflixAds =
-          // showRating
-          settings.Amazon.showRating =
-          settings.Netflix.showRating =
-          settings.Disney.showRating =
-          // SpeedSlider
-          settings.Amazon.speedSlider =
-          settings.Netflix.speedSlider =
-          settings.Disney.speedSlider =
-          // playOnFullScreen
-          settings.Video.playOnFullScreen =
-            VideoSkips;
-        if (VideoSkips) settings.Amazon.watchCredits = settings.Netflix.watchCredits = settings.Disney.watchCredits = false;
-      } else if (e.target.id === "VideoSkipIntro") settings.Amazon.skipIntro = settings.Netflix.skipIntro = settings.Disney.skipIntro = !getBooleanOfCategory("skipIntro");
-      else if (e.target.id === "VideoSkipCredits") {
-        const skipCredits = getBooleanOfCategory("skipCredits");
-        settings.Amazon.skipCredits = settings.Netflix.skipCredits = settings.Disney.skipCredits = !skipCredits;
-        if (!skipCredits) {
-          settings.Amazon.watchCredits = settings.Netflix.watchCredits = settings.Disney.watchCredits = false;
-        }
-      } else if (e.target.id === "VideoWatchCredits") {
-        const watchCredits = getBooleanOfCategory("watchCredits");
-        settings.Amazon.watchCredits = settings.Netflix.watchCredits = settings.Disney.watchCredits = !watchCredits;
-        if (!watchCredits) {
-          settings.Amazon.skipCredits = settings.Netflix.skipCredits = settings.Disney.skipCredits = false;
-        }
-      } else if (e.target.id === "VideoAds") settings.Amazon.blockFreevee = settings.Netflix.NetflixAds = !(settings?.Amazon.blockFreevee && settings?.Netflix.NetflixAds);
-      else if (e.target.id === "VideoShowRating") settings.Amazon.showRating = settings.Netflix.showRating = settings.Disney.showRating = !getBooleanOfCategory("showRating");
-      else if (e.target.id === "VideoSpeedSlider") settings.Amazon.speedSlider = settings.Netflix.speedSlider = settings.Disney.speedSlider = !getBooleanOfCategory("speedSlider");
+        let VideoSkipTypes = ["skipIntro", "skipCredits", "showRating", "speedSlider"];
+        VideoSkipTypes.forEach((key) => {
+          setCategoryToBoolean(key, VideoSkips);
+        });
+        settings.Amazon.blockFreevee = settings.Netflix.skipAd = settings.Video.playOnFullScreen = VideoSkips;
+        if (VideoSkips) setCategoryToBoolean("watchCredits", false);
+      } else if (e.target.id === "VideoAds") settings.Amazon.blockFreevee = settings.Netflix.skipAd = !(settings?.Amazon.blockFreevee && settings?.Netflix.skipAd);
       else if (e.target.id === "VideoFullScreen") settings.Video.playOnFullScreen = !settings.Video.playOnFullScreen;
+      else if (e.target.id.startsWith("Video")) {
+        let key = lowerCaseFirstLetter(e.target.id.replace("Video", ""));
+        if (key === "skipCredits" || key === "watchCredits") {
+          toggleCategoryBoolean(key === "skipCredits" ? "watchCredits" : "skipCredits", key);
+        } else {
+          setCategoryToBoolean(key, !getBooleanOfCategory(key));
+        }
+      }
       // -------------      Default        ---------------------------------------
       else if (e.target.id === "DefaultSkips") settings.Amazon.filterPaid = !settings?.Amazon.filterPaid;
       //  -------------      Amazon        ---------------------------------------
       else if (e.target.id === "AmazonSkips")
         settings.Amazon.skipAd = settings.Amazon.filterPaid = settings.Amazon.streamLinks = !(settings.Amazon.skipAd && settings.Amazon.filterPaid && settings.Amazon.streamLinks);
-      else if (e.target.id === "AmazonSkipCredits") {
-        settings.Amazon.skipCredits = !settings.Amazon.skipCredits;
-        if (settings.Amazon.skipCredits) settings.Amazon.watchCredits = false;
-      } else if (e.target.id === "AmazonWatchCredits") {
-        settings.Amazon.watchCredits = !settings.Amazon.watchCredits;
-        if (settings.Amazon.watchCredits) settings.Amazon.skipCredits = false;
-      } else if (e.target.id === "AmazonSkipIntro") settings.Amazon.skipIntro = !settings.Amazon.skipIntro;
-      else if (e.target.id === "AmazonSkipAd") settings.Amazon.skipAd = !settings.Amazon.skipAd;
-      else if (e.target.id === "AmazonBlockFreevee") settings.Amazon.blockFreevee = !settings.Amazon.blockFreevee;
-      else if (e.target.id === "AmazonSpeedSlider") settings.Amazon.speedSlider = !settings.Amazon.speedSlider;
-      else if (e.target.id === "AmazonFilterPaid") settings.Amazon.filterPaid = !settings.Amazon.filterPaid;
-      else if (e.target.id === "AmazonStreamLinks") settings.Amazon.streamLinks = !settings.Amazon.streamLinks;
-      //  -------------      Netflix        ---------------------------------------
       else if (e.target.id === "NetflixSkips")
         settings.Netflix.skipRecap = settings.Netflix.skipBlocked = settings.Netflix.profile = !(settings?.Netflix.skipRecap && settings?.Netflix.skipBlocked && settings?.Netflix.profile);
-      else if (e.target.id === "NetflixSkipIntro") settings.Netflix.skipIntro = !settings.Netflix.skipIntro;
-      else if (e.target.id === "NetflixSkipRecap") settings.Netflix.skipRecap = !settings.Netflix.skipRecap;
-      else if (e.target.id === "NetflixSkipCredits") {
-        settings.Netflix.skipCredits = !settings.Netflix.skipCredits;
-        if (settings.Netflix.skipCredits) settings.Netflix.watchCredits = false;
-      } else if (e.target.id === "NetflixWatchCredits") {
-        settings.Netflix.watchCredits = !settings.Netflix.watchCredits;
-        if (settings.Netflix.watchCredits) settings.Netflix.skipCredits = false;
-      } else if (e.target.id === "NetflixSkipBlocked") settings.Netflix.skipBlocked = !settings.Netflix.skipBlocked;
-      else if (e.target.id === "NetflixNetflixAds") settings.Netflix.NetflixAds = !settings.Netflix.NetflixAds;
-      else if (e.target.id === "NetflixSpeedSlider") settings.Netflix.speedSlider = !settings.Netflix.speedSlider;
-      else if (e.target.id === "NetflixProfile") settings.Netflix.profile = !settings.Netflix.profile;
-      else if (e.target.id === "NetflixShowRating") settings.Netflix.showRating = !settings.Netflix.showRating;
-      //  -------------      Disney        ---------------------------------------
-      else if (e.target.id === "DisneySkips") {
-        // const DisneySkips = !settings?.Disney.skipIntro;
-        // settings.Disney.skipIntro = DisneySkips;
-        //       } else if (e.target.id === "DisneySkipIntro") {
-        // settings.Disney.skipIntro = !settings.Disney.skipIntro;
-      } else if (e.target.id === "DisneySkipIntro") settings.Disney.skipIntro = !settings.Disney.skipIntro;
-      else if (e.target.id === "DisneySkipCredits") {
-        settings.Disney.skipCredits = !settings.Disney.skipCredits;
-        if (settings.Disney.skipCredits) settings.Disney.watchCredits = false;
-      } else if (e.target.id === "DisneyWatchCredits") {
-        settings.Disney.watchCredits = !settings.Disney.watchCredits;
-        if (settings.Disney.watchCredits) settings.Disney.skipCredits = false;
-      } else if (e.target.id === "DisneySpeedSlider") settings.Disney.speedSlider = !settings.Disney.speedSlider;
-      else if (e.target.id === "DisneyShowRating") settings.Disney.showRating = !settings.Disney.showRating;
+      // else if (e.target.id === "DisneySkips") settings.Disney.skipIntro = !settings?.Disney.skipIntro
+      else if (e.target.id === "CrunchyrollSkips") settings.Crunchyroll.skipIntro = settings.Crunchyroll.releaseCalendar = !(settings?.Crunchyroll.skipIntro && settings?.Crunchyroll.releaseCalendar);
+      const services = ["Amazon", "Netflix", "Disney", "Crunchyroll"];
+      for (const service of services) {
+        if (e.target.id.startsWith(service)) {
+          let key = lowerCaseFirstLetter(e.target.id.replace(service, ""));
+          if (key === "skipCredits" || key === "watchCredits") {
+            toggleSetting(service, key === "skipCredits" ? "watchCredits" : "skipCredits", key);
+          } else {
+            settings[service][key] = !settings[service]?.[key];
+          }
+        }
+      }
       // check if settings changed
       if (JSON.stringify(settings) !== JSON.stringify(currentSettings)) {
         setSettings(e.target.id);
diff --git a/chrome/skipper.js b/chrome/skipper.js
index 90442e05..1b91363b 100644
--- a/chrome/skipper.js
+++ b/chrome/skipper.js
@@ -30,7 +30,7 @@ if (isPrimeVideo || isNetflix || isDisney || isHotstar || isCrunchyroll) {
   const defaultSettings = {
     settings: {
       Amazon: { skipIntro: true, skipCredits: true, watchCredits: false, skipAd: true, blockFreevee: true, speedSlider: true, filterPaid: false, showRating: true, streamLinks: true },
-      Netflix: { skipIntro: true, skipRecap: true, skipCredits: true, watchCredits: false, skipBlocked: true, NetflixAds: true, speedSlider: true, profile: true, showRating: true },
+      Netflix: { skipIntro: true, skipRecap: true, skipCredits: true, watchCredits: false, skipBlocked: true, skipAd: true, speedSlider: true, profile: true, showRating: true },
       Disney: { skipIntro: true, skipCredits: true, watchCredits: false, speedSlider: true, showRating: true },
       Crunchyroll: { skipIntro: true, speedSlider: true, releaseCalendar: true },
       Video: { playOnFullScreen: true },
@@ -61,7 +61,7 @@ if (isPrimeVideo || isNetflix || isDisney || isHotstar || isCrunchyroll) {
       if (isNetflix) {
         // start Observers depending on the settings
         if (settings.Netflix?.profile) AutoPickProfile();
-        if (settings.Netflix?.NetflixAds) Netflix_SkipAdInterval();
+        if (settings.Netflix?.skipAd) Netflix_SkipAdInterval();
         NetflixObserver.observe(document, config);
       } else if (isPrimeVideo) {
         AmazonSkipIntroObserver.observe(document, AmazonSkipIntroConfig);
@@ -132,7 +132,7 @@ if (isPrimeVideo || isNetflix || isDisney || isHotstar || isCrunchyroll) {
         log(key, "Old value:", oldValue, ", new value:", newValue);
         if (isNetflix) {
           // if value is changed then check if it is enabled or disabled
-          if (oldValue === undefined || (newValue.Netflix.NetflixAds !== oldValue?.Netflix?.NetflixAds && newValue.Netflix.NetflixAds)) Netflix_SkipAdInterval();
+          if (oldValue === undefined || (newValue.Netflix.skipAd !== oldValue?.Netflix?.skipAd && newValue.Netflix.skipAd)) Netflix_SkipAdInterval();
         } else if (isPrimeVideo) {
           if (oldValue === undefined || (newValue.Amazon.skipAd !== oldValue?.Amazon?.skipAd && newValue.Amazon.skipAd)) Amazon_AdTimeout();
           if (oldValue === undefined || (newValue.Amazon.blockFreevee !== oldValue?.Amazon?.blockFreevee && newValue.Amazon.blockFreevee)) Amazon_FreeveeTimeout();
@@ -231,7 +231,7 @@ if (isPrimeVideo || isNetflix || isDisney || isHotstar || isCrunchyroll) {
   async function startShowRatingInterval() {
     addRating();
     let RatingInterval = setInterval(function () {
-      if ((isNetflix && !settings.Netflix?.NetflixAds) || (isPrimeVideo && !settings.Amazon?.skipAd) || ((isDisney || isHotstar) && !settings.Disney?.skipCredits)) {
+      if ((isNetflix && !settings.Netflix?.showRating) || (isPrimeVideo && !settings.Amazon?.showRating) || ((isDisney || isHotstar) && !settings.Disney?.showRating)) {
         log("stopped adding Rating");
         clearInterval(RatingInterval);
         return;
@@ -239,7 +239,7 @@ if (isPrimeVideo || isNetflix || isDisney || isHotstar || isCrunchyroll) {
       addRating();
     }, 1000);
     let DBCacheInterval = setInterval(function () {
-      if ((isNetflix && !settings.Netflix?.NetflixAds) || (isPrimeVideo && !settings.Amazon?.skipAd) || ((isDisney || isHotstar) && !settings.Disney?.skipCredits)) {
+      if ((isNetflix && !settings.Netflix?.showRating) || (isPrimeVideo && !settings.Amazon?.showRating) || ((isDisney || isHotstar) && !settings.Disney?.showRating)) {
         log("stopped DBCacheInterval");
         clearInterval(DBCacheInterval);
         return;
@@ -528,7 +528,7 @@ if (isPrimeVideo || isNetflix || isDisney || isHotstar || isCrunchyroll) {
 
           let speed = document.createElement("p");
           speed.id = "videoSpeed";
-          speed.textContent = videoSpeed ? videoSpeed + "x" : "1x";
+          speed.textContent = videoSpeed ? videoSpeed.toFixed(1) + "x" : "1x";
           // makes the button clickable
           // speed.setAttribute("class", "control-icon-btn");
           speed.style = "height:10px;color:#f9f9f9;pointer-events: auto;position: relative;bottom: 8px;padding: 0 5px;";
@@ -540,7 +540,7 @@ if (isPrimeVideo || isNetflix || isDisney || isHotstar || isCrunchyroll) {
             else slider.style.display = "block";
           };
           slider.oninput = function () {
-            speed.textContent = this.value / 10 + "x";
+            speed.textContent = (this.value / 10).toFixed(1) + "x";
             video.playbackRate = this.value / 10;
             setVideoSpeed(this.value / 10);
           };
@@ -628,7 +628,7 @@ if (isPrimeVideo || isNetflix || isDisney || isHotstar || isCrunchyroll) {
   }
   function Netflix_SkipAdInterval() {
     let AdInterval = setInterval(() => {
-      if (!settings.Netflix?.NetflixAds) {
+      if (!settings.Netflix?.skipAd) {
         log("stopped observing| Ad");
         clearInterval(AdInterval);
         return;
@@ -680,7 +680,7 @@ if (isPrimeVideo || isNetflix || isDisney || isHotstar || isCrunchyroll) {
 
             let speed = document.createElement("p");
             speed.id = "videoSpeed";
-            speed.textContent = videoSpeed ? videoSpeed + "x" : "1x";
+            speed.textContent = videoSpeed ? videoSpeed.toFixed(1) + "x" : "1x";
             // makes the button clickable
             // speed.setAttribute("class", "control-icon-btn");
             speed.style = "position:relative;bottom:20px;font-size: 3em;padding: 0 5px;";
@@ -692,7 +692,7 @@ if (isPrimeVideo || isNetflix || isDisney || isHotstar || isCrunchyroll) {
               else slider.style.display = "block";
             };
             slider.oninput = function () {
-              speed.textContent = this.value / 10 + "x";
+              speed.textContent = (this.value / 10).toFixed(1) + "x";
               video.playbackRate = this.value / 10;
               setVideoSpeed(this.value / 10);
             };
@@ -815,14 +815,14 @@ if (isPrimeVideo || isNetflix || isDisney || isHotstar || isCrunchyroll) {
 
           let speed = document.createElement("p");
           speed.id = "videoSpeed";
-          speed.textContent = "1x";
+          speed.textContent = "1.0x";
           position.insertBefore(speed, position.firstChild);
           speed.onclick = function () {
             if (slider.style.display === "block") slider.style.display = "none";
             else slider.style.display = "block";
           };
           slider.oninput = function () {
-            speed.textContent = this.value / 10 + "x";
+            speed.textContent = (this.value / 10).toFixed(1) + "x";
             video.playbackRate = this.value / 10;
           };
         }
@@ -833,7 +833,7 @@ if (isPrimeVideo || isNetflix || isDisney || isHotstar || isCrunchyroll) {
           video.playbackRate = alreadySlider.value / 10;
         }
         alreadySlider.oninput = function () {
-          speed.textContent = this.value / 10 + "x";
+          speed.textContent = (this.value / 10).toFixed(1) + "x";
           video.playbackRate = this.value / 10;
         };
       }
diff --git a/firefox/manifest.json b/firefox/manifest.json
index 935f423c..2c0f2250 100644
--- a/firefox/manifest.json
+++ b/firefox/manifest.json
@@ -2,7 +2,7 @@
   "manifest_version": 2,
   "name": "__MSG_extensionName__",
   "description": "__MSG_extensionDescription__",
-  "version": "1.0.65",
+  "version": "1.0.66",
   "homepage_url": "https://github.com/Dreamlinerm/Netflix-Prime-Auto-Skip",
   "icons": {
     "16": "icons/NetflixAmazon Auto-Skip.svg",
@@ -36,7 +36,7 @@
       "matches": ["https://static.crunchyroll.com/vilos-v2/web/vilos/player.html*"]
     }
   ],
-  "permissions": ["storage", "*://apis.justwatch.com/*"],
+  "permissions": ["storage"],
   "browser_action": {
     "default_icon": "icons/NetflixAmazon Auto-Skip.svg",
     "default_title": "__MSG_extensionName__",
diff --git a/firefox/popup/popup.html b/firefox/popup/popup.html
index 5c9b691a..2e6b7896 100644
--- a/firefox/popup/popup.html
+++ b/firefox/popup/popup.html
@@ -29,7 +29,7 @@
           <img class="Logo" src="../icons/NetflixAmazon Auto-Skip.svg" />
           <div class="flex-center flex-col">
             <h2 class="title" i18n>pageTitle</h2>
-            <p style="color: grey; font-size: 1em">v.1.0.65</p>
+            <p style="color: grey; font-size: 1em">v.1.0.66</p>
           </div>
         </div>
         <a target="_blank" class="flex-center flex-col" style="text-align: center; text-decoration: none" href="https://addons.mozilla.org/de/firefox/addon/netflix-prime-auto-skip/">
diff --git a/firefox/popup/settings.html b/firefox/popup/settings.html
index 25e499c6..6a3fc296 100644
--- a/firefox/popup/settings.html
+++ b/firefox/popup/settings.html
@@ -29,7 +29,7 @@
           <img class="Logo" src="../icons/NetflixAmazon Auto-Skip.svg" />
           <div class="flex-center flex-col">
             <h2 class="title" i18n>pageTitle</h2>
-            <p style="font-size: 1em">v.1.0.65</p>
+            <p style="font-size: 1em">v.1.0.66</p>
           </div>
         </div>
         <a target="_blank" class="flex-center flex-col" style="text-align: center; text-decoration: none" href="https://addons.mozilla.org/de/firefox/addon/netflix-prime-auto-skip/">
@@ -702,7 +702,16 @@ <h2 i18n>ImportSettings</h2>
           <h2>Changelog</h2>
           <div>
             <div class="line flex">
-              <h2>1.0.65</h2>
+              <h2>1.0.66</h2>
+              <ul>
+                <li>added Streaming Service Crunchyroll</li>
+                <li>fixed Netflix SpeedSlider was conflicting with netflix ad Skip</li>
+                <li>added Portuguese (BR) as a Language</li>
+                <li>simplified Code substantially(min. 600 LOC less)</li>
+              </ul>
+            </div>
+            <div class="line flex">
+              <p>1.0.65</p>
               <ul>
                 <li>fixed Netflix SpeedSlider was conflicting with netflix ad Skip</li>
                 <li>added Portuguese (BR) as a Language</li>
diff --git a/package-lock.json b/package-lock.json
index c664e633..a9234148 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "streaming-enhanced",
-  "version": "1.0.65",
+  "version": "1.0.66",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "streaming-enhanced",
-      "version": "1.0.65",
+      "version": "1.0.66",
       "license": "weaklyProtective"
     }
   }
diff --git a/package.json b/package.json
index e7698e2f..aee7abb5 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "streaming-enhanced",
-  "version": "1.0.65",
+  "version": "1.0.66",
   "description": "Automatically skip Ads, Intros, Recaps, Credits, etc. on Netflix, Prime video and Disney+ & Hotstar.",
   "scripts": {
     "start": "web-ext run --source-dir ./firefox/",