Merge branch 'master' of https://github.com/ajayyy/SponsorBlock into selenium

New Crowdin updates (#883 )
Merge pull request #896 from ajayyy/improvements
2025-12-06 11:37:02 +03:00 · 2021-08-20 13:28:31 -04:00 · 2021-08-20 03:57:46 -04:00 · 2021-08-20 03:57:27 -04:00 · 2021-08-20 03:54:49 -04:00 · 2021-08-20 02:00:15 -04:00
73 changed files with 22860 additions and 959 deletions
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -3,6 +3,8 @@ module.exports = {
        browser: true,
        es2021: true,
        node: true,
+        jest: true,
+        jasmine: true,
    },
    extends: [
        "eslint:recommended",
--- a/.github/workflows/browserstack.yml
+++ b/.github/workflows/browserstack.yml
@@ -0,0 +1,34 @@
+name: 'BrowserStack Test'
+on: [push, pull_request]
+jobs:
+  ubuntu-job:
+    name: 'BrowserStack Test on Ubuntu'
+    runs-on: ubuntu-latest  # Can be self-hosted runner also
+    steps:
+      - name: 'BrowserStack Env Setup'  # Invokes the setup-env action
+        uses: browserstack/github-actions/setup-env@master
+        with:
+          username:  ${{ secrets.BROWSERSTACK_USERNAME }}
+          access-key: ${{ secrets.BROWSERSTACK_ACCESS_KEY }}
+      - name: 'BrowserStack Local Tunnel Setup'  # Invokes the setup-local action
+        uses: browserstack/github-actions/setup-local@master
+        with:
+          local-testing: start
+          local-identifier: random
+      # The next 3 steps are for building the web application to be tested and starting the web server on the runner environment
+      - name: 'Checkout the repository'
+        uses: actions/checkout@v2
+
+      - name: Copy configuration
+        run: cp config.json.example config.json
+
+      - name: 'Building web application to be tested'
+        run: npm install
+      # - name: 'Running application under test'
+      #   run: npm test
+      - name: 'Running test on BrowserStack'
+        run: npm test
+      - name: 'BrowserStackLocal Stop'  # Terminating the BrowserStackLocal tunnel connection
+        uses: browserstack/github-actions/setup-local@master
+        with:
+          local-testing: stop
--- a/config.json.example
+++ b/config.json.example
@@ -2,5 +2,5 @@
    "serverAddress": "https://sponsor.ajay.app",
    "testingServerAddress": "https://sponsor.ajay.app/test",
    "serverAddressComment": "This specifies the default SponsorBlock server to connect to",
-    "categoryList": ["sponsor", "selfpromo", "interaction", "intro", "outro", "preview", "music_offtopic"]
+    "categoryList": ["sponsor", "selfpromo", "interaction", "poi_highlight", "intro", "outro", "preview", "music_offtopic"]
 }
--- a/jest.config.js
+++ b/jest.config.js
@@ -1,6 +1,6 @@
 module.exports = {
    "roots": [
-        "src"
+        "test"
    ],
    "transform": {
        "^.+\\.ts$": "ts-jest"
--- a/manifest/manifest.json
+++ b/manifest/manifest.json
@@ -4,6 +4,7 @@
    "version": "2.2",
    "default_locale": "en",
    "description": "__MSG_Description__",
+    "homepage_url": "https://sponsor.ajay.app",
    "content_scripts": [{
        "run_at": "document_start",
        "matches": [
@@ -40,8 +41,11 @@
        "icons/help.svg",
        "icons/report.png",
        "icons/close.png",
+        "icons/skipIcon.svg",
        "icons/refresh.svg",
        "icons/beep.ogg",
+        "icons/pause.svg",
+        "icons/stop.svg",
        "icons/PlayerInfoIconSponsorBlocker.svg",
        "icons/PlayerDeleteIconSponsorBlocker.svg",
        "popup.html",
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -6,13 +6,14 @@
  "dependencies": {
    "@types/react": "^16.9.22",
    "@types/react-dom": "^16.9.5",
+    "@types/selenium-webdriver": "^4.0.15",
    "babel": "^6.23.0",
    "babel-core": "^6.26.3",
    "babel-loader": "^8.0.6",
    "babel-preset-env": "^1.7.0",
    "concurrently": "^5.1.0",
-    "react": "^16.12.0",
-    "react-dom": "^16.12.0"
+    "react": "^17.0.2",
+    "react-dom": "^17.0.2"
  },
  "devDependencies": {
    "@types/chrome": "0.0.91",
@@ -21,11 +22,13 @@
    "@types/jquery": "^3.3.31",
    "@typescript-eslint/eslint-plugin": "^4.9.1",
    "@typescript-eslint/parser": "^4.9.1",
+    "chromedriver": "^92.0.0",
    "copy-webpack-plugin": "^6.0.3",
    "eslint": "^7.15.0",
    "eslint-plugin-react": "^7.21.5",
    "jest": "^27.0.6",
    "rimraf": "^3.0.0",
+    "selenium-webdriver": "^4.0.0-beta.4",
    "ts-jest": "^27.0.3",
    "ts-loader": "^6.2.1",
    "typescript": "~4.3",
@@ -53,7 +56,8 @@
    "dev:firefox": "npm run build:dev:firefox && concurrently \"npm run web-run:firefox\" \"npm run build:watch:firefox\"",
    "dev:firefox-android": "npm run build:dev:firefox && concurrently \"npm run web-run:firefox-android\" \"npm run build:watch:firefox\"",
    "clean": "rimraf dist",
-    "test": "npx jest",
+    "test": "npm run build:chrome && npx jest",
+    "test-without-building": "npx jest",
    "lint": "eslint src",
    "lint:fix": "eslint src --fix"
  },
--- a/public/_locales/bg/messages.json
+++ b/public/_locales/bg/messages.json
@@ -224,6 +224,24 @@
    "showNotice": {
        "message": "Отново покажете известието"
    },
+    "showSkipNotice": {
+        "message": "Показване на известие след пропускане на сегмент"
+    },
+    "noticeVisibilityMode0": {
+        "message": "Известия за пропускане в пълен размер"
+    },
+    "noticeVisibilityMode1": {
+        "message": "Малки известия за пропускане при автоматично пропускане"
+    },
+    "noticeVisibilityMode2": {
+        "message": "Изцяло малки известия за пропускане"
+    },
+    "noticeVisibilityMode3": {
+        "message": "Плавни известия за пропускане при автоматично пропускане"
+    },
+    "noticeVisibilityMode4": {
+        "message": "Изцяло плавни известия за пропускане"
+    },
    "longDescription": {
        "message": "SponsorBlock ви позволява да прескачате спонсори, въведения, заключения, напомняния за абониране и други досадни части от видеоклиповете в YouTube. SponsorBlock е разширение за браузър, създадено от множество хора, което позволява на всеки да изпраща началния и крайния час на спонсорирани сегменти и други сегменти от видеоклиповете в YouTube. След като един човек подаде тази информация, всички останали с това разширение ще прескочат спонсорирания сегмент. Можете също да пропуснете части без музика при музикалните видеоклипове.",
        "description": "Full description of the extension on the store pages."
@@ -284,8 +302,17 @@
    "skip_category": {
        "message": "Пропускане на {0}?"
    },
+    "skip_to_category": {
+        "message": "Прескачане до {0}?",
+        "description": "Used for skipping to things (Skip to Highlight)"
+    },
    "skipped": {
-        "message": "Пропуснато"
+        "message": "{0} пропуснат",
+        "description": "Example: Sponsor Skipped"
+    },
+    "skipped_to_category": {
+        "message": "Прескочено до {0}",
+        "description": "Used for skipping to things (Skipped to Highlight)"
    },
    "disableAutoSkip": {
        "message": "Деактивиране на автоматичното пропускане"
@@ -347,12 +374,6 @@
    "createdBy": {
        "message": "Създаден от"
    },
-    "autoSkip": {
-        "message": "Автоматично пропускане"
-    },
-    "showSkipNotice": {
-        "message": "Показване на известие след пропускане на сегмент"
-    },
    "keybindCurrentlySet": {
        "message": ". В момента е настроено на:"
    },
@@ -544,14 +565,20 @@
    "category_music_offtopic_short": {
        "message": "Без музика"
    },
+    "category_poi_highlight": {
+        "message": "Акцент"
+    },
+    "category_poi_highlight_description": {
+        "message": "Частта от видеото, която повечето хора търсят. Подобно на коментарите „Видеото започва от х“."
+    },
    "category_livestream_messages": {
        "message": "Поточно предаване: Четене на съобщения/дарения"
    },
    "category_livestream_messages_short": {
        "message": "Четене на съобщения"
    },
-    "disable": {
-        "message": "Забрани"
+    "autoSkip": {
+        "message": "Автоматично пропускане"
    },
    "manualSkip": {
        "message": "Ръчно Прескачане"
@@ -559,6 +586,18 @@
    "showOverlay": {
        "message": "Показване в seek лентата"
    },
+    "disable": {
+        "message": "Забрани"
+    },
+    "autoSkip_POI": {
+        "message": "Автоматично прескачане до началото"
+    },
+    "manualSkip_POI": {
+        "message": "Питане, когато видеото се зарежда"
+    },
+    "showOverlay_POI": {
+        "message": "Показване в лентата за превъртане"
+    },
    "autoSkipOnMusicVideos": {
        "message": "Автоматично пропускане на всички сегменти, когато има сегмент без музика"
    },
--- a/public/_locales/cs/messages.json
+++ b/public/_locales/cs/messages.json
@@ -224,6 +224,9 @@
    "showNotice": {
        "message": "Znovu zobrazit upozornění"
    },
+    "showSkipNotice": {
+        "message": "Zobrazit upozornění po přeskočení segmentu"
+    },
    "longDescription": {
        "message": "SponsorBlock vám umožní přeskakovat sponzorské sekce, intra, outra, oznámení k odběru a další otravné části YouTube videí. SponsorBlock je crowdsourcované rozšíření prohlížeče, které dává komukoli možnost odeslat začátek a konec sponzorovaných segmentů a dalších segmentů YouTube videí. Jakmile jedna osoba odešle tuto informaci, všichni ostatní s tímto rozšířením automaticky přeskočí sponzorovaný segment. Můžete také přeskakovat nehudební sekce v hudebních videích.",
        "description": "Full description of the extension on the store pages."
@@ -284,9 +287,6 @@
    "skip_category": {
        "message": "Přeskočit {0}?"
    },
-    "skipped": {
-        "message": "- přeskočeno"
-    },
    "disableAutoSkip": {
        "message": "Zakázat automatické přeskočení"
    },
@@ -347,12 +347,6 @@
    "createdBy": {
        "message": "Vytvořil"
    },
-    "autoSkip": {
-        "message": "Automatické přeskočení"
-    },
-    "showSkipNotice": {
-        "message": "Zobrazit upozornění po přeskočení segmentu"
-    },
    "keybindCurrentlySet": {
        "message": ". Je momentálně nastaveno na:"
    },
@@ -550,8 +544,8 @@
    "category_livestream_messages_short": {
        "message": "Čtení zpráv"
    },
-    "disable": {
-        "message": "Zakázat"
+    "autoSkip": {
+        "message": "Automatické přeskočení"
    },
    "manualSkip": {
        "message": "Ruční přeskočení"
@@ -559,6 +553,9 @@
    "showOverlay": {
        "message": "Zobrazit v liště"
    },
+    "disable": {
+        "message": "Zakázat"
+    },
    "autoSkipOnMusicVideos": {
        "message": "Automaticky přeskočit všechny segmenty, když je ve videu nehudební segment"
    },
--- a/public/_locales/de/messages.json
+++ b/public/_locales/de/messages.json
@@ -85,6 +85,9 @@
    "noVideoID": {
        "message": "Kein YouTube-Video gefunden.\nWenn dies falsch ist, aktualisiere den Tab."
    },
+    "refreshSegments": {
+        "message": "Segment aktualisieren"
+    },
    "success": {
        "message": "Geschafft!"
    },
@@ -185,6 +188,9 @@
    "whatInfoButton": {
        "message": "Dieser Knopf öffnet ein Pop-up auf der Youtube-Seite."
    },
+    "autoHideInfoButton": {
+        "message": "Info-Button automatisch ausblenden"
+    },
    "hideDeleteButton": {
        "message": "Deaktiviere den Löschen-Knopf im Youtube-Videoplayer"
    },
@@ -200,6 +206,9 @@
    "whatViewTracking": {
        "message": "Diese Funktion erfasst, welche Segmente du übersprungen hast, um andere Nutzer zu zeigen, wie hilfreich ihre Beiträge sind. Außerdem stellt dies zusammen mit positiven Bewertungen sicher, dass keine unerwünschten Inhalte in die Datenbank gelangen. Die Erweiterung sendet jedes Mal, wenn du ein Segment überspringst, eine Meldung an den Server. Hoffentlich verändern die meisten Nutzer diese Einstellung nicht, um unsere Statistik zu verbessern :)"
    },
+    "enableViewTrackingInPrivate": {
+        "message": "Aktiviere den Übersprungen Zähler in Privaten/Incognito Tabs"
+    },
    "enableQueryByHashPrefix": {
        "message": "Abfrage nach Hash-Präfix"
    },
@@ -215,6 +224,9 @@
    "showNotice": {
        "message": "Hinweis erneut anzeigen"
    },
+    "showSkipNotice": {
+        "message": "Zeige Pop-up nach dem Überspringen eines Segments"
+    },
    "longDescription": {
        "message": "SponsorBlock lässt dich gesponserte Videosegmente, Intros, Outros, Interaktions-Erinnerungen, Musikvideoteile ohne Musik und andere nervige Teile von YouTube-Videos überspringen. SponsorBlock ist eine crowdsourced Browser-Erweiterung, in der jeder die Start- und Endzeit gesponserter Videosegmente und anderer Segmente von YouTube-Videos einreicht. Sobald eine Person diese Informationen einreicht, überspringen alle anderen mit dieser Erweiterung das gesponserte Segment.",
        "description": "Full description of the extension on the store pages."
@@ -275,8 +287,17 @@
    "skip_category": {
        "message": "{0} überspringen?"
    },
+    "skip_to_category": {
+        "message": "Zu {0} springen?",
+        "description": "Used for skipping to things (Skip to Highlight)"
+    },
    "skipped": {
-        "message": "Übersprungen"
+        "message": "{0} übersprungen",
+        "description": "Example: Sponsor Skipped"
+    },
+    "skipped_to_category": {
+        "message": "Zu {0} gesprungen",
+        "description": "Used for skipping to things (Skipped to Highlight)"
    },
    "disableAutoSkip": {
        "message": "Automatisches Überspringen deaktivieren"
@@ -338,18 +359,16 @@
    "createdBy": {
        "message": "Erstellt von"
    },
-    "autoSkip": {
-        "message": "Automatisch überspringen"
-    },
-    "showSkipNotice": {
-        "message": "Zeige Pop-up nach dem Überspringen eines Segments"
-    },
    "keybindCurrentlySet": {
        "message": ". Aktuelle Einstellung:"
    },
    "supportOtherSites": {
        "message": "Drittanbieter YouTube-Sites unterstützen"
    },
+    "supportOtherSitesDescription": {
+        "message": "Unterstütze Drittanbieter YouTube Clients. Zum unterstützen müssen zusätzlichliche Berechtigungen akzeptiert werden. Dies funktioniert NICHT im Incognitomodus auf Chrome oder anderen Chromium Varianten.",
+        "description": "This replaces the 'supports Invidious' option because it now works on other YouTube sites such as Cloudtube"
+    },
    "supportedSites": {
        "message": "Unterstützte Seiten: "
    },
@@ -383,6 +402,12 @@
    "minDurationDescription": {
        "message": "Videosegmente, die kürzer als der festgelegte Wert sind, werden nicht übersprungen oder im Player angezeigt."
    },
+    "skipNoticeDuration": {
+        "message": "Benachrichtigungsdauer überspringen (Sekunden):"
+    },
+    "skipNoticeDurationDescription": {
+        "message": "Die Überspringen Benachrichtigung wird mindestens so lange angezeigt. Für manuelles Überspringen kann sie länger sichtbar sein."
+    },
    "shortCheck": {
        "message": "Die folgende Einreichung ist kürzer als deine Mindestdauer. Das könnte bedeuten, dass dieses Videosegment bereits eingereicht wurde und aufgrund dieser Option einfach ignoriert wird. Bist du dir sicher, dass du es übermitteln möchtest?"
    },
@@ -513,6 +538,9 @@
    "category_preview": {
        "message": "Vorschau/Zusammenfassung"
    },
+    "category_preview_description": {
+        "message": "Kurze Zusammenfassung bisheriger Videos oder eine Vorschau auf das aktuelle Video. Für zusammengeschnittene Clips gedacht, jedoch nicht für mündliche Zusammenfassungen."
+    },
    "category_music_offtopic": {
        "message": "Musikvideoteile ohne Musik"
    },
@@ -522,14 +550,20 @@
    "category_music_offtopic_short": {
        "message": "Musikvideoteile ohne Musik"
    },
+    "category_poi_highlight": {
+        "message": "Hervorheben"
+    },
+    "category_poi_highlight_description": {
+        "message": "Der Teil des Videos, nach dem die meisten Leute suchen, ähnlich wie \"Video startet bei x\" Kommentare."
+    },
    "category_livestream_messages": {
        "message": "In Livestreams Spenden/Nachrichten vorlesen"
    },
    "category_livestream_messages_short": {
        "message": "Wertschätzungen im Livestream"
    },
-    "disable": {
-        "message": "Deaktivieren"
+    "autoSkip": {
+        "message": "Automatisch überspringen"
    },
    "manualSkip": {
        "message": "Manuelles Überspringen"
@@ -537,6 +571,18 @@
    "showOverlay": {
        "message": "In der Video-Zeitleiste anzeigen"
    },
+    "disable": {
+        "message": "Deaktivieren"
+    },
+    "autoSkip_POI": {
+        "message": "Automatisch zum Start springen"
+    },
+    "showOverlay_POI": {
+        "message": "In der Video-Zeitleiste anzeigen"
+    },
+    "autoSkipOnMusicVideos": {
+        "message": "Alle Segmente automatisch überspringen, wenn ein nicht-Musiksegment vorhanden ist"
+    },
    "colorFormatIncorrect": {
        "message": "Die Farbe ist falsch formatiert. Sie sollte ein 3-6-stelliger Hex-Code mit einer Raute am Anfang sein."
    },
@@ -644,6 +690,16 @@
    "categoryUpdate2": {
        "message": "Öffne die Optionen um das Verhalten bei Intros, Outros, Merchandising (Fanartikel) usw. einzustellen."
    },
+    "help": {
+        "message": "Hilfe"
+    },
+    "experiementOptOut": {
+        "message": "Abmeldung aller zukünftigen Experimente",
+        "description": "This is used in a popup about a new experiment to get a list of unlisted videos to back up since all unlisted videos uploaded before 2017 will be set to private."
+    },
+    "hideForever": {
+        "message": "Dauerhaft verbergen"
+    },
    "warningChatInfo": {
        "message": "Du wurdest ermahnt und kannst zur Zeit keine Segmente einreichen. Uns ist nämlich aufgefallen, dass du ein paar gängige Fehler machst, die nicht bösartig sind. Um die Regeln klarzustellen laden wir dich zu einem kurzem Gespräch auf discord.gg/SponsorBlock oder matrix.to/#/+sponsor:ajay.app ein"
    },
--- a/public/_locales/el/messages.json
+++ b/public/_locales/el/messages.json
@@ -62,9 +62,6 @@
    "skip": {
        "message": "Παράκαμψη"
    },
-    "skipped": {
-        "message": "Παραλείφθηκε"
-    },
    "minLower": {
        "message": "λεπτό"
    },
--- a/public/_locales/en/messages.json
+++ b/public/_locales/en/messages.json
@@ -19,7 +19,7 @@
    "channelWhitelisted": {
        "message": "Channel Whitelisted!"
    },
-   "Segment": {
+    "Segment": {
        "message": "segment"
    },
    "Segments": {
@@ -224,6 +224,24 @@
    "showNotice": {
        "message": "Show Notice Again"
    },
+    "showSkipNotice": {
+        "message": "Show Notice After A Segment Is Skipped"
+    },
+    "noticeVisibilityMode0": {
+        "message": "Full Size Skip Notices"
+    },
+    "noticeVisibilityMode1": {
+        "message": "Small Skip Notices for Auto Skip"
+    },
+    "noticeVisibilityMode2": {
+        "message": "All Small Skip Notices"
+    },
+    "noticeVisibilityMode3": {
+        "message": "Faded Skip Notices for Auto Skip"
+    },
+    "noticeVisibilityMode4": {
+        "message": "All Faded Skip Notices"
+    },
    "longDescription": {
        "message": "SponsorBlock lets you skip over sponsors, intros, outros, subscription reminders, and other annoying parts of YouTube videos. SponsorBlock is a crowdsourced browser extension that let's anyone submit the start and end time's of sponsored segments and other segments of YouTube videos. Once one person submits this information, everyone else with this extension will skip right over the sponsored segment. You can also skip over non music sections of music videos.",
        "description": "Full description of the extension on the store pages."
@@ -284,8 +302,17 @@
    "skip_category": {
        "message": "Skip {0}?"
    },
+    "skip_to_category": {
+        "message": "Skip to {0}?",
+        "description": "Used for skipping to things (Skip to Highlight)"
+    },
    "skipped": {
-        "message": "Skipped"
+        "message": "{0} Skipped",
+        "description": "Example: Sponsor Skipped"
+    },
+    "skipped_to_category": {
+        "message": "Skipped to {0}",
+        "description": "Used for skipping to things (Skipped to Highlight)"
    },
    "disableAutoSkip": {
        "message": "Disable Auto Skip"
@@ -347,12 +374,6 @@
    "createdBy": {
        "message": "Created By"
    },
-    "autoSkip": {
-        "message": "Auto Skip"
-    },
-    "showSkipNotice": {
-        "message": "Show Notice After A Segment Is Skipped"
-    },
    "keybindCurrentlySet": {
        "message": ". It is currently set to:"
    },
@@ -544,14 +565,20 @@
    "category_music_offtopic_short": {
        "message": "Non-Music"
    },
+    "category_poi_highlight": {
+        "message": "Highlight"
+    },
+    "category_poi_highlight_description": {
+        "message": "The part of the video that most people are looking for. Similar to \"Video starts at x\" comments."
+    },
    "category_livestream_messages": {
        "message": "Livestream: Donation/Message Readings"
    },
    "category_livestream_messages_short": {
        "message": "Message Reading"
    },
-    "disable": {
-        "message": "Disable"
+    "autoSkip": {
+        "message": "Auto Skip"
    },
    "manualSkip": {
        "message": "Manual Skip"
@@ -559,6 +586,18 @@
    "showOverlay": {
        "message": "Show In Seek Bar"
    },
+    "disable": {
+        "message": "Disable"
+    },
+    "autoSkip_POI": {
+        "message": "Auto skip to the start"
+    },
+    "manualSkip_POI": {
+        "message": "Ask when video loads"
+    },
+    "showOverlay_POI": {
+        "message": "Show In Seek Bar"
+    },
    "autoSkipOnMusicVideos": {
        "message": "Auto skip all segments when there is a non-music segment"
    },
@@ -672,6 +711,10 @@
    "help": {
        "message": "Help"
    },
+    "GotIt": {
+        "message": "Got it",
+        "description": "Used as the button to dismiss a tooltip"
+    },
    "experiementOptOut": {
        "message": "Opt-out of all future experiments",
        "description": "This is used in a popup about a new experiment to get a list of unlisted videos to back up since all unlisted videos uploaded before 2017 will be set to private."
@@ -685,5 +728,74 @@
    "voteRejectedWarning": {
        "message": "Vote rejected due to a warning. Click to open a chat to resolve it, or come back later when you have time.",
        "description": "This is an integrated chat panel that will appearing allowing them to talk to the Discord/Matrix chat without leaving their browser."
+    },
+    "Donate": {
+        "message": "Donate"
+    },
+    "hideDonationLink": {
+        "message": "Hide Donation Link"
+    },
+    "helpPageThanksForInstalling": {
+        "message": "Thanks for installing SponsorBlock."
+    },
+    "helpPageReviewOptions": {
+        "message": "Please review the options below"
+    },
+    "helpPageFeatureDisclaimer": {
+        "message": "Many features are disabled by default. If you want to skip intros, outros, use Invidious, etc., enable them below. You can also hide/show UI elements."
+    },
+    "helpPageHowSkippingWorks": {
+        "message": "How skipping works"
+    },
+    "helpPageHowSkippingWorks1": {
+        "message": "Video segments will automatically be skipped if they are found in the database. You can open the popup by clicking the extension icon to get a preview of what they are."
+    },
+    "helpPageHowSkippingWorks2": {
+        "message": "Whenever you skip a segment, you will get notice. If the timing seems wrong vote down by clicking downvote! You can also vote in the popup."
+    },
+    "Submitting": {
+        "message": "Submitting"
+    },
+    "helpPageSubmitting1": {
+        "message": "Submitting can either be done in the popup by hitting the \"Segment Starts Now\" button or in the video player with the buttons on the player."
+    },
+    "helpPageSubmitting2": {
+        "message": "Clicking the play button indicated the start of a segment and clicking the stop icon indicates the end. You can prepare multiple sponsors before hitting submit. Clicking the upload button will submit. Clicking the garbage can will delete."
+    },
+    "Editing": {
+        "message": "Editing"
+    },
+    "helpPageEditing1": {
+        "message": "If you messed up, you can edit or delete your segments after clicking the up arrow button."
+    },
+    "helpPageTooSlow": {
+        "message": "This is too slow"
+    },
+    "helpPageTooSlow1": {
+        "message": "There are hotkeys if you want to use them. Press the semicolon key to indicate the start/end of a sponsor segment and click the apostrophe to submit. These can be changed in the options. If you don't use QWERTY, you should probably change the keybinding."
+    },
+    "helpPageCopyOfDatabase": {
+        "message": "Can I get a copy of the Database? What happens if you disappear?"
+    },
+    "helpPageCopyOfDatabase1": {
+        "message": "The database is public and available at"
+    },
+    "helpPageCopyOfDatabase2": {
+        "message": "The source code is freely available. So, even if something happens to me, your submissions are not lost."
+    },
+    "helpPageNews": {
+        "message": "News and how it is made"
+    },
+    "helpPageSourceCode": {
+        "message": "Where can I get the source code?"
+    },
+    "Credits": {
+        "message": "Credits"
+    },
+    "highlightNewFeature": {
+        "message": "New! Get to the point of the video with one click with the new highlight category"
+    },
+    "LearnMore": {
+        "message": "Learn More"
    }
 }
--- a/public/_locales/es/messages.json
+++ b/public/_locales/es/messages.json
@@ -224,6 +224,24 @@
    "showNotice": {
        "message": "Mostrar aviso de nuevo"
    },
+    "showSkipNotice": {
+        "message": "Mostrar aviso después de que se omita un segmento"
+    },
+    "noticeVisibilityMode0": {
+        "message": "Avisos de Omisión de Tamaño Completo"
+    },
+    "noticeVisibilityMode1": {
+        "message": "Avisos de Omisión Pequeños para la Omisión Automática"
+    },
+    "noticeVisibilityMode2": {
+        "message": "Todos los Avisos de Omisión Pequeños"
+    },
+    "noticeVisibilityMode3": {
+        "message": "Avisos de Omisión Desvanecidos para la Omisión Automática"
+    },
+    "noticeVisibilityMode4": {
+        "message": "Todos los Avisos de Omisión Desvanecidos"
+    },
    "longDescription": {
        "message": "SponsorBlock te permite saltarte los patrocinadores, intros, outros, recordatorios de suscripción y otras partes molestas de los videos de YouTube. SponsorBlock es una extensión de navegador de código abierto que permite a cualquiera enviar el tiempo de inicio y fin de los segmentos de patrocinadores y otros segmentos de los videos de YouTube. Una vez que una persona envía esta información, todos los que tengan esta extensión podrán saltearse ese segmento. También es posible saltar las secciones no musicales de los videos musicales.",
        "description": "Full description of the extension on the store pages."
@@ -284,8 +302,17 @@
    "skip_category": {
        "message": "¿Saltar {0}?"
    },
+    "skip_to_category": {
+        "message": "¿Saltar a {0}?",
+        "description": "Used for skipping to things (Skip to Highlight)"
+    },
    "skipped": {
-        "message": "Omitido/as"
+        "message": "{0} Omitido/as",
+        "description": "Example: Sponsor Skipped"
+    },
+    "skipped_to_category": {
+        "message": "Se ha saltado a {0}",
+        "description": "Used for skipping to things (Skipped to Highlight)"
    },
    "disableAutoSkip": {
        "message": "Desactivar la omisión automática"
@@ -347,12 +374,6 @@
    "createdBy": {
        "message": "Creado Por"
    },
-    "autoSkip": {
-        "message": "Omitir automáticamente"
-    },
-    "showSkipNotice": {
-        "message": "Mostrar aviso después de que se omita un segmento"
-    },
    "keybindCurrentlySet": {
        "message": ". Actualmente está configurado para:"
    },
@@ -544,14 +565,20 @@
    "category_music_offtopic_short": {
        "message": "No musical"
    },
+    "category_poi_highlight": {
+        "message": "Destacar"
+    },
+    "category_poi_highlight_description": {
+        "message": "La parte del video que la mayoría de gente está buscando. Similar a los comentarios que dicen \"El video comienza en x\"."
+    },
    "category_livestream_messages": {
        "message": "Directo: Lecturas de donaciones y mensajes"
    },
    "category_livestream_messages_short": {
        "message": "Lectura del mensaje"
    },
-    "disable": {
-        "message": "Desactivar"
+    "autoSkip": {
+        "message": "Omitir automáticamente"
    },
    "manualSkip": {
        "message": "Omisión manual"
@@ -559,8 +586,20 @@
    "showOverlay": {
        "message": "Mostrar en la barra de búsqueda"
    },
+    "disable": {
+        "message": "Desactivar"
+    },
+    "autoSkip_POI": {
+        "message": "Omitir automáticamente al inicio"
+    },
+    "manualSkip_POI": {
+        "message": "Preguntar cuando cargue el video"
+    },
+    "showOverlay_POI": {
+        "message": "Mostrar en la barra de búsqueda"
+    },
    "autoSkipOnMusicVideos": {
-        "message": "Saltar automáticamente todos los segmentos cuando hay un segmento no musical"
+        "message": "Omitir automáticamente todos los segmentos cuando hay un segmento no musical"
    },
    "colorFormatIncorrect": {
        "message": "Su color está formateado incorrectamente. Debería ser un código hexadecimal de 3 o 6 dígitos con un signo numérico al principio."
--- a/public/_locales/et/messages.json
+++ b/public/_locales/et/messages.json
@@ -224,6 +224,9 @@
    "showNotice": {
        "message": "Kuva märkus uuesti"
    },
+    "showSkipNotice": {
+        "message": "Kuva segmendi vahelejätmisel teatis"
+    },
    "longDescription": {
        "message": "SponsorBlock lubab sul vahele jätta sponsorid, vaheajad, kanali tellimise meeldetuletused ja muud YouTube'i videote tüütud kohad. SponsorBlock on rahva ühistööna toimiv brauserilaiendus, mis lubab igaühel saata sponsoreeritud segmendi algus- ja lõpuaegu ning teiste video segmentide aegu. Kui üks inimene saadab sponsoreeritud segmendi, jätavad teised laienduse kasutajad kohe selle vahele. Laiendus võimaldab ka muusikavideotel mitte-muusika jaotised vahele jätta.",
        "description": "Full description of the extension on the store pages."
@@ -284,8 +287,17 @@
    "skip_category": {
        "message": "Jätad {0} vahele?"
    },
+    "skip_to_category": {
+        "message": "Jäta {0}-ni vahele?",
+        "description": "Used for skipping to things (Skip to Highlight)"
+    },
    "skipped": {
-        "message": "vahelejäetud"
+        "message": "{0} vahelejäetud",
+        "description": "Example: Sponsor Skipped"
+    },
+    "skipped_to_category": {
+        "message": "{0}-ni vahelejäetud",
+        "description": "Used for skipping to things (Skipped to Highlight)"
    },
    "disableAutoSkip": {
        "message": "Keela automaatne vahelejätmine"
@@ -347,12 +359,6 @@
    "createdBy": {
        "message": "Autor"
    },
-    "autoSkip": {
-        "message": "Autom. vahelejätmine"
-    },
-    "showSkipNotice": {
-        "message": "Kuva segmendi vahelejätmisel teatis"
-    },
    "keybindCurrentlySet": {
        "message": ". Hetkel on selleks määratud:"
    },
@@ -544,14 +550,20 @@
    "category_music_offtopic_short": {
        "message": "Mitte-muusika"
    },
+    "category_poi_highlight": {
+        "message": "Esiletõst"
+    },
+    "category_poi_highlight_description": {
+        "message": "Video osa, mida enamus inimesed otsivad. Sarnaneb kommentaaridele stiilis \"video algab ajal x\"."
+    },
    "category_livestream_messages": {
        "message": "Otseülekanne: annetuste ja sõnumite lugemine"
    },
    "category_livestream_messages_short": {
        "message": "Sõnumite lugemine"
    },
-    "disable": {
-        "message": "Keela"
+    "autoSkip": {
+        "message": "Autom. vahelejätmine"
    },
    "manualSkip": {
        "message": "Käsitsi vahelejätmine"
@@ -559,6 +571,18 @@
    "showOverlay": {
        "message": "Kuva mängija ajaribal"
    },
+    "disable": {
+        "message": "Keela"
+    },
+    "autoSkip_POI": {
+        "message": "Jäta automaatselt alguseni vahele"
+    },
+    "manualSkip_POI": {
+        "message": "Küsi video laadimisel"
+    },
+    "showOverlay_POI": {
+        "message": "Kuva mängija ajaribal"
+    },
    "autoSkipOnMusicVideos": {
        "message": "Jäta automaatselt kõik segmendid vahele, kui eksisteerib mitte-muusika segment"
    },
--- a/public/_locales/fi/messages.json
+++ b/public/_locales/fi/messages.json
@@ -224,6 +224,9 @@
    "showNotice": {
        "message": "Näytä ilmoitus uudelleen"
    },
+    "showSkipNotice": {
+        "message": "Näytä ilmoitus ohitetun segmentin jälkeen"
+    },
    "longDescription": {
        "message": "SponsorBlockin avulla voit ohittaa sponsorit, introt, outrot, tilausmuistutukset ja muut ärsyttävät osat YouTube-videoissa. SponsorBlock on joukkoistettu selainlaajennus, jonka avulla kuka tahansa voi lähettää Youtube-videoiden sponsoroitujen ja muiden segmenttien aloitus- ja päättymisajat. Kun yksi henkilö on lähettänyt tämän tiedon, kaikki muut, joilla on tämä laajennus, ohittavat sponsoroidun segmentin. Voit myös ohittaa musiikkivideoiden musiikittomat osat.",
        "description": "Full description of the extension on the store pages."
@@ -284,8 +287,17 @@
    "skip_category": {
        "message": "Ohita {0}?"
    },
+    "skip_to_category": {
+        "message": "Ohita {0}an?",
+        "description": "Used for skipping to things (Skip to Highlight)"
+    },
    "skipped": {
-        "message": "Ohitettu"
+        "message": "{0} ohitettu",
+        "description": "Example: Sponsor Skipped"
+    },
+    "skipped_to_category": {
+        "message": "Ohitettiin {0}an",
+        "description": "Used for skipping to things (Skipped to Highlight)"
    },
    "disableAutoSkip": {
        "message": "Poista automaattinen ohitus käytöstä"
@@ -347,12 +359,6 @@
    "createdBy": {
        "message": "Luonut"
    },
-    "autoSkip": {
-        "message": "Ohita automaattisesti"
-    },
-    "showSkipNotice": {
-        "message": "Näytä ilmoitus ohitetun segmentin jälkeen"
-    },
    "keybindCurrentlySet": {
        "message": ". Tällä hetkellä se on asetettu näppäimeen:"
    },
@@ -544,14 +550,20 @@
    "category_music_offtopic_short": {
        "message": "Musiikiton"
    },
+    "category_poi_highlight": {
+        "message": "Kohokohta"
+    },
+    "category_poi_highlight_description": {
+        "message": "Kohta videossa, mitä suurin osa ihmisistä etsivät.\nSamankaltainen \"Video alkaa kohdassa x\" kommenttien kanssa."
+    },
    "category_livestream_messages": {
        "message": "Livestream: lahjoitusten/viestien lukeminen"
    },
    "category_livestream_messages_short": {
        "message": "Viestien lukeminen"
    },
-    "disable": {
-        "message": "Poista käytöstä"
+    "autoSkip": {
+        "message": "Ohita automaattisesti"
    },
    "manualSkip": {
        "message": "Manuaalinen ohitus"
@@ -559,6 +571,18 @@
    "showOverlay": {
        "message": "Näytä liukusäätimessä"
    },
+    "disable": {
+        "message": "Poista käytöstä"
+    },
+    "autoSkip_POI": {
+        "message": "Ohita automaattisesti alkuun"
+    },
+    "manualSkip_POI": {
+        "message": "Kysy kun video latautuu"
+    },
+    "showOverlay_POI": {
+        "message": "Näytä liukusäätimessä"
+    },
    "autoSkipOnMusicVideos": {
        "message": "Ohita kaikki segmentit automaattisesti, kun videossa on \"Musiikiton\" segmentti"
    },
--- a/public/_locales/fr/messages.json
+++ b/public/_locales/fr/messages.json
@@ -224,6 +224,9 @@
    "showNotice": {
        "message": "Afficher la notification"
    },
+    "showSkipNotice": {
+        "message": "Notifier après qu'un segment ait été sauté"
+    },
    "longDescription": {
        "message": "SponsorBlock vous permet de passer les sponsors, les intros, les outros, les rappels d'abonnement et autres parties ennuyeuses des vidéos YouTube. SponsorBlock est une extension de navigateur qui permet à n'importe qui de soumettre les temps de début et de fin des segments sponsorisés et d'autres segments de vidéos YouTube. Une fois qu'une personne a soumis ces informations, toutes les autres personnes possédant cette extension passeront directement les segments sponsorisés. Vous pouvez également sauter les sections non musicales des vidéos musicales.",
        "description": "Full description of the extension on the store pages."
@@ -284,9 +287,6 @@
    "skip_category": {
        "message": "Passer {0} ?"
    },
-    "skipped": {
-        "message": "Passé"
-    },
    "disableAutoSkip": {
        "message": "Désactiver le passage automatique"
    },
@@ -347,12 +347,6 @@
    "createdBy": {
        "message": "Créé par"
    },
-    "autoSkip": {
-        "message": "Passage automatique"
-    },
-    "showSkipNotice": {
-        "message": "Notifier après qu'un segment ait été sauté"
-    },
    "keybindCurrentlySet": {
        "message": ". Il est actuellement réglé sur :"
    },
@@ -550,8 +544,8 @@
    "category_livestream_messages_short": {
        "message": "Lecture de messages"
    },
-    "disable": {
-        "message": "Désactiver"
+    "autoSkip": {
+        "message": "Passage automatique"
    },
    "manualSkip": {
        "message": "Passer manuellement"
@@ -559,6 +553,9 @@
    "showOverlay": {
        "message": "Afficher dans la barre de progression"
    },
+    "disable": {
+        "message": "Désactiver"
+    },
    "colorFormatIncorrect": {
        "message": "Votre couleur est mal formatée. Il devrait s'agir d'un code hexadécimal à 3 ou 6 chiffres avec un signe numérique au début."
    },
--- a/public/_locales/he/messages.json
+++ b/public/_locales/he/messages.json
@@ -183,10 +183,10 @@
    "createdBy": {
        "message": "נוצר על ידי"
    },
-    "autoSkip": {
-        "message": "דילוג אוטומטי"
-    },
    "add": {
        "message": "הוסף"
+    },
+    "autoSkip": {
+        "message": "דילוג אוטומטי"
    }
 }
--- a/public/_locales/hr/messages.json
+++ b/public/_locales/hr/messages.json
@@ -131,6 +131,9 @@
    "Options": {
        "message": "Opcije"
    },
+    "showSkipNotice": {
+        "message": "Pokaži obavijest nakon preskakanja isječka"
+    },
    "website": {
        "message": "Web-stranica",
        "description": "Used on Firefox Store Page"
@@ -158,9 +161,6 @@
    "skip_category": {
        "message": "Preskočiti {0}?"
    },
-    "skipped": {
-        "message": "Preskočeno"
-    },
    "disableAutoSkip": {
        "message": "Deaktiviraj automatsko preskakanje"
    },
@@ -191,12 +191,6 @@
    "createdBy": {
        "message": "Izradio"
    },
-    "autoSkip": {
-        "message": "Automatsko preskakanje"
-    },
-    "showSkipNotice": {
-        "message": "Pokaži obavijest nakon preskakanja isječka"
-    },
    "keybindCurrentlySet": {
        "message": ". Trenutno je postavljeno na:"
    },
@@ -290,6 +284,9 @@
    "category_music_offtopic_short": {
        "message": "Ne-glazbeni"
    },
+    "autoSkip": {
+        "message": "Automatsko preskakanje"
+    },
    "manualSkip": {
        "message": "Ručno preskakanje"
    },
--- a/public/_locales/hu/messages.json
+++ b/public/_locales/hu/messages.json
@@ -221,6 +221,9 @@
    "showNotice": {
        "message": "Értesítés megjelenítése ismét"
    },
+    "showSkipNotice": {
+        "message": "Jelezzen, ha egy szegmens át lett ugorva"
+    },
    "longDescription": {
        "message": "A SponsorBlock-al átugorhatja a szponzorokat, introkat, outrokat, feliratkozás emlékeztetőket és a YouTube videók többi idegesítő részeit. A SponsorBlock egy közösség által vezérelt böngészőbővítmény, ami lehetővé tesz bárkit arra, hogy megjelölhesse egy szponzor vagy más szegmens kezdő és végpontjait. Ha megosztja ezt az információt, mindenki más ennek a bővítménynek a birtokában egyenesen átugorja majd ezt a szponzorszegmenst. Emellett például a zene videók nem-zene részei is átugorhatóak.",
        "description": "Full description of the extension on the store pages."
@@ -278,9 +281,6 @@
    "skip_category": {
        "message": "Átugorja ezt: {0}?"
    },
-    "skipped": {
-        "message": "Átugorva"
-    },
    "disableAutoSkip": {
        "message": "Auto átugrás kikapcsolása"
    },
@@ -341,12 +341,6 @@
    "createdBy": {
        "message": "Készítette"
    },
-    "autoSkip": {
-        "message": "Auto átugrás"
-    },
-    "showSkipNotice": {
-        "message": "Jelezzen, ha egy szegmens át lett ugorva"
-    },
    "keybindCurrentlySet": {
        "message": ". Jelenleg erre van állítva:"
    },
@@ -513,8 +507,8 @@
    "category_livestream_messages_short": {
        "message": "Üzenet beolvasása"
    },
-    "disable": {
-        "message": "Kikapcsol"
+    "autoSkip": {
+        "message": "Auto átugrás"
    },
    "manualSkip": {
        "message": "Átugrás manuálisan"
@@ -522,6 +516,9 @@
    "showOverlay": {
        "message": "Megjelenítés a keresősávban"
    },
+    "disable": {
+        "message": "Kikapcsol"
+    },
    "colorFormatIncorrect": {
        "message": "A szín helytelenül van formázva. Egy 3 vagy 6 számjegyből álló hex kódnak kell lennie egy kettőskereszttel az elején."
    },
--- a/public/_locales/id/messages.json
+++ b/public/_locales/id/messages.json
@@ -218,6 +218,9 @@
    "showNotice": {
        "message": "Tampilkan Pemberitahuan Lagi"
    },
+    "showSkipNotice": {
+        "message": "Tampilkan pemberitahuan setelah melewati segmen"
+    },
    "longDescription": {
        "message": "SponsorBlock membuat anda melewati sponsor, intro, outro, pengingat berlangganan dan segmen mengganggu lainnya di video YouTube. SponsorBlock adalah ekstensi browser crowdsourced yang membolehkan siapa saja mengirim waktu awal dan akhir dari segmen sponsor dan segmen video YouTube lainnya. Setelah seseorang mengirim informasi ini, orang lain yang memakai ekstensi ini akan melewati segmen sponsor di video yang sama. Anda juga dapat melewati bagian non-musik di musik video.",
        "description": "Full description of the extension on the store pages."
@@ -278,9 +281,6 @@
    "skip_category": {
        "message": "Lewati {0}?"
    },
-    "skipped": {
-        "message": "Dilewati"
-    },
    "disableAutoSkip": {
        "message": "Nonaktifkan Lewati Otomatis"
    },
@@ -341,12 +341,6 @@
    "createdBy": {
        "message": "Dibuat Oleh"
    },
-    "autoSkip": {
-        "message": "Lewati Otomatis"
-    },
-    "showSkipNotice": {
-        "message": "Tampilkan pemberitahuan setelah melewati segmen"
-    },
    "keybindCurrentlySet": {
        "message": ". Saat ini diatur pada:"
    },
@@ -513,8 +507,8 @@
    "category_livestream_messages_short": {
        "message": "Membaca Pesan Chat"
    },
-    "disable": {
-        "message": "Nonaktif"
+    "autoSkip": {
+        "message": "Lewati Otomatis"
    },
    "manualSkip": {
        "message": "Lewati Manual"
@@ -522,6 +516,9 @@
    "showOverlay": {
        "message": "Tampilkan Di Bilah Waktu"
    },
+    "disable": {
+        "message": "Nonaktif"
+    },
    "colorFormatIncorrect": {
        "message": "Warna anda tidak diformat dengan benar. Harusnya terdiri dari 3 atau 6 digit kode heksa dengan tagar di awal."
    },
--- a/public/_locales/it/messages.json
+++ b/public/_locales/it/messages.json
@@ -224,6 +224,9 @@
    "showNotice": {
        "message": "Mostra di Nuovo l'Avviso"
    },
+    "showSkipNotice": {
+        "message": "Mostra Avviso Dopo Aver Saltato un Segmento"
+    },
    "longDescription": {
        "message": "SponsorBlock ti consente di saltare sponsorizzazioni, introduzioni, conclusioni, promemoria di iscrizione e altre componenti fastidiose dei video su YouTube. SponsorBlock è un'estensione per browser in crowdsourcing, che consente a chiunque di inviare l'ora di inizio e di fine dei segmenti sponsorizzati e altri segmenti video su YouTube. Quando una persona invia queste informazioni, chiunque altro in possesso di questa estensione sarà in grado di saltare direttamente il segmento sponsorizzato. È possibile saltare anche le sezioni non musicali dei video musicali.",
        "description": "Full description of the extension on the store pages."
@@ -284,9 +287,6 @@
    "skip_category": {
        "message": "Vuoi saltare {0}?"
    },
-    "skipped": {
-        "message": "Saltato"
-    },
    "disableAutoSkip": {
        "message": "Disabilita Salto Automatico"
    },
@@ -347,12 +347,6 @@
    "createdBy": {
        "message": "Creato da"
    },
-    "autoSkip": {
-        "message": "Salta Automaticamente"
-    },
-    "showSkipNotice": {
-        "message": "Mostra Avviso Dopo Aver Saltato un Segmento"
-    },
    "keybindCurrentlySet": {
        "message": ". Attualmente è impostato su:"
    },
@@ -550,8 +544,8 @@
    "category_livestream_messages_short": {
        "message": "Lettura Messaggi"
    },
-    "disable": {
-        "message": "Disattiva"
+    "autoSkip": {
+        "message": "Salta Automaticamente"
    },
    "manualSkip": {
        "message": "Salto Manuale"
@@ -559,6 +553,9 @@
    "showOverlay": {
        "message": "Mostra nella Barra di Ricerca"
    },
+    "disable": {
+        "message": "Disattiva"
+    },
    "colorFormatIncorrect": {
        "message": "Il tuo colore è formattato in modo errato. Dovrebbe essere un codice esadecimale a 3 o 6 cifre con un segno numerico iniziale."
    },
--- a/public/_locales/ja/messages.json
+++ b/public/_locales/ja/messages.json
@@ -137,17 +137,17 @@
        "message": "リーダーボード"
    },
    "recordTimesDescription": {
-        "message": "送信"
+        "message": "提出"
    },
    "submissionEditHint": {
        "message": "提出をクリックするとセクション編集画面が表示されます",
        "description": "Appears in the popup to inform them that editing has been moved to the video player."
    },
    "popupHint": {
-        "message": "ヒント: オプションから提出時のキーバインドを設定できます"
+        "message": "心得: 利用者設定で提出時のキーバインドを設定できます"
    },
    "clearTimesButton": {
-        "message": "時間をクリア"
+        "message": "時間を消去"
    },
    "submitTimesButton": {
        "message": "時間を提出"
@@ -224,6 +224,24 @@
    "showNotice": {
        "message": "再度通知を表示する"
    },
+    "showSkipNotice": {
+        "message": "セグメントがスキップされた後に通知を表示する"
+    },
+    "noticeVisibilityMode0": {
+        "message": "飛び越し通知（全体）"
+    },
+    "noticeVisibilityMode1": {
+        "message": "自動飛び越し通知（小）"
+    },
+    "noticeVisibilityMode2": {
+        "message": "すべての飛び越し通知（小）"
+    },
+    "noticeVisibilityMode3": {
+        "message": "表示の終了した自動飛び越し通知"
+    },
+    "noticeVisibilityMode4": {
+        "message": "表示の終了した全ての飛び越し通知"
+    },
    "longDescription": {
        "message": "SponsorBlockはスポンサー、イントロ、アウトロ、チャンネル登録のお願いなど、YouTube動画の煩わしい部分をスキップします。SponsorBlockはYouTube動画のスポンサー付きセグメントなどの開始時間と終了時間を誰でも投稿できる、クラウドソースのブラウザ拡張機能です。一人がセグメントの情報を送信すると、この拡張機能を使用している他の全員が、スポンサー付きセグメントをスキップできるようになります。また、ミュージックビデオの音楽がない部分をスキップすることもできます。",
        "description": "Full description of the extension on the store pages."
@@ -284,8 +302,17 @@
    "skip_category": {
        "message": "{0} をスキップしますか?"
    },
+    "skip_to_category": {
+        "message": "{0}まで飛び越しますか？",
+        "description": "Used for skipping to things (Skip to Highlight)"
+    },
    "skipped": {
-        "message": "スキップしました"
+        "message": "{0}を飛び越しました",
+        "description": "Example: Sponsor Skipped"
+    },
+    "skipped_to_category": {
+        "message": "{0}まで飛び越しました",
+        "description": "Used for skipping to things (Skipped to Highlight)"
    },
    "disableAutoSkip": {
        "message": "自動スキップを無効にする"
@@ -347,12 +374,6 @@
    "createdBy": {
        "message": "作成者:"
    },
-    "autoSkip": {
-        "message": "自動スキップ"
-    },
-    "showSkipNotice": {
-        "message": "セグメントがスキップされた後に通知を表示する"
-    },
    "keybindCurrentlySet": {
        "message": "。現在の設定は:"
    },
@@ -544,14 +565,20 @@
    "category_music_offtopic_short": {
        "message": "音楽以外の部分"
    },
+    "category_poi_highlight": {
+        "message": "強調表示"
+    },
+    "category_poi_highlight_description": {
+        "message": "ほとんどの人が必要としている動画の箇所。「xx:xx 開始」というようなコメントと類似。"
+    },
    "category_livestream_messages": {
        "message": "ライブ配信: 寄付/メッセージの読み上げ"
    },
    "category_livestream_messages_short": {
        "message": "寄付などの読み上げ"
    },
-    "disable": {
-        "message": "無効"
+    "autoSkip": {
+        "message": "自動スキップ"
    },
    "manualSkip": {
        "message": "手動スキップ"
@@ -559,6 +586,18 @@
    "showOverlay": {
        "message": "シークバーに表示"
    },
+    "disable": {
+        "message": "無効"
+    },
+    "autoSkip_POI": {
+        "message": "動画の開始時刻まで飛び越し"
+    },
+    "manualSkip_POI": {
+        "message": "動画を読み込んだ際に確認する"
+    },
+    "showOverlay_POI": {
+        "message": "シークバーに表示"
+    },
    "autoSkipOnMusicVideos": {
        "message": "非音楽区域がある場合，全区域を自動的に飛び越す"
    },
--- a/public/_locales/ko/messages.json
+++ b/public/_locales/ko/messages.json
@@ -224,6 +224,9 @@
    "showNotice": {
        "message": "알림 다시 보여주기"
    },
+    "showSkipNotice": {
+        "message": "구간을 건너뛴 후 알림 표시"
+    },
    "longDescription": {
        "message": "SponsorBlock을 사용하면 영상에서 스폰서 광고, 인트로 영상, 아웃트로 영상, 구독 광고와 그 외 쓸데없는 부분을 즉시 건너뛸 수 있습니다. SponsorBlock은 모든 사람들이 참여하는 브라우저 확장 기능으로 확장 기능 사용자는 스폰서 광고 또는 다른 광고의 시작 시간과 끝 시간을 확인하여 서버로 전송할 수 있습니다. 이러한 정보가 전송되면 그 영상을 보는 다른 사용자들은 광고 구간이 나오기 전에 자동으로 건너뛸 수 있습니다. SponsorBlock을 사용하면 뮤직 비디오에서 음악이나 노래가 아닌 구간도 건너뛸 수 있습니다.",
        "description": "Full description of the extension on the store pages."
@@ -284,8 +287,17 @@
    "skip_category": {
        "message": "{0} 을(를) 건너뛰겠어요?"
    },
+    "skip_to_category": {
+        "message": "{0}(으)로 건너뛰겠어요?",
+        "description": "Used for skipping to things (Skip to Highlight)"
+    },
    "skipped": {
-        "message": "스킵됨"
+        "message": "{0} 건너뜀",
+        "description": "Example: Sponsor Skipped"
+    },
+    "skipped_to_category": {
+        "message": "{0}(으)로 건너뛰었습니다",
+        "description": "Used for skipping to things (Skipped to Highlight)"
    },
    "disableAutoSkip": {
        "message": "자동 스킵 비활성화"
@@ -347,12 +359,6 @@
    "createdBy": {
        "message": "개발자: "
    },
-    "autoSkip": {
-        "message": "자동으로 건너뛰기"
-    },
-    "showSkipNotice": {
-        "message": "구간을 건너뛴 후 알림 표시"
-    },
    "keybindCurrentlySet": {
        "message": ". 현재 다음으로 설정되어 있습니다:"
    },
@@ -544,14 +550,20 @@
    "category_music_offtopic_short": {
        "message": "음악이 아닌 구간"
    },
+    "category_poi_highlight": {
+        "message": "하이라이트"
+    },
+    "category_poi_highlight_description": {
+        "message": "대부분의 사람들이 찾는 동영상의 파트를 말합니다. \"바쁘신 분들은...\" 댓글과 유사합니다."
+    },
    "category_livestream_messages": {
        "message": "라이브스트림: 후원/메시지 읽기"
    },
    "category_livestream_messages_short": {
        "message": "메시지 읽기"
    },
-    "disable": {
-        "message": "비활성화"
+    "autoSkip": {
+        "message": "자동으로 건너뛰기"
    },
    "manualSkip": {
        "message": "수동 스킵"
@@ -559,6 +571,18 @@
    "showOverlay": {
        "message": "재생 시간 바 표시"
    },
+    "disable": {
+        "message": "비활성화"
+    },
+    "autoSkip_POI": {
+        "message": "시점으로 자동 건너뛰기"
+    },
+    "manualSkip_POI": {
+        "message": "동영상을 불러왔을 때 묻기"
+    },
+    "showOverlay_POI": {
+        "message": "재생 시간 바에 표시"
+    },
    "autoSkipOnMusicVideos": {
        "message": "음악이 아닌 구간이 있을 때는 모든 구간 자동 건너뛰기"
    },
--- a/public/_locales/ml/messages.json
+++ b/public/_locales/ml/messages.json
@@ -212,6 +212,9 @@
    "showNotice": {
        "message": "അറിയിപ്പ് വീണ്ടും കാണിക്കുക"
    },
+    "showSkipNotice": {
+        "message": "ഒരു സെഗ്മെന്റ് ഒഴിവാക്കിയതിനുശേഷം അറിയിപ്പ് കാണിക്കുക"
+    },
    "longDescription": {
        "message": "സ്പോൺസർമാർ, ആമുഖങ്ങൾ, ros ട്ട്‌ട്രോകൾ, സബ്‌സ്‌ക്രിപ്‌ഷൻ ഓർമ്മപ്പെടുത്തലുകൾ, YouTube വീഡിയോകളുടെ മറ്റ് ശല്യപ്പെടുത്തുന്ന ഭാഗങ്ങൾ എന്നിവ ഒഴിവാക്കാൻ സ്‌പോൺസർബ്ലോക്ക് നിങ്ങളെ അനുവദിക്കുന്നു. സ്പോൺ‌സർ‌ബ്ലോക്ക് ഒരു ക്ര crow ഡ്സോഴ്സ്ഡ് ബ്ര browser സർ എക്സ്റ്റൻഷനാണ്, ഇത് സ്പോൺസർ ചെയ്ത സെഗ്‌മെന്റുകളുടെയും YouTube വീഡിയോകളുടെ മറ്റ് സെഗ്‌മെൻറുകളുടെയും ആരംഭ, അവസാന സമയങ്ങൾ സമർപ്പിക്കാൻ ആരെയും അനുവദിക്കുക. ഒരു വ്യക്തി ഈ വിവരങ്ങൾ‌ സമർപ്പിച്ചുകഴിഞ്ഞാൽ‌, ഈ വിപുലീകരണമുള്ള മറ്റെല്ലാവരും സ്പോൺ‌സർ‌ ചെയ്‌ത സെഗ്‌മെൻറിനെ മറികടക്കും. സംഗീത വീഡിയോകളുടെ സംഗീതേതര വിഭാഗങ്ങളും നിങ്ങൾക്ക് ഒഴിവാക്കാം.",
        "description": "Full description of the extension on the store pages."
@@ -269,9 +272,6 @@
    "skip_category": {
        "message": "{0} ഒഴിവാക്കുക?"
    },
-    "skipped": {
-        "message": "ഒഴിവാക്കി"
-    },
    "disableAutoSkip": {
        "message": "യാന്ത്രിക ഒഴിവാക്കൽ പ്രവർത്തനരഹിതമാക്കുക"
    },
@@ -332,12 +332,6 @@
    "createdBy": {
        "message": "ഉണ്ടാക്കിയത്"
    },
-    "autoSkip": {
-        "message": "യാന്ത്രിക ഒഴിവാക്കുക"
-    },
-    "showSkipNotice": {
-        "message": "ഒരു സെഗ്മെന്റ് ഒഴിവാക്കിയതിനുശേഷം അറിയിപ്പ് കാണിക്കുക"
-    },
    "keybindCurrentlySet": {
        "message": ". ഇത് നിലവിൽ ഇതായി സജ്ജീകരിച്ചിരിക്കുന്നു:"
    },
@@ -504,8 +498,8 @@
    "category_livestream_messages_short": {
        "message": "സന്ദേശ വായന"
    },
-    "disable": {
-        "message": "പ്രവർത്തനരഹിതമാക്കുക"
+    "autoSkip": {
+        "message": "യാന്ത്രിക ഒഴിവാക്കുക"
    },
    "manualSkip": {
        "message": "സ്വമേധയാലുള്ള ഒഴിവാക്കൽ"
@@ -513,6 +507,9 @@
    "showOverlay": {
        "message": "സീക്ക് ബാറിൽ കാണിക്കുക"
    },
+    "disable": {
+        "message": "പ്രവർത്തനരഹിതമാക്കുക"
+    },
    "colorFormatIncorrect": {
        "message": "നിങ്ങളുടെ നിറം തെറ്റായി ഫോർമാറ്റുചെയ്‌തു. ഇത് തുടക്കത്തിൽ ഒരു നമ്പർ ചിഹ്നമുള്ള 3 അല്ലെങ്കിൽ 6 അക്ക ഹെക്സ് കോഡായിരിക്കണം."
    },
--- a/public/_locales/ms/messages.json
+++ b/public/_locales/ms/messages.json
@@ -212,6 +212,9 @@
    "showNotice": {
        "message": "Tunjukkan Notis Lagi"
    },
+    "showSkipNotice": {
+        "message": "Tunjukkan Makluman Setelah Segmen Dilangkau"
+    },
    "longDescription": {
        "message": "SponsorBlock membolehkan anda melewati penaja, intro, outro, peringatan langganan, dan bahagian lain dari video YouTube yang menjengkelkan. SponsorBlock adalah pelanjutan penyemak imbas yang banyak untuk membolehkan sesiapa sahaja menghantar segmen tajaan dan masa tayangan dari segmen video YouTube yang lain. Setelah satu orang menyerahkan maklumat ini, semua orang yang mempunyai pelanjutan ini akan melangkau segmen yang ditaja. Anda juga boleh melangkau bahagian muzik video muzik bukan.",
        "description": "Full description of the extension on the store pages."
@@ -269,9 +272,6 @@
    "skip_category": {
        "message": "Langkau {0}?"
    },
-    "skipped": {
-        "message": "Langkau"
-    },
    "disableAutoSkip": {
        "message": "Lumpuhkan Langkau Auto"
    },
@@ -332,12 +332,6 @@
    "createdBy": {
        "message": "Dicipta oleh"
    },
-    "autoSkip": {
-        "message": "Langkau Auto"
-    },
-    "showSkipNotice": {
-        "message": "Tunjukkan Makluman Setelah Segmen Dilangkau"
-    },
    "keybindCurrentlySet": {
        "message": ". Pada masa ini ditetapkan untuk:"
    },
@@ -504,8 +498,8 @@
    "category_livestream_messages_short": {
        "message": "Bacaan Mesej"
    },
-    "disable": {
-        "message": "Nyahaktifkan"
+    "autoSkip": {
+        "message": "Langkau Auto"
    },
    "manualSkip": {
        "message": "Langkau Manual"
@@ -513,6 +507,9 @@
    "showOverlay": {
        "message": "Tunjukkan Di Bar Mencari"
    },
+    "disable": {
+        "message": "Nyahaktifkan"
+    },
    "colorFormatIncorrect": {
        "message": "Warna anda tidak diformat dengan betul. Ia mestilah kod hex 3 atau 6 digit dengan tanda nombor pada awalnya."
    },
--- a/public/_locales/nl/messages.json
+++ b/public/_locales/nl/messages.json
@@ -224,6 +224,9 @@
    "showNotice": {
        "message": "Melding opnieuw weergeven"
    },
+    "showSkipNotice": {
+        "message": "Melding weergeven nadat een segment is overgeslagen"
+    },
    "longDescription": {
        "message": "SponsorBlock laat u sponsoring, intro's, outro's, herinneringen om te abonneren en andere vervelende onderdelen van YouTube-video's overslaan. SponsorBlock is een gecrowdsourcete browser-extensie waarmee iedereen de begin- en eindtijd van gesponsorde segmenten en andere segmenten van YouTube-video's kan indienen. Zodra één persoon deze informatie indient, zal iedereen met deze extensie het gesponsorde segment overslaan. U kunt ook secties zonder muziek in muziekvideo's overslaan.",
        "description": "Full description of the extension on the store pages."
@@ -284,9 +287,6 @@
    "skip_category": {
        "message": "{0} overslaan?"
    },
-    "skipped": {
-        "message": "Overgeslagen"
-    },
    "disableAutoSkip": {
        "message": "Automatisch overslaan uitschakelen"
    },
@@ -347,12 +347,6 @@
    "createdBy": {
        "message": "Gemaakt door"
    },
-    "autoSkip": {
-        "message": "Automatisch overslaan"
-    },
-    "showSkipNotice": {
-        "message": "Melding weergeven nadat een segment is overgeslagen"
-    },
    "keybindCurrentlySet": {
        "message": ". Hij is momenteel ingesteld op:"
    },
@@ -550,8 +544,8 @@
    "category_livestream_messages_short": {
        "message": "Lezen van berichten"
    },
-    "disable": {
-        "message": "Uitschakelen"
+    "autoSkip": {
+        "message": "Automatisch overslaan"
    },
    "manualSkip": {
        "message": "Handmatig overslaan"
@@ -559,6 +553,9 @@
    "showOverlay": {
        "message": "Weergeven in tijdbalk"
    },
+    "disable": {
+        "message": "Uitschakelen"
+    },
    "autoSkipOnMusicVideos": {
        "message": "Automatisch alle segmenten overslaan wanneer er een niet-muziek-segment is"
    },
--- a/public/_locales/no/messages.json
+++ b/public/_locales/no/messages.json
@@ -212,6 +212,9 @@
    "showNotice": {
        "message": "Vis varselet igjen"
    },
+    "showSkipNotice": {
+        "message": "Vis varsel etter at et segment har blitt hoppet over"
+    },
    "longDescription": {
        "message": "SponsorBlock lar deg hoppe over sponsorer, introer, outro-er, abonnementspåminnelser, og andre irriterende deler av YouTube-videoer. SponsorBlock er en fellesskapsdrevet nettleserutvidelser som lar alle sende inn start- og sluttidspunktene til sponsede segmenter og andre segmenter i YouTube-videoer. Når en person sender inn denne informasjonen, vil alle andre med denne utvidelsen hoppe rett over det sponsede segmentet. Du kan også hoppe over ikke-musikk-seksjoner i musikkvideoer.",
        "description": "Full description of the extension on the store pages."
@@ -269,9 +272,6 @@
    "skip_category": {
        "message": "Vil du hoppe over {0}?"
    },
-    "skipped": {
-        "message": "Hoppet over"
-    },
    "disableAutoSkip": {
        "message": "Skru av autohopping"
    },
@@ -332,12 +332,6 @@
    "createdBy": {
        "message": "Opprettet av"
    },
-    "autoSkip": {
-        "message": "Hopp over automatisk"
-    },
-    "showSkipNotice": {
-        "message": "Vis varsel etter at et segment har blitt hoppet over"
-    },
    "keybindCurrentlySet": {
        "message": ". Den er før øyeblikket satt til:"
    },
@@ -504,8 +498,8 @@
    "category_livestream_messages_short": {
        "message": "Høytlesning av meldinger"
    },
-    "disable": {
-        "message": "Deaktiver"
+    "autoSkip": {
+        "message": "Hopp over automatisk"
    },
    "manualSkip": {
        "message": "Manuelt hopp"
@@ -513,6 +507,9 @@
    "showOverlay": {
        "message": "Vis i tidsstripen"
    },
+    "disable": {
+        "message": "Deaktiver"
+    },
    "colorFormatIncorrect": {
        "message": "Fargen din er formattert feil. Det burde være en 3- eller 6-sifret heksadesimal kode med et nummertegn foran."
    },
--- a/public/_locales/pl/messages.json
+++ b/public/_locales/pl/messages.json
@@ -224,6 +224,9 @@
    "showNotice": {
        "message": "Pokaż informacje ponownie"
    },
+    "showSkipNotice": {
+        "message": "Pokaż informację po pominięciu segmentu"
+    },
    "longDescription": {
        "message": "SponsorBlock pozwala pomijać sponsorów, intra, outra, przypomnienia o subskrypcjach i inne irytujące fragmenty filmów na YouTube. SponsorBlock jest opartym na crowdsourcingu rozszerzeniem do przeglądarki, które pozwala każdemu zgłosić początek i koniec segmentów sponsorowanych oraz innych segmentów w filmach na YouTube. Kiedy ktoś już zamieści te informacje, wszyscy pozostali z tym rozszerzeniem będą pomijać segment sponsorowany. Możesz również pomijać fragmenty teledysków bez muzyki.",
        "description": "Full description of the extension on the store pages."
@@ -284,9 +287,6 @@
    "skip_category": {
        "message": "Pominąć {0}?"
    },
-    "skipped": {
-        "message": "Pominięto"
-    },
    "disableAutoSkip": {
        "message": "Wyłącz autopomijanie"
    },
@@ -347,12 +347,6 @@
    "createdBy": {
        "message": "Stworzony przez"
    },
-    "autoSkip": {
-        "message": "Autopomijanie"
-    },
-    "showSkipNotice": {
-        "message": "Pokaż informację po pominięciu segmentu"
-    },
    "keybindCurrentlySet": {
        "message": ". Obecnie ustawiony:"
    },
@@ -550,8 +544,8 @@
    "category_livestream_messages_short": {
        "message": "Czytanie wiadomości"
    },
-    "disable": {
-        "message": "Wyłączone"
+    "autoSkip": {
+        "message": "Autopomijanie"
    },
    "manualSkip": {
        "message": "Ręczne pomijanie"
@@ -559,6 +553,9 @@
    "showOverlay": {
        "message": "Pokaż na pasku"
    },
+    "disable": {
+        "message": "Wyłączone"
+    },
    "autoSkipOnMusicVideos": {
        "message": "Automatycznie pomiń wszystkie segmenty, gdy istnieje segment niemuzyczny"
    },
--- a/public/_locales/pt_BR/messages.json
+++ b/public/_locales/pt_BR/messages.json
@@ -131,7 +131,7 @@
        "message": "Envios"
    },
    "savedPeopleFrom": {
-        "message": "Poupaste a outros de "
+        "message": "Você poupou as pessoas de "
    },
    "viewLeaderboard": {
        "message": "Placar de classificação"
@@ -224,6 +224,24 @@
    "showNotice": {
        "message": "Mostrar notificação outra vez"
    },
+    "showSkipNotice": {
+        "message": "Mostrar Aviso Após Um Segmento Ser Ignorado"
+    },
+    "noticeVisibilityMode0": {
+        "message": "Avisos de Ignorar em Tamanho Inteiro"
+    },
+    "noticeVisibilityMode1": {
+        "message": "Avisos de Ignorar pequenos quando Pulado Automaticamente"
+    },
+    "noticeVisibilityMode2": {
+        "message": "Todos os Avisos de Ignorar em Tamanho Pequeno"
+    },
+    "noticeVisibilityMode3": {
+        "message": "Avisos de Ignorar semi-transparentes quando Pulado Automaticamente"
+    },
+    "noticeVisibilityMode4": {
+        "message": "Todos os Avisos de Ignorar semi-transparentes"
+    },
    "longDescription": {
        "message": "O SponsorBlock permite que você pule patrocinadores, introduções, créditos finais, lembretes de inscrição, e outras partes irritantes dos vídeos do YouTube. O SponsorBlock é uma extensão de navegador de crowdsourcing que permite enviar a qualquer um o tempo inicial e final de segmentos patrocinados de vídeos do YouTube. Assim que uma pessoa enviar essa informação, todas as outras pessoas com essa extensão irão pular o segmento patrocinado. Você também pode pular seções que não são de música dos vídeos de música.",
        "description": "Full description of the extension on the store pages."
@@ -284,8 +302,17 @@
    "skip_category": {
        "message": "Pular {0}?"
    },
+    "skip_to_category": {
+        "message": "Pular para {0}?",
+        "description": "Used for skipping to things (Skip to Highlight)"
+    },
    "skipped": {
-        "message": "Pulado"
+        "message": "{0} Ignorado",
+        "description": "Example: Sponsor Skipped"
+    },
+    "skipped_to_category": {
+        "message": "Pulado para {0}",
+        "description": "Used for skipping to things (Skipped to Highlight)"
    },
    "disableAutoSkip": {
        "message": "Desativar Salto Automático"
@@ -347,12 +374,6 @@
    "createdBy": {
        "message": "Criado por"
    },
-    "autoSkip": {
-        "message": "Pular automaticamente"
-    },
-    "showSkipNotice": {
-        "message": "Mostrar Aviso Após um Segmento Ser Ignorado"
-    },
    "keybindCurrentlySet": {
        "message": ". Atualmente, está definido para:"
    },
@@ -544,14 +565,20 @@
    "category_music_offtopic_short": {
        "message": "Não musical"
    },
+    "category_poi_highlight": {
+        "message": "Destaques"
+    },
+    "category_poi_highlight_description": {
+        "message": "A parte do vídeo que a maioria das pessoas procura. Similar aos comentários \"Vídeo começa aos x\"."
+    },
    "category_livestream_messages": {
        "message": "Livestream: Leituras de Doação/Mensagem"
    },
    "category_livestream_messages_short": {
        "message": "Leitura de mensagens"
    },
-    "disable": {
-        "message": "Desativar"
+    "autoSkip": {
+        "message": "Pular automaticamente"
    },
    "manualSkip": {
        "message": "Pular manualmente"
@@ -559,6 +586,18 @@
    "showOverlay": {
        "message": "Mostrar barra de progresso"
    },
+    "disable": {
+        "message": "Desativar"
+    },
+    "autoSkip_POI": {
+        "message": "Pular automaticamente para o início"
+    },
+    "manualSkip_POI": {
+        "message": "Perguntar quando o vídeo carregar"
+    },
+    "showOverlay_POI": {
+        "message": "Mostrar na barra de progresso"
+    },
    "autoSkipOnMusicVideos": {
        "message": "Pular automaticamente todos os segmentos quando há um segmento que não é música"
    },
--- a/public/_locales/ro/messages.json
+++ b/public/_locales/ro/messages.json
@@ -212,6 +212,9 @@
    "showNotice": {
        "message": "Arată Notificarea Din Nou"
    },
+    "showSkipNotice": {
+        "message": "Arată o notificare după ce un segment este sărit"
+    },
    "longDescription": {
        "message": "SponsorBlock vă permite să săriți peste sponsori, intro, outros, memento-uri pentru abonament și alte părți enervante ale videoclipurilor YouTube SponsorBlock este o extensie crowdsourced de browser, care hai să trimită oricui timpul de început și de sfârșit pentru segmente sponsorizate și alte segmente de videoclipuri YouTube. Odată ce o persoană transmite aceste informații, toți ceilalți cu această extensie vor sări peste segmentul sponsorizat. De asemenea, poți sări peste secțiunile non-muzicale ale videoclipurilor.",
        "description": "Full description of the extension on the store pages."
@@ -269,9 +272,6 @@
    "skip_category": {
        "message": "Omiteți {0}?"
    },
-    "skipped": {
-        "message": "Sărit"
-    },
    "disableAutoSkip": {
        "message": "Dezactivează Autoskip"
    },
@@ -332,12 +332,6 @@
    "createdBy": {
        "message": "Creat De"
    },
-    "autoSkip": {
-        "message": "Sari Peste Automat"
-    },
-    "showSkipNotice": {
-        "message": "Arată o notificare după ce un segment este sărit"
-    },
    "keybindCurrentlySet": {
        "message": ". În prezent este setat:"
    },
@@ -501,8 +495,8 @@
    "category_livestream_messages_short": {
        "message": "Citire Mesaj"
    },
-    "disable": {
-        "message": "Dezactivare"
+    "autoSkip": {
+        "message": "Sari Peste Automat"
    },
    "manualSkip": {
        "message": "Sari Peste Manual"
@@ -510,6 +504,9 @@
    "showOverlay": {
        "message": "Arată În Bara de Derulare"
    },
+    "disable": {
+        "message": "Dezactivare"
+    },
    "colorFormatIncorrect": {
        "message": "Culoarea ta este formatată incorect. Ar trebui să fie un cod hexadecimal de 3 sau 6 cifre cu un hash la început."
    },
--- a/public/_locales/ru/messages.json
+++ b/public/_locales/ru/messages.json
@@ -71,7 +71,7 @@
        "message": "В базе есть сегменты для этого видео!"
    },
    "sponsor404": {
-        "message": "Сегментов не найдено"
+        "message": "Сегменты не найдены"
    },
    "sponsorStart": {
        "message": "Сегмент начинается отсюда"
@@ -95,7 +95,7 @@
        "message": "Голос засчитан!"
    },
    "serverDown": {
-        "message": "Кажется, сервера не работают. Незамедлительно свяжитесь с разработчиком."
+        "message": "Кажется, сервер не отвечает. Свяжитесь с разработчиком."
    },
    "connectionError": {
        "message": "Ошибка соединения. Код ошибки: "
@@ -224,6 +224,9 @@
    "showNotice": {
        "message": "Показать уведомление снова"
    },
+    "showSkipNotice": {
+        "message": "Показывать уведомление после пропуска сегмента"
+    },
    "longDescription": {
        "message": "SponsorBlock позволяет пропускать спонсорские вставки, начальные и конечные заставки, просьбы подписаться и другое в видео на YouTube. SponsorBlock — коллективное расширение, которое позволяет каждому отправить время начала и конца подобных сегментов в видео. После того, как кто-нибудь отправляет эту информацию, все остальные пользователи расширения будут автоматически пропускать эти сегменты. Так же можно пропускать части клипов без музыки.",
        "description": "Full description of the extension on the store pages."
@@ -284,8 +287,17 @@
    "skip_category": {
        "message": "Пропустить {0}?"
    },
+    "skip_to_category": {
+        "message": "Пропустить до {0}?",
+        "description": "Used for skipping to things (Skip to Highlight)"
+    },
    "skipped": {
-        "message": "Пропущено"
+        "message": "Пропущено: {0}",
+        "description": "Example: Sponsor Skipped"
+    },
+    "skipped_to_category": {
+        "message": "Пропущено до {0}",
+        "description": "Used for skipping to things (Skipped to Highlight)"
    },
    "disableAutoSkip": {
        "message": "Отключить автоматический пропуск"
@@ -303,7 +315,7 @@
        "message": "Показывать длительность без сегментов"
    },
    "showTimeWithSkipsDescription": {
-        "message": "Эта длительность отображается в скобках рядом с фактической под полосой прокрутки. Показывает длительность видео без сегментов. Включает сегменты, для которых выбрано \"Отображать в полосе прокрутки\"."
+        "message": "Длительность отображается в скобках после фактической под полосой прокрутки. Показывает длительность видео без сегментов. Включает сегменты, для которых выбрано \"Отображать в полосе прокрутки\"."
    },
    "youHaveSkipped": {
        "message": "Вы пропустили "
@@ -342,17 +354,11 @@
        "message": "Установить идентификатор пользователя"
    },
    "userIDChangeWarning": {
-        "message": "Внимание: изменение идентификатора пользователя необратимо. Вы действительно хотите это сделать? Сделайте резервную копию вашего старого на всякий случай."
+        "message": "Внимание: изменение идентификатора пользователя необратимо. Вы действительно хотите это сделать? Сделайте резервную копию на всякий случай."
    },
    "createdBy": {
        "message": "Создано"
    },
-    "autoSkip": {
-        "message": "Автоматический пропуск"
-    },
-    "showSkipNotice": {
-        "message": "Показывать уведомление после пропуска сегмента"
-    },
    "keybindCurrentlySet": {
        "message": ". Он сейчас назначен на:"
    },
@@ -400,7 +406,7 @@
        "message": "Длительность отображения окошка о пропуске (в секундах):"
    },
    "skipNoticeDurationDescription": {
-        "message": "Окошко о пропуске будет оставаться на экране в течение как минимум этого времени. Может быть активно дольше при пропуске вручную."
+        "message": "Окошко о пропуске будет оставаться на экране как минимум в течение этого времени. Может быть активно дольше при пропуске вручную."
    },
    "shortCheck": {
        "message": "Следующий диапазон времени короче, чем Ваша настройка минимальной длительности. Это может означать, что он уже был отправлен, и просто игнорируется из-за этой настройки. Вы действительно хотите отправить?"
@@ -478,7 +484,7 @@
        "message": "Не удалось скопировать в буфер"
    },
    "copyDebugInformationOptions": {
-        "message": "Копирует информацию в буфер обмена, которая будет предоставлена разработчику при возникновении ошибки / по запросу разработчика. Такие сведения, как ID пользователя, список разрешенных каналов и адрес пользовательского сервера не передаются. Однако, отправляются ваш user agent, браузер, операционная система и номер версии расширения. "
+        "message": "Копирует в буфер обмена информацию, которая будет предоставлена разработчику при возникновении ошибки / по запросу разработчика. Такие сведения, как ID пользователя, список разрешенных каналов и адрес пользовательского сервера не передаются. Однако, отправляются ваш user agent, браузер, операционная система и номер версии расширения. "
    },
    "copyDebugInformationComplete": {
        "message": "Отладочная информация скопирована в буфер обмена. Вы можете удалить любую информацию, которой не хотите делиться. Сохраните ее в текстовом файле или вставьте в отчет об ошибке."
@@ -544,14 +550,20 @@
    "category_music_offtopic_short": {
        "message": "Без музыки"
    },
+    "category_poi_highlight": {
+        "message": "Важное"
+    },
+    "category_poi_highlight_description": {
+        "message": "Часть видео, которую ищет большинство людей. По сути заменяет комментарии типа \"Видео начинается с x:xx\"."
+    },
    "category_livestream_messages": {
        "message": "Прямые трансляции: пожертвование/чтение сообщения"
    },
    "category_livestream_messages_short": {
        "message": "Чтение сообщений"
    },
-    "disable": {
-        "message": "Отключить"
+    "autoSkip": {
+        "message": "Автоматический пропуск"
    },
    "manualSkip": {
        "message": "Пропускать вручную"
@@ -559,6 +571,18 @@
    "showOverlay": {
        "message": "Показывать в полосе прокрутки"
    },
+    "disable": {
+        "message": "Отключить"
+    },
+    "autoSkip_POI": {
+        "message": "Автоматически пропускать к началу видео"
+    },
+    "manualSkip_POI": {
+        "message": "Спрашивать после загрузки видео"
+    },
+    "showOverlay_POI": {
+        "message": "Показывать в полосе прокрутки"
+    },
    "autoSkipOnMusicVideos": {
        "message": "Пропускать все сегменты автоматически при наличии сегмента без музыки"
    },
@@ -645,7 +669,7 @@
        "message": "Рекомендуем включить \"Принудительная проверка каналов перед пропуском\""
    },
    "downvoteDescription": {
-        "message": "Неверно указано время"
+        "message": "Не нужен/неверно указано время"
    },
    "incorrectCategory": {
        "message": "Неверная категория"
--- a/public/_locales/sk/messages.json
+++ b/public/_locales/sk/messages.json
@@ -224,6 +224,9 @@
    "showNotice": {
        "message": "Znovu zobraziť upozornenie"
    },
+    "showSkipNotice": {
+        "message": "Zobraziť upozornenie pri preskočení segmentu"
+    },
    "longDescription": {
        "message": "SponsorBlock umožňuje preskočiť sponzorov, úvodné časti, záverečné časti, pripomienky na odber, nehudobné časti videoklipov alebo iné otravné časti YouTube videí. SponsorBlock je crowdsourceové rozšírenie prehliadača, pomocou ktorého môže ktokoľvek označiť začiatok a koniec takéhoto segmentu. Po odoslaní potom všetci ostatní s týmto rozšírením tieto segmenty automaticky preskočia.",
        "description": "Full description of the extension on the store pages."
@@ -284,8 +287,17 @@
    "skip_category": {
        "message": "Preskočiť {0}?"
    },
+    "skip_to_category": {
+        "message": "Preskočiť na {0}?",
+        "description": "Used for skipping to things (Skip to Highlight)"
+    },
    "skipped": {
-        "message": "preskočené"
+        "message": "{0} preskočené",
+        "description": "Example: Sponsor Skipped"
+    },
+    "skipped_to_category": {
+        "message": "Preskočené na {0}",
+        "description": "Used for skipping to things (Skipped to Highlight)"
    },
    "disableAutoSkip": {
        "message": "Zakázať Automatické Preskočenie"
@@ -347,12 +359,6 @@
    "createdBy": {
        "message": "Vytvoril"
    },
-    "autoSkip": {
-        "message": "Automatické Preskočenie"
-    },
-    "showSkipNotice": {
-        "message": "Zobraziť upozornenie pri preskočení segmentu"
-    },
    "keybindCurrentlySet": {
        "message": ". Aktuálne je nastavené na:"
    },
@@ -544,14 +550,20 @@
    "category_music_offtopic_short": {
        "message": "Bez hudby"
    },
+    "category_poi_highlight": {
+        "message": "Hlavný obsah videa"
+    },
+    "category_poi_highlight_description": {
+        "message": "Tá časť videa, ktorú ľudia vyhľadávajú. Podobné komentárom \"Video začína v čase x\"."
+    },
    "category_livestream_messages": {
        "message": "Živé vysielanie: oznamy a dary"
    },
    "category_livestream_messages_short": {
        "message": "Oznamy"
    },
-    "disable": {
-        "message": "Zakázať"
+    "autoSkip": {
+        "message": "Automatické Preskočenie"
    },
    "manualSkip": {
        "message": "Manuálne Preskočenie"
@@ -559,6 +571,18 @@
    "showOverlay": {
        "message": "Zobraziť v časovej lište"
    },
+    "disable": {
+        "message": "Zakázať"
+    },
+    "autoSkip_POI": {
+        "message": "Automaticky preskočiť na začiatok"
+    },
+    "manualSkip_POI": {
+        "message": "Opýtať sa, keď sa video nahraje"
+    },
+    "showOverlay_POI": {
+        "message": "Zobraziť v časovej lište"
+    },
    "autoSkipOnMusicVideos": {
        "message": "Automaticky preskočiť všetky segmenty ak neexistuje segment bez hudby"
    },
@@ -683,7 +707,7 @@
        "message": "Dostali ste varovanie a nemôžete tak dočasne odosielať segmenty. To znamená, že sme si všimli, že ste spravili nejaké chyby, ktoré nie sú myslené zle, a chceme Vám len objasniť pravidlá. Môžete sa pripojiť do konverzácie pomocou discord.gg/SponsorBlock alebo matrix.to/#/+sponsor:ajay.app"
    },
    "voteRejectedWarning": {
-        "message": "Hlasovanie bolo zamietnuté kvôli varovaniu. Kliknite pre otvorenie chatu, aby ste ho vyriešili, alebo sa vrátťe až budete mať čas.",
+        "message": "Hlasovanie bolo zamietnuté kvôli varovaniu. Kliknite pre otvorenie chatu, aby ste ho vyriešili, alebo sa vráťte až budete mať čas.",
        "description": "This is an integrated chat panel that will appearing allowing them to talk to the Discord/Matrix chat without leaving their browser."
    }
 }
--- a/public/_locales/sv/messages.json
+++ b/public/_locales/sv/messages.json
@@ -224,6 +224,9 @@
    "showNotice": {
        "message": "Visa Notisen Igen"
    },
+    "showSkipNotice": {
+        "message": "Visa ett meddelande efter att ett segment har hoppats över"
+    },
    "longDescription": {
        "message": "SponsorBlock låter dig hoppa över sponsormeddelanden, introduktioner, eftertexter, prenumerationspåminnelser och andra irriterande delar av YouTube-videor. SponsorBlock är ett crowdsourced webbläsartillägg som låter vem som helst att skicka in start- och sluttid på sponsorsegment och andra segment av YouTube-videor. När en person skickar in denna information kommer alla andra som har detta tillägg installerat att hoppa över det sponsrade segmentet. Du kan även hoppa över icke-musikavsnitt i musikvideor.",
        "description": "Full description of the extension on the store pages."
@@ -284,8 +287,17 @@
    "skip_category": {
        "message": "Hoppa över {0}?"
    },
+    "skip_to_category": {
+        "message": "Hoppa till {0}?",
+        "description": "Used for skipping to things (Skip to Highlight)"
+    },
    "skipped": {
-        "message": "Skippat"
+        "message": "{0} överhoppad",
+        "description": "Example: Sponsor Skipped"
+    },
+    "skipped_to_category": {
+        "message": "Hoppat till {0}",
+        "description": "Used for skipping to things (Skipped to Highlight)"
    },
    "disableAutoSkip": {
        "message": "Inaktivera hoppa över automatiskt"
@@ -347,12 +359,6 @@
    "createdBy": {
        "message": "Skapad av"
    },
-    "autoSkip": {
-        "message": "Hoppa över automatiskt"
-    },
-    "showSkipNotice": {
-        "message": "Visa ett meddelande efter att ett segment har hoppats över"
-    },
    "keybindCurrentlySet": {
        "message": ". Nuvarande snabbtangent är:"
    },
@@ -544,14 +550,20 @@
    "category_music_offtopic_short": {
        "message": "Icke-musik"
    },
+    "category_poi_highlight": {
+        "message": "Markera"
+    },
+    "category_poi_highlight_description": {
+        "message": "Den del av videon som de flesta letar efter. Liknande kommentarer \"Video börjar på x\"."
+    },
    "category_livestream_messages": {
        "message": "Liveström: Donations-/meddelandeavläsningar"
    },
    "category_livestream_messages_short": {
        "message": "Meddelandeläsning"
    },
-    "disable": {
-        "message": "Inaktivera"
+    "autoSkip": {
+        "message": "Hoppa över automatiskt"
    },
    "manualSkip": {
        "message": "Hoppa över manuellt"
@@ -559,6 +571,18 @@
    "showOverlay": {
        "message": "Visa i sökfältet"
    },
+    "disable": {
+        "message": "Inaktivera"
+    },
+    "autoSkip_POI": {
+        "message": "Hoppa automatiskt till start"
+    },
+    "manualSkip_POI": {
+        "message": "Fråga när video laddas"
+    },
+    "showOverlay_POI": {
+        "message": "Visa i sökfältet"
+    },
    "autoSkipOnMusicVideos": {
        "message": "Hoppa över alla segment automatiskt när det finns ett icke-musiksegment"
    },
--- a/public/_locales/ta/messages.json
+++ b/public/_locales/ta/messages.json
@@ -212,6 +212,9 @@
    "showNotice": {
        "message": "அறிவிப்பை மீண்டும் காட்டு"
    },
+    "showSkipNotice": {
+        "message": "ஒரு பிரிவு தவிர்க்கப்பட்ட பிறகு அறிவிப்பைக் காட்டு"
+    },
    "longDescription": {
        "message": "ஸ்பான்சர்கள், அறிமுகங்கள், அவுட்ரோஸ், சந்தா நினைவூட்டல்கள் மற்றும் YouTube வீடியோக்களின் பிற எரிச்சலூட்டும் பகுதிகளைத் தவிர்க்க ஸ்பான்சர் பிளாக் உங்களை அனுமதிக்கிறது. ஸ்பான்சர் பிளாக் என்பது ஒரு கூட்ட நெரிசலான உலாவி நீட்டிப்பாகும், இது ஸ்பான்சர் செய்யப்பட்ட பிரிவுகளின் தொடக்க மற்றும் இறுதி நேரங்களையும் YouTube வீடியோக்களின் பிற பிரிவுகளையும் எவரும் சமர்ப்பிக்கலாம். ஒரு நபர் இந்த தகவலைச் சமர்ப்பித்தவுடன், இந்த நீட்டிப்பு உள்ள மற்றவர்கள் ஸ்பான்சர் செய்யப்பட்ட பிரிவைத் தவிர்த்து விடுவார்கள். இசை வீடியோக்களின் இசை அல்லாத பிரிவுகளையும் நீங்கள் தவிர்க்கலாம்.",
        "description": "Full description of the extension on the store pages."
@@ -269,9 +272,6 @@
    "skip_category": {
        "message": "{0} ஐ தவிர்?"
    },
-    "skipped": {
-        "message": "தவிர்க்கப்பட்டது"
-    },
    "disableAutoSkip": {
        "message": "ஆட்டோ ஸ்கிப்பை முடக்கு"
    },
@@ -332,12 +332,6 @@
    "createdBy": {
        "message": "உருவாக்கியது"
    },
-    "autoSkip": {
-        "message": "ஆட்டோ ஸ்கிப்"
-    },
-    "showSkipNotice": {
-        "message": "ஒரு பிரிவு தவிர்க்கப்பட்ட பிறகு அறிவிப்பைக் காட்டு"
-    },
    "keybindCurrentlySet": {
        "message": ". இது தற்போது அமைக்கப்பட்டுள்ளது:"
    },
@@ -504,8 +498,8 @@
    "category_livestream_messages_short": {
        "message": "செய்தி வாசிப்பு"
    },
-    "disable": {
-        "message": "முடக்கு"
+    "autoSkip": {
+        "message": "ஆட்டோ ஸ்கிப்"
    },
    "manualSkip": {
        "message": "கையேடு தவிர்"
@@ -513,6 +507,9 @@
    "showOverlay": {
        "message": "சீக் பட்டியில் காட்டு"
    },
+    "disable": {
+        "message": "முடக்கு"
+    },
    "colorFormatIncorrect": {
        "message": "உங்கள் நிறம் தவறாக வடிவமைக்கப்பட்டுள்ளது. இது ஆரம்பத்தில் எண் அடையாளத்துடன் 3 அல்லது 6 இலக்க ஹெக்ஸ் குறியீடாக இருக்க வேண்டும்."
    },
--- a/public/_locales/te/messages.json
+++ b/public/_locales/te/messages.json
@@ -212,6 +212,9 @@
    "showNotice": {
        "message": "మళ్ళీ నోటీసు చూపించు"
    },
+    "showSkipNotice": {
+        "message": "ఒక విభాగం దాటవేయబడిన తర్వాత నోటీసు చూపించు"
+    },
    "longDescription": {
        "message": "స్పాన్సర్లు, పరిచయాలు, ros ట్రోలు, చందా రిమైండర్‌లు మరియు YouTube వీడియోల యొక్క ఇతర బాధించే భాగాలను దాటవేయడానికి స్పాన్సర్‌బ్లాక్ మిమ్మల్ని అనుమతిస్తుంది. స్పాన్సర్బ్లాక్ అనేది క్రౌడ్ సోర్స్డ్ బ్రౌజర్ పొడిగింపు, ఇది ఎవరైనా స్పాన్సర్ చేసిన విభాగాలు మరియు యూట్యూబ్ వీడియోల యొక్క ప్రారంభ మరియు ముగింపు సమయాన్ని సమర్పించనివ్వండి. ఒక వ్యక్తి ఈ సమాచారాన్ని సమర్పించిన తర్వాత, ఈ పొడిగింపు ఉన్న ప్రతి ఒక్కరూ ప్రాయోజిత విభాగంలో దాటవేస్తారు. మీరు మ్యూజిక్ వీడియోల యొక్క నాన్-మ్యూజిక్ విభాగాలను కూడా దాటవేయవచ్చు.",
        "description": "Full description of the extension on the store pages."
@@ -269,9 +272,6 @@
    "skip_category": {
        "message": "{0} ని దాటవేయాలా?"
    },
-    "skipped": {
-        "message": "దాటవేయబడింది"
-    },
    "disableAutoSkip": {
        "message": "ఆటో దాటవేయిని ఆపివేయి"
    },
@@ -332,12 +332,6 @@
    "createdBy": {
        "message": "సృష్టికర్త"
    },
-    "autoSkip": {
-        "message": "ఆటో దాటవేయి"
-    },
-    "showSkipNotice": {
-        "message": "ఒక విభాగం దాటవేయబడిన తర్వాత నోటీసు చూపించు"
-    },
    "keybindCurrentlySet": {
        "message": ". ఇది ప్రస్తుతం దీనికి సెట్ చేయబడింది:"
    },
@@ -504,8 +498,8 @@
    "category_livestream_messages_short": {
        "message": "సందేశ పఠనం"
    },
-    "disable": {
-        "message": "డిసేబుల్"
+    "autoSkip": {
+        "message": "ఆటో దాటవేయి"
    },
    "manualSkip": {
        "message": "మాన్యువల్ దాటవేయి"
@@ -513,6 +507,9 @@
    "showOverlay": {
        "message": "సీక్ బార్‌లో చూపించు"
    },
+    "disable": {
+        "message": "డిసేబుల్"
+    },
    "colorFormatIncorrect": {
        "message": "మీ రంగు తప్పుగా ఆకృతీకరించబడింది. ఇది ప్రారంభంలో సంఖ్య గుర్తుతో 3 లేదా 6 అంకెల హెక్స్ కోడ్ అయి ఉండాలి."
    },
--- a/public/_locales/tr/messages.json
+++ b/public/_locales/tr/messages.json
@@ -224,6 +224,9 @@
    "showNotice": {
        "message": "Uyarıyı Tekrar Göster"
    },
+    "showSkipNotice": {
+        "message": "Bir Kısmı Atladıktan Sonra Uyarı Göster"
+    },
    "longDescription": {
        "message": "SponsorBlock, sponsorları, giriş ve bitiş kısımlarını, abonelik hatırlatıcılarını ve YouTube videolarının diğer can sıkıcı kısımlarını atlamanıza olanak tanır. SponsorBlock, herkesin sponsorlu kısımları ve YouTube videolarının diğer kısımlarının başlangıç ve bitiş zamanlarını göndermesine izin veren kitle kaynaklı bir tarayıcı uzantısıdır. Bir kişi bu bilgiyi gönderdikten sonra, bu uzantıya sahip diğer herkes sponsorlu kısımları hemen atlayacaktır. Müzik videolarının müzik dışı bölümlerini de atlayabilirsiniz.",
        "description": "Full description of the extension on the store pages."
@@ -284,8 +287,17 @@
    "skip_category": {
        "message": "{0} atla?"
    },
+    "skip_to_category": {
+        "message": "{0} kısmına atlansın mı?",
+        "description": "Used for skipping to things (Skip to Highlight)"
+    },
    "skipped": {
-        "message": "Atlandı"
+        "message": "{0} Atlandı",
+        "description": "Example: Sponsor Skipped"
+    },
+    "skipped_to_category": {
+        "message": "{0} kısmına atlandı",
+        "description": "Used for skipping to things (Skipped to Highlight)"
    },
    "disableAutoSkip": {
        "message": "Otomatik Atlamayı Devredışı Bırak"
@@ -347,12 +359,6 @@
    "createdBy": {
        "message": "Oluşturan"
    },
-    "autoSkip": {
-        "message": "Otomatik Atla"
-    },
-    "showSkipNotice": {
-        "message": "Bir Kısmı Atladıktan Sonra Uyarı Göster"
-    },
    "keybindCurrentlySet": {
        "message": ". Şu an buna ayarlı:"
    },
@@ -550,8 +556,8 @@
    "category_livestream_messages_short": {
        "message": "Canlı Yayın Mesajlarını Okumak"
    },
-    "disable": {
-        "message": "Devredışı"
+    "autoSkip": {
+        "message": "Otomatik Atla"
    },
    "manualSkip": {
        "message": "Elle Atla"
@@ -559,6 +565,18 @@
    "showOverlay": {
        "message": "Arama Çubuğunda Göster"
    },
+    "disable": {
+        "message": "Devredışı"
+    },
+    "autoSkip_POI": {
+        "message": "Başlangıca otomatik atla"
+    },
+    "manualSkip_POI": {
+        "message": "Videonun başında sor"
+    },
+    "showOverlay_POI": {
+        "message": "Arama Çubuğunda Göster"
+    },
    "autoSkipOnMusicVideos": {
        "message": "Müzik olmayan kısım varsa tüm kısımları otomatik atla"
    },
--- a/public/_locales/uk/messages.json
+++ b/public/_locales/uk/messages.json
@@ -85,6 +85,9 @@
    "noVideoID": {
        "message": "Відео YouTube, не знайдено.\nЯкщо це не так, поновіть вкладку."
    },
+    "refreshSegments": {
+        "message": "Оновити сегменти"
+    },
    "success": {
        "message": "Успіх!"
    },
@@ -185,6 +188,9 @@
    "whatInfoButton": {
        "message": "Ця кнопка відкриває спливаюче вікно на сторінці YouTube."
    },
+    "autoHideInfoButton": {
+        "message": "Кнопка \"Автоматично сховати інформацію\""
+    },
    "hideDeleteButton": {
        "message": "Приховати кнопку видалення в плеєрі YouTube"
    },
@@ -218,6 +224,9 @@
    "showNotice": {
        "message": "Показувати сповіщення знову"
    },
+    "showSkipNotice": {
+        "message": "Показувати сповіщення після пропуску сегмента"
+    },
    "longDescription": {
        "message": "SponsorBlock дозволяє пропускати спонсорські вставки, початкові і кінцеві заставки, прохання підписатися і інше в відео на YouTube. SponsorBlock - колективне розширення, яке дозволяє кожному надіслати час початку і кінця подібних сегментів в відео. Після того, як хто-небудь надсилає цю інформацію, всі інші користувачі розширення будуть автоматично пропускати ці сегменти. Так само можна пропускати частини кліпів без музики.",
        "description": "Full description of the extension on the store pages."
@@ -278,8 +287,17 @@
    "skip_category": {
        "message": "Пропустити {0}?"
    },
+    "skip_to_category": {
+        "message": "Пропустить до {0}?",
+        "description": "Used for skipping to things (Skip to Highlight)"
+    },
    "skipped": {
-        "message": "Пропущено"
+        "message": "{0} Пропущено",
+        "description": "Example: Sponsor Skipped"
+    },
+    "skipped_to_category": {
+        "message": "Пропущено до {0}",
+        "description": "Used for skipping to things (Skipped to Highlight)"
    },
    "disableAutoSkip": {
        "message": "Вимкнути автоматичний пропуск"
@@ -341,12 +359,6 @@
    "createdBy": {
        "message": "Створено"
    },
-    "autoSkip": {
-        "message": "Автоматичний пропуск"
-    },
-    "showSkipNotice": {
-        "message": "Показувати сповіщення після пропуску сегмента"
-    },
    "keybindCurrentlySet": {
        "message": ". Він зараз призначений на:"
    },
@@ -390,6 +402,12 @@
    "minDurationDescription": {
        "message": "Сегменти коротше цього значення не будуть пропускатися і не будуть показані в плеєрі."
    },
+    "skipNoticeDuration": {
+        "message": "Тривалість повідомлення пропуску (в секундах):"
+    },
+    "skipNoticeDurationDescription": {
+        "message": "Повідомлення про пропуск залишиться на екрані принаймні так довго. Для пропуску вручну він може бути видимим довше."
+    },
    "shortCheck": {
        "message": "Наступний діапазон часу коротше, ніж Ваше налаштування мінімальної тривалості. Це може означати, що він вже був надісланий, і просто ігнорується через це налаштування. Ви дійсно хочете надіслати?"
    },
@@ -532,14 +550,20 @@
    "category_music_offtopic_short": {
        "message": "Без музики"
    },
+    "category_poi_highlight": {
+        "message": "Основные"
+    },
+    "category_poi_highlight_description": {
+        "message": "Часть видео, которую ищут большинство людей. Аналогично комментарию «Видео начинается с X:XX»."
+    },
    "category_livestream_messages": {
        "message": "Прямі трансляції: пожертвування/читання повідомлення"
    },
    "category_livestream_messages_short": {
        "message": "Читання повідомлень"
    },
-    "disable": {
-        "message": "Вимкнути"
+    "autoSkip": {
+        "message": "Автоматичний пропуск"
    },
    "manualSkip": {
        "message": "Пропуск вручну"
@@ -547,6 +571,21 @@
    "showOverlay": {
        "message": "Показувати в смузі прокрутки"
    },
+    "disable": {
+        "message": "Вимкнути"
+    },
+    "autoSkip_POI": {
+        "message": "Автоматический переход к началу"
+    },
+    "manualSkip_POI": {
+        "message": "Спросите, когда видео загружается"
+    },
+    "showOverlay_POI": {
+        "message": "Показать на панели поиска"
+    },
+    "autoSkipOnMusicVideos": {
+        "message": "Автоматично пропустити усі сегменти, якщо присутній сегмент без музики"
+    },
    "colorFormatIncorrect": {
        "message": "Ви ввели колір в неправильному форматі. Це повинно бути 3-х або 6-ти значне шістнадцяткове число з символом # на початку."
    },
@@ -654,11 +693,21 @@
    "categoryUpdate2": {
        "message": "Відкрийте налаштування, щоб пропускати початкові і кінцеві заставки, саморекламу та інше."
    },
+    "help": {
+        "message": "Довідка"
+    },
    "experiementOptOut": {
        "message": "Відмова від усіх майбутніх експериментів",
        "description": "This is used in a popup about a new experiment to get a list of unlisted videos to back up since all unlisted videos uploaded before 2017 will be set to private."
    },
    "hideForever": {
        "message": "Сховати назавжди"
+    },
+    "warningChatInfo": {
+        "message": "Ви отримали попередження, тому тимчасово не можете обирати сегменти. Це означає, що ми помітили, що ви робили кілька поширених помилок, які не є злісними. Тому ми хочемо нагадати вам правила. Ви можете приєднатися до чату з правилами використовуючи discord.gg/SponsorBlock або matrix.to/#/+sponsor:ajay.app"
+    },
+    "voteRejectedWarning": {
+        "message": "Голосування відхилено через попередження. Натисніть, щоб відкрити чат для вирішення цієї проблеми, або поверніться пізніше.",
+        "description": "This is an integrated chat panel that will appearing allowing them to talk to the Discord/Matrix chat without leaving their browser."
    }
 }
--- a/public/_locales/vi/messages.json
+++ b/public/_locales/vi/messages.json
@@ -77,7 +77,7 @@
        "message": "Đoạn quảng cáo bắt đầu vào lúc này"
    },
    "sponsorEnd": {
-        "message": "Đoạn quảng cáo kết thúc vào lúc này"
+        "message": "Phân đoạn kết thúc vào lúc này"
    },
    "sponsorCancel": {
        "message": "Huỷ tạo phân đoạn"
@@ -224,6 +224,9 @@
    "showNotice": {
        "message": "Hiện thông báo lại"
    },
+    "showSkipNotice": {
+        "message": "Hiển thị thông báo sau khi bỏ qua quảng cáo"
+    },
    "longDescription": {
        "message": "SponsorBlock giúp bạn bỏ qua quảng cáo từ nhà tài trợ, đoạn giới thiệu, đoạn kết, lời nhắc đăng ký kênh, và những phần khó chịu khác trong các video Youtube. SponsorBlock là một tiện ích mở rộng cho trình duyệt, cho phép tất cả người dùng đăng thời điểm bắt đầu và kết thúc của những đoạn quảng cáo từ nhà tài trợ và các đoạn khác trong video Youtube. Sau khi một người đăng thông tin này lên, tất cả mọi người dùng tiện ích mở rộng này sẽ bỏ qua đoạn quảng cáo đó. Bạn cũng có thể bỏ qua phần không có nhạc trong những video âm nhạc.",
        "description": "Full description of the extension on the store pages."
@@ -284,11 +287,8 @@
    "skip_category": {
        "message": "Bỏ qua {0}?"
    },
-    "skipped": {
-        "message": "Đã bỏ qua"
-    },
    "disableAutoSkip": {
-        "message": "Tắt tự động bỏ qua quảng cáo"
+        "message": "Tắt tự động bỏ qua"
    },
    "enableAutoSkip": {
        "message": "Bật tự động bỏ qua quảng cáo"
@@ -347,12 +347,6 @@
    "createdBy": {
        "message": "Được tạo bởi"
    },
-    "autoSkip": {
-        "message": "Tự động bỏ qua quảng cáo"
-    },
-    "showSkipNotice": {
-        "message": "Hiển thị thông báo sau khi bỏ qua quảng cáo"
-    },
    "keybindCurrentlySet": {
        "message": ". Phím đang được đặt:"
    },
@@ -533,7 +527,7 @@
        "message": "Xem trước/Tóm tắt"
    },
    "category_preview_description": {
-        "message": "Tóm tắt nhanh các tập trước, hoặc xem trước những gì sẽ xảy ra sau video hiện tại. Dùng cho các đoạn clip gắn kèm với nhau, không phải cho tóm tắt bằng lời."
+        "message": "Tóm tắt nhanh về tập trước/tập sau trong 1 chuỗi video (series) dài (hoặc cũng có thể là tóm tắt trước về video sắp chiếu)."
    },
    "category_music_offtopic": {
        "message": "Nhạc: Phần không nhạc"
@@ -550,8 +544,8 @@
    "category_livestream_messages_short": {
        "message": "Đọc tin nhắn"
    },
-    "disable": {
-        "message": "Tắt"
+    "autoSkip": {
+        "message": "Tự động bỏ qua quảng cáo"
    },
    "manualSkip": {
        "message": "Bỏ qua thủ công"
@@ -559,6 +553,12 @@
    "showOverlay": {
        "message": "Hiện ở thanh xem trước"
    },
+    "disable": {
+        "message": "Tắt"
+    },
+    "autoSkipOnMusicVideos": {
+        "message": "Tự động bỏ qua tất cả các phân đoạn nếu trong video có phân đoạn không phải nhạc"
+    },
    "colorFormatIncorrect": {
        "message": "Mã màu sai định dạng. Mã màu phải có 3 hoặc 6 ký tự hệ hex và có dấu thăng ở đầu."
    },
@@ -610,6 +610,13 @@
    "hiddenDueToDuration": {
        "message": "đã bị ẩn: quá ngắn"
    },
+    "channelDataNotFound": {
+        "description": "This error appears in an alert when they try to whitelist a channel and the extension is unable to determine what channel they are looking at.",
+        "message": "Không xác định được ID kênh. Nếu bạn đang xem video này trên 1 trang web thứ 3, hãy mở lại video này trên trang chủ Youtube rồi thử lại. Điều này cũng có thể do những thay đổi trong mã nguồn trang web YouTube, nếu bạn nghĩ vậy, hãy bình luận tại đây:"
+    },
+    "videoInfoFetchFailed": {
+        "message": "SponsorBlock không thể truy vấn dữ liệu lịch sử phân đoạn video. Có thể do trình chặn quảng cáo của bạn. Bạn có thể tìm hiểu nguyên nhân và cách fix ở đây: https://github.com/ajayyy/SponsorBlock/issues/741."
+    },
    "youtubePermissionRequest": {
        "message": "Có vẻ như SponsorBlock không thể truy cập API YouTube. Để khắc phục điều này, hãy chấp nhận lời nhắc cấp quyền sẽ xuất hiện tiếp theo, đợi vài giây rồi tải lại trang."
    },
@@ -622,6 +629,9 @@
    "permissionRequestFailed": {
        "message": "Truy cập bị từ chối, bạn đã nhấp vào từ chối à?"
    },
+    "adblockerIssueWhitelist": {
+        "message": "Nếu bạn không thể giải quyết được vấn đề này, hãy vô hiệu hoá cài đặt 'Bỏ qua video không công khai/riêng tư', vì SponsorBlock không thể lấy được thông tin của video này"
+    },
    "forceChannelCheck": {
        "message": "Bắt buộc kiểm tra kênh trước khi bỏ qua"
    },
@@ -659,7 +669,18 @@
    "help": {
        "message": "Trợ giúp"
    },
+    "experiementOptOut": {
+        "message": "Từ chối tham gia thử nghiệm trong tương lai",
+        "description": "This is used in a popup about a new experiment to get a list of unlisted videos to back up since all unlisted videos uploaded before 2017 will be set to private."
+    },
    "hideForever": {
        "message": "Ẩn vĩnh viễn"
+    },
+    "warningChatInfo": {
+        "message": "Bạn đã nhận được một cảnh báo (Warring) và tạm thời không thể gửi các phân đoạn. Bạn đã mắc lỗi trong việc tạo quá nhiều lần (có thể là chọn sai kiểu phân đoạn hoặc sai thời gian phân đoạn). Chúng tôi muốn bạn nhận ra điều đó để có thể giúp bạn khắc phục điều này trong tương lai, không mắc lỗi nữa. Bạn có thể gặp các VIP User tại đây: discord.gg/SponsorBlock hoặc matrix.to/#/+sponsor:ajay.app. Bọn họ sẽ giúp bạn gỡ cảnh báo sau khi bạn đã hiểu ra lỗi sai của bạn."
+    },
+    "voteRejectedWarning": {
+        "message": "Bỏ phiếu bị từ chối do có cảnh báo. Nhấp để mở cuộc trò chuyện để giải quyết hoặc quay lại sau.",
+        "description": "This is an integrated chat panel that will appearing allowing them to talk to the Discord/Matrix chat without leaving their browser."
    }
 }
--- a/public/_locales/zh_CN/messages.json
+++ b/public/_locales/zh_CN/messages.json
@@ -215,6 +215,9 @@
    "showNotice": {
        "message": "重新显示通知"
    },
+    "showSkipNotice": {
+        "message": "在跳过片段后显示通知"
+    },
    "longDescription": {
        "message": "SponsorBlock 可帮您跳过 YouTube 视频中的赞助商广告、开场、结尾、订阅提醒和其他烦人片段。SponsorBlock 是一个众包的浏览器扩展，可以让任何人提交 YouTube 视频的赞助商广告和其他片段的开始和结束时间。若有一人提交了信息，其他所有使用此扩展的人都能直接跳过赞助商广告片段。您也可以跳过音乐视频中的非音乐部分。",
        "description": "Full description of the extension on the store pages."
@@ -272,9 +275,6 @@
    "skip_category": {
        "message": "跳过{0}？"
    },
-    "skipped": {
-        "message": "跳过"
-    },
    "disableAutoSkip": {
        "message": "禁用自动跳过"
    },
@@ -335,12 +335,6 @@
    "createdBy": {
        "message": "创建者"
    },
-    "autoSkip": {
-        "message": "自动跳过"
-    },
-    "showSkipNotice": {
-        "message": "在跳过片段后显示通知"
-    },
    "keybindCurrentlySet": {
        "message": "。目前被设定为："
    },
@@ -510,8 +504,8 @@
    "category_livestream_messages_short": {
        "message": "阅读消息"
    },
-    "disable": {
-        "message": "禁用"
+    "autoSkip": {
+        "message": "自动跳过"
    },
    "manualSkip": {
        "message": "手动跳过"
@@ -519,6 +513,9 @@
    "showOverlay": {
        "message": "在搜索栏中显示"
    },
+    "disable": {
+        "message": "禁用"
+    },
    "colorFormatIncorrect": {
        "message": "颜色格式错误。应为以“#”开头的 3 位或 6 位十六进制数字。"
    },
@@ -605,5 +602,8 @@
    },
    "categoryUpdate2": {
        "message": "打开选项，跳过开头，结尾，商业等。"
+    },
+    "help": {
+        "message": "帮助"
    }
 }
--- a/public/_locales/zh_TW/messages.json
+++ b/public/_locales/zh_TW/messages.json
@@ -224,6 +224,9 @@
    "showNotice": {
        "message": "再次顯示通知"
    },
+    "showSkipNotice": {
+        "message": "在跳過片段後顯示通知"
+    },
    "longDescription": {
        "message": "SponsorBlock 讓您可以跳過贊助工商，開場動畫，結束動畫，訂閱提醒等煩人的 YouTube 影片片段。SponsorBlock 是個大眾外包的網頁瀏覽器擴充功能，能讓任何人提交贊助片段的始與末。當一個人提交這個片段後，所有使用這個擴充功能的人都可以跳過該片段。您也可以跳過在音樂中的非音樂片段",
        "description": "Full description of the extension on the store pages."
@@ -284,9 +287,6 @@
    "skip_category": {
        "message": "跳過 {0}？"
    },
-    "skipped": {
-        "message": "已跳過"
-    },
    "disableAutoSkip": {
        "message": "停用自動跳過"
    },
@@ -347,12 +347,6 @@
    "createdBy": {
        "message": "創建者"
    },
-    "autoSkip": {
-        "message": "自動跳過"
-    },
-    "showSkipNotice": {
-        "message": "在跳過片段後顯示通知"
-    },
    "keybindCurrentlySet": {
        "message": "。它目前被設定為："
    },
@@ -393,6 +387,9 @@
    "minDurationDescription": {
        "message": "小於設定值的片段不會被跳過或在播放器中顯示"
    },
+    "skipNoticeDuration": {
+        "message": "跳過通知持續顯示時間（秒）："
+    },
    "skipNoticeDurationDescription": {
        "message": "跳過片段提示的顯示時間將會以上列時間長度為準（單位：秒）；手動跳過的時候會顯示較長於上面的時間"
    },
@@ -544,8 +541,8 @@
    "category_livestream_messages_short": {
        "message": "閱讀訊息"
    },
-    "disable": {
-        "message": "停用"
+    "autoSkip": {
+        "message": "自動跳過"
    },
    "manualSkip": {
        "message": "手動跳過"
@@ -553,6 +550,12 @@
    "showOverlay": {
        "message": "在時間條顯示"
    },
+    "disable": {
+        "message": "停用"
+    },
+    "autoSkipOnMusicVideos": {
+        "message": "自動跳過非音樂片段（如果有的話）"
+    },
    "colorFormatIncorrect": {
        "message": "您設定的顏色無效。它應該是三或六位數的 hex 碼，且以井字號開頭。"
    },
@@ -604,6 +607,10 @@
    "hiddenDueToDuration": {
        "message": "隱藏：太短"
    },
+    "channelDataNotFound": {
+        "description": "This error appears in an alert when they try to whitelist a channel and the extension is unable to determine what channel they are looking at.",
+        "message": "未偵測到頻道ID，如果您正在使用嵌入式YouTube播放器，請移至YouTube網站上觀看本影片。此問題亦有可能是由於YouTube改變了系統架構，如果你認為這是造成此問題的原因，請留言告訴我們："
+    },
    "videoInfoFetchFailed": {
        "message": "似乎有東西在阻止 SponsorBlock 取得影片資料。請至 https://github.com/ajayyy/SponsorBlock/issues/741 以了解更多資訊。"
    },
--- a/public/content.css
+++ b/public/content.css
@@ -106,12 +106,10 @@

@keyframes fadeIn {
 	from { opacity: 0; }
-	  to { opacity: 1; }
 }

@keyframes fadeOut {
-	from { opacity: 1; }
-	  to { opacity: 0; }
+	to { opacity: 0; }
 }

 .sponsorBlockSpacer {
@@ -131,17 +129,18 @@
 	right: 10px;
 }

-.sponsorSkipNotice {
-    min-width: 350px;
-	max-width: 50%;
-    background-color: rgba(28, 28, 28, 0.9);
+.sponsorSkipNoticeParent {
    position: absolute;
-	right: 5px;
+
 	bottom: 100px;
 	right: 10px;
+}
+
+.sponsorSkipNoticeParent, .sponsorSkipNotice {
+	min-width: 350px;
+	max-width: 50%;

 	border-radius: 5px;
-
 	border-spacing: 5px 10px;
 	padding-left: 5px;
 	padding-right: 5px;
@@ -149,17 +148,34 @@
 	border-collapse: unset;
 }

+.sponsorSkipNotice {
+	min-width: 350px;
+	background-color: rgba(28, 28, 28, 0.9);
+
+	transition: all 0.1s ease-out;
+}
+
+.sponsorSkipNotice .hidden {
+	display: none;
+}
+
 /* For Cloudtube */
 .sponsorSkipNotice td, .sponsorSkipNotice table, .sponsorSkipNotice th {
 	border: none;
 }

 .sponsorSkipNoticeFadeIn {
-	animation: fadeIn 0.5s;
+	animation: fadeIn 0.5s ease-out;
+}
+
+.sponsorSkipNoticeFaded {
+	opacity: 0.5;
 }

 .sponsorSkipNoticeFadeOut {
-	animation: fadeOut 3s cubic-bezier(0.55, 0.055, 0.675, 0.19);
+	transition: opacity 3s cubic-bezier(0.55, 0.055, 0.675, 0.19);
+	opacity: 0 !important;
+	animation: none !important;
 }

 .sponsorSkipNotice .sponsorSkipNoticeTimeLeft {
@@ -169,14 +185,28 @@
    padding: 2px 5px;
    font-size: 12px;

+	display: flex;
+    align-items: center;
+
 	border: 1px solid #eeeeee;
 }

+.sponsorSkipNoticeTimeLeft img {
+	vertical-align: middle;
+    height: 13px;
+
+	padding-top: 7.8%;
+    padding-bottom: 7.8%;
+}
+
 /* if two are very close to eachother */
 .secondSkipNotice {
 	bottom: 250px;
+}

-  	transition: bottom 0.2s;
+.noticeLeftIcon {
+	display: flex;
+  	align-items: center;
 }

 .sponsorSkipNotice .sponsorSkipNoticeUnskipSection {
@@ -220,7 +250,9 @@

 	float: right;

-	margin-right: 5px;
+	margin-right: 10px;
+	display: flex;
+	align-items: center;
 }

 .sponsorSkipNoticeRightButton {
@@ -243,7 +275,9 @@
 	font-weight: bold;
 	color: rgb(235, 235, 235);
 	
+	margin-top: auto;
 	display: inline-block;
+	margin-right: 10px;
 }

 .sponsorSkipInfo {
@@ -467,4 +501,42 @@ input::-webkit-inner-spin-button {
 .sbChatClose {
 	height: 14px;
 	cursor: pointer;
+}
+
+.skipButtonControlBarContainer {
+	cursor: pointer;
+	display: flex;
+}
+
+.skipButtonControlBarContainer.hidden {
+	display: none !important;
+}
+
+#sbSkipIconControlBarImage {
+	height: 60%;
+    top: 0px;
+    bottom: 0px;
+    display: block;
+    margin: auto;
+}
+
+.sponsorBlockTooltip {
+    position: absolute;
+    background-color: rgba(28, 28, 28, 0.7);
+    border-radius: 5px;
+    padding: 10px;
+    max-width: 300px;
+    white-space: normal;
+    line-height: 1.5em;
+}
+
+.sponsorBlockTooltip::after {
+    content: " ";
+    position: absolute;
+    top: 100%;
+    left: 15%;
+    margin-left: -15px;
+    border-width: 15px;
+    border-style: solid;
+    border-color: rgba(28, 28, 28, 0.7) transparent transparent transparent;
 }
--- a/public/help/images/popup.png
+++ b/public/help/images/popup.png
--- a/public/help/images/voting
+++ b/public/help/images/voting
--- a/public/help/index_en.html
+++ b/public/help/index_en.html
@@ -5,6 +5,9 @@
  <meta charset="utf-8">

  <link href="styles.css" rel="stylesheet"/>
+
+  <script src="../js/vendor.js"></script>
+  <script src="../js/help.js"></script>
 </head>

 <body>
@@ -14,90 +17,92 @@
    SponsorBlock
  </div>

-  <div class="container">
+  <div class="container sponsorBlockPageBody">

-    <p class="createdBy">Created By <a href="https://ajay.app">Ajay Ramachandran</a> <img src="https://ajay.app/newprofilepic.jpg" height="30" class="profilepiccircle"/></p>
-
-    <p>
-        Thanks for installing SponsorBlock. By using this extension, you agree to the <a href="https://gist.github.com/ajayyy/aa9f8ded2b573d4f73a3ffa0ef74f796">Privacy Policy</a> and <a href="https://gist.github.com/ajayyy/9e8100f069348e0bc062641f34d6af12">Terms of Use</a>.
+    <p class="createdBy">
+      <img src="https://ajay.app/newprofilepic.jpg" height="30" class="profilepiccircle"/>
+      Created By <a href="https://ajay.app">Ajay Ramachandran</a> 
+      <a href="https://sponsor.ajay.app/donate" target="_blank" rel="noopener" id="sbDonate">(Donate)</a>
    </p>

-    <p class="projectPreview">
+    <p>
+        __MSG_helpPageThanksForInstalling__ By using this extension, you agree to the <a href="https://gist.github.com/ajayyy/aa9f8ded2b573d4f73a3ffa0ef74f796">Privacy Policy</a> and <a href="https://gist.github.com/ajayyy/9e8100f069348e0bc062641f34d6af12">Terms of Use</a>.
+    </p>
+
+    <p>
 	      Come contribute, make some suggestions and help out on <a href="https://discord.gg/QnmVMpU">Discord</a> or on <a href="https://matrix.to/#/#sponsor:ajay.app?via=ajay.app&via=matrix.org&via=mozilla.org">Matrix</a>.
    </p>

-    <p style="margin-bottom: 0" class="bigText center">Please review the options below</p>
+    <p style="margin-bottom: 0; margin-top: 0" class="bigText center">__MSG_helpPageReviewOptions__</p>

-    <p>
-      Many features are disabled by default. If you want to skip intros, outros, use Invidious, etc., enable them below.
-      You can also hide/show UI elements.
+    <p class="smallText">
+      __MSG_helpPageFeatureDisclaimer__
    </p>

    <iframe src="../options/options.html#embed" width="100%" height="500px" style="border: none"></iframe>

-    <h1>How skipping works</h1>
+    <h1>__MSG_helpPageHowSkippingWorks__</h1>

    <p class="projectPreview">
      <span class="projectPreviewImageLarge">
-          <img src="https://i.imgur.com/caf5Bju.png">
+          <img src="images/popup.png">
      </span>

-      Video segments will automatically be skipped if they are found in the database. You can open the popup by clicking the extension icon to get a preview of what they are.
+      __MSG_helpPageHowSkippingWorks1__
      
      <br/>
      <br/>

-      Whenever you skip a segment, you will get notice. If the timing seems wrong vote down by clicking downvote! You can also vote in the popup.
+      __MSG_helpPageHowSkippingWorks2__
    </p>

-    <div class="center"><img height="120px" src="https://user-images.githubusercontent.com/12688112/63067735-5a638700-bede-11e9-8147-f321b57527ec.gif"></div>
+    <div class="center"><img height="120px" src="images/voting on notice.gif"></div>

-    <h1>Submitting</h1>
+    <h1>__MSG_Submitting__</h1>

    <p class="projectPreview">
        <span class="projectPreviewImageLargeRight">
            <img src="https://i.imgur.com/A1ilk6x.gif">
        </span>
  
-        Submitting can either be done in the popup by hitting the "Segment Starts Now" button or in the video player with the buttons on the player.
+        __MSG_helpPageSubmitting1__
        
        <br/>
        <br/>

-        Clicking the play button indicated the start of a segment and clicking the stop icon indicates the end. You can prepare multiple sponsors before hitting submit. Clicking the upload button will submit. Clicking the garbage can will delete.
+        __MSG_helpPageSubmitting2__
    </p>

-    <h1>Editing</h1>
+    <h1>__MSG_Editing__</h1>

    <p class="projectPreview">
        <span class="projectPreviewImageLarge">
-            <img src="https://i.imgur.com/DZHqbsx.gif">
+            <img src="https://wiki.sponsor.ajay.app/images/6/6a/Popup_only.png">
        </span>
  
-        If you messed up, you can edit or delete your segments in the popup or in the info menu (by hitting the info icon).
+        __MSG_helpPageEditing1__

    </p>

-    <h1>This is too slow</h1>
+    <h1>__MSG_helpPageTooSlow__</h1>

    <p>
-      There are hotkeys if you want to use them. Press the semicolon key to indicate the start/end of a sponsor segment and click the apostrophe to submit.
-      These can be changed in the options. If you don't use QWERTY, you should probably change the keybinding.
+      __MSG_helpPageTooSlow1__
    </p>

-    <h1>Can I get a copy of the Database? What happens if you disappear?</h1>
+    <h1>__MSG_helpPageCopyOfDatabase__</h1>

    <p>
-      The database is public and available at <a href="https://sponsor.ajay.app/database">https://sponsor.ajay.app/database</a> and the source code is freely available. So, even if something happens to me, your submissions are not lost.
+      __MSG_helpPageCopyOfDatabase1__ <a href="https://sponsor.ajay.app/database">https://sponsor.ajay.app/database</a>. __MSG_helpPageCopyOfDatabase2__
    </p>

-    <h1>News and how it is made</h1>
+    <h1>__MSG_helpPageNews__</h1>

    <p>
      See <a href="https://sponsor.ajay.app/news">https://sponsor.ajay.app/news</a>.
    </p>

-    <h1>Where can I get the source code?</h1>
+    <h1>__MSG_helpPageSourceCode__</h1>

    <h4 style="display: inline">Client:</h4>
    <!-- Github logo -->
@@ -107,7 +112,7 @@
    <!-- Github logo -->
    <a href="https://github.com/ajayyy/SponsorBlockServer"><svg aria-hidden="true" version="1.1" viewBox="0 0 16 16" height="58px" style="padding-left: 15px"><path fill-rule="evenodd" d="M8 0C3.58 0 0 3.58 0 8c0 3.54 2.29 6.53 5.47 7.59.4.07.55-.17.55-.38 0-.19-.01-.82-.01-1.49-2.01.37-2.53-.49-2.69-.94-.09-.23-.48-.94-.82-1.13-.28-.15-.68-.52-.01-.53.63-.01 1.08.58 1.23.82.72 1.21 1.87.87 2.33.66.07-.52.28-.87.51-1.07-1.78-.2-3.64-.89-3.64-3.95 0-.87.31-1.59.82-2.15-.08-.2-.36-1.02.08-2.12 0 0 .67-.21 2.2.82.64-.18 1.32-.27 2-.27.68 0 1.36.09 2 .27 1.53-1.04 2.2-.82 2.2-.82.44 1.1.16 1.92.08 2.12.51.56.82 1.27.82 2.15 0 3.07-1.87 3.75-3.65 3.95.29.25.54.73.54 1.48 0 1.07-.01 1.93-.01 2.2 0 .21.15.46.55.38A8.013 8.013 0 0 0 16 8c0-4.42-3.58-8-8-8z"></path></svg></a>

-    <h1>Credits</h1>
+    <h1>__MSG_Credits__</h1>

    <p>
      Thanks to all <a href="https://github.com/ajayyy/SponsorBlock/graphs/contributors">SponsorBlock contributors</a>,
--- a/public/help/styles.css
+++ b/public/help/styles.css
@@ -129,8 +129,11 @@ a {
  text-decoration: none;
 }

+p,li {
+  font-size: 16px;
+}
+
 p,li,a {
-  font-size: 20px;
  color: #c4c4c4;
 }

@@ -180,4 +183,8 @@ h1,h2,h3,h4,h5,h6 {

 svg {
 text-decoration: none; 
+}
+
+#sbDonate {
+  font-size: 10px;
 }
--- a/public/icons/PlayerCancelSegmentIconSponsorBlocker.svg
+++ b/public/icons/PlayerCancelSegmentIconSponsorBlocker.svg
@@ -41,12 +41,13 @@
     id="namedview18"
     showgrid="false"
     inkscape:zoom="0.83098592"
-     inkscape:cx="-238.41697"
-     inkscape:cy="258.22009"
+     inkscape:cx="220.07455"
+     inkscape:cy="308.76246"
     inkscape:window-x="477"
     inkscape:window-y="961"
     inkscape:window-maximized="1"
-     inkscape:current-layer="svg16" />
+     inkscape:current-layer="svg16"
+     inkscape:pagecheckerboard="true" />
  <defs
     id="defs4">
    <style
--- a/public/icons/pause.svg
+++ b/public/icons/pause.svg
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   height="24px"
+   viewBox="0 0 24 24"
+   width="24px"
+   fill="#000000"
+   version="1.1"
+   id="svg6"
+   sodipodi:docname="pause.svg"
+   inkscape:version="0.92.4 (5da689c313, 2019-01-14)">
+  <metadata
+     id="metadata12">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs10" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="730"
+     inkscape:window-height="480"
+     id="namedview8"
+     showgrid="false"
+     inkscape:zoom="9.8333333"
+     inkscape:cx="12"
+     inkscape:cy="12"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg6" />
+  <path
+     d="M0 0h24v24H0z"
+     fill="none"
+     id="path2" />
+  <path
+     d="M6 19h4V5H6v14zm8-14v14h4V5h-4z"
+     id="path4"
+     style="fill:#ffffff" />
+</svg>
--- a/public/icons/skipIcon.svg
+++ b/public/icons/skipIcon.svg
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   viewBox="0 0 565.15 568"
+   version="1.1"
+   id="svg16"
+   sodipodi:docname="skipIcon.svg"
+   inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
+   inkscape:export-filename="D:\Dell Data\_Projects\_____SponsorSkip\ignored\svg\SponsorBlocker4.png"
+   inkscape:export-xdpi="43.436523"
+   inkscape:export-ydpi="43.436523">
+  <metadata
+     id="metadata20">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>LogoSponsorBlocker2</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1001"
+     id="namedview18"
+     showgrid="false"
+     inkscape:zoom="1.6619718"
+     inkscape:cx="316.31071"
+     inkscape:cy="330.01409"
+     inkscape:window-x="477"
+     inkscape:window-y="961"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg16"
+     inkscape:pagecheckerboard="true" />
+  <defs
+     id="defs4">
+    <style
+       id="style2">.cls-1{fill:red;}.cls-2{fill:#fff;}</style>
+  </defs>
+  <title
+     id="title6">LogoSponsorBlocker2</title>
+  <path
+     class="cls-1"
+     d="m 282.58,568 a 65,65 0 0 1 -34.14,-9.66 C 95.41,463.94 2.54,300.46 0,121 a 64.91,64.91 0 0 1 34,-58.09 522.56,522.56 0 0 1 497.16,0 64.91,64.91 0 0 1 34,58.12 c -2.53,179.43 -95.4,342.91 -248.42,437.3 A 65,65 0 0 1 282.58,568 Z m 0,-548.31 A 502.24,502.24 0 0 0 43.4,80.22 45.27,45.27 0 0 0 19.7,120.75 c 2.44,172.67 91.81,330 239.07,420.83 a 46.19,46.19 0 0 0 47.61,0 C 453.64,450.73 543,293.42 545.45,120.75 A 45.26,45.26 0 0 0 521.75,80.21 502.26,502.26 0 0 0 282.58,19.69 Z"
+     id="path8"
+     inkscape:connector-curvature="0"
+     style="fill:#ffffff" />
+  <path
+     style="fill:#ffffff"
+     d="M 284.70508 42.693359 A 479.9 479.9 0 0 0 54.369141 100.41992 A 22.53 22.53 0 0 0 42.669922 120.41992 C 45.069922 290.25992 135.67008 438.63977 270.83008 522.00977 A 22.48 22.48 0 0 0 294.32031 522.00977 C 429.48031 438.63977 520.08047 290.25992 522.48047 120.41992 A 22.53 22.53 0 0 0 510.7793 100.41992 A 479.9 479.9 0 0 0 284.70508 42.693359 z M 188.7168 140.07227 L 312.64844 264.00586 L 188.7168 387.9375 L 159.5918 358.8125 L 254.19336 264.00586 L 159.5918 169.19727 L 188.7168 140.07227 z M 305.625 140.07227 L 429.55859 264.00586 L 305.625 387.9375 L 276.50195 358.8125 L 371.10352 264.00586 L 276.50195 169.19727 L 305.625 140.07227 z "
+     id="path10" />
+  <g
+     id="g825"
+     transform="translate(-3.86549,36.564644)" />
+</svg>
--- a/public/icons/stop.svg
+++ b/public/icons/stop.svg
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   height="24px"
+   viewBox="0 0 24 24"
+   width="24px"
+   fill="#000000"
+   version="1.1"
+   id="svg6"
+   sodipodi:docname="stop.svg"
+   inkscape:version="0.92.4 (5da689c313, 2019-01-14)">
+  <metadata
+     id="metadata12">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs10" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="730"
+     inkscape:window-height="480"
+     id="namedview8"
+     showgrid="false"
+     inkscape:zoom="9.8333333"
+     inkscape:cx="12"
+     inkscape:cy="12"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg6" />
+  <path
+     d="M0 0h24v24H0z"
+     fill="none"
+     id="path2" />
+  <path
+     d="M6 6h12v12H6z"
+     id="path4"
+     style="fill:#ffffff" />
+</svg>
--- a/public/options/options.css
+++ b/public/options/options.css
@@ -343,10 +343,13 @@ svg {

 .categoryTableElement > * {
    padding-right: 15px;
+}
+
+.categoryTableDescription > * {
    padding-bottom: 15px;
 }

-.categoryOptionsSelector {
+.optionsSelector {
    background-color: #c00000;
    color: white;
    
@@ -361,4 +364,8 @@ svg {

    background: none;
    border: none;
+}
+
+#sbDonate {
+    font-size: 10px;
 }
--- a/public/options/options.html
+++ b/public/options/options.html
@@ -19,7 +19,12 @@
 	</div>

 	<div class="center">
-		<p class="createdBy titleBar">__MSG_createdBy__ <a href="https://ajay.app">Ajay Ramachandran</a> <img src="../icons/newprofilepic.jpg" height="30" class="profilepiccircle"/></p>
+		<p class="createdBy titleBar">
+			<img src="../icons/newprofilepic.jpg" height="30" class="profilepiccircle"/>
+			__MSG_createdBy__ 
+			<a href="https://ajay.app">Ajay Ramachandran</a> 
+			<a href="https://sponsor.ajay.app/donate" target="_blank" rel="noopener" id="sbDonate">(__MSG_Donate__)</a>
+		</p>

 		<h1>__MSG_Options__</h1>
 	
@@ -210,9 +215,21 @@
 					</div>
 				</label>
 			</div>
+
+			<br/>
+			<br/>
+			<br/>
+
+			<div option-type="selector" sync-option="noticeVisibilityMode">
+				<select class="selector-element optionsSelector" >
+					<option value="0">__MSG_noticeVisibilityMode0__</option>
+					<option value="1">__MSG_noticeVisibilityMode1__</option>
+					<option value="2">__MSG_noticeVisibilityMode2__</option>
+					<option value="3">__MSG_noticeVisibilityMode3__</option>
+					<option value="4">__MSG_noticeVisibilityMode4__</option>
+				</select>
+			</div>
 	
-			<br/>
-			<br/>
 			<br/>
 			<br/>

@@ -439,6 +456,24 @@

 			<br/>
 			<br/>
+
+			<div option-type="toggle" toggle-type="reverse" sync-option="showDonationLink" no-safari="true">
+				<label class="switch-container">
+					<label class="switch">
+						<input type="checkbox" checked>
+						<span class="slider round"></span>
+					</label>
+					<div class="switch-label">
+						__MSG_hideDonationLink__
+					</div>
+				</label>
+	
+			</div>
+
+			<br/>
+			<br/>
+			<br/>
+			<br/>
 	
 			<div option-type="private-text-change" sync-option="userID" confirm-message="userIDChangeWarning">
 				<div class="option-button trigger-button">
--- a/src/background.ts
+++ b/src/background.ts
@@ -32,10 +32,10 @@ chrome.tabs.onUpdated.addListener(function(tabId) {
 chrome.runtime.onMessage.addListener(function (request, sender, callback) {
 	switch(request.message) {
        case "openConfig":
-            chrome.runtime.openOptionsPage();
+            chrome.tabs.create({url: chrome.runtime.getURL('options/options.html' + (request.hash ? '#' + request.hash : ''))});
            return;
        case "openHelp":
-            chrome.tabs.create({url: chrome.runtime.getURL('help/index_en.html')});
+            chrome.tabs.create({url: chrome.runtime.getURL('help/index.html')});
            return;
        case "openPage":
            chrome.tabs.create({url: chrome.runtime.getURL(request.url)});
@@ -74,12 +74,14 @@ chrome.runtime.onInstalled.addListener(function () {
        // If there is no userID, then it is the first install.
        if (!userID){
            //open up the install page
-            chrome.tabs.create({url: chrome.extension.getURL("/help/index_en.html")});
+            chrome.tabs.create({url: chrome.extension.getURL("/help/index.html")});

            //generate a userID
            const newUserID = utils.generateUserID();
            //save this UUID
            Config.config.userID = newUserID;
+
+            Config.config.highlightCategoryUpdate = false;
        }
    }, 1500);
 });
--- a/src/components/CategoryChooserComponent.tsx
+++ b/src/components/CategoryChooserComponent.tsx
@@ -1,6 +1,7 @@
 import * as React from "react";

 import * as CompileConfig from "../../config.json";
+import { Category } from "../types";
 import CategorySkipOptionsComponent from "./CategorySkipOptionsComponent";

 export interface CategoryChooserProps { 
@@ -61,7 +62,7 @@ class CategoryChooserComponent extends React.Component<CategoryChooserProps, Cat

        for (const category of CompileConfig.categoryList) {
            elements.push(
-                <CategorySkipOptionsComponent category={category}
+                <CategorySkipOptionsComponent category={category as Category}
                    key={category}>
                </CategorySkipOptionsComponent>
            );
--- a/src/components/CategorySkipOptionsComponent.tsx
+++ b/src/components/CategorySkipOptionsComponent.tsx
@@ -1,10 +1,12 @@
 import * as React from "react";

 import Config from "../config"
-import { CategorySkipOption } from "../types";
+import { Category, CategorySkipOption } from "../types";
+
+import { getCategoryActionType } from "../utils/categoryUtils";

 export interface CategorySkipOptionsProps { 
-    category: string;
+    category: Category;
    defaultColor?: string;
    defaultPreviewColor?: string;
 }
@@ -59,7 +61,7 @@ class CategorySkipOptionsComponent extends React.Component<CategorySkipOptionsPr
                    <td id={this.props.category + "SkipOption"}
                        className="skipOption">
                        <select
-                            className="categoryOptionsSelector"
+                            className="optionsSelector"
                            defaultValue={defaultOption}
                            onChange={this.skipOptionSelected.bind(this)}>
                                {this.getCategorySkipOptions()}
@@ -87,7 +89,7 @@ class CategorySkipOptionsComponent extends React.Component<CategorySkipOptionsPr
                </tr>

                <tr id={this.props.category + "DescriptionRow"}
-                    className="small-description">
+                    className="small-description categoryTableDescription">
                        <td
                            colSpan={2}>
                            {chrome.i18n.getMessage("category_" + this.props.category + "_description")}
@@ -152,7 +154,8 @@ class CategorySkipOptionsComponent extends React.Component<CategorySkipOptionsPr
        for (const optionName of optionNames) {
            elements.push(
                <option key={optionName} value={optionName}>
-                    {chrome.i18n.getMessage(optionName)}
+                    {chrome.i18n.getMessage(optionName !== "disable" ? optionName + getCategoryActionType(this.props.category) 
+                                                                     : optionName)}
                </option>
            );
        }
--- a/src/components/NoticeComponent.tsx
+++ b/src/components/NoticeComponent.tsx
@@ -1,20 +1,34 @@
 import * as React from "react";
 import Config from "../config";

+enum CountdownMode {
+    Timer,
+    Paused,
+    Stopped
+}
+
 export interface NoticeProps {
    noticeTitle: string,

    maxCountdownTime?: () => number,
    amountOfPreviousNotices?: number,
+    showInSecondSlot?: boolean,
    timed?: boolean,
    idSuffix?: string,

    videoSpeed?: () => number,

    fadeIn?: boolean,
+    startFaded?: boolean,
+    firstColumn?: React.ReactElement,
+    firstRow?: React.ReactElement,
+    bottomRow?: React.ReactElement[],
+
+    smaller?: boolean,

    // Callback for when this is closed
    closeListener: () => void,
+    onMouseEnter?: (e: React.MouseEvent<HTMLElement, MouseEvent>) => void,

    zIndex?: number,
    style?: React.CSSProperties
@@ -26,8 +40,11 @@ export interface NoticeState {
    maxCountdownTime: () => number,

    countdownTime: number,
-    countdownText: string,
-    countdownManuallyPaused: boolean,
+    countdownMode: CountdownMode,
+
+    mouseHovering: boolean;
+
+    startFaded: boolean;
 }

 class NoticeComponent extends React.Component<NoticeProps, NoticeState> {
@@ -61,8 +78,10 @@ class NoticeComponent extends React.Component<NoticeProps, NoticeState> {

            //the countdown until this notice closes
            countdownTime: maxCountdownTime(),
-            countdownText: null,
-            countdownManuallyPaused: false
+            countdownMode: CountdownMode.Timer,
+            mouseHovering: false,
+
+            startFaded: this.props.startFaded ?? false
        }
    }

@@ -77,80 +96,149 @@ class NoticeComponent extends React.Component<NoticeProps, NoticeState> {
        }

        return (
-            <table id={"sponsorSkipNotice" + this.idSuffix} 
-                className={"sponsorSkipObject sponsorSkipNotice" 
+            <div id={"sponsorSkipNotice" + this.idSuffix} 
+                className={"sponsorSkipObject sponsorSkipNoticeParent"
+                    + (this.props.showInSecondSlot ? " secondSkipNotice" : "")}
+                onMouseEnter={(e) => this.onMouseEnter(e) }
+                onMouseLeave={() => this.timerMouseLeave()}
+                style={noticeStyle} >
+                <table className={"sponsorSkipObject sponsorSkipNotice" 
                        + (this.props.fadeIn ? " sponsorSkipNoticeFadeIn" : "")
-                        + (this.amountOfPreviousNotices > 0 ? " secondSkipNotice" : "")}
-                style={noticeStyle}
-                onMouseEnter={() => this.timerMouseEnter()}
-                onMouseLeave={() => this.timerMouseLeave()}> 
-                <tbody>
+                        + (this.state.startFaded ? " sponsorSkipNoticeFaded" : "") } >
+                    <tbody>

-                    {/* First row */}
-                    <tr id={"sponsorSkipNoticeFirstRow" + this.idSuffix}>
-                        {/* Left column */}
-                        <td>
-                            {/* Logo */}
-                            <img id={"sponsorSkipLogo" + this.idSuffix} 
-                                className="sponsorSkipLogo sponsorSkipObject"
-                                src={chrome.extension.getURL("icons/IconSponsorBlocker256px.png")}>
-                            </img>
+                        {/* First row */}
+                        <tr id={"sponsorSkipNoticeFirstRow" + this.idSuffix}>
+                            {/* Left column */}
+                            <td className="noticeLeftIcon">
+                                {/* Logo */}
+                                <img id={"sponsorSkipLogo" + this.idSuffix} 
+                                    className="sponsorSkipLogo sponsorSkipObject"
+                                    src={chrome.extension.getURL("icons/IconSponsorBlocker256px.png")}>
+                                </img>

-                            <span id={"sponsorSkipMessage" + this.idSuffix}
-                                style={{float: "left"}}
-                                className="sponsorSkipMessage sponsorSkipObject">
-                                
-                                {this.state.noticeTitle}
-                            </span>
-                        </td>
-
-                        {/* Right column */}
-                        <td className="sponsorSkipNoticeRightSection"
-                            style={{top: "11px"}}>
-                            
-                            {/* Time left */}
-                            {this.props.timed ? ( 
-                                <span id={"sponsorSkipNoticeTimeLeft" + this.idSuffix}
-                                    onClick={() => this.toggleManualPause()}
-                                    className="sponsorSkipObject sponsorSkipNoticeTimeLeft">
-
-                                    {this.state.countdownText || (this.state.countdownTime + "s")}
+                                <span id={"sponsorSkipMessage" + this.idSuffix}
+                                    style={{float: "left"}}
+                                    className="sponsorSkipMessage sponsorSkipObject">
+                                    
+                                    {this.state.noticeTitle}
                                </span>
-                            ) : ""}
-                        

-                            {/* Close button */}
-                            <img src={chrome.extension.getURL("icons/close.png")}
-                                className="sponsorSkipObject sponsorSkipNoticeButton sponsorSkipNoticeCloseButton sponsorSkipNoticeRightButton"
-                                onClick={() => this.close()}>
-                            </img>
-                        </td>
-                    </tr> 
+                                {this.props.firstColumn}
+                            </td>

-                    {this.props.children}
+                            {this.props.firstRow}

-                </tbody> 
-            </table>
+                            {/* Right column */}
+                            <td className="sponsorSkipNoticeRightSection"
+                                style={{top: "9.32px"}}>
+                                
+                                {/* Time left */}
+                                {this.props.timed ? ( 
+                                    <span id={"sponsorSkipNoticeTimeLeft" + this.idSuffix}
+                                        onClick={() => this.toggleManualPause()}
+                                        className="sponsorSkipObject sponsorSkipNoticeTimeLeft">
+
+                                        {this.getCountdownElements()}
+
+                                    </span>
+                                ) : ""}
+                            
+
+                                {/* Close button */}
+                                <img src={chrome.extension.getURL("icons/close.png")}
+                                    className="sponsorSkipObject sponsorSkipNoticeButton sponsorSkipNoticeCloseButton sponsorSkipNoticeRightButton"
+                                    onClick={() => this.close()}>
+                                </img>
+                            </td>
+                        </tr> 
+
+                        {this.props.children}
+
+                        {!this.props.smaller && this.props.bottomRow ? 
+                            this.props.bottomRow
+                        : null}
+
+                    </tbody> 
+                </table>
+
+                {/* Add as a hidden table to keep the height constant */}
+                {this.props.smaller && this.props.bottomRow ? 
+                    <table style={{visibility: "hidden", paddingTop: "14px"}}>
+                        <tbody>
+                        {this.props.bottomRow}
+                        </tbody>
+                    </table>
+                : null}
+            </div>
        );
    }

+    getCountdownElements(): React.ReactElement[] {
+        return [(
+                    <span 
+                        id={"skipNoticeTimerText" + this.idSuffix}
+                        key="skipNoticeTimerText"
+                        className={this.state.countdownMode !== CountdownMode.Timer ? "hidden" : ""} >
+                            {this.state.countdownTime + "s"}
+                    </span>
+                ),(
+                    <img 
+                        id={"skipNoticeTimerPaused" + this.idSuffix}
+                        key="skipNoticeTimerPaused"
+                        className={this.state.countdownMode !== CountdownMode.Paused ? "hidden" : ""}
+                        src={chrome.runtime.getURL("icons/pause.svg")}
+                        alt={chrome.i18n.getMessage("paused")} />
+                ),(
+                    <img 
+                        id={"skipNoticeTimerStopped" + this.idSuffix}
+                        key="skipNoticeTimerStopped"
+                        className={this.state.countdownMode !== CountdownMode.Stopped ? "hidden" : ""}
+                        src={chrome.runtime.getURL("icons/stop.svg")}
+                        alt={chrome.i18n.getMessage("manualPaused")} />
+        )];
+    }
+
+    onMouseEnter(event: React.MouseEvent<HTMLElement, MouseEvent>): void {
+        if (this.props.onMouseEnter) this.props.onMouseEnter(event);
+
+        this.fadedMouseEnter();
+        this.timerMouseEnter();
+    }
+
+    fadedMouseEnter(): void {
+        if (this.state.startFaded) {
+            this.setState({
+                startFaded: false
+            });
+        }
+    }
+
    timerMouseEnter(): void {
-        if (this.state.countdownManuallyPaused) return;
+        if (this.state.countdownMode === CountdownMode.Stopped) return;

        this.pauseCountdown();
+
+        this.setState({
+            mouseHovering: true
+        });
    }

    timerMouseLeave(): void {
-        if (this.state.countdownManuallyPaused) return;
+        if (this.state.countdownMode === CountdownMode.Stopped) return;

        this.startCountdown();
+
+        this.setState({
+            mouseHovering: false
+        });
    }

    toggleManualPause(): void {
        this.setState({
-            countdownManuallyPaused: !this.state.countdownManuallyPaused
+            countdownMode: this.state.countdownMode === CountdownMode.Stopped ? CountdownMode.Timer : CountdownMode.Stopped
        }, () => {
-            if (this.state.countdownManuallyPaused) {
+            if (this.state.countdownMode === CountdownMode.Stopped || this.state.mouseHovering) {
                this.pauseCountdown();
            } else {
                this.startCountdown();
@@ -207,7 +295,7 @@ class NoticeComponent extends React.Component<NoticeProps, NoticeState> {
        //reset countdown and inform the user
        this.setState({
            countdownTime: this.state.maxCountdownTime(),
-            countdownText: this.state.countdownManuallyPaused ? chrome.i18n.getMessage("manualPaused") : chrome.i18n.getMessage("paused")
+            countdownMode: this.state.countdownMode === CountdownMode.Timer ? CountdownMode.Paused : this.state.countdownMode
        });
        
        this.removeFadeAnimation();
@@ -221,7 +309,7 @@ class NoticeComponent extends React.Component<NoticeProps, NoticeState> {

        this.setState({
            countdownTime: this.state.maxCountdownTime(),
-            countdownText: null
+            countdownMode: CountdownMode.Timer
        });

        this.setupInterval();
@@ -243,7 +331,7 @@ class NoticeComponent extends React.Component<NoticeProps, NoticeState> {

        this.setState({
            countdownTime: this.state.maxCountdownTime(),
-            countdownText: null
+            countdownMode: CountdownMode.Timer
        });

        this.removeFadeAnimation();
--- a/src/components/SkipNoticeComponent.tsx
+++ b/src/components/SkipNoticeComponent.tsx
@@ -1,10 +1,12 @@
 import * as React from "react";
 import * as CompileConfig from "../../config.json";
 import Config from "../config"
-import { ContentContainer, SponsorHideType, SponsorTime } from "../types";
+import { Category, ContentContainer, CategoryActionType, SponsorHideType, SponsorTime, NoticeVisbilityMode } from "../types";
 import NoticeComponent from "./NoticeComponent";
 import NoticeTextSelectionComponent from "./NoticeTextSectionComponent";

+import { getCategoryActionType, getSkippingText } from "../utils/categoryUtils";
+
 export enum SkipNoticeAction {
    None,
    Upvote,
@@ -20,7 +22,11 @@ export interface SkipNoticeProps {
    // Contains functions and variables from the content script needed by the skip notice
    contentContainer: ContentContainer;

-    closeListener: () => void
+    closeListener: () => void;
+    showKeybindHint?: boolean;
+    smaller: boolean;
+
+    unskipTime?: number;
 }

 export interface SkipNoticeState {
@@ -41,6 +47,10 @@ export interface SkipNoticeState {
    thanksForVotingText?: string; //null until the voting buttons should be hidden

    actionState?: SkipNoticeAction;
+
+    showKeybindHint?: boolean;
+
+    smaller?: boolean;
 }

 class SkipNoticeComponent extends React.Component<SkipNoticeProps, SkipNoticeState> {
@@ -50,6 +60,7 @@ class SkipNoticeComponent extends React.Component<SkipNoticeProps, SkipNoticeSta
    contentContainer: ContentContainer;

    amountOfPreviousNotices: number;
+    showInSecondSlot: boolean;
    audio: HTMLAudioElement;
    
    idSuffix: string;
@@ -70,15 +81,12 @@ class SkipNoticeComponent extends React.Component<SkipNoticeProps, SkipNoticeSta
        this.contentContainer = props.contentContainer;
        this.audio = null;

-        const categoryName = chrome.i18n.getMessage(this.segments.length > 1 ? "multipleSegments" 
-            : "category_" + this.segments[0].category + "_short") || chrome.i18n.getMessage("category_" + this.segments[0].category);
-        let noticeTitle = categoryName + " " + chrome.i18n.getMessage("skipped");
-        if (!this.autoSkip) {
-            noticeTitle = chrome.i18n.getMessage("skip_category").replace("{0}", categoryName);
-        }
+        const noticeTitle = getSkippingText(this.segments, this.props.autoSkip);
    
-        //add notice
-        this.amountOfPreviousNotices = document.getElementsByClassName("sponsorSkipNotice").length;
+        const previousSkipNotices = document.getElementsByClassName("sponsorSkipNoticeParent");
+        this.amountOfPreviousNotices = previousSkipNotices.length;
+        // If there is at least one already in the first slot
+        this.showInSecondSlot = previousSkipNotices.length > 0 && [...previousSkipNotices].some(notice => !notice.classList.contains("secondSkipNotice"));

        // Sort segments
        if (this.segments.length > 1) {
@@ -109,7 +117,11 @@ class SkipNoticeComponent extends React.Component<SkipNoticeProps, SkipNoticeSta
            choosingCategory: false,
            thanksForVotingText: null,

-            actionState: SkipNoticeAction.None
+            actionState: SkipNoticeAction.None,
+
+            showKeybindHint: this.props.showKeybindHint ?? true,
+
+            smaller: this.props.smaller ?? false
        }

        if (!this.autoSkip) {
@@ -132,145 +144,173 @@ class SkipNoticeComponent extends React.Component<SkipNoticeProps, SkipNoticeSta
            noticeStyle.transform = "scale(0.8) translate(10%, 10%)";
        }

+        // If it started out as smaller, always keep the 
+        // skip button there
+        const firstColumn = this.props.smaller ? (
+            this.getSkipButton()
+        ) : null;
+
        return (
            <NoticeComponent noticeTitle={this.state.noticeTitle}
                amountOfPreviousNotices={this.amountOfPreviousNotices}
+                showInSecondSlot={this.showInSecondSlot}
                idSuffix={this.idSuffix}
                fadeIn={true}
+                startFaded={Config.config.noticeVisibilityMode >= NoticeVisbilityMode.FadedForAll 
+                    || (Config.config.noticeVisibilityMode >= NoticeVisbilityMode.FadedForAutoSkip && this.autoSkip)}
                timed={true}
                maxCountdownTime={this.state.maxCountdownTime}
                videoSpeed={() => this.contentContainer().v?.playbackRate}
                style={noticeStyle}
                ref={this.noticeRef}
-                closeListener={() => this.closeListener()}>
+                closeListener={() => this.closeListener()}
+                smaller={this.state.smaller}
+                firstColumn={firstColumn}
+                bottomRow={[...this.getMessageBoxes(), ...this.getBottomRow() ]}
+                onMouseEnter={() => this.onMouseEnter() } >
                    
                {(Config.config.audioNotificationOnSkip) && <audio ref={(source) => { this.audio = source; }}>
                    <source src={chrome.extension.getURL("icons/beep.ogg")} type="audio/ogg"></source>
                </audio>}
+            </NoticeComponent>
+        );
+    }

-                {/* Text Boxes */}
-                {this.getMessageBoxes()}
-              
-                {/* Bottom Row */}
-                <tr id={"sponsorSkipNoticeSecondRow" + this.idSuffix}>
+    getBottomRow(): JSX.Element[] {
+        return [
+            /* Bottom Row */
+            (<tr id={"sponsorSkipNoticeSecondRow" + this.idSuffix}
+                key={0}>

-                    {/* Vote Button Container */}
-                    {!this.state.thanksForVotingText ?
-                        <td id={"sponsorTimesVoteButtonsContainer" + this.idSuffix}
-                            className="sponsorTimesVoteButtonsContainer">
+                {/* Vote Button Container */}
+                {!this.state.thanksForVotingText ?
+                    <td id={"sponsorTimesVoteButtonsContainer" + this.idSuffix}
+                        className="sponsorTimesVoteButtonsContainer">

-                            {/* Upvote Button */}
-                            <img id={"sponsorTimesDownvoteButtonsContainer" + this.idSuffix}
-                                className="sponsorSkipObject voteButton"
-                                style={{marginRight: "10px"}}
-                                src={chrome.extension.getURL("icons/thumbs_up.svg")}
-                                title={chrome.i18n.getMessage("upvoteButtonInfo")}
-                                onClick={() => this.prepAction(SkipNoticeAction.Upvote)}>
-                            
-                            </img>
+                        {/* Upvote Button */}
+                        <img id={"sponsorTimesDownvoteButtonsContainer" + this.idSuffix}
+                            className="sponsorSkipObject voteButton"
+                            style={{marginRight: "10px"}}
+                            src={chrome.extension.getURL("icons/thumbs_up.svg")}
+                            title={chrome.i18n.getMessage("upvoteButtonInfo")}
+                            onClick={() => this.prepAction(SkipNoticeAction.Upvote)}>
+                        
+                        </img>

-                            {/* Report Button */}
-                            <img id={"sponsorTimesDownvoteButtonsContainer" + this.idSuffix}
-                                className="sponsorSkipObject voteButton"
-                                src={chrome.extension.getURL("icons/thumbs_down.svg")}
-                                title={chrome.i18n.getMessage("reportButtonInfo")}
-                                onClick={() => this.adjustDownvotingState(true)}>
-                            
-                            </img>
+                        {/* Report Button */}
+                        <img id={"sponsorTimesDownvoteButtonsContainer" + this.idSuffix}
+                            className="sponsorSkipObject voteButton"
+                            src={chrome.extension.getURL("icons/thumbs_down.svg")}
+                            title={chrome.i18n.getMessage("reportButtonInfo")}
+                            onClick={() => this.adjustDownvotingState(true)}>
+                        
+                        </img>

-                        </td>
+                    </td>

-                        :
+                    :

-                        <td id={"sponsorTimesVoteButtonInfoMessage" + this.idSuffix}
-                                className="sponsorTimesInfoMessage sponsorTimesVoteButtonMessage"
-                                style={{marginRight: "10px"}}>
-                            {this.state.thanksForVotingText}
-                        </td>
-                    }
+                    <td id={"sponsorTimesVoteButtonInfoMessage" + this.idSuffix}
+                            className="sponsorTimesInfoMessage sponsorTimesVoteButtonMessage"
+                            style={{marginRight: "10px"}}>
+                        {this.state.thanksForVotingText}
+                    </td>
+                }

-                    {/* Unskip Button */}
-                    <td className="sponsorSkipNoticeUnskipSection">
-                        <button id={"sponsorSkipUnskipButton" + this.idSuffix}
-                            className="sponsorSkipObject sponsorSkipNoticeButton"
-                            style={{marginLeft: "4px"}}
-                            onClick={() => this.prepAction(SkipNoticeAction.Unskip)}>
+                {/* Unskip/Skip Button */}
+                {!this.props.smaller ? this.getSkipButton() : null}

-                            {this.state.unskipText + " (" + Config.config.skipKeybind + ")"}
+                {/* Never show button if autoSkip is enabled */}
+                {!this.autoSkip ? "" : 
+                    <td className="sponsorSkipNoticeRightSection"
+                        key={1}>
+                        <button className="sponsorSkipObject sponsorSkipNoticeButton sponsorSkipNoticeRightButton"
+                            onClick={this.contentContainer().dontShowNoticeAgain}>
+
+                            {chrome.i18n.getMessage("Hide")}
+                        </button>
+                    </td>
+                }
+            </tr>),
+
+            /* Downvote Options Row */
+            (this.state.downvoting &&
+                <tr id={"sponsorSkipNoticeDownvoteOptionsRow" + this.idSuffix}
+                    key={2}>
+                    <td id={"sponsorTimesDownvoteOptionsContainer" + this.idSuffix}>
+
+                        {/* Normal downvote */}
+                        <button className="sponsorSkipObject sponsorSkipNoticeButton"
+                                onClick={() => this.prepAction(SkipNoticeAction.Downvote)}>
+                            {chrome.i18n.getMessage("downvoteDescription")}
+                        </button>
+
+                        {/* Category vote */}
+                        <button className="sponsorSkipObject sponsorSkipNoticeButton"
+                                onClick={() => this.openCategoryChooser()}>
+
+                            {chrome.i18n.getMessage("incorrectCategory")}
                        </button>
                    </td>

-                    {/* Never show button if autoSkip is enabled */}
-                    {!this.autoSkip ? "" : 
-                        <td className="sponsorSkipNoticeRightSection">
-                            <button className="sponsorSkipObject sponsorSkipNoticeButton sponsorSkipNoticeRightButton"
-                                onClick={this.contentContainer().dontShowNoticeAgain}>
-
-                                {chrome.i18n.getMessage("Hide")}
-                            </button>
-                        </td>
-                    }
                </tr>
+            ),

-                {/* Downvote Options Row */}
-                {this.state.downvoting &&
-                    <tr id={"sponsorSkipNoticeDownvoteOptionsRow" + this.idSuffix}>
-                        <td id={"sponsorTimesDownvoteOptionsContainer" + this.idSuffix}>
+            /* Category Chooser Row */
+            (this.state.choosingCategory &&
+                <tr id={"sponsorSkipNoticeCategoryChooserRow" + this.idSuffix}
+                    key={3}>
+                    <td>
+                        {/* Category Selector */}
+                        <select id={"sponsorTimeCategories" + this.idSuffix}
+                                className="sponsorTimeCategories"
+                                defaultValue={this.segments[0].category} //Just default to the first segment, as we don't know which they'll choose
+                                ref={this.categoryOptionRef}>

-                            {/* Normal downvote */}
+                            {this.getCategoryOptions()}
+                        </select>
+
+                        {/* Submit Button */}
+                        {this.segments.length === 1 &&
                            <button className="sponsorSkipObject sponsorSkipNoticeButton"
-                                    onClick={() => this.prepAction(SkipNoticeAction.Downvote)}>
-                                {chrome.i18n.getMessage("downvoteDescription")}
+                                    onClick={() => this.prepAction(SkipNoticeAction.CategoryVote)}>
+
+                                {chrome.i18n.getMessage("submit")}
                            </button>
+                        }
+                        
+                    </td>
+                </tr>
+            ),

-                            {/* Category vote */}
-                            <button className="sponsorSkipObject sponsorSkipNoticeButton"
-                                    onClick={() => this.openCategoryChooser()}>
+            /* Segment Chooser Row */
+            (this.state.actionState !== SkipNoticeAction.None &&
+                <tr id={"sponsorSkipNoticeSubmissionOptionsRow" + this.idSuffix}
+                    key={4}>
+                    <td id={"sponsorTimesSubmissionOptionsContainer" + this.idSuffix}>
+                        {this.getSubmissionChooser()}
+                    </td>
+                </tr>
+            )
+        ];
+    }

-                                {chrome.i18n.getMessage("incorrectCategory")}
-                            </button>
-                        </td>
+    getSkipButton(): JSX.Element {
+        if (this.segments.length > 1 
+                || getCategoryActionType(this.segments[0].category) !== CategoryActionType.POI
+                || this.props.unskipTime) {
+            return (
+                <span className="sponsorSkipNoticeUnskipSection">
+                    <button id={"sponsorSkipUnskipButton" + this.idSuffix}
+                        className="sponsorSkipObject sponsorSkipNoticeButton"
+                        style={{marginLeft: "4px"}}
+                        onClick={() => this.prepAction(SkipNoticeAction.Unskip)}>

-                    </tr>
-                }
-
-                {/* Category Chooser Row */}
-                {this.state.choosingCategory &&
-                    <tr id={"sponsorSkipNoticeCategoryChooserRow" + this.idSuffix}>
-                        <td>
-                            {/* Category Selector */}
-                            <select id={"sponsorTimeCategories" + this.idSuffix}
-                                    className="sponsorTimeCategories"
-                                    defaultValue={this.segments[0].category} //Just default to the first segment, as we don't know which they'll choose
-                                    ref={this.categoryOptionRef}>
-
-                                {this.getCategoryOptions()}
-                            </select>
-
-                            {/* Submit Button */}
-                            {this.segments.length === 1 &&
-                                <button className="sponsorSkipObject sponsorSkipNoticeButton"
-                                        onClick={() => this.prepAction(SkipNoticeAction.CategoryVote)}>
-
-                                    {chrome.i18n.getMessage("submit")}
-                                </button>
-                            }
-                            
-                        </td>
-                    </tr>
-                }
-
-                {/* Segment Chooser Row */}
-                {this.state.actionState !== SkipNoticeAction.None &&
-                    <tr id={"sponsorSkipNoticeSubmissionOptionsRow" + this.idSuffix}>
-                        <td id={"sponsorTimesSubmissionOptionsContainer" + this.idSuffix}>
-                            {this.getSubmissionChooser()}
-                        </td>
-                    </tr>
-                }
-
-            </NoticeComponent>
-        );
+                        {this.state.unskipText + (this.state.showKeybindHint ? " (" + Config.config.skipKeybind + ")" : "")}
+                    </button>
+                </span>
+            );
+        }
    }

    getSubmissionChooser(): JSX.Element[] {
@@ -289,6 +329,14 @@ class SkipNoticeComponent extends React.Component<SkipNoticeProps, SkipNoticeSta
        return elements;
    }

+    onMouseEnter(): void {
+        if (this.state.smaller) {
+            this.setState({
+                smaller: false
+            });
+        }
+    }
+
    prepAction(action: SkipNoticeAction): void {
        if (this.segments.length === 1) {
            this.performAction(0, action);
@@ -299,14 +347,15 @@ class SkipNoticeComponent extends React.Component<SkipNoticeProps, SkipNoticeSta
        }
    }

-    getMessageBoxes(): JSX.Element[] | JSX.Element {
+    getMessageBoxes(): JSX.Element[] {
        if (this.state.messages.length === 0) {
            // Add a spacer if there is no text
-            return (
+            return [
                <tr id={"sponsorSkipNoticeSpacer" + this.idSuffix}
-                    className="sponsorBlockSpacer">
+                    className="sponsorBlockSpacer"
+                    key={"messageBoxSpacer"}>
                </tr>
-            );
+            ];
        }

        const elements: JSX.Element[] = [];
@@ -344,7 +393,7 @@ class SkipNoticeComponent extends React.Component<SkipNoticeProps, SkipNoticeSta
                this.contentContainer().vote(0, this.segments[index].UUID, undefined, this);
                break;
            case SkipNoticeAction.CategoryVote:
-                this.contentContainer().vote(undefined, this.segments[index].UUID, this.categoryOptionRef.current.value, this)
+                this.contentContainer().vote(undefined, this.segments[index].UUID, this.categoryOptionRef.current.value as Category, this)
                break;
            case SkipNoticeAction.Unskip:
                this.state.unskipCallback(index);
@@ -391,7 +440,8 @@ class SkipNoticeComponent extends React.Component<SkipNoticeProps, SkipNoticeSta
    getCategoryOptions(): React.ReactElement[] {
        const elements = [];

-        for (const category of CompileConfig.categoryList) {
+        const categories = CompileConfig.categoryList.filter((cat => getCategoryActionType(cat as Category) === CategoryActionType.Skippable));
+        for (const category of categories) {
            elements.push(
                <option value={category}
                        key={category}>
@@ -404,7 +454,7 @@ class SkipNoticeComponent extends React.Component<SkipNoticeProps, SkipNoticeSta
    }

    unskip(index: number): void {
-        this.contentContainer().unskipSponsorTime(this.segments[index]);
+        this.contentContainer().unskipSponsorTime(this.segments[index], this.props.unskipTime);

        this.unskippedMode(index, chrome.i18n.getMessage("reskip"));
    }
@@ -418,12 +468,14 @@ class SkipNoticeComponent extends React.Component<SkipNoticeProps, SkipNoticeSta
    }

    getUnskippedModeInfo(index: number, buttonText: string): SkipNoticeState {
-        const maxCountdownTime = () => {
+        const changeCountdown = getCategoryActionType(this.segments[index].category) === CategoryActionType.Skippable;
+
+        const maxCountdownTime = changeCountdown ? () => {
            const sponsorTime = this.segments[index];
            const duration = Math.round((sponsorTime.segment[1] - this.contentContainer().v.currentTime) * (1 / this.contentContainer().v.playbackRate));

            return Math.max(duration, Config.config.skipNoticeDuration);
-        };
+        } : this.state.maxCountdownTime;

        return {
            unskipText: buttonText,
@@ -456,7 +508,7 @@ class SkipNoticeComponent extends React.Component<SkipNoticeProps, SkipNoticeSta
        });
    }

-    afterVote(segment: SponsorTime, type: number, category: string): void {
+    afterVote(segment: SponsorTime, type: number, category: Category): void {
        this.addVoteButtonInfo(chrome.i18n.getMessage("voted"));

        if (type === 0) {
--- a/src/components/SponsorTimeEditComponent.tsx
+++ b/src/components/SponsorTimeEditComponent.tsx
@@ -4,8 +4,9 @@ import Config from "../config";
 import * as CompileConfig from "../../config.json";

 import Utils from "../utils";
-import { ContentContainer, SponsorTime } from "../types";
+import { Category, CategoryActionType, ContentContainer, SponsorTime } from "../types";
 import SubmissionNoticeComponent from "./SubmissionNoticeComponent";
+import { getCategoryActionType } from "../utils/categoryUtils";
 const utils = new Utils();

 export interface SponsorTimeEditProps {
@@ -16,6 +17,7 @@ export interface SponsorTimeEditProps {
    contentContainer: ContentContainer,

    submissionNotice: SubmissionNoticeComponent;
+    categoryList?: Category[];
 }

 export interface SponsorTimeEditState {
@@ -106,43 +108,47 @@ class SponsorTimeEditComponent extends React.Component<SponsorTimeEditProps, Spo
                            onChange={(e) => {
                                const sponsorTimeEdits = this.state.sponsorTimeEdits;
                                sponsorTimeEdits[0] = e.target.value;
+                                if (getCategoryActionType(sponsorTime.category) === CategoryActionType.POI) sponsorTimeEdits[1] = e.target.value;

                                this.setState({sponsorTimeEdits});
-
                                this.saveEditTimes();
                            }}>
                        </input>

-                        <span>
-                            {" " + chrome.i18n.getMessage("to") + " "}
-                        </span>
+                        {getCategoryActionType(sponsorTime.category) === CategoryActionType.Skippable ? (
+                            <span>
+                                <span>
+                                    {" " + chrome.i18n.getMessage("to") + " "}
+                                </span>

-                        <input id={"submittingTime1" + this.idSuffix}
-                            className="sponsorTimeEdit sponsorTimeEditInput"
-                            ref={oldYouTubeDarkStyles}
-                            type="text"
-                            value={this.state.sponsorTimeEdits[1]}
-                            onChange={(e) => {
-                                const sponsorTimeEdits = this.state.sponsorTimeEdits;
-                                sponsorTimeEdits[1] = e.target.value;
+                                <input id={"submittingTime1" + this.idSuffix}
+                                    className="sponsorTimeEdit sponsorTimeEditInput"
+                                    ref={oldYouTubeDarkStyles}
+                                    type="text"
+                                    value={this.state.sponsorTimeEdits[1]}
+                                    onChange={(e) => {
+                                        const sponsorTimeEdits = this.state.sponsorTimeEdits;
+                                        sponsorTimeEdits[1] = e.target.value;

-                                this.setState({sponsorTimeEdits});
+                                        this.setState({sponsorTimeEdits});

-                                this.saveEditTimes();
-                            }}>
-                        </input>
+                                        this.saveEditTimes();
+                                    }}>
+                                </input>

-                        <span id={"nowButton1" + this.idSuffix}
-                            className="sponsorNowButton"
-                            onClick={() => this.setTimeToNow(1)}>
-                                {chrome.i18n.getMessage("bracketNow")}
-                        </span>
+                                <span id={"nowButton1" + this.idSuffix}
+                                    className="sponsorNowButton"
+                                    onClick={() => this.setTimeToNow(1)}>
+                                        {chrome.i18n.getMessage("bracketNow")}
+                                </span>

-                        <span id={"endButton" + this.idSuffix}
-                            className="sponsorNowButton"
-                            onClick={() => this.setTimeToEnd()}>
-                                {chrome.i18n.getMessage("bracketEnd")}
-                        </span>
+                                <span id={"endButton" + this.idSuffix}
+                                    className="sponsorNowButton"
+                                    onClick={() => this.setTimeToEnd()}>
+                                        {chrome.i18n.getMessage("bracketEnd")}
+                                </span>
+                            </span>
+                        ): ""}
                </div>
            );
        } else {
@@ -151,7 +157,8 @@ class SponsorTimeEditComponent extends React.Component<SponsorTimeEditProps, Spo
                    className="sponsorTimeDisplay"
                    onClick={this.toggleEditTime.bind(this)}>
                        {utils.getFormattedTime(segment[0], true) +
-                            ((!isNaN(segment[1])) ? " " + chrome.i18n.getMessage("to") + " " + utils.getFormattedTime(segment[1], true) : "")}
+                            ((!isNaN(segment[1]) && getCategoryActionType(sponsorTime.category) === CategoryActionType.Skippable)
+                                     ? " " + chrome.i18n.getMessage("to") + " " + utils.getFormattedTime(segment[1], true) : "")}
                </div>
            );
        }
@@ -171,13 +178,14 @@ class SponsorTimeEditComponent extends React.Component<SponsorTimeEditProps, Spo
                        {this.getCategoryOptions()}
                    </select>

-                    <img id={"sponsorTimeCategoriesHelpButton" + this.idSuffix}
-                        className="helpButton"
-                        src={chrome.extension.getURL("icons/help.svg")}
-                        title={chrome.i18n.getMessage("categoryGuidelines")}
-                        onClick={() => chrome.runtime.sendMessage({"message": "openConfig"})}>
-                    
-                    </img>
+                    {/* open in new tab */}
+                    <a href="https://wiki.sponsor.ajay.app/index.php/Segment_Categories"
+                        target="_blank" rel="noreferrer">
+                        <img id={"sponsorTimeCategoriesHelpButton" + this.idSuffix}
+                            className="helpButton"
+                            src={chrome.extension.getURL("icons/help.svg")}
+                            title={chrome.i18n.getMessage("categoryGuidelines")} />
+                    </a>
                </div>

                <br/>
@@ -190,7 +198,7 @@ class SponsorTimeEditComponent extends React.Component<SponsorTimeEditProps, Spo
                    {chrome.i18n.getMessage("delete")}
                </span>

-                {(!isNaN(segment[1])) ? (
+                {(!isNaN(segment[1]) && getCategoryActionType(sponsorTime.category) === CategoryActionType.Skippable) ? (
                    <span id={"sponsorTimePreviewButton" + this.idSuffix}
                        className="sponsorTimeEditButton"
                        onClick={this.previewTime.bind(this)}>
@@ -225,7 +233,7 @@ class SponsorTimeEditComponent extends React.Component<SponsorTimeEditProps, Spo
            </option>
        )];

-        for (const category of CompileConfig.categoryList) {
+        for (const category of (this.props.categoryList ?? CompileConfig.categoryList)) {
            elements.push(
                <option value={category}
                        key={category}>
@@ -239,7 +247,7 @@ class SponsorTimeEditComponent extends React.Component<SponsorTimeEditProps, Spo

    categorySelectionChange(event: React.ChangeEvent<HTMLSelectElement>): void {
        // See if show more categories was pressed
-        if (!Config.config.categorySelections.some((category) => category.name === event.target.value)) {
+        if (event.target.value !== DEFAULT_CATEGORY && !Config.config.categorySelections.some((category) => category.name === event.target.value)) {
            const chosenCategory = event.target.value;
            event.target.value = DEFAULT_CATEGORY;
            
@@ -247,11 +255,16 @@ class SponsorTimeEditComponent extends React.Component<SponsorTimeEditProps, Spo
            if (confirm(chrome.i18n.getMessage("enableThisCategoryFirst")
                            .replace("{0}", chrome.i18n.getMessage("category_" + chosenCategory)))) {
                // Open options page
-                chrome.runtime.sendMessage({"message": "openConfig"});
+                chrome.runtime.sendMessage({message: "openConfig", hash: chosenCategory + "OptionsName"});
            }
            
            return;
        }
+
+        if (getCategoryActionType(event.target.value as Category) === CategoryActionType.POI) {
+            this.setTimeTo(1, null);
+            this.props.contentContainer().updateEditButtonsOnPlayer();
+        }
        
        this.saveEditTimes();
    }
@@ -264,11 +277,16 @@ class SponsorTimeEditComponent extends React.Component<SponsorTimeEditProps, Spo
        this.setTimeTo(1, this.props.contentContainer().v.duration);
    }

+    /**
+     * @param index 
+     * @param time If null, will set time to the first index's time
+     */
    setTimeTo(index: number, time: number): void {
        const sponsorTime = this.props.contentContainer().sponsorTimesSubmitting[this.props.index];
+        if (time === null) time = sponsorTime.segment[0];

-        sponsorTime.segment[index] = 
-            time;
+        sponsorTime.segment[index] = time;
+        if (getCategoryActionType(sponsorTime.category) === CategoryActionType.POI) sponsorTime.segment[1] = time;

        this.setState({
            sponsorTimeEdits: this.getFormattedSponsorTimesEdits(sponsorTime)
@@ -312,7 +330,7 @@ class SponsorTimeEditComponent extends React.Component<SponsorTimeEditProps, Spo
            }
        }

-        sponsorTimesSubmitting[this.props.index].category = this.categoryOptionRef.current.value;
+        sponsorTimesSubmitting[this.props.index].category = this.categoryOptionRef.current.value as Category;

        Config.config.segmentTimes.set(this.props.contentContainer().sponsorVideoID, sponsorTimesSubmitting);

@@ -369,4 +387,4 @@ class SponsorTimeEditComponent extends React.Component<SponsorTimeEditProps, Spo
    }
 }

-export default SponsorTimeEditComponent;
+export default SponsorTimeEditComponent;
--- a/src/components/SubmissionNoticeComponent.tsx
+++ b/src/components/SubmissionNoticeComponent.tsx
@@ -12,7 +12,7 @@ export interface SubmissionNoticeProps {

    callback: () => unknown;

-    closeListener: () => void
+    closeListener: () => void;
 }

 export interface SubmissionNoticeeState {
@@ -95,7 +95,7 @@ class SubmissionNoticeComponent extends React.Component<SubmissionNoticeProps, S

                        {/* Guidelines button */}
                        <button className="sponsorSkipObject sponsorSkipNoticeButton sponsorSkipNoticeRightButton"
-                            onClick={() => window.open("https://github.com/ajayyy/SponsorBlock/wiki/Guidelines")}>
+                            onClick={() => window.open("https://wiki.sponsor.ajay.app/index.php/Guidelines")}>

                            {chrome.i18n.getMessage(Config.config.submissionCountSinceCategories > 3 ? "guidelines" : "readTheGuidelines")}
                        </button>
--- a/src/config.ts
+++ b/src/config.ts
@@ -1,14 +1,11 @@
 import * as CompileConfig from "../config.json";
-import { CategorySelection, CategorySkipOption, PreviewBarOption, SponsorTime, StorageChangesObject, UnEncodedSegmentTimes as UnencodedSegmentTimes } from "./types";
-
-import Utils from "./utils";
-const utils = new Utils();
+import { Category, CategorySelection, CategorySkipOption, NoticeVisbilityMode, PreviewBarOption, SponsorTime, StorageChangesObject, UnEncodedSegmentTimes as UnencodedSegmentTimes } from "./types";

 interface SBConfig {
    userID: string,
    /** Contains unsubmitted segments that the user has created. */
    segmentTimes: SBMap<string, SponsorTime[]>,
-    defaultCategory: string,
+    defaultCategory: Category,
    whitelistedChannels: string[],
    forceChannelCheck: boolean,
    skipKeybind: string,
@@ -23,6 +20,7 @@ interface SBConfig {
    trackViewCount: boolean,
    trackViewCountInPrivate: boolean,
    dontShowNotice: boolean,
+    noticeVisibilityMode: NoticeVisbilityMode,
    hideVideoPlayerControls: boolean,
    hideInfoButtonPlayerControls: boolean,
    hideDeleteButtonPlayerControls: boolean,
@@ -40,8 +38,10 @@ interface SBConfig {
    refetchWhenNotFound: boolean,
    ytInfoPermissionGranted: boolean,
    allowExpirements: boolean,
+    showDonationLink: boolean,
    autoHideInfoButton: boolean,
    autoSkipOnMusicVideos: boolean,
+    highlightCategoryUpdate: boolean

    // What categories should be skipped
    categorySelections: CategorySelection[],
@@ -63,6 +63,8 @@ interface SBConfig {
        "preview-preview": PreviewBarOption,
        "music_offtopic": PreviewBarOption,
        "preview-music_offtopic": PreviewBarOption,
+        "poi_highlight": PreviewBarOption,
+        "preview-poi_highlight": PreviewBarOption,
    }
 }

@@ -148,7 +150,7 @@ const Config: SBObject = {
    defaults: {
        userID: null,
        segmentTimes: new SBMap("segmentTimes"),
-        defaultCategory: "chooseACategory",
+        defaultCategory: "chooseACategory" as Category,
        whitelistedChannels: [],
        forceChannelCheck: false,
        skipKeybind: "Enter",
@@ -163,6 +165,7 @@ const Config: SBObject = {
        trackViewCount: true,
        trackViewCountInPrivate: true,
        dontShowNotice: false,
+        noticeVisibilityMode: NoticeVisbilityMode.FadedForAutoSkip,
        hideVideoPlayerControls: false,
        hideInfoButtonPlayerControls: false,
        hideDeleteButtonPlayerControls: false,
@@ -180,11 +183,13 @@ const Config: SBObject = {
        refetchWhenNotFound: true,
        ytInfoPermissionGranted: false,
        allowExpirements: true,
+        showDonationLink: true,
        autoHideInfoButton: true,
        autoSkipOnMusicVideos: false,
+        highlightCategoryUpdate: false, // TODO: Remove this once update is done

        categorySelections: [{
-            name: "sponsor",
+            name: "sponsor" as Category,
            option: CategorySkipOption.AutoSkip
        }],

@@ -249,6 +254,14 @@ const Config: SBObject = {
            "preview-music_offtopic": {
                color: "#a6634a",
                opacity: "0.7"
+            },
+            "poi_highlight": {
+                color: "#ff1684",
+                opacity: "0.7"
+            },
+            "preview-poi_highlight": {
+                color: "#9b044c",
+                opacity: "0.7"
            }
        }
    },
@@ -345,6 +358,17 @@ function fetchConfig(): Promise<void> {
 }

 function migrateOldFormats(config: SBConfig) {
+    if (!config["highlightCategoryAdded"] && !config.categorySelections.some((s) => s.name === "poi_highlight")) {
+        config["highlightCategoryAdded"] = true;
+        
+        config.categorySelections.push({
+            name: "poi_highlight" as Category,
+            option: CategorySkipOption.ManualSkip
+        });
+
+        config.categorySelections = config.categorySelections;
+    }
+
    if (config["askAboutUnlistedVideos"]) {
        chrome.storage.sync.remove("askAboutUnlistedVideos");
    }
@@ -361,25 +385,6 @@ function migrateOldFormats(config: SBConfig) {
        }
    }

-    // Adding preview category
-    if (!config["previewCategoryUpdate"]) {
-        config["previewCategoryUpdate"] = true;
-        for (const selection of config.categorySelections) {
-            if (selection.name === "intro" 
-                    && selection.option === CategorySkipOption.AutoSkip ||  selection.option === CategorySkipOption.ManualSkip) {
-                
-                // Add a default skip option for preview category
-                config.categorySelections.push({
-                    name: "preview",
-                    option: CategorySkipOption.ManualSkip
-                });
-                // Ensure it gets updated
-                config.categorySelections = config.categorySelections;
-                break;
-            }
-        }
-    }
-
    if (config["disableAutoSkip"]) {
        for (const selection of config.categorySelections) {
            if (selection.name === "sponsor") {
@@ -390,100 +395,6 @@ function migrateOldFormats(config: SBConfig) {
        }
    }

-    // Auto vote removal
-    if (config["autoUpvote"]) {
-        chrome.storage.sync.remove("autoUpvote");
-    }
-    // mobileUpdateShowCount removal
-    if (config["mobileUpdateShowCount"] !== undefined) {
-        chrome.storage.sync.remove("mobileUpdateShowCount");
-    }
-    // categoryUpdateShowCount removal
-    if (config["categoryUpdateShowCount"] !== undefined) {
-        chrome.storage.sync.remove("categoryUpdateShowCount");
-    }
-
-    // Channel URLS
-    if (config.whitelistedChannels.length > 0 && 
-            (config.whitelistedChannels[0] == null || config.whitelistedChannels[0].includes("/"))) {
-        const channelURLFixer = async() => {
-            const newChannelList: string[] = [];
-            for (const item of config.whitelistedChannels) {
-                if (item != null) {
-                    if (item.includes("/channel/")) {
-                        newChannelList.push(item.split("/")[2]);
-                    } else if (item.includes("/user/") &&  utils.isContentScript()) {
-
-                        
-                        // Replace channel URL with channelID
-                        const response = await utils.asyncRequestToCustomServer("GET", "https://sponsor.ajay.app/invidious/api/v1/channels/" + item.split("/")[2] + "?fields=authorId");
-                    
-                        if (response.ok) {
-                            newChannelList.push((JSON.parse(response.responseText)).authorId);
-                        } else {
-                            // Add it at the beginning so it gets converted later
-                            newChannelList.unshift(item);
-                        }
-                    } else if (item.includes("/user/")) {
-                        // Add it at the beginning so it gets converted later (The API can only be called in the content script due to CORS issues)
-                        newChannelList.unshift(item);
-                    } else {
-                        newChannelList.push(item);
-                    }
-                }
-            }
-
-            config.whitelistedChannels = newChannelList;
-        }
-
-        channelURLFixer();
-    }
-
-    // Check if off-topic category needs to be removed
-    for (let i = 0; i < config.categorySelections.length; i++) {
-        if (config.categorySelections[i].name === "offtopic") {
-            config.categorySelections.splice(i, 1);
-            // Call set listener
-            config.categorySelections = config.categorySelections;
-            break;
-        }
-    }
-
-    // Migrate old "sponsorTimes"
-    if (config["sponsorTimes"]) {
-        let jsonData: unknown = config["sponsorTimes"];
-
-        // Check if data is stored in the old format for SBMap (a JSON string)
-        if (typeof jsonData === "string") {
-            try {	
-                jsonData = JSON.parse(jsonData);	   
-            } catch(e) {
-                // Continue normally (out of this if statement)
-            }
-        }
-
-        // Otherwise junk data
-        if (Array.isArray(jsonData)) {
-            const oldMap = new Map(jsonData);
-            oldMap.forEach((sponsorTimes: [number, number][], key) => {
-                const segmentTimes: SponsorTime[] = [];
-                for (const segment of sponsorTimes) {
-                    segmentTimes.push({
-                        segment: segment,
-                        category: "sponsor",
-                        UUID: null
-                    });
-                }
-
-                config.segmentTimes.rawSet(key, segmentTimes);
-            });
-
-            config.segmentTimes.update();
-        }
-
-        chrome.storage.sync.remove("sponsorTimes");
-    }
-
    // Remove some old unused options
    if (config["sponsorVideoID"] !== undefined) {
        chrome.storage.sync.remove("sponsorVideoID");
--- a/src/content.ts
+++ b/src/content.ts
@@ -1,6 +1,5 @@
 import Config from "./config";
-
-import { SponsorTime, CategorySkipOption, VideoID, SponsorHideType, VideoInfo, StorageChangesObject, ChannelIDInfo, ChannelIDStatus, SponsorSourceType } from "./types";
+import { SponsorTime, CategorySkipOption, VideoID, SponsorHideType, VideoInfo, StorageChangesObject, CategoryActionType, ChannelIDInfo, ChannelIDStatus, SponsorSourceType, SegmentUUID, Category, SkipToTimeParams, ToggleSkippable } from "./types";

 import { ContentContainer } from "./types";
 import Utils from "./utils";
@@ -14,6 +13,9 @@ import SkipNoticeComponent from "./components/SkipNoticeComponent";
 import SubmissionNotice from "./render/SubmissionNotice";
 import { Message, MessageResponse } from "./messageTypes";
 import * as Chat from "./js-components/chat";
+import { getCategoryActionType } from "./utils/categoryUtils";
+import { SkipButtonControlBar } from "./js-components/skipButtonControlBar";
+import { Tooltip } from "./render/Tooltip";

 // Hack to get the CSS loaded on permission-based sites (Invidious)
 utils.wait(() => Config.config !== null, 5000, 10).then(addCSS);
@@ -26,6 +28,7 @@ let sponsorTimes: SponsorTime[] = null;
 let sponsorVideoID: VideoID = null;
 // List of open skip notices
 const skipNotices: SkipNotice[] = [];
+let activeSkipKeybindElement: ToggleSkippable = null;

 // JSON video info 
 let videoInfo: VideoInfo = null;
@@ -69,6 +72,7 @@ let channelWhitelisted = false;

 // create preview bar
 let previewBar: PreviewBar = null;
+let skipButtonControlBar: SkipButtonControlBar = null;

 /** Element containing the player controls on the YouTube player. */
 let controls: HTMLElement | null = null;
@@ -449,7 +453,12 @@ function startSponsorSchedule(includeIntersectingSegments = false, currentTime?:
        if (incorrectVideoCheck(videoID, currentSkip)) return;

        if (video.currentTime >= skipTime[0] && video.currentTime < skipTime[1]) {
-            skipToTime(video, skipTime, skippingSegments, skipInfo.openNotice);
+            skipToTime({
+                v: video, 
+                skipTime, 
+                skippingSegments, 
+                openNotice: skipInfo.openNotice
+            });

            if (utils.getCategorySelection(currentSkip.category)?.option === CategorySkipOption.ManualSkip) {
                forcedSkipTime = skipTime[0] + 0.001;
@@ -511,6 +520,7 @@ function refreshVideoAttachments() {
            videosWithEventListeners.push(video);

            setupVideoListeners();
+            setupSkipButtonControlBar();
        }
    }
 }
@@ -562,6 +572,22 @@ function setupVideoListeners() {
    
                startSponsorSchedule();
            }
+
+            if (!Config.config.dontShowNotice) {
+                const currentPoiSegment = sponsorTimes.find((segment) => 
+                        getCategoryActionType(segment.category) === CategoryActionType.POI &&
+                        video.currentTime - segment.segment[0] > 0 &&
+                        video.currentTime - segment.segment[0] < video.duration * 0.006); // Approximate size on preview bar
+                if (currentPoiSegment && !skipNotices.some((notice) => notice.segments.some((s) => s.UUID === currentPoiSegment.UUID))) {
+                    skipToTime({
+                        v: video, 
+                        skipTime: currentPoiSegment.segment, 
+                        skippingSegments: [currentPoiSegment], 
+                        openNotice: true, 
+                        forceAutoSkip: true
+                    });
+                }
+            }
        });
        video.addEventListener('ratechange', () => startSponsorSchedule());
        // Used by videospeed extension (https://github.com/igrigorik/videospeed/pull/740)
@@ -578,6 +604,22 @@ function setupVideoListeners() {
    }
 }

+function setupSkipButtonControlBar() {
+    if (!skipButtonControlBar) {
+        skipButtonControlBar = new SkipButtonControlBar({
+            skip: (segment) => skipToTime({
+                v: video, 
+                skipTime: segment.segment, 
+                skippingSegments: [segment], 
+                openNotice: true, 
+                forceAutoSkip: true
+            })
+        });
+    }
+
+    skipButtonControlBar.attachToPage();
+}
+
 async function sponsorsLookup(id: string, keepOldSubmissions = true) {
    if (!video) refreshVideoAttachments();
    //there is still no video here
@@ -707,24 +749,47 @@ function retryFetch(): void {
 function startSkipScheduleCheckingForStartSponsors() {
    if (!switchingVideos) {
        // See if there are any starting sponsors
-        let startingSponsor = -1;
+        let startingSegmentTime = -1;
+        let startingSegment: SponsorTime = null;
        for (const time of sponsorTimes) {
-            if (time.segment[0] <= video.currentTime && time.segment[0] > startingSponsor && time.segment[1] > video.currentTime) {
-                startingSponsor = time.segment[0];
+            if (time.segment[0] <= video.currentTime && time.segment[0] > startingSegmentTime && time.segment[1] > video.currentTime 
+                    && getCategoryActionType(time.category) === CategoryActionType.Skippable) {
+                        startingSegmentTime = time.segment[0];
+                        startingSegment = time;
                break;
            }
        }
-        if (startingSponsor === -1) {
+        if (startingSegmentTime === -1) {
            for (const time of sponsorTimesSubmitting) {
-                if (time.segment[0] <= video.currentTime && time.segment[0] > startingSponsor && time.segment[1] > video.currentTime) {
-                    startingSponsor = time.segment[0];
+                if (time.segment[0] <= video.currentTime && time.segment[0] > startingSegmentTime && time.segment[1] > video.currentTime 
+                        && getCategoryActionType(time.category) === CategoryActionType.Skippable) {
+                            startingSegmentTime = time.segment[0];
+                            startingSegment = time;
                    break;
                }
            }
        }

-        if (startingSponsor !== -1) {
-            startSponsorSchedule(undefined, startingSponsor);
+        // For highlight category
+        const poiSegments = sponsorTimes
+            .filter((time) => time.segment[1] > video.currentTime && getCategoryActionType(time.category) === CategoryActionType.POI)
+            .sort((a, b) => b.segment[0] - a.segment[0]);
+        for (const time of poiSegments) {
+            const skipOption = utils.getCategorySelection(time.category)?.option;
+            if (skipOption !== CategorySkipOption.ShowOverlay) {
+                skipToTime({
+                    v: video,
+                    skipTime: time.segment, 
+                    skippingSegments: [time], 
+                    openNotice: true,
+                    unskipTime: video.currentTime
+                });
+                if (skipOption === CategorySkipOption.AutoSkip) break;
+            }
+        }
+
+        if (startingSegmentTime !== -1) {
+            startSponsorSchedule(undefined, startingSegmentTime);
        } else {
            startSponsorSchedule();
        }
@@ -811,7 +876,6 @@ function updatePreviewBar(): void {
    if (video === null) return;

    const previewBarSegments: PreviewBarSegment[] = [];
-
    if (sponsorTimes) {
        sponsorTimes.forEach((segment) => {
            if (segment.hidden !== SponsorHideType.Visible) return;
@@ -820,6 +884,7 @@ function updatePreviewBar(): void {
                segment: segment.segment as [number, number],
                category: segment.category,
                unsubmitted: false,
+                showLarger: getCategoryActionType(segment.category) === CategoryActionType.POI
            });
        });
    }
@@ -829,6 +894,7 @@ function updatePreviewBar(): void {
            segment: segment.segment as [number, number],
            category: segment.category,
            unsubmitted: true,
+            showLarger: getCategoryActionType(segment.category) === CategoryActionType.POI
        });
    });

@@ -977,7 +1043,8 @@ function getStartTimes(sponsorTimes: SponsorTime[], includeIntersectingSegments:
                || ((includeNonIntersectingSegments && sponsorTimes[i].segment[0] >= minimum) 
                    || (includeIntersectingSegments && sponsorTimes[i].segment[0] < minimum && sponsorTimes[i].segment[1] > minimum))) 
                && (!onlySkippableSponsors || utils.getCategorySelection(sponsorTimes[i].category).option !== CategorySkipOption.ShowOverlay)
-                && (!hideHiddenSponsors || sponsorTimes[i].hidden === SponsorHideType.Visible)) {
+                && (!hideHiddenSponsors || sponsorTimes[i].hidden === SponsorHideType.Visible)
+                && getCategoryActionType(sponsorTimes[i].category) === CategoryActionType.Skippable) {

            startTimes.push(sponsorTimes[i].segment[0]);
        } 
@@ -1021,9 +1088,9 @@ function sendTelemetryAndCount(skippingSegments: SponsorTime[], secondsSkipped:
 }

 //skip from the start time to the end time for a certain index sponsor time
-function skipToTime(v: HTMLVideoElement, skipTime: number[], skippingSegments: SponsorTime[], openNotice: boolean) {
+function skipToTime({v, skipTime, skippingSegments, openNotice, forceAutoSkip, unskipTime}: SkipToTimeParams): void {
    // There will only be one submission if it is manual skip
-    const autoSkip: boolean = shouldAutoSkip(skippingSegments[0]);
+    const autoSkip: boolean = forceAutoSkip || shouldAutoSkip(skippingSegments[0]);

    if ((autoSkip || sponsorTimesSubmitting.includes(skippingSegments[0])) && v.currentTime !== skipTime[1]) {
        // Fix for looped videos not working when skipping to the end #426
@@ -1035,10 +1102,35 @@ function skipToTime(v: HTMLVideoElement, skipTime: number[], skippingSegments: S
        }
    }

-    if (openNotice) {
-        //send out the message saying that a sponsor message was skipped
-        if (!Config.config.dontShowNotice || !autoSkip) {
-            skipNotices.push(new SkipNotice(skippingSegments, autoSkip, skipNoticeContentContainer));
+    if (!autoSkip 
+            && skippingSegments.length === 1 
+            && getCategoryActionType(skippingSegments[0].category) === CategoryActionType.POI) {
+        skipButtonControlBar.enable(skippingSegments[0], !Config.config.highlightCategoryUpdate ? 15 : 0);
+
+        if (!Config.config.highlightCategoryUpdate) {
+            new Tooltip({
+                text: chrome.i18n.getMessage("highlightNewFeature"),
+                link: "https://blog.ajay.app/highlight-sponsorblock",
+                referenceNode: skipButtonControlBar.getElement().parentElement,
+                prependElement: skipButtonControlBar.getElement(),
+                timeout: 15
+            });
+
+            Config.config.highlightCategoryUpdate = true;
+        }
+
+        activeSkipKeybindElement?.setShowKeybindHint(false);
+        activeSkipKeybindElement = skipButtonControlBar;
+    } else {
+        if (openNotice) {
+            //send out the message saying that a sponsor message was skipped
+            if (!Config.config.dontShowNotice || !autoSkip) {
+                const newSkipNotice = new SkipNotice(skippingSegments, autoSkip, skipNoticeContentContainer, unskipTime);
+                skipNotices.push(newSkipNotice);
+
+                activeSkipKeybindElement?.setShowKeybindHint(false);
+                activeSkipKeybindElement = newSkipNotice;
+            }
        }
    }

@@ -1046,11 +1138,10 @@ function skipToTime(v: HTMLVideoElement, skipTime: number[], skippingSegments: S
    if (autoSkip) sendTelemetryAndCount(skippingSegments, skipTime[1] - skipTime[0], true);
 }

-function unskipSponsorTime(segment: SponsorTime) {
-    if (sponsorTimes != null) {
-        //add a tiny bit of time to make sure it is not skipped again
-        video.currentTime = segment.segment[0] + 0.001;
-    }
+function unskipSponsorTime(segment: SponsorTime, unskipTime: number = null) {
+    //add a tiny bit of time to make sure it is not skipped again
+    console.log(unskipTime)
+    video.currentTime = unskipTime ?? segment.segment[0] + 0.001;
 }

 function reskipSponsorTime(segment: SponsorTime) {
@@ -1189,7 +1280,7 @@ function updateEditButtonsOnPlayer(): void {
        creatingSegment = isSegmentCreationInProgress();

        // Show only if there are any segments to submit
-        submitButtonVisible = sponsorTimesSubmitting.length > 1 || (sponsorTimesSubmitting.length > 0 && !creatingSegment);
+        submitButtonVisible = sponsorTimesSubmitting.length > 0;

        // Show only if there are any segments to delete
        deleteButtonVisible = sponsorTimesSubmitting.length > 1 || (sponsorTimesSubmitting.length > 0 && !creatingSegment);
@@ -1427,7 +1518,7 @@ function clearSponsorTimes() {
 }

 //if skipNotice is null, it will not affect the UI
-function vote(type: number, UUID: string, category?: string, skipNotice?: SkipNoticeComponent) {
+function vote(type: number, UUID: SegmentUUID, category?: Category, skipNotice?: SkipNoticeComponent) {
    if (skipNotice !== null && skipNotice !== undefined) {
        //add loading info
        skipNotice.addVoteButtonInfo.bind(skipNotice)(chrome.i18n.getMessage("Loading"))
@@ -1631,9 +1722,8 @@ function hotkeyListener(e: KeyboardEvent): void {

    switch (key) {
        case skipKey:
-            if (skipNotices.length > 0) {
-                const latestSkipNotice = skipNotices[skipNotices.length - 1];
-                latestSkipNotice.toggleSkip.call(latestSkipNotice);
+            if (activeSkipKeybindElement) {
+                activeSkipKeybindElement.toggleSkip.call(activeSkipKeybindElement);
            }
            break; 
        case startSponsorKey:
--- a/src/help.ts
+++ b/src/help.ts
@@ -0,0 +1,17 @@
+import Config from "./config";
+import { showDonationLink } from "./utils/configUtils";
+
+import Utils from "./utils";
+const utils = new Utils();
+
+window.addEventListener('DOMContentLoaded', init);
+
+async function init() {
+    utils.localizeHtmlPage();
+
+    await utils.wait(() => Config.config !== null);
+
+    if (!showDonationLink()) {
+        document.getElementById("sbDonate").style.display = "none";
+    }
+}
--- a/src/js-components/previewBar.ts
+++ b/src/js-components/previewBar.ts
@@ -15,6 +15,7 @@ export interface PreviewBarSegment {
    segment: [number, number];
    category: string;
    unsubmitted: boolean;
+    showLarger: boolean;
 }

 class PreviewBar {
@@ -102,9 +103,10 @@ class PreviewBar {
            let currentSegmentLength = Infinity;

            for (const seg of this.segments) {
-                if (seg.segment[0] <= timeInSeconds && seg.segment[1] > timeInSeconds) {
-                    const segmentLength = seg.segment[1] - seg.segment[0];
-
+                const segmentLength = seg.segment[1] - seg.segment[0];
+                const startTime = segmentLength !== 0 ? seg.segment[0] : Math.floor(seg.segment[0]);
+                const endTime = segmentLength !== 0 ? seg.segment[1] : Math.ceil(seg.segment[1]);
+                if (startTime <= timeInSeconds && endTime >= timeInSeconds) {
                    if (segmentLength < currentSegmentLength) {
                        currentSegmentLength = segmentLength;
                        segment = seg;
@@ -181,10 +183,10 @@ class PreviewBar {
        });
    }

-    createBar({category, unsubmitted, segment}: PreviewBarSegment): HTMLLIElement {
+    createBar({category, unsubmitted, segment, showLarger}: PreviewBarSegment): HTMLLIElement {
        const bar = document.createElement('li');
        bar.classList.add('previewbar');
-        bar.innerHTML = '&nbsp;';
+        bar.innerHTML = showLarger ? '&nbsp;&nbsp;' : '&nbsp;';

        const fullCategoryName = (unsubmitted ? 'preview-' : '') + category;
        bar.setAttribute('sponsorblock-category', fullCategoryName);
@@ -193,7 +195,7 @@ class PreviewBar {
        if (!this.onMobileYouTube) bar.style.opacity = Config.config.barTypes[fullCategoryName]?.opacity;

        bar.style.position = "absolute";
-        bar.style.width = this.timeToPercentage(segment[1] - segment[0]);
+        if (segment[1] - segment[0] > 0) bar.style.width = this.timeToPercentage(segment[1] - segment[0]);
        bar.style.left = this.timeToPercentage(segment[0]);

        return bar;
--- a/src/js-components/skipButtonControlBar.ts
+++ b/src/js-components/skipButtonControlBar.ts
@@ -0,0 +1,100 @@
+import Config from "../config";
+import { SponsorTime } from "../types";
+import { getSkippingText } from "../utils/categoryUtils";
+
+
+export interface SkipButtonControlBarProps {
+    skip: (segment: SponsorTime) => void;
+}
+
+export class SkipButtonControlBar {
+
+    container: HTMLElement;
+    skipIcon: HTMLImageElement;
+    textContainer: HTMLElement;
+    chapterText: HTMLElement;
+    segment: SponsorTime;
+
+    showKeybindHint = true;
+
+    timeout: NodeJS.Timeout;
+    duration = 0;
+
+    skip: (segment: SponsorTime) => void;
+
+    constructor(props: SkipButtonControlBarProps) {
+        this.skip = props.skip;
+
+        this.container = document.createElement("div");
+        this.container.classList.add("skipButtonControlBarContainer");
+        this.container.classList.add("hidden");
+
+        this.skipIcon = document.createElement("img");
+        this.skipIcon.src = chrome.runtime.getURL("icons/skipIcon.svg");
+        this.skipIcon.classList.add("ytp-button");
+        this.skipIcon.id = "sbSkipIconControlBarImage";
+
+        this.textContainer = document.createElement("div");
+        
+        this.container.appendChild(this.skipIcon);
+        this.container.appendChild(this.textContainer);
+        this.container.addEventListener("click", () => this.toggleSkip());
+        this.container.addEventListener("mouseenter", () => this.stopTimer());
+        this.container.addEventListener("mouseleave", () => this.startTimer());
+    }
+
+    getElement(): HTMLElement {
+        return this.container;
+    }
+
+    attachToPage(): void {
+        const leftControlsContainer = document.querySelector(".ytp-left-controls");
+        this.chapterText = document.querySelector(".ytp-chapter-container");
+    
+        if (!leftControlsContainer.contains(this.container)) {
+            leftControlsContainer.insertBefore(this.container, this.chapterText);
+        }
+    }
+
+    enable(segment: SponsorTime, duration?: number): void {
+        if (duration) this.duration = duration;
+        this.segment = segment;
+        this.refreshText();
+
+        this.startTimer();
+    }
+
+    refreshText(): void {
+        if (this.segment) {
+            this.chapterText?.classList?.add("hidden");
+            this.container.classList.remove("hidden");
+            this.textContainer.innerText = getSkippingText([this.segment], false) + (this.showKeybindHint ? " (" + Config.config.skipKeybind + ")" : "");
+        }
+    }
+
+    setShowKeybindHint(show: boolean): void {
+        this.showKeybindHint = show;
+
+        this.refreshText();
+    }
+
+    stopTimer(): void {
+        if (this.timeout) clearTimeout(this.timeout);
+    }
+
+    startTimer(): void {
+        this.stopTimer();
+        this.timeout = setTimeout(() => this.disable(), Math.max(Config.config.skipNoticeDuration, this.duration) * 1000);
+    }
+
+    disable(): void {
+        this.container.classList.add("hidden");
+        this.chapterText?.classList?.remove("hidden");
+    }
+
+    toggleSkip(): void {
+        this.skip(this.segment);
+        this.disable();
+    }
+}
+
--- a/src/options.ts
+++ b/src/options.ts
@@ -6,6 +6,7 @@ window.SB = Config;

 import Utils from "./utils";
 import CategoryChooser from "./render/CategoryChooser";
+import { showDonationLink } from "./utils/configUtils";
 const utils = new Utils();

 window.addEventListener('DOMContentLoaded', init);
@@ -28,6 +29,10 @@ async function init() {

    await utils.wait(() => Config.config !== null);

+    if (!showDonationLink()) {
+        document.getElementById("sbDonate").style.visibility = "hidden";
+    }
+
    // Set all of the toggle options to the correct option
    const optionsContainer = document.getElementById("options");
    const optionsElements = optionsContainer.querySelectorAll("*");
@@ -40,9 +45,10 @@ async function init() {
            continue;
        }

+        const option = optionsElements[i].getAttribute("sync-option");
+
        switch (optionsElements[i].getAttribute("option-type")) {
            case "toggle": {
-                const option = optionsElements[i].getAttribute("sync-option");
                const optionResult = Config.config[option];

                const checkbox = optionsElements[i].querySelector("input");
@@ -95,16 +101,15 @@ async function init() {
                break;
            }
            case "text-change": {
-                const textChangeOption = optionsElements[i].getAttribute("sync-option");
                const textChangeInput = <HTMLInputElement> optionsElements[i].querySelector(".option-text-box");
                
                const textChangeSetButton = <HTMLElement> optionsElements[i].querySelector(".text-change-set");

-                textChangeInput.value = Config.config[textChangeOption];
+                textChangeInput.value = Config.config[option];

                textChangeSetButton.addEventListener("click", async () => {
                    // See if anything extra must be done
-                    switch (textChangeOption) {
+                    switch (option) {
                        case "serverAddress": {
                            const result = validateServerAddress(textChangeInput.value);

@@ -130,7 +135,7 @@ async function init() {
                        }
                    }

-                    Config.config[textChangeOption] = textChangeInput.value;
+                    Config.config[option] = textChangeInput.value;
                });

                // Reset to the default if needed
@@ -138,9 +143,9 @@ async function init() {
                textChangeResetButton.addEventListener("click", () => {
                    if (!confirm(chrome.i18n.getMessage("areYouSureReset"))) return;

-                    Config.config[textChangeOption] = Config.defaults[textChangeOption];
+                    Config.config[option] = Config.defaults[option];

-                    textChangeInput.value = Config.config[textChangeOption];
+                    textChangeInput.value = Config.config[option];
                });

                break;
@@ -175,30 +180,42 @@ async function init() {

                break;
            }
-            case "display":{
+            case "display": {
                updateDisplayElement(<HTMLElement> optionsElements[i])
                break;
            }
            case "number-change": {
-                const numberChangeOption = optionsElements[i].getAttribute("sync-option");
-                const configValue = Config.config[numberChangeOption];
+                const configValue = Config.config[option];
                const numberInput = optionsElements[i].querySelector("input");

                if (isNaN(configValue) || configValue < 0) {
-                    numberInput.value = Config.defaults[numberChangeOption];
+                    numberInput.value = Config.defaults[option];
                } else {
                    numberInput.value = configValue;
                }

                numberInput.addEventListener("input", () => {
-                    Config.config[numberChangeOption] = numberInput.value;
+                    Config.config[option] = numberInput.value;
                });

                break;
            }
+            case "selector": {
+                const configValue = Config.config[option];
+                const selectorElement = optionsElements[i].querySelector(".selector-element") as HTMLSelectElement;
+                selectorElement.value = configValue;
+
+                selectorElement.addEventListener("change", () => {
+                    let value: string | number = selectorElement.value;
+                    if (!isNaN(Number(value))) value = Number(value);
+
+                    Config.config[option] = value;
+                });
+                break;
+            }
            case "react-CategoryChooserComponent":
                new CategoryChooser(optionsElements[i]);
-            break;
+                break;
        }
    }

--- a/src/popup.ts
+++ b/src/popup.ts
@@ -3,6 +3,7 @@ import Config from "./config";
 import Utils from "./utils";
 import { SponsorTime, SponsorHideType } from "./types";
 import { Message, MessageResponse } from "./messageTypes";
+import { showDonationLink } from "./utils/configUtils";
 const utils = new Utils();

 interface MessageListener {
@@ -12,7 +13,7 @@ interface MessageListener {
 class MessageHandler {
    messageListener: MessageListener;

-    constructor (messageListener?: MessageListener) {
+    constructor(messageListener?: MessageListener) {
        this.messageListener = messageListener;
    }

@@ -107,14 +108,14 @@ async function runThePopup(messageListener?: MessageListener): Promise<void> {
        "sbDonate"
    ].forEach(id => PageElements[id] = document.getElementById(id));

-    // Hide donate button on safari
-    if (navigator.vendor === "Apple Computer, Inc.") {
+    // Hide donate button if wanted (Safari, or user choice)
+    if (!showDonationLink()) {
        PageElements.sbDonate.style.display = "none";
    }

    //setup click listeners
    PageElements.sponsorStart.addEventListener("click", sendSponsorStartMessage);
-    PageElements.whitelistToggle.addEventListener("change", function() {
+    PageElements.whitelistToggle.addEventListener("change", function () {
        if (this.checked) {
            whitelistChannel();
        } else {
@@ -122,7 +123,7 @@ async function runThePopup(messageListener?: MessageListener): Promise<void> {
        }
    });
    PageElements.whitelistForceCheck.addEventListener("click", openOptions);
-    PageElements.toggleSwitch.addEventListener("change", function() {
+    PageElements.toggleSwitch.addEventListener("change", function () {
        toggleSkipping(!this.checked);
    });
    PageElements.submitTimes.addEventListener("click", submitTimes);
@@ -174,7 +175,7 @@ async function runThePopup(messageListener?: MessageListener): Promise<void> {
        if (userID != undefined) {
            //there are probably some views on these submissions then
            //get the amount of views from the sponsors submitted
-            utils.sendRequestToServer("GET", "/api/getViewsForUser?userID=" + userID, function(response) {
+            utils.sendRequestToServer("GET", "/api/getViewsForUser?userID=" + userID, function (response) {
                if (response.status == 200) {
                    const viewCount = JSON.parse(response.responseText).viewCount;
                    if (viewCount != 0) {
@@ -191,7 +192,7 @@ async function runThePopup(messageListener?: MessageListener): Promise<void> {
            });

            //get this time in minutes
-            utils.sendRequestToServer("GET", "/api/getSavedTimeForUser?userID=" + userID, function(response) {
+            utils.sendRequestToServer("GET", "/api/getSavedTimeForUser?userID=" + userID, function (response) {
                if (response.status == 200) {
                    const minutesSaved = JSON.parse(response.responseText).timeSaved;
                    if (minutesSaved != 0) {
@@ -237,7 +238,7 @@ async function runThePopup(messageListener?: MessageListener): Promise<void> {
    getSegmentsFromContentScript(false);

    function onTabs(tabs, updating: boolean): void {
-        messageHandler.sendMessage(tabs[0].id, {message: 'getVideoID'}, function(result) {
+        messageHandler.sendMessage(tabs[0].id, { message: 'getVideoID' }, function (result) {
            if (result !== undefined && result.videoID) {
                currentVideoID = result.videoID;
                creatingSegment = result.creatingSegment;
@@ -262,7 +263,7 @@ async function runThePopup(messageListener?: MessageListener): Promise<void> {

        messageHandler.sendMessage(
            tabs[0].id,
-            {message: 'isInfoFound', updating},
+            { message: 'isInfoFound', updating },
            infoFound
        );
    }
@@ -274,8 +275,8 @@ async function runThePopup(messageListener?: MessageListener): Promise<void> {
        }, (tabs) => onTabs(tabs, updating));
    }

-    function infoFound(request: {found: boolean, sponsorTimes: SponsorTime[]}) {
-        if(chrome.runtime.lastError) {
+    function infoFound(request: { found: boolean, sponsorTimes: SponsorTime[] }) {
+        if (chrome.runtime.lastError) {
            //This page doesn't have the injected content script, or at least not yet
            displayNoVideo();
            return;
@@ -306,8 +307,8 @@ async function runThePopup(messageListener?: MessageListener): Promise<void> {
        }, tabs => {
            messageHandler.sendMessage(
                tabs[0].id,
-                {message: 'isChannelWhitelisted'},
-                function(response) {
+                { message: 'isChannelWhitelisted' },
+                function (response) {
                    if (response.value) {
                        PageElements.whitelistChannel.style.display = "none";
                        PageElements.unwhitelistChannel.style.display = "unset";
@@ -315,7 +316,7 @@ async function runThePopup(messageListener?: MessageListener): Promise<void> {
                        document.querySelectorAll('.SBWhitelistIcon')[0].classList.add("rotated");
                    }
                });
-            }
+        }
        );
    }

@@ -327,7 +328,7 @@ async function runThePopup(messageListener?: MessageListener): Promise<void> {
        }, (tabs) => {
            messageHandler.sendMessage(
                tabs[0].id,
-                {from: 'popup', message: 'sponsorStart'},
+                { from: 'popup', message: 'sponsorStart' },
                async (response) => {
                    startSponsorCallback(response);

@@ -351,7 +352,7 @@ async function runThePopup(messageListener?: MessageListener): Promise<void> {
        });
    }

-    function startSponsorCallback(response: {creatingSegment: boolean}) {
+    function startSponsorCallback(response: { creatingSegment: boolean }) {
        creatingSegment = response.creatingSegment;

        // Only update the segments after a segment was created
@@ -364,12 +365,12 @@ async function runThePopup(messageListener?: MessageListener): Promise<void> {
    }

    //display the video times from the array at the top, in a different section
-    function displayDownloadedSponsorTimes(request: {found: boolean, sponsorTimes: SponsorTime[]}) {
+    function displayDownloadedSponsorTimes(request: { found: boolean, sponsorTimes: SponsorTime[] }) {
        if (request.sponsorTimes != undefined) {
            // Sort list by start time
            const segmentTimes = request.sponsorTimes
-                                .sort((a, b) => a.segment[1] - b.segment[1])
-                                .sort((a, b) => a.segment[0] - b.segment[0]);
+                .sort((a, b) => a.segment[1] - b.segment[1])
+                .sort((a, b) => a.segment[0] - b.segment[0]);

            //add them as buttons to the issue reporting container
            const container = document.getElementById("issueReporterTimeButtons");
@@ -388,7 +389,7 @@ async function runThePopup(messageListener?: MessageListener): Promise<void> {
                categoryColorCircle.style.backgroundColor = Config.config.barTypes[segmentTimes[i].category]?.color;
                categoryColorCircle.classList.add("dot");
                categoryColorCircle.classList.add("sponsorTimesCategoryColorCircle");
-                
+
                let extraInfo = "";
                if (segmentTimes[i].hidden === SponsorHideType.Downvoted) {
                    //this one is downvoted
@@ -397,7 +398,7 @@ async function runThePopup(messageListener?: MessageListener): Promise<void> {
                    //this one is too short
                    extraInfo = " (" + chrome.i18n.getMessage("hiddenDueToDuration") + ")";
                }
-                
+
                const textNode = document.createTextNode(utils.shortCategoryName(segmentTimes[i].category) + extraInfo);
                const segmentTimeFromToNode = document.createElement("div");
                segmentTimeFromToNode.innerText = utils.getFormattedTime(segmentTimes[i].segment[0], true) + " " + chrome.i18n.getMessage("to") + " " + utils.getFormattedTime(segmentTimes[i].segment[1], true);
@@ -446,7 +447,7 @@ async function runThePopup(messageListener?: MessageListener): Promise<void> {
                voteButtonsContainer.appendChild(uuidButton);

                //add click listener to open up vote panel
-                sponsorTimeButton.addEventListener("click", function() {
+                sponsorTimeButton.addEventListener("click", function () {
                    voteButtonsContainer.classList.toggle("voteButtonsContainer--hide");
                });

@@ -478,15 +479,15 @@ async function runThePopup(messageListener?: MessageListener): Promise<void> {
            }, tabs => {
                messageHandler.sendMessage(
                    tabs[0].id,
-                    {message: 'submitTimes'},
+                    { message: 'submitTimes' },
                );
            });
        }
    }
-  
+
    function showNoticeAgain() {
        Config.config.dontShowNotice = false;
-  
+
        PageElements.showNoticeAgain.style.display = "none";
    }

@@ -499,11 +500,11 @@ async function runThePopup(messageListener?: MessageListener): Promise<void> {

    //make the options div visible
    function openOptions() {
-        chrome.runtime.sendMessage({"message": "openConfig"});
+        chrome.runtime.sendMessage({ "message": "openConfig" });
    }

    function openHelp() {
-        chrome.runtime.sendMessage({"message": "openHelp"});
+        chrome.runtime.sendMessage({ "message": "openHelp" });
    }

    //make the options username setting option visible
@@ -516,7 +517,7 @@ async function runThePopup(messageListener?: MessageListener): Promise<void> {
        PageElements.setUsernameContainer.style.display = "none";
        PageElements.setUsername.style.display = "flex";
        PageElements.setUsername.classList.add("SBExpanded");
-        
+
        PageElements.setUsernameStatusContainer.style.display = "none";

        PageElements.sponsorTimesContributionsContainer.classList.add("hidden");
@@ -555,18 +556,18 @@ async function runThePopup(messageListener?: MessageListener): Promise<void> {
    function displayNoVideo() {
        document.getElementById("loadingIndicator").innerText = chrome.i18n.getMessage("noVideoID");
    }
-  
+
    function addVoteMessage(message, UUID) {
        const voteButtonsContainer = document.getElementById("sponsorTimesVoteButtonsContainer" + UUID);
        voteButtonsContainer.style.display = "none";

        const voteStatusContainer = document.getElementById("sponsorTimesVoteStatusContainer" + UUID);
        voteStatusContainer.style.removeProperty("display");
-        
+
        const thanksForVotingText = document.getElementById("sponsorTimesThanksForVotingText" + UUID);
        thanksForVotingText.innerText = message;
    }
-  
+
    function vote(type, UUID) {
        //add loading info
        addVoteMessage(chrome.i18n.getMessage("Loading"), UUID);
@@ -597,8 +598,8 @@ async function runThePopup(messageListener?: MessageListener): Promise<void> {
        }, tabs => {
            messageHandler.sendMessage(
                tabs[0].id,
-                {message: 'getChannelID'},
-                function(response) {
+                { message: 'getChannelID' },
+                function (response) {
                    if (!response.channelID) {
                        alert(chrome.i18n.getMessage("channelDataNotFound") + " https://github.com/ajayyy/SponsorBlock/issues/753");
                        return;
@@ -630,10 +631,10 @@ async function runThePopup(messageListener?: MessageListener): Promise<void> {
                    }, tabs => {
                        messageHandler.sendMessage(
                            tabs[0].id, {
-                                message: 'whitelistChange',
-                                value: true
-                            });
-                        }
+                            message: 'whitelistChange',
+                            value: true
+                        });
+                    }
                    );
                }
            );
@@ -648,38 +649,38 @@ async function runThePopup(messageListener?: MessageListener): Promise<void> {
        }, tabs => {
            messageHandler.sendMessage(
                tabs[0].id,
-                {message: 'getChannelID'},
-                function(response) {
+                { message: 'getChannelID' },
+                function (response) {
                    //get whitelisted channels
-                        let whitelistedChannels = Config.config.whitelistedChannels;
-                        if (whitelistedChannels == undefined) {
-                            whitelistedChannels = [];
-                        }
+                    let whitelistedChannels = Config.config.whitelistedChannels;
+                    if (whitelistedChannels == undefined) {
+                        whitelistedChannels = [];
+                    }

-                        //remove this channel
-                        const index = whitelistedChannels.indexOf(response.channelID);
-                        whitelistedChannels.splice(index, 1);
+                    //remove this channel
+                    const index = whitelistedChannels.indexOf(response.channelID);
+                    whitelistedChannels.splice(index, 1);

-                        //change button
-                        PageElements.whitelistChannel.style.display = "unset";
-                        PageElements.unwhitelistChannel.style.display = "none";
-                        document.querySelectorAll('.SBWhitelistIcon')[0].classList.remove("rotated");
+                    //change button
+                    PageElements.whitelistChannel.style.display = "unset";
+                    PageElements.unwhitelistChannel.style.display = "none";
+                    document.querySelectorAll('.SBWhitelistIcon')[0].classList.remove("rotated");

-                        //save this
-                        Config.config.whitelistedChannels = whitelistedChannels;
+                    //save this
+                    Config.config.whitelistedChannels = whitelistedChannels;

-                        //send a message to the client
-                        messageHandler.query({
-                            active: true,
-                            currentWindow: true
-                        }, tabs => {
-                            messageHandler.sendMessage(
-                                tabs[0].id, {
-                                    message: 'whitelistChange',
-                                    value: false
-                                });
-                            }
-                        );
+                    //send a message to the client
+                    messageHandler.query({
+                        active: true,
+                        currentWindow: true
+                    }, tabs => {
+                        messageHandler.sendMessage(
+                            tabs[0].id, {
+                            message: 'whitelistChange',
+                            value: false
+                        });
+                    }
+                    );
                }
            );
        });
@@ -694,12 +695,13 @@ async function runThePopup(messageListener?: MessageListener): Promise<void> {
        }, tabs => {
            messageHandler.sendMessage(
                tabs[0].id,
-                {message: 'refreshSegments'},
+                { message: 'refreshSegments' },
                (response) => {
                    infoFound(response);
                    stopAnimation();
                }
-            )}
+            )
+        }
        );
    }

@@ -707,7 +709,7 @@ async function runThePopup(messageListener?: MessageListener): Promise<void> {
     * Should skipping be disabled (visuals stay)
     */
    function toggleSkipping(disabled) {
-		Config.config.disableSkipping = disabled;
+        Config.config.disableSkipping = disabled;

        let hiddenButton = PageElements.disableSkipping;
        let shownButton = PageElements.enableSkipping;
@@ -728,13 +730,13 @@ async function runThePopup(messageListener?: MessageListener): Promise<void> {
     * @param {float} seconds 
     * @returns {string}
     */
-	function getFormattedHours(minutes) {
-		minutes = Math.round(minutes * 10) / 10
-		const hours = Math.floor(minutes / 60);
-		return (hours > 0 ? hours + "h " : "") + (minutes % 60).toFixed(1);
-	}
-  
-//end of function
+    function getFormattedHours(minutes) {
+        minutes = Math.round(minutes * 10) / 10
+        const hours = Math.floor(minutes / 60);
+        return (hours > 0 ? hours + "h " : "") + (minutes % 60).toFixed(1);
+    }
+
+    //end of function
 }

 if (chrome.tabs != undefined) {
--- a/src/render/SkipNotice.tsx
+++ b/src/render/SkipNotice.tsx
@@ -5,7 +5,8 @@ import Utils from "../utils";
 const utils = new Utils();

 import SkipNoticeComponent, { SkipNoticeAction } from "../components/SkipNoticeComponent";
-import { SponsorTime, ContentContainer } from "../types";
+import { SponsorTime, ContentContainer, NoticeVisbilityMode } from "../types";
+import Config from "../config";

 class SkipNotice {
    segments: SponsorTime[];
@@ -17,7 +18,7 @@ class SkipNotice {

    skipNoticeRef: React.MutableRefObject<SkipNoticeComponent>;

-    constructor(segments: SponsorTime[], autoSkip = false, contentContainer: ContentContainer) {
+    constructor(segments: SponsorTime[], autoSkip = false, contentContainer: ContentContainer, unskipTime: number = null) {
        this.skipNoticeRef = React.createRef();

        this.segments = segments;
@@ -44,11 +45,20 @@ class SkipNotice {
                autoSkip={autoSkip} 
                contentContainer={contentContainer}
                ref={this.skipNoticeRef}
-                closeListener={() => this.close()} />,
+                closeListener={() => this.close()}
+                smaller={Config.config.noticeVisibilityMode >= NoticeVisbilityMode.MiniForAll 
+                    || (Config.config.noticeVisibilityMode >= NoticeVisbilityMode.MiniForAutoSkip && autoSkip)}
+                unskipTime={unskipTime} />,
            this.noticeElement
        );
    }

+    setShowKeybindHint(value: boolean): void {
+        this.skipNoticeRef.current.setState({
+            showKeybindHint: value
+        });
+    }
+
    close(): void {
        ReactDOM.unmountComponentAtNode(this.noticeElement);

--- a/src/render/Tooltip.tsx
+++ b/src/render/Tooltip.tsx
@@ -0,0 +1,73 @@
+import * as React from "react";
+import * as ReactDOM from "react-dom";
+
+export interface TooltipProps {
+    text: string, 
+    link?: string,
+    referenceNode: HTMLElement,
+    prependElement?: HTMLElement, // Element to append before
+    bottomOffset?: string
+    timeout?: number;
+}
+
+export class Tooltip {
+    text: string;   
+    container: HTMLDivElement;
+
+    timer: NodeJS.Timeout;
+    
+    constructor(props: TooltipProps) {
+        props.bottomOffset ??= "70px";
+        this.text = props.text;
+
+        this.container = document.createElement('div');
+        this.container.id = "sponsorTooltip" + props.text;
+        this.container.style.display = "relative";
+
+        if (props.prependElement) {
+            props.referenceNode.insertBefore(this.container, props.prependElement);
+        } else {
+            props.referenceNode.appendChild(this.container);
+        }
+
+        if (props.timeout) {
+            this.timer = setTimeout(() => this.close(), props.timeout * 1000);
+        }
+
+        ReactDOM.render(
+            <div style={{bottom: props.bottomOffset}} 
+                className="sponsorBlockTooltip" >
+                <div>
+                    <img className="sponsorSkipLogo sponsorSkipObject"
+                        src={chrome.extension.getURL("icons/IconSponsorBlocker256px.png")}>
+                    </img>
+                    <span className="sponsorSkipObject">
+                        {this.text + (props.link ? ". " : "")}
+                        {props.link ? 
+                            <a style={{textDecoration: "underline"}} 
+                                    target="_blank"
+                                    rel="noopener noreferrer"
+                                    href={props.link}>
+                                {chrome.i18n.getMessage("LearnMore")}
+                                </a> 
+                        : null}
+                    </span>
+                </div>
+                <button className="sponsorSkipObject sponsorSkipNoticeButton"
+                    style ={{float: "right" }}
+                    onClick={() => this.close()}>
+
+                    {chrome.i18n.getMessage("GotIt")}
+                </button>
+            </div>,
+            this.container
+        )
+    }
+
+    close(): void {
+        ReactDOM.unmountComponentAtNode(this.container);
+        this.container.remove();
+
+        if (this.timer) clearTimeout(this.timer);
+    }
+}
--- a/src/types.ts
+++ b/src/types.ts
@@ -4,9 +4,9 @@ import SkipNotice from "./render/SkipNotice";

 export interface ContentContainer {
    (): {
-        vote: (type: number, UUID: string, category?: string, skipNotice?: SkipNoticeComponent) => void,
+        vote: (type: number, UUID: SegmentUUID, category?: Category, skipNotice?: SkipNoticeComponent) => void,
        dontShowNoticeAgain: () => void,
-        unskipSponsorTime: (segment: SponsorTime) => void,
+        unskipSponsorTime: (segment: SponsorTime, unskipTime: number) => void,
        sponsorTimes: SponsorTime[],
        sponsorTimesSubmitting: SponsorTime[],
        skipNotices: SkipNotice[],
@@ -41,7 +41,7 @@ export enum CategorySkipOption {
 }

 export interface CategorySelection {
-    name: string;
+    name: Category;
    option: CategorySkipOption
 }

@@ -51,6 +51,14 @@ export enum SponsorHideType {
    MinimumDuration
 }

+export enum CategoryActionType {
+    Skippable = "", // Strings are used to find proper language configs
+    POI = "_POI"
+}
+
+export type SegmentUUID = string  & { __segmentUUIDBrand: unknown };
+export type Category = string & { __categoryBrand: unknown };
+
 export enum SponsorSourceType {
    Server = undefined,
    Local = 1
@@ -58,9 +66,9 @@ export enum SponsorSourceType {

 export interface SponsorTime {
    segment: [number] | [number, number];
-    UUID: string;
+    UUID: SegmentUUID;

-    category: string;
+    category: Category;

    hidden?: SponsorHideType;
    source?: SponsorSourceType;
@@ -151,7 +159,7 @@ export interface VideoInfo {
            isUnlisted: boolean,
            hasYpcMetadata: boolean,
            viewCount: string,
-            category: string,
+            category: Category,
            publishDate: string,
            ownerChannelName: string,
            uploadDate: string,
@@ -177,4 +185,26 @@ export enum ChannelIDStatus {
 export interface ChannelIDInfo {
    id: string,
    status: ChannelIDStatus
+}
+
+export interface SkipToTimeParams {
+    v: HTMLVideoElement, 
+    skipTime: number[], 
+    skippingSegments: SponsorTime[], 
+    openNotice: boolean, 
+    forceAutoSkip?: boolean,
+    unskipTime?: number
+}
+
+export interface ToggleSkippable {
+    toggleSkip: () => void;
+    setShowKeybindHint: (show: boolean) => void;
+}
+
+export enum NoticeVisbilityMode {
+    FullSize = 0,
+    MiniForAutoSkip = 1,
+    MiniForAll = 2,
+    FadedForAutoSkip = 3,
+    FadedForAll = 4
 }
--- a/src/utils.ts
+++ b/src/utils.ts
@@ -261,7 +261,6 @@ export default class Utils {
        const objects = document.getElementsByClassName("sponsorBlockPageBody")[0].children;
        for (let j = 0; j < objects.length; j++) {
            const obj = objects[j];
-            
            const localizedMessage = this.getLocalizedMessage(obj.innerHTML.toString());
            if (localizedMessage) obj.innerHTML = localizedMessage;
        }
@@ -356,7 +355,7 @@ export default class Utils {
            }, (response) => {
                resolve(response);
            });
-        })
+        });
    }

    /**
@@ -429,6 +428,8 @@ export default class Utils {
    }

    getFormattedTime(seconds: number, precise?: boolean): string {
+        seconds = Math.max(seconds, 0);
+        
        const hours = Math.floor(seconds / 60 / 60);
        const minutes = Math.floor(seconds / 60) % 60;
        let minutesDisplay = String(minutes);
--- a/src/utils/categoryUtils.ts
+++ b/src/utils/categoryUtils.ts
@@ -0,0 +1,23 @@
+import { Category, CategoryActionType, SponsorTime } from "../types";
+
+export function getSkippingText(segments: SponsorTime[], autoSkip: boolean): string {
+    const categoryName = chrome.i18n.getMessage(segments.length > 1 ? "multipleSegments" 
+        : "category_" + segments[0].category + "_short") || chrome.i18n.getMessage("category_" + segments[0].category);
+    if (autoSkip) {
+        const messageId = getCategoryActionType(segments[0].category) === CategoryActionType.Skippable 
+            ? "skipped" : "skipped_to_category";
+        return chrome.i18n.getMessage(messageId).replace("{0}", categoryName);
+    } else {
+        const messageId = getCategoryActionType(segments[0].category) === CategoryActionType.Skippable 
+            ? "skip_category" : "skip_to_category";
+        return chrome.i18n.getMessage(messageId).replace("{0}", categoryName);
+    }
+}
+
+export function getCategoryActionType(category: Category): CategoryActionType {
+    if (category.startsWith("poi_")) {
+        return CategoryActionType.POI;
+    } else {
+        return CategoryActionType.Skippable;
+    }
+}
--- a/src/utils/configUtils.ts
+++ b/src/utils/configUtils.ts
@@ -0,0 +1,5 @@
+import Config from "../config";
+
+export function showDonationLink(): boolean {
+    return navigator.vendor !== "Apple Computer, Inc." && Config.config.showDonationLink;
+}
--- a/test/selenium.test.ts
+++ b/test/selenium.test.ts
@@ -0,0 +1,149 @@
+import { Builder, By, until, WebDriver } from "selenium-webdriver";
+import * as Chrome from "selenium-webdriver/chrome";
+import * as Path from "path";
+
+test("Selenium Chrome test", async () => {
+    const driver = await setup();    
+
+    try {
+        await waitForInstall(driver);
+        // This video has no ads
+        await goToVideo(driver, "jNQXAC9IVRw");
+
+        await createSegment(driver, "4", "10.33", "0:04.000 to 0:10.330");
+
+        await editSegments(driver, 0, "0:04.000", "0:10.330", "5", "13.211", "0:05.000 to 0:13.211", false);
+
+        await autoskipSegment(driver, 5, 13.211);
+    } finally {
+        await driver.quit();
+    }
+}, 100_000);
+
+async function setup(): Promise<WebDriver> {
+    const options = new Chrome.Options();
+    options.addArguments("--load-extension=" + Path.join(__dirname, "../dist/"));
+    options.addArguments("--mute-audio");
+    options.addArguments("--disable-features=PreloadMediaEngagementData, MediaEngagementBypassAutoplayPolicies");
+    options.windowSize({
+        width: 1280,
+        height: 720
+    });
+
+    let driver;
+    if (process.env.BROWSERSTACK_BUILD_NAME) {
+        const capabilities = {
+            'os': 'windows',
+            'os_version': '10',
+            'browserName': 'chrome',
+            'browser_version' : 'latest',
+            'browserstack.local': 'true',
+            'build': process.env.BROWSERSTACK_BUILD_NAME,
+            'project': process.env.BROWSERSTACK_PROJECT_NAME,
+            'browserstack.localIdentifier': process.env.BROWSERSTACK_LOCAL_IDENTIFIER,
+            'browserstack.user': process.env.BROWSERSTACK_USERNAME,
+            'browserstack.key': process.env.BROWSERSTACK_ACCESS_KEY
+        }
+
+        driver = await new Builder()
+            .usingServer('http://hub-cloud.browserstack.com/wd/hub')
+            .setChromeOptions(options)
+            .withCapabilities(capabilities)
+            .build();
+    } else {
+        driver = await new Builder()
+            .forBrowser("chrome")
+            .setChromeOptions(options)
+            .build();
+    }
+
+    driver.manage().setTimeouts({
+        implicit: 5000
+    });
+
+    return driver;
+}
+
+async function waitForInstall(driver: WebDriver, startingTab = 0): Promise<void> {
+    // Selenium only knows about the one tab it's on,
+    // so we can't wait for the help page to appear
+    await driver.sleep(3000);
+
+    const handles = await driver.getAllWindowHandles();
+    await driver.switchTo().window(handles[startingTab]);
+}
+
+async function goToVideo(driver: WebDriver, videoId: string): Promise<void> {
+    await driver.get("https://www.youtube.com/watch?v=" + videoId);
+    await driver.wait(until.elementIsVisible(await driver.findElement(By.className("ytd-video-primary-info-renderer"))));
+}
+
+async function createSegment(driver: WebDriver, startTime: string, endTime: string, expectedDisplayedTime: string): Promise<void> {
+    const startSegmentButton = await driver.findElement(By.id("startSegmentButton"));
+    const cancelSegmentButton = await driver.findElement(By.id("cancelSegmentButton"));
+    await driver.executeScript("document.querySelector('video').currentTime = " + startTime);
+
+    await startSegmentButton.click();
+    await driver.wait(until.elementIsVisible(cancelSegmentButton));
+
+    await driver.executeScript("document.querySelector('video').currentTime = " + endTime);
+
+    await startSegmentButton.click();
+    await driver.wait(until.elementIsNotVisible(cancelSegmentButton));
+
+    const submitButton = await driver.findElement(By.id("submitButton"));
+    await submitButton.click();
+
+    const sponsorTimeDisplays = await driver.findElements(By.className("sponsorTimeDisplay"));
+    const sponsorTimeDisplay = sponsorTimeDisplays[sponsorTimeDisplays.length - 1];
+    await driver.wait(until.elementTextIs(sponsorTimeDisplay, expectedDisplayedTime));
+}
+
+async function editSegments(driver: WebDriver, index: number, expectedStartTimeBox: string, expectedEndTimeBox: string,
+    startTime: string, endTime: string, expectedDisplayedTime: string, openSubmitBox: boolean): Promise<void> {
+    
+    if (openSubmitBox) {
+        const submitButton = await driver.findElement(By.id("submitButton"));
+        await submitButton.click();
+    }
+
+    let editButton = await driver.findElement(By.id("sponsorTimeEditButtonSubmissionNotice" + index));
+    let sponsorTimeDisplays = await driver.findElements(By.className("sponsorTimeDisplay"));
+    let sponsorTimeDisplay = sponsorTimeDisplays[index];
+    await sponsorTimeDisplay.click();
+    // Ensure edit time appears
+    await driver.findElement(By.id("submittingTime0SubmissionNotice" + index));
+
+    // Try the edit button too
+    await editButton.click();
+    await editButton.click();
+
+    const startTimeBox = await driver.findElement(By.id("submittingTime0SubmissionNotice" + index));
+    expect((await startTimeBox.getAttribute("value"))).toBe(expectedStartTimeBox);
+    await startTimeBox.clear();
+    await startTimeBox.sendKeys(startTime);
+
+    const endTimeBox = await driver.findElement(By.id("submittingTime1SubmissionNotice" + index));
+    expect((await endTimeBox.getAttribute("value"))).toBe(expectedEndTimeBox);
+    await endTimeBox.clear();
+    await endTimeBox.sendKeys(endTime);
+
+    editButton = await driver.findElement(By.id("sponsorTimeEditButtonSubmissionNotice" + index));
+    await editButton.click();
+
+    sponsorTimeDisplays = await driver.findElements(By.className("sponsorTimeDisplay"));
+    sponsorTimeDisplay = sponsorTimeDisplays[index];
+    await driver.wait(until.elementTextIs(sponsorTimeDisplay, expectedDisplayedTime));
+}
+
+async function autoskipSegment(driver: WebDriver, startTime: number, endTime: number): Promise<void> {
+    const video = await driver.findElement(By.css("video"));
+
+    await driver.executeScript("document.querySelector('video').currentTime = " + (startTime - 0.5));
+    await driver.executeScript("document.querySelector('video').play()");
+
+    await driver.sleep(1300);
+
+    expect(parseFloat(await video.getAttribute("currentTime"))).toBeGreaterThan(endTime);
+    await driver.executeScript("document.querySelector('video').pause()");
+}
--- a/webpack/webpack.common.js
+++ b/webpack/webpack.common.js
@@ -10,6 +10,7 @@ module.exports = env => ({
        background: path.join(__dirname, srcDir + 'background.ts'),
        content: path.join(__dirname, srcDir + 'content.ts'),
        options:  path.join(__dirname, srcDir + 'options.ts'),
+        help:  path.join(__dirname, srcDir + 'help.ts'),
        permissions:  path.join(__dirname, srcDir + 'permissions.ts')
    },
    output: {
Author	SHA1	Message	Date
Ajay Ramachandran	6714dbb73f	Merge branch 'master' of https://github.com/ajayyy/SponsorBlock into selenium	2021-08-20 13:28:31 -04:00
Ajay Ramachandran	989b5c9370	New Crowdin updates (#883 )	2021-08-20 03:57:46 -04:00
Ajay Ramachandran	032264d8bb	Merge pull request #896 from ajayyy/improvements More highlight improvements	2021-08-20 03:57:27 -04:00
Ajay Ramachandran	d089e43b8a	Add tooltip about highlight feature	2021-08-20 03:54:49 -04:00
Ajay Ramachandran	b3336a218e	Make help page localisable and make up to date Closes https://github.com/ajayyy/SponsorBlock/issues/509	2021-08-20 02:00:15 -04:00
Ajay Ramachandran	bea943dc96	Add option to disable $ link	2021-08-20 00:04:42 -04:00
Ajay Ramachandran	12f41521f5	Merge pull request #895 from ajayyy/improvements Highlight category improvements	2021-08-19 22:37:53 -04:00
Ajay Ramachandran	36aec560ca	Add options for smaller and faded notice	2021-08-19 22:32:28 -04:00
Ajay Ramachandran	e8a106d36b	Fix warnings	2021-08-19 13:23:28 -04:00
Ajay Ramachandran	2c52b9e600	Merge pull request #690 from ajayyy/improvements Highlight category	2021-08-19 13:23:26 -04:00
Ajay Ramachandran	3c5316a11c	Disable fading by default for now	2021-08-19 13:21:30 -04:00
Ajay Ramachandran	c5044d3ebd	Decrease font size on help page	2021-08-19 11:45:32 -04:00
Ajay Ramachandran	db34f1fd5b	Add keybind support to skip to highlight	2021-08-19 01:17:36 -04:00
Ajay Ramachandran	21f563fdb7	Fix confusing padding on options page	2021-08-18 13:33:28 -04:00
Ajay Ramachandran	3bbc699d98	Move highlight category on options page	2021-08-18 13:29:02 -04:00
Ajay Ramachandran	53d688f219	Fix skip button on control bar in firefox	2021-08-18 11:18:24 -04:00
Ajay Ramachandran	2231e2a345	Keep showing control bar button if hovered	2021-08-18 02:13:05 -04:00
Ajay Ramachandran	e126b59078	Added skip button in control bar instead of using skip notice	2021-08-18 02:07:24 -04:00
Ajay Ramachandran	2a0e893dfc	Fix second notice fading too soon	2021-08-17 23:09:01 -04:00
Ajay Ramachandran	8b348a2aeb	Rename highlight category to poi_highlight	2021-08-17 22:05:19 -04:00
Ajay Ramachandran	28096e1ba6	Don't show multiple skip notices after skipping highlight	2021-08-17 21:45:30 -04:00
Ajay Ramachandran	56b74d6863	Use "skipped to" for poi	2021-08-17 21:44:57 -04:00
Ajay Ramachandran	ffc8f0b6a0	Hide unskip by default on poi segments	2021-08-17 21:05:53 -04:00
Ajay Ramachandran	4fef6dcfa0	Remove preview category auto enable	2021-08-17 21:03:36 -04:00
Ajay Ramachandran	a3c80573fa	Make unskip work with highlight segment	2021-08-17 20:47:40 -04:00
Ajay Ramachandran	a13f5d2359	Show skip notice when clicking poi segment in seek bar	2021-08-17 19:37:52 -04:00
Ajay Ramachandran	42beaf698c	Make highlight larger on preview bar	2021-08-17 18:37:59 -04:00
Ajay Ramachandran	4e99754b8c	Merge branch 'master' of https://github.com/ajayyy/SponsorBlock into improvements	2021-08-17 18:25:18 -04:00
Ajay Ramachandran	422139f474	Link to new wiki	2021-08-17 01:45:03 -04:00
Ajay Ramachandran	93e5bf5033	Merge pull request #887 from maximmax42/patch-1 Fix for an "enable category" popup	2021-08-14 21:54:16 -04:00
Maxim	1bd78ec1c4	Fix for an "enable category" popup If you choose any category when editing a segment, and then choose the "Choose a category" one, it triggers the enable category message with an empty category name. This is a fix for that.	2021-08-15 02:42:47 +05:00
Ajay Ramachandran	f01a1ae4ec	Never show negative formatted time	2021-08-13 23:19:08 -04:00
Ajay Ramachandran	9c54d141e9	Merge branch 'master' of https://github.com/ajayyy/SponsorBlock into improvements	2021-07-31 01:02:41 -04:00
Ajay Ramachandran	32c512a12c	Add browser stack support to selenium test	2021-07-31 00:56:49 -04:00
Ajay Ramachandran	4ef8e36821	Fix build step casing	2021-07-30 23:37:13 -04:00
Ajay Ramachandran	788d4bf73c	Build before running test	2021-07-30 23:36:31 -04:00
Ajay Ramachandran	d73c666e1f	Extract out setup steps	2021-07-30 23:34:15 -04:00
Ajay Ramachandran	3187efaf1a	Add test for skipping preview segment	2021-07-30 16:00:59 -04:00
Ajay Ramachandran	b9bbbebc10	Add test for editing	2021-07-30 15:53:57 -04:00
Ajay Ramachandran	d93e9a7d8a	Add basic selenium test	2021-07-30 15:04:05 -04:00
Ajay Ramachandran	8c9424b6c5	Show notice in first slot if available	2021-07-18 15:42:54 -04:00
Ajay Ramachandran	6fa5aea680	Use short skip notice for highlight category	2021-07-15 16:36:42 -04:00
Ajay Ramachandran	a839480a33	Add auto and manual skip at start	2021-07-15 16:01:22 -04:00
Ajay Ramachandran	0dd2d18b07	Merge branch 'master' of https://github.com/ajayyy/SponsorBlock into improvements	2021-07-02 21:21:25 -04:00
Ajay Ramachandran	798221606d	Revert padding change	2021-07-01 01:13:06 -04:00
Ajay Ramachandran	55b38dc30e	Fix x button position	2021-07-01 01:11:34 -04:00
Ajay Ramachandran	a1722db8d5	Fix key issues and remove redundant css property	2021-07-01 01:03:14 -04:00
Ajay Ramachandran	d27ddc85ae	Move code for smaller notice into general notice component Fixes other notices	2021-07-01 00:54:52 -04:00
Ajay Ramachandran	6d07abf6c8	Added basic PoC expanding notice todo: move code to the general notice	2021-06-30 23:43:45 -04:00
Ajay Ramachandran	7adf0ad169	Added a notice that starts faded	2021-06-30 21:50:54 -04:00
Ajay Ramachandran	0086f00889	Remove printing	2021-06-30 21:28:14 -04:00
Ajay Ramachandran	d458bb0cdf	Merge branch 'master' of https://github.com/ajayyy/SponsorBlock into improvements # Conflicts: # src/components/SkipNoticeComponent.tsx # src/config.ts # src/content.ts	2021-06-30 21:27:21 -04:00
Ajay Ramachandran	71ec724295	Merge branch 'master' of https://github.com/ajayyy/SponsorBlock into improvements	2021-06-18 00:46:55 -04:00
Ajay Ramachandran	5472919866	Merge branch 'master' of https://github.com/ajayyy/SponsorBlock into improvements	2021-05-22 23:08:11 -04:00
Ajay Ramachandran	92eafdb6f3	Merge branch 'master' of https://github.com/ajayyy/SponsorBlock into improvements	2021-05-22 01:52:05 -04:00
Ajay Ramachandran	5fbb8c0d4a	Merge branch 'master' of https://github.com/ajayyy/SponsorBlock into improvements # Conflicts: # manifest/manifest.json # src/components/SponsorTimeEditComponent.tsx # src/config.ts # src/content.ts # src/types.ts	2021-05-22 01:28:24 -04:00
Ajay Ramachandran	ebf3b324b6	Added a smaller notice	2021-05-13 20:03:05 -04:00
Ajay Ramachandran	e680099cec	Scroll to category in options page	2021-05-11 01:09:01 -04:00
Ajay Ramachandran	616981a2b7	Update react to fix chrome warnings	2021-05-11 00:27:18 -04:00
Ajay Ramachandran	2aaee2c1c4	Only show skip keybind hint on one notice	2021-05-11 00:18:40 -04:00
Ajay Ramachandran	ef7e5d1312	Made highlight category work with hover text	2021-05-11 00:06:22 -04:00
Ajay Ramachandran	a8af7a0d78	Merge branch 'master' of https://github.com/ajayyy/SponsorBlock into improvements # Conflicts: # public/_locales/en/messages.json # src/utils.ts	2021-05-10 20:17:17 -04:00
Ajay Ramachandran	97ed091432	Change highlight default	2021-05-06 15:58:27 -04:00
Ajay Ramachandran	756233a959	Update db link	2021-04-29 20:30:05 -04:00
Ajay Ramachandran	9c13b7e8fd	Merge branch 'master' of https://github.com/ajayyy/SponsorBlock into improvements	2021-04-23 21:34:47 -04:00
Ajay Ramachandran	a812b16da5	Fix centering on cloudtube	2021-04-08 19:04:11 -04:00
Ajay Ramachandran	4020cdc4f2	Support CloudTube	2021-04-08 18:42:13 -04:00
Ajay Ramachandran	5cf6719681	Merge branch 'master' of https://github.com/ajayyy/SponsorBlock into improvements	2021-04-08 17:58:50 -04:00
Ajay Ramachandran	0a587ed98b	Fix button visibility for highlight category and always show upload button	2021-04-07 21:44:42 -04:00
Ajay Ramachandran	a08dbf4da1	Add submitting for highlight category	2021-04-05 23:35:05 -04:00
Ajay Ramachandran	edcda31db4	Raise z index of notice to be in front of endcards	2021-04-01 21:15:11 -04:00
Ajay Ramachandran	a10d7c338c	Add preview category Closes https://github.com/ajayyy/SponsorBlock/issues/444	2021-03-30 22:50:36 -04:00
Ajay Ramachandran	3ff5fdb3a1	Prompt to accept youtube.com permission if video info fails to load Should fix #698, #687, #611 and #635	2021-03-24 20:13:33 -04:00
Ajay Ramachandran	cc935624e9	Add homepage url	2021-03-20 12:24:49 -04:00
Ajay Ramachandran	2681dc1890	Submit video duration	2021-03-20 11:50:15 -04:00