Merge pull request #399 from ajayyy/react

Save category in preview submissions and other fixes
Show short names when hovering the preview bar
2025-12-09 13:07:05 +03:00 · 2020-07-03 21:20:53 -04:00 · 2020-07-03 21:16:38 -04:00 · 2020-07-03 20:58:15 -04:00 · 2020-07-03 20:58:01 -04:00 · 2020-07-03 20:56:45 -04:00
41 changed files with 1653 additions and 394 deletions
--- a/README.md
+++ b/README.md
@@ -11,18 +11,21 @@
  <b>Download:</b>
  <a href="https://chrome.google.com/webstore/detail/mnjggcdmjocbbbhaepdhchncahnbgone">Chrome/Chromium</a> |
  <a href="https://addons.mozilla.org/addon/sponsorblock/?src=external-github">Firefox</a> |
+  <a href="https://github.com/ajayyy/SponsorBlock/wiki/Android">Android</a> |
  <a href="https://sponsor.ajay.app">Website</a> |
  <a href="https://sponsor.ajay.app/stats">Stats</a>
 </p>

 <p align="center">
  <b>Unofficial Ports:</b>
-  <a href="https://github.com/ajayyy/SponsorBlock/wiki/Unofficial-Ports#mpv-media-player">MPV</a>
+  <a href="https://github.com/ajayyy/SponsorBlock/wiki/Unofficial-Ports#mpv-media-player">MPV</a> |
+  <a href="https://github.com/ajayyy/SponsorBlock/wiki/Unofficial-Ports#kodi">Kodi</a> |
+  <a href="https://github.com/ajayyy/SponsorBlock/wiki/Unofficial-Ports#ios">iOS</a>
 </p>

 <p align="center">
    <a href="https://addons.mozilla.org/addon/sponsorblock/?src=external-github"><img src="https://img.shields.io/amo/users/sponsorblock?label=Firefox%20Users" alt="Badge"></img></a>
-    <a href="https://chrome.google.com/webstore/detail/mnjggcdmjocbbbhaepdhchncahnbgone"><img src="https://img.shields.io/chrome-web-store/users/mnjggcdmjocbbbhaepdhchncahnbgone?label=Chome%20Users" alt="Badge"></img></a>
+    <a href="https://chrome.google.com/webstore/detail/mnjggcdmjocbbbhaepdhchncahnbgone"><img src="https://img.shields.io/chrome-web-store/users/mnjggcdmjocbbbhaepdhchncahnbgone?label=Chrome%20Users" alt="Badge"></img></a>
    <a href="https://sponsor.ajay.app/stats"><img src="https://img.shields.io/badge/dynamic/json?label=Sponsors%20Submitted&query=totalSubmissions&suffix=%20sponsors&url=http%3A%2F%2Fsponsor.ajay.app%2Fapi%2FgetTotalStats&color=darkred" alt="Badge"></img></a>
    <a href="https://sponsor.ajay.app/stats"><img src="https://img.shields.io/badge/dynamic/json?label=Contributing%20Users&query=userCount&url=http%3A%2F%2Fsponsor.ajay.app%2Fapi%2FgetTotalStats&color=darkblue" alt="Badge"></img></a>
    <a href="https://sponsor.ajay.app/stats"><img src="https://img.shields.io/badge/dynamic/json?label=Time%20Saved%20From%20Skips&query=daysSaved&url=http%3A%2F%2Fsponsor.ajay.app%2Fapi%2FgetDaysSavedFormatted&color=darkgreen&suffix=%20days" alt="Badge"></img></a>
@@ -32,7 +35,7 @@

 SponsorBlock is an extension that will skip over sponsored segments of YouTube videos. SponsorBlock is a crowdsourced browser extension that lets anyone submit the start and end times of sponsored segments of YouTube videos. Once one person submits this information, everyone else with this extension will skip right over the sponsored segment.

-Also support Invidio.us.
+Also supports Invidio.us.

 **Translate:** [![Crowdin](https://badges.crowdin.net/sponsorblock/localized.svg)](https://crowdin.com/project/sponsorblock)

@@ -46,7 +49,7 @@ The backend server code is available here: https://github.com/ajayyy/SponsorBloc

 It is a simple SQLite database that will hold all the timing data.

-To make sure that this project doesn't die, I have made the database publicly downloadable at https://sponsor.ajay.app/database.db. If you are planning on using the database in another project, please read the [API Docs](https://github.com/ajayyy/SponsorBlock/wiki/API-Docs) page for more information.
+To make sure that this project doesn't die, I have made the database publicly downloadable at https://sponsor.ajay.app/database.db ([License](https://github.com/ajayyy/SponsorBlock/wiki/Database-and-API-License)). If you are planning on using the database in another project, please read the [API Docs](https://github.com/ajayyy/SponsorBlock/wiki/API-Docs) page for more information.

 The dataset and API are now being used in some [ports](https://github.com/ajayyy/SponsorBlock/wiki/Unofficial-Ports) as well as a [neural network](https://github.com/andrewzlee/NeuralBlock).

--- a/manifest/manifest.json
+++ b/manifest/manifest.json
@@ -1,7 +1,7 @@
 {
    "name": "__MSG_fullName__",
-    "short_name": "__MSG_Name__",
-    "version": "1.2.30",
+    "short_name": "SponsorBlock",
+    "version": "2.0.3",
    "default_locale": "en",
    "description": "__MSG_Description__",
    "content_scripts": [{
@@ -32,6 +32,7 @@
        "icons/downvote.png",
        "icons/thumbs_down.svg",
        "icons/thumbs_up.svg",
+        "icons/help.svg",
        "icons/report.png",
        "icons/close.png",
        "icons/beep.ogg",
@@ -49,7 +50,7 @@
        "*://*/*"
    ],
    "browser_action": {
-        "default_title": "__MSG_Name__",
+        "default_title": "SponsorBlock",
        "default_popup": "popup.html"
    }, 
    "background": {
--- a/public/_locales/bg/messages.json
+++ b/public/_locales/bg/messages.json
@@ -95,9 +95,6 @@
    "voted": {
        "message": "Гласувано!"
    },
-    "voteFail": {
-        "message": "Вече сте гласували така преди."
-    },
    "connectionError": {
        "message": "Възникна грешка с връзката. Код на грешката: "
    },
@@ -127,5 +124,29 @@
    },
    "voteOnTime": {
        "message": "Гласуване за спонсорства"
+    },
+    "savedPeopleFrom": {
+        "message": "Вие сте помогнали на хора да пропуснат "
+    },
+    "viewLeaderboard": {
+        "message": "Вижте leaderboard-а"
+    },
+    "here": {
+        "message": "тук"
+    },
+    "discordAdvert": {
+        "message": "Елате в официалния Discord сървър за да давате предложения!"
+    },
+    "hideThis": {
+        "message": "Скрий това"
+    },
+    "Options": {
+        "message": "Настройки"
+    },
+    "showButtons": {
+        "message": "Показване на бутоните в YouTube Player-а"
+    },
+    "hideButtons": {
+        "message": "Скриване на бутоните в YouTube Player-а"
    }
 }
--- a/public/_locales/de/messages.json
+++ b/public/_locales/de/messages.json
@@ -33,11 +33,17 @@
        "message": "gesponsorter Inhalt"
    },
    "Segments": {
-        "message": "gesponsorte Inhalte"
+        "message": "gesponserten Inhalten"
+    },
+    "upvoteButtonInfo": {
+        "message": "Diesen Beitrag aufwerten"
    },
    "reportButtonTitle": {
        "message": "Melden"
    },
+    "reportButtonInfo": {
+        "message": "Beitrag als unzulässig melden."
+    },
    "Dismiss": {
        "message": "Abbrechen"
    },
@@ -98,8 +104,8 @@
    "voted": {
        "message": "Abgestimmt!"
    },
-    "voteFail": {
-        "message": "Du hast bereits so abgestimmt."
+    "serverDown": {
+        "message": "Der Server ist scheinbar offline. Bitte unverzüglich dem Entwickler melden."
    },
    "connectionError": {
        "message": "Ein Verbindungsfehler ist aufgetreten. Fehlermeldung: "
@@ -477,35 +483,82 @@
    "category_sponsor": {
        "message": "Sponsor"
    },
+    "category_sponsor_description": {
+        "message": "Bezahlte Promotion, bezahlte Empfehlungen und direkte Werbung. Nicht für Selbstpromotion oder kostenlose Shoutouts an Ursachen/Webseiten/Produkte, die sie mögen."
+    },
    "category_intro": {
        "message": "Intro Animation"
    },
+    "category_intro_description": {
+        "message": "Intro Animationen, die in der Serie wiederholt werden oder keinen direkten Wert haben. Dies sollte nicht für Musikvideos verwendet werden."
+    },
+    "category_intro_short": {
+        "message": "Intro"
+    },
    "category_outro": {
        "message": "Endkarten/Credits"
    },
+    "category_outro_description": {
+        "message": "Credits oder wenn die YouTube-Endkarten erscheinen. Nicht für gesprochene Fazits. Dies sollte keine nützlichen Inhalte beinhalten. Dies sollte nicht für Musikvideos verwendet werden."
+    },
    "category_interaction": {
        "message": "Interaktions-Erinnerung (Abonnieren)"
    },
+    "category_interaction_description": {
+        "message": "Wenn es eine kurze Erinnerung gibt, zu abonnieren oder zu folgen in der Mitte des Videos. Wenn es lange ist oder etwas Konkretes ist, sollte es stattdessen unter Selbstpromotion stehen."
+    },
+    "category_interaction_short": {
+        "message": "Interaktions-Erinnerung"
+    },
    "category_selfpromo": {
-        "message": "Eigenwerbung und Merchandise"
+        "message": "Unbezahlt/Eigenwerbung"
+    },
+    "category_selfpromo_description": {
+        "message": "Ähnlich wie bei \"Sponsor\" mit Ausnahme von unbezahlten oder Selbstpromotion. Dies beinhaltet Abschnitte über Waren, Spenden oder Informationen darüber, mit wem sie zusammengearbeitet haben."
    },
    "category_music_offtopic": {
        "message": "Musik: Nicht-Musik-Abschnitt"
    },
+    "category_music_offtopic_description": {
+        "message": "Nur für den Einsatz in Musikvideos. Dies beinhaltet Einführungen oder Outros in Musikvideos."
+    },
+    "category_music_offtopic_short": {
+        "message": "Nicht-Musik"
+    },
    "category_livestream_messages": {
        "message": "Livestream: Spenden/Nachrichten vorlesen"
    },
+    "category_livestream_messages_short": {
+        "message": "Nachrichten lesen"
+    },
    "disable": {
        "message": "Deaktivieren"
    },
    "manualSkip": {
-        "message": "Manueller Überspringen"
+        "message": "Manuelles Überspringen"
    },
    "showOverlay": {
        "message": "Vor-/Rücklaufleiste anzeigen"
    },
+    "colorFormatIncorrect": {
+        "message": "Ihre Farbe ist falsch formatiert. Sie sollte ein 3-6-stelliger Hex-Code mit einem Zahlenzeichen am Anfang sein."
+    },
+    "previewColor": {
+        "message": "Vorschau Farbe",
+        "description": "Referring to submissions that have not been sent to the server yet."
+    },
+    "seekBarColor": {
+        "message": "Suchleisten-Farbe"
+    },
+    "category": {
+        "message": "Kategorie"
+    },
+    "skipOption": {
+        "message": "Option zum Überspringen",
+        "description": "Used on the options page to describe the ways to skip the segment (auto skip, manual, etc.)"
+    },
    "enableTestingServer": {
-        "message": "Beta Testing Server aktivieren"
+        "message": "Beta-Testing Server aktivieren"
    },
    "whatEnableTestingServer": {
        "message": "Deine Einreichungen und Stimmen werden NICHT für den Hauptserver geltend. Benutze dies nur für Tests."
@@ -532,7 +585,7 @@
        "message": "Kanal-ID wurde noch nicht geladen."
    },
    "adblockerIssue": {
-        "message": "Irgendwas hält SponsorBlock davon ab, die Videodaten abzurufen. Möglicherweise ist das dein Werbeblocker. Mehr Infos: https://github.com/ajayyy/SponsorBlock/wiki/Fix-Ad-Blocker-Blocking-SponsorBlock's-Requests"
+        "message": "Irgendetwas hält SponsorBlock davon ab, die Videodaten abzurufen. Möglicherweise ist es dein Werbeblocker. Mehr Infos: https://github.com/ajayyy/SponsorBlock/wiki/Fix-Ad-Blocker-Blocking-SponsorBlock's-Requests"
    },
    "itCouldBeAdblockerIssue": {
        "message": "Falls dies weiterhin geschieht, könnte dies durch Ihren Werbeblocker verursacht werden. Bitte überprüfen Sie https://github.com/ajayyy/SponsorBlock/wiki/Fix-Ad-Blocker-Blocking-SponsorBlock's-Requests"
@@ -554,5 +607,27 @@
    },
    "nonMusicCategoryOnMusic": {
        "message": "Dieses Video ist als Musik kategorisiert. Sind Sie sicher, dass Sie Segmente mit Nicht-Musikkategorien einreichen möchten? Wenn dieses Video nicht wirklich Musik ist, sollten Sie dieses Segment nicht einreichen. Bitte lesen Sie die Richtlinien, wenn Sie verwirrt sind."
+    },
+    "multipleSegments": {
+        "message": "Mehrere Segmente"
+    },
+    "guidelines": {
+        "message": "Richtlinien"
+    },
+    "readTheGuidelines": {
+        "message": "Lesen Sie die Richtlinien!!",
+        "description": "Show the first time they submit or if they are \"high risk\""
+    },
+    "categoryUpdate1": {
+        "message": "Kategorien sind hier!"
+    },
+    "categoryUpdate2": {
+        "message": "Öffnen Sie die Optionen um Intros, Outros, Merch usw. zu überspringen."
+    },
+    "unsubmittedWarning": {
+        "message": "Nicht eingereichte Segment-Benachrichtigung"
+    },
+    "unsubmittedWarningDescription": {
+        "message": "Senden Sie eine Benachrichtigung, wenn Sie ein Video mit nicht hochgeladenen Segmenten verlassen"
    }
 }
--- a/public/_locales/en/messages.json
+++ b/public/_locales/en/messages.json
@@ -1,8 +1,4 @@
 {
-    "Name": {
-        "message": "SponsorBlock",
-        "description": "Name of the extension."
-    },
    "fullName": {
        "message": "SponsorBlock for YouTube - Skip Sponsorships",
        "description": "Name of the extension."
@@ -222,7 +218,7 @@
        "message": "Show Notice Again"
    },
    "longDescription": {
-        "message": "SponsorBlock is an extension that will skip over sponsored segments of YouTube videos. SponsorBlock is a crowdsourced browser extension that lets anyone submit the start and end times of sponsored segments of YouTube videos. Once one person submits this information, everyone else with this extension will skip right over the sponsored segment.",
+        "message": "SponsorBlock is an extension that will skip over sponsored segments of YouTube videos. SponsorBlock is a crowdsourced browser extension that lets anyone submit the start and end times of sponsored segments of YouTube videos. Once one person submits this information, everyone else with this extension will skip right over the sponsored segment. \n\n You can also skip intros, outros, reminders to subscribe and other categories.",
        "description": "Full description of the extension on the store pages."
    },
    "website": {
@@ -293,6 +289,12 @@
    "audioNotificationDescription": {
        "message": "Audio notification on skip will play a sound whenever a sponsor is skipped. If disabled (or auto skip is disabled), no sound will be played."
    },
+    "showTimeWithSkips": {
+        "message": "Show Time With Skips Removed"
+    },
+    "showTimeWithSkipsDescription": {
+        "message": "This time appears in brackets next to the current time on below the seekbar. This shows the total video duration minus any segments. This includes segments marked as only \"Show In Seekbar\"."
+    },
    "youHaveSkipped": {
        "message": "You have skipped "
    },
@@ -470,9 +472,6 @@
    "theKey": {
        "message": "The key"
    },
-    "keyAlreadyUsedByYouTube": {
-        "message": "is already used by youtube. Please select another key."
-    },
    "keyAlreadyUsed": {
        "message": "is bound to another action. Please select another key."
    },
@@ -483,24 +482,54 @@
    "category_sponsor": {
        "message": "Sponsor"
    },
+    "category_sponsor_description": {
+        "message": "Paid promotion, paid referrals and direct advertisements. Not for self-promotion or free shoutouts to causes/creators/websites/products they like."
+    },
    "category_intro": {
-        "message": "Intro Animation"
+        "message": "Intermission/Intro Animation"
+    },
+    "category_intro_description": {
+        "message": "An interval without actual content. Could be a pause, static frame, repeating animation. This should not be used for transitions containing information or be used on music videos."
+    },
+    "category_intro_short": {
+        "message": "Intermission"
    },
    "category_outro": {
        "message": "Endcards/Credits"
    },
+    "category_outro_description": {
+        "message": "Credits or when the YouTube endcards appear. Not for spoken conclusions. This should not include useful content. This should not be used on music videos."
+    },
    "category_interaction": {
        "message": "Interaction Reminder (Subscribe)"
    },
+    "category_interaction_description": {
+        "message": "When there is a short reminder to like, subscribe or follow them in the middle of content. If it is long or about something specific, it should be under self promotion instead."
+    },
+    "category_interaction_short": {
+        "message": "Interaction Reminder"
+    },
    "category_selfpromo": {
        "message": "Unpaid/Self Promotion"
    },
+    "category_selfpromo_description": {
+        "message": "Similar to \"sponsor\" except for unpaid or self promotion. This includes sections about merchandise, donations, or information about who they collaborated with."
+    },
    "category_music_offtopic": {
        "message": "Music: Non-Music Section"
    },
+    "category_music_offtopic_description": {
+        "message": "Only for use in music videos. This includes introductions or outros in music videos."
+    },
+    "category_music_offtopic_short": {
+        "message": "Non-Music"
+    },
    "category_livestream_messages": {
        "message": "Livestream: Donation/Message Readings"
    },
+    "category_livestream_messages_short": {
+        "message": "Message Reading"
+    },
    "disable": {
        "message": "Disable"
    },
@@ -510,6 +539,23 @@
    "showOverlay": {
        "message": "Show In Seek Bar"
    },
+    "colorFormatIncorrect": {
+        "message": "Your color is formatted incorrectly. It should be a 3 or 6 digit hex code with a number sign at the beginning."
+    },
+    "previewColor": {
+        "message": "Preview Color",
+        "description": "Referring to submissions that have not been sent to the server yet."
+    },
+    "seekBarColor": {
+        "message": "Seek Bar Color"
+    },
+    "category": {
+        "message": "Category"
+    },
+    "skipOption": {
+        "message": "Skip Option",
+        "description": "Used on the options page to describe the ways to skip the segment (auto skip, manual, etc.)"
+    },
    "enableTestingServer": {
        "message": "Enable Beta Testing Server"
    },
@@ -563,5 +609,24 @@
    },
    "multipleSegments": {
        "message": "Multiple Segments"
+    },
+    "guidelines": {
+        "message": "Guidelines"
+    },
+    "readTheGuidelines": {
+        "message": "Read The Guidelines!!",
+        "description": "Show the first time they submit or if they are \"high risk\""
+    },
+    "categoryUpdate1": {
+        "message": "Categories are here!"
+    },
+    "categoryUpdate2": {
+        "message": "Open the options to skip intros, outros, merch, etc."
+    },
+    "unsubmittedWarning": {
+        "message": "Unsubmitted Segments Notification"
+    },
+    "unsubmittedWarningDescription": {
+        "message": "Send a notification when you leave a video with segments that are not uploaded"
    }
 }
--- a/public/_locales/es/messages.json
+++ b/public/_locales/es/messages.json
@@ -458,9 +458,6 @@
    "category_interaction": {
        "message": "Recordatorio de interacción (subscribir)"
    },
-    "category_selfpromo": {
-        "message": "Auto-promoción y mercancía"
-    },
    "category_music_offtopic": {
        "message": "Música: Sección sin musica"
    },
--- a/public/_locales/fi/messages.json
+++ b/public/_locales/fi/messages.json
@@ -101,9 +101,6 @@
    "voted": {
        "message": "Äänestetty!"
    },
-    "voteFail": {
-        "message": "Olet jo äänestänyt näin aiemmin."
-    },
    "serverDown": {
        "message": "Palvelin näyttää olevan alhaalla. Ota heti yhteyttä kehittäjään."
    },
@@ -339,9 +336,6 @@
    "category_interaction": {
        "message": "Vuorovaikutusmuistutus (tilaaminen)"
    },
-    "category_selfpromo": {
-        "message": "Itsepromootio ja fanituotteet"
-    },
    "category_music_offtopic": {
        "message": "Musiikki: muussa kuin Musiikki-osiossa"
    },
--- a/public/_locales/fr/messages.json
+++ b/public/_locales/fr/messages.json
@@ -81,10 +81,10 @@
        "message": "Êtes-vous certain(e) de vouloir supprimer vos soumissions ?\n\n"
    },
    "Unknown": {
-        "message": "Une erreur s'est produite lors de la soumission, veuillez ré-essayer plus tard."
+        "message": "Une erreur s'est produite lors de la soumission, veuillez réessayer plus tard."
    },
    "sponsorFound": {
-        "message": "Les messages commerciaux pour cette vidéo sont déjà dans notre base de donnée !"
+        "message": "Les messages commerciaux pour cette vidéo sont déjà dans notre base de données !"
    },
    "sponsor404": {
        "message": "Pas de messages commerciaux trouvés"
@@ -104,9 +104,6 @@
    "voted": {
        "message": "A voté !"
    },
-    "voteFail": {
-        "message": "Vous avez déjà voté pour ce choix."
-    },
    "serverDown": {
        "message": "Le serveur ne fonctionne pas. Contactez le développeur."
    },
@@ -171,10 +168,10 @@
        "message": "Soumettre les temps"
    },
    "publicStats": {
-        "message": "Affiché sur le classement public pour montrer vos contributions. Voir sur"
+        "message": "Votre pseudo est inscrit dans le classement public pour afficher vos contributions. Le consulter"
    },
    "setUsername": {
-        "message": "Choisir pseudo"
+        "message": "Choisir un pseudonyme"
    },
    "discordAdvert": {
        "message": "Rejoignez le serveur Discord officiel pour toutes suggestions ou remarques!"
@@ -300,7 +297,7 @@
        "message": "Vous avez passé "
    },
    "youHaveSaved": {
-        "message": "Vous avez économisé "
+        "message": "Vous vous êtes économisé "
    },
    "minLower": {
        "message": "minute"
@@ -345,13 +342,13 @@
        "message": "Passage automatique"
    },
    "showSkipNotice": {
-        "message": "Afficher l'avis après le passage d'un sponsor"
+        "message": "Notifier après qu'un sponsor ait été sauté"
    },
    "keybindCurrentlySet": {
        "message": ". Il est actuellement réglé sur :"
    },
    "supportInvidious": {
-        "message": "Soutenir Invidious"
+        "message": "Supporter Invidious"
    },
    "supportInvidiousDescription": {
        "message": "Invidious (invidio.us) est un client tiers pour YouTube. Vous devez accepter des permissions supplémentaires pour activer son support. Cette fonctionnalité ne fonctionne pas en mode incognito sur Chrome et les autres variantes de Chromium."
@@ -486,21 +483,48 @@
    "category_sponsor": {
        "message": "Message commercial"
    },
+    "category_sponsor_description": {
+        "message": "Promotion rémunérée, parrainage rémunéré et publicité directe. Pas pour l'autopromotion ou les présentations gratuites de causes, de créateurs, de sites web ou de produits qu'ils aiment."
+    },
    "category_intro": {
        "message": "Générique d'introduction"
    },
+    "category_intro_description": {
+        "message": "Introductions animées qui sont récurrentes ou qui n'ont pas de valeur ajoutée directe dans la série. Ne doit pas être utilisé pour les vidéos musicales."
+    },
+    "category_intro_short": {
+        "message": "Introduction"
+    },
    "category_outro": {
        "message": "Générique de fin"
    },
+    "category_outro_description": {
+        "message": "Générique de fin ou quand les fiches de fin de vidéo apparaissent. Ne pas utiliser pour les conclusions orales. Ne doit pas inclure de contenu utile. Ne pas utiliser sur les vidéos de musique."
+    },
    "category_interaction": {
        "message": "Rappel d'interaction (abonnement)"
    },
+    "category_interaction_description": {
+        "message": "Lorsqu'il y a un bref rappel pour liker, s'abonner ou les follow parmi le contenu. Si le message est long ou porte sur quelque chose de spécifique, cela devrait plutôt être classé comme une autopromotion."
+    },
+    "category_interaction_short": {
+        "message": "Rappel d'interaction"
+    },
    "category_selfpromo": {
-        "message": "Auto-promotion et produits dérivés"
+        "message": "Non rémunéré/autopromotion"
+    },
+    "category_selfpromo_description": {
+        "message": "Semblable au \"sponsor\", excepté pour la promotion non rémunérée ou l'auto-promotion. Cela inclut les marchandises, les dons et les informations sur leurs collaborateurs."
    },
    "category_music_offtopic": {
        "message": "Musique : Segment non-musicale"
    },
+    "category_music_offtopic_description": {
+        "message": "A utiliser uniquement dans les vidéos musicales. Cela inclut les introductions ou les fins dans les vidéos."
+    },
+    "category_music_offtopic_short": {
+        "message": "Hors musique"
+    },
    "category_livestream_messages": {
        "message": "Stream : lecture de dons et messages"
    },
@@ -513,6 +537,23 @@
    "showOverlay": {
        "message": "Afficher dans la barre de progression"
    },
+    "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."
+    },
+    "previewColor": {
+        "message": "Couleur en mode aperçu",
+        "description": "Referring to submissions that have not been sent to the server yet."
+    },
+    "seekBarColor": {
+        "message": "Couleur dans la barre de progression"
+    },
+    "category": {
+        "message": "Catégorie"
+    },
+    "skipOption": {
+        "message": "Option de saut",
+        "description": "Used on the options page to describe the ways to skip the segment (auto skip, manual, etc.)"
+    },
    "enableTestingServer": {
        "message": "Activer le serveur de test bêta"
    },
@@ -566,5 +607,24 @@
    },
    "multipleSegments": {
        "message": "Plusieurs segments"
+    },
+    "guidelines": {
+        "message": "Instructions"
+    },
+    "readTheGuidelines": {
+        "message": "Lisez les instructions !!",
+        "description": "Show the first time they submit or if they are \"high risk\""
+    },
+    "categoryUpdate1": {
+        "message": "Les catégories sont là !"
+    },
+    "categoryUpdate2": {
+        "message": "Ouvrir les options pour sauter les intros, outros, marchandises, etc."
+    },
+    "unsubmittedWarning": {
+        "message": "Notification de segments non soumis"
+    },
+    "unsubmittedWarningDescription": {
+        "message": "Envoyer une notification lorsque vous quittez une vidéo avec des segments qui ne sont pas téléversés"
    }
 }
--- a/public/_locales/hu/messages.json
+++ b/public/_locales/hu/messages.json
@@ -1,4 +1,8 @@
 {
+    "Name": {
+        "message": "SponsorBlock",
+        "description": "Name of the extension."
+    },
    "Loading": {
        "message": "Betöltés..."
    },
--- a/public/_locales/it/messages.json
+++ b/public/_locales/it/messages.json
@@ -91,9 +91,6 @@
    "voted": {
        "message": "Votato!"
    },
-    "voteFail": {
-        "message": "Hai già votato."
-    },
    "connectionError": {
        "message": "Si è verificato un errore durante la connessione. Codice errore: "
    },
--- a/public/_locales/nl/messages.json
+++ b/public/_locales/nl/messages.json
@@ -11,15 +11,39 @@
        "message": "Sla sponsoring over op YouTube video's. Rapporteer sponsors van video's die je bekijkt om tijd van anderen te besparen.",
        "description": "Description of the extension."
    },
+    "400": {
+        "message": "Server zegt dat het verzoek ongeldig is"
+    },
+    "429": {
+        "message": "Je hebt te veel sponsortijden voor deze video doorgegeven, weet je zeker dat het er zo veel zijn?"
+    },
+    "409": {
+        "message": "Dit is al een keer ingediend"
+    },
+    "channelWhitelisted": {
+        "message": "Kanaal gewhitelist!"
+    },
    "Sponsor": {
        "message": "sponsor"
    },
    "Sponsors": {
        "message": "sponsoren"
    },
+    "Segment": {
+        "message": "Sponsor segment"
+    },
+    "Segments": {
+        "message": "Sponsor segmenten"
+    },
+    "upvoteButtonInfo": {
+        "message": "Stem op deze indiening"
+    },
    "reportButtonTitle": {
        "message": "Melden"
    },
+    "reportButtonInfo": {
+        "message": "Rapporteer deze indiening als onjuist."
+    },
    "Dismiss": {
        "message": "Negeren"
    },
@@ -35,9 +59,21 @@
    "Hide": {
        "message": "Nooit weergeven"
    },
+    "hitGoBack": {
+        "message": "Druk op unskip om naar waar je vandaan komt te gaan."
+    },
+    "unskip": {
+        "message": "Unskip"
+    },
+    "reskip": {
+        "message": "Reskip"
+    },
    "paused": {
        "message": "Gepauzeerd"
    },
+    "manualPaused": {
+        "message": "Timer gestopt"
+    },
    "clearThis": {
        "message": "Weet je zeker dat je dit formulier wilt wissen?\n\n"
    },
@@ -59,9 +95,6 @@
    "voted": {
        "message": "Gestemd!"
    },
-    "voteFail": {
-        "message": "U hebt al eerder op deze manier gestemd."
-    },
    "connectionError": {
        "message": "Er is een verbindingsfout opgetreden. Foutcode: "
    },
--- a/public/_locales/pl_PL/messages.json
+++ b/public/_locales/pl_PL/messages.json
@@ -95,9 +95,6 @@
    "voted": {
        "message": "Zagłosowano!"
    },
-    "voteFail": {
-        "message": "Już na to głosowałeś."
-    },
    "connectionError": {
        "message": "Błąd z połączeniem. Kod błędu: "
    },
--- a/public/_locales/pt_BR/messages.json
+++ b/public/_locales/pt_BR/messages.json
@@ -72,7 +72,7 @@
        "message": "Tem certeza que quer limpar isso?\n\n"
    },
    "Unknown": {
-        "message": "Teve um erro ao enviar seus segmentos, tente novamente depois."
+        "message": "Houve um erro ao enviar seus segmentos, tente novamente mais tarde."
    },
    "sponsorFound": {
        "message": "Os patrocinadores desse vídeo estão no banco de dados!"
@@ -87,7 +87,7 @@
        "message": "Patrocínio termina agora"
    },
    "noVideoID": {
-        "message": "Isso provavelmente não é uma tab do YouTube, ou você clicou muito cedo. \n Se sabe que é uma tab do YouTube,\n feche esse popup e abra de novo."
+        "message": "Nenhum vídeo do YouTube foi encontrado nesta aba. Se você sabe que esta é uma aba do YouTube, feche este pop-up e abra-o novamente. Se isso não funcionar, tente recarregar a aba."
    },
    "success": {
        "message": "Sucesso!"
@@ -95,17 +95,14 @@
    "voted": {
        "message": "Votado!"
    },
-    "voteFail": {
-        "message": "Você já votou antes."
-    },
    "connectionError": {
-        "message": "Um erro de conexão aconteceu: Código: "
+        "message": "Ocorreu um erro de conexão. Código de erro: "
    },
    "wantToSubmit": {
        "message": "Quer enviar os segmentos para o vídeo de ID"
    },
    "leftTimes": {
-        "message": "Parece que você se esqueceu de enviar alguns segmentos. Volta pra página para os enviar (não foram deletados)."
+        "message": "Parece que você se esqueceu de enviar alguns segmentos. Volte para aquela página para enviá-los (eles não foram deletados)."
    },
    "clearTimes": {
        "message": "Apagar intervalos dos patrocínios"
@@ -114,25 +111,25 @@
        "message": "Abrir o Popup SponsorBlock"
    },
    "SubmitTimes": {
-        "message": "Submeter intervalos dos patrocínios"
+        "message": "Enviar intervalos de patrocínios"
    },
    "submitCheck": {
-        "message": "Tem a certeza que pretende submeter?"
+        "message": "Você tem certeza que deseja enviar isto?"
    },
    "whitelistChannel": {
-        "message": "Meter canal na Whitelist"
+        "message": "Colocar canal na lista branca"
    },
    "removeFromWhitelist": {
-        "message": "Remover canal da Whitelist"
+        "message": "Remover canal da lista branca"
    },
    "voteOnTime": {
        "message": "Vote num intervalo de patrocínio"
    },
    "recordTimes": {
-        "message": "Registe um intervalo de patrocínio"
+        "message": "Grave os intervalos de um patrocínio"
    },
    "soFarUHSubmited": {
-        "message": "Até agora submeteu"
+        "message": "Até agora, você já enviou"
    },
    "savedPeopleFrom": {
        "message": "Poupaste a outros de "
@@ -144,10 +141,10 @@
        "message": "aqui"
    },
    "recordTimesDescription": {
-        "message": "Clique no botão abaixo quando o patrocínio começar e quando terminar para registrar e submetê-lo à base de dados."
+        "message": "Clique no botão abaixo quando o patrocínio começa e termina para gravá-lo na base de dados."
    },
    "popupHint": {
-        "message": "Dica: Aperte a tecla ; enquanto reproduzir o vídeo para registar o começo/fim de um patrocínio e \" para enviar. (Essa configuração pode ser mudada em opções.)"
+        "message": "Dica: Aperte a tecla ponto e vírgula (;) com a janela focada em um vídeo para reportar o começo/fim de um patrocínio e aspas (\") para enviar. (Esta configuração pode ser mudada nas opções.)"
    },
    "lastTimes": {
        "message": "Últimos Intervalos de Patrocínios Seleciados"
@@ -162,10 +159,10 @@
        "message": "Isso é usado na página pública de estatísticas que mostra o quanto você já contríbuíu. Veja-a"
    },
    "setUsername": {
-        "message": "Criar nomde de utilizador"
+        "message": "Definir nome de usuário"
    },
    "discordAdvert": {
-        "message": "Junte-se ao discord oficial para sugerir dicas e sugestões!"
+        "message": "Junte-se ao servidor do discord oficial para dar dicas e sugestões!"
    },
    "hideThis": {
        "message": "Esconder isto"
@@ -480,9 +477,6 @@
    "category_interaction": {
        "message": "Lembrete de interação (inscrever-se)"
    },
-    "category_selfpromo": {
-        "message": "Auto-Promoção e Mercadorias"
-    },
    "category_music_offtopic": {
        "message": "Música: Seção sem música"
    },
--- a/public/_locales/pt_PT/messages.json
+++ b/public/_locales/pt_PT/messages.json
@@ -91,9 +91,6 @@
    "voted": {
        "message": "Votado!"
    },
-    "voteFail": {
-        "message": "Já votou antes."
-    },
    "connectionError": {
        "message": "Deu-se um erro de conecção: Código: "
    },
--- a/public/_locales/ro/messages.json
+++ b/public/_locales/ro/messages.json
@@ -1 +1,633 @@
-{}
+{
+    "Name": {
+        "message": "SponsorBlock",
+        "description": "Name of the extension."
+    },
+    "fullName": {
+        "message": "SponsorBlock pentru YouTube - Sari peste sponsorizări",
+        "description": "Name of the extension."
+    },
+    "Description": {
+        "message": "Sari peste sponsorizările din videoclipurile de pe YouTube. Adaugă sponsorizări din videoclipurile pe care le urmăriți pentru a salva timpul altora.",
+        "description": "Description of the extension."
+    },
+    "400": {
+        "message": "Serverul a spus că această cerere este invalidă"
+    },
+    "429": {
+        "message": "Ai trimis prea multe timpuri ale sponsorizărilor pentru acest videoclip, sunteți sigur că sunt atât de multe?"
+    },
+    "409": {
+        "message": "Acest lucru a fost deja trimis înainte"
+    },
+    "channelWhitelisted": {
+        "message": "Canalul a fost adăugat la excepții!"
+    },
+    "Sponsor": {
+        "message": "sponsor"
+    },
+    "Sponsors": {
+        "message": "sponsori"
+    },
+    "Segment": {
+        "message": "segment sponsorizat"
+    },
+    "Segments": {
+        "message": "segmente sponsorizate"
+    },
+    "upvoteButtonInfo": {
+        "message": "Votează această înregistrare"
+    },
+    "reportButtonTitle": {
+        "message": "Raportează"
+    },
+    "reportButtonInfo": {
+        "message": "Raportează această înregistrare ca fiind incorectă."
+    },
+    "Dismiss": {
+        "message": "Renunță"
+    },
+    "Loading": {
+        "message": "Se încarcă..."
+    },
+    "Mins": {
+        "message": "Minute"
+    },
+    "Secs": {
+        "message": "Secunde"
+    },
+    "Hide": {
+        "message": "Nu mai afișa niciodată"
+    },
+    "hitGoBack": {
+        "message": "Apasă unskip pentru a reveni."
+    },
+    "unskip": {
+        "message": "Unskip"
+    },
+    "reskip": {
+        "message": "Sari peste"
+    },
+    "paused": {
+        "message": "Pauză"
+    },
+    "manualPaused": {
+        "message": "Cronometru oprit"
+    },
+    "confirmMSG": {
+        "message": "Pentru a edita sau a șterge valori individuale, apasă butonul de informații sau deschide popup-ul extensiei apăsând iconița extensiei din colțul dreapta sus."
+    },
+    "clearThis": {
+        "message": "Ești sigur că vrei să ștergi asta?\n\n"
+    },
+    "Unknown": {
+        "message": "A apărut o eroare în trimiterea timpilor sponsorizărilor, încearcă din nou mai târziu."
+    },
+    "sponsorFound": {
+        "message": "Sponsorii acestui videoclip se află în baza de date!"
+    },
+    "sponsor404": {
+        "message": "Nu s-a gasit niciun sponsor"
+    },
+    "sponsorStart": {
+        "message": "Sponsorizarea Începe Acum"
+    },
+    "sponsorEnd": {
+        "message": "Sponsorizarea Se Termină Acum"
+    },
+    "noVideoID": {
+        "message": "Nu există niciun videoclip YouTube în aceast tab. Dacă știți că acesta este un tab YouTube, închideți acest popup și deschideți-l din nou. Daca nici asta nu merge, încercați să reîncărcați pagina."
+    },
+    "success": {
+        "message": "Succes!"
+    },
+    "voted": {
+        "message": "Votat!"
+    },
+    "serverDown": {
+        "message": "Se pare că serverul este oprit. Contactează imediat dezvoltatorul."
+    },
+    "connectionError": {
+        "message": "A apărut o eroare de conexiune. Cod de eroare: "
+    },
+    "wantToSubmit": {
+        "message": "Doriți să trimiteți timpii sponsorizărilor pentru acest video id"
+    },
+    "leftTimes": {
+        "message": "Se pare că ați lăsat unii timpi ai sponsorilor netrimiși. Mergeți înapoi la pagina respectivă pentru a îi trimite (timpii nu au fost șterși)."
+    },
+    "clearTimes": {
+        "message": "Șterge Timpii Sponsorizărilor"
+    },
+    "openPopup": {
+        "message": "Deschide Popup-ul SponsorBlock"
+    },
+    "SubmitTimes": {
+        "message": "Trimte Timpii Sponsorizărilor"
+    },
+    "submitCheck": {
+        "message": "Sunteți sigur că doriți să trimiteți asta?"
+    },
+    "whitelistChannel": {
+        "message": "Adaugă Canalul La Excepții"
+    },
+    "removeFromWhitelist": {
+        "message": "Șterge Canalul De La Excepții"
+    },
+    "voteOnTime": {
+        "message": "Votează Timpii Sponsorizărilor"
+    },
+    "recordTimes": {
+        "message": "Înregistrează timpul unei sponsorizări"
+    },
+    "soFarUHSubmited": {
+        "message": "Până acum, ai trimis"
+    },
+    "savedPeopleFrom": {
+        "message": "Ai salvat alte persoane de la "
+    },
+    "viewLeaderboard": {
+        "message": "Vezi clasamentul"
+    },
+    "here": {
+        "message": "aici"
+    },
+    "recordTimesDescription": {
+        "message": "Apasă pe butonul de mai jos când începe o sponsorizare și când se termină pentru a înregistra-o și pentru a o trimite la baza de date."
+    },
+    "popupHint": {
+        "message": "Indiciu: Apasă pe tasta punct și virgulă în timp ce ești centrat pe videoclip pentru a raporta începutul/finalul unei sponsorizări și apasă pe ghilimele pentru a o trimite. (Acest lucru poate fi schimbat din opțiuni)"
+    },
+    "lastTimes": {
+        "message": "Ultimii Timpi Ai Mesajului Sponsorizat Aleși"
+    },
+    "clearTimesButton": {
+        "message": "Șterge Timpii"
+    },
+    "submitTimesButton": {
+        "message": "Trimite Timpii"
+    },
+    "publicStats": {
+        "message": "Acest lucru este folosit pe pagina publică de statistici pentru a arăta cât de mult ai contribuit. Vezi pagina"
+    },
+    "setUsername": {
+        "message": "Setează Numele De Utilizator"
+    },
+    "discordAdvert": {
+        "message": "Vino și alătură-te serverului oficial de discord pentru a oferi sugestii și feedback!"
+    },
+    "hideThis": {
+        "message": "Ascunde asta"
+    },
+    "Options": {
+        "message": "Opţiuni"
+    },
+    "showButtons": {
+        "message": "Arată Butoanele Pe Playerul De YouTube"
+    },
+    "hideButtons": {
+        "message": "Ascunde Butoanele Pe Playerul De YouTube"
+    },
+    "hideButtonsDescription": {
+        "message": "Asta ascunde butoanele ce apar pe playerul de YouTube pentru a trimite segmente."
+    },
+    "showInfoButton": {
+        "message": "Arată Butoanele De Informații Pe Playerul De YouTube"
+    },
+    "hideInfoButton": {
+        "message": "Ascunde Butoanele De Informații Pe Playerul De YouTube"
+    },
+    "whatInfoButton": {
+        "message": "Acesta este butonul care deschide popup-ul pe pagina de YouTube."
+    },
+    "hideDeleteButton": {
+        "message": "Ascunde Butonul De Ștergere Pe Playerul De YouTube"
+    },
+    "showDeleteButton": {
+        "message": "Arată Butonul De Ștergere Pe Playerul De YouTube"
+    },
+    "whatDeleteButton": {
+        "message": "Acest buton de pe playerul de YouTube va șterge toate segmentele netrimise pentru videoclipul curent."
+    },
+    "disableViewTracking": {
+        "message": "Dezactivează Urmărirea Săriturilor"
+    },
+    "enableViewTracking": {
+        "message": "Activează Urmărirea Săriturilor"
+    },
+    "whatViewTracking": {
+        "message": "Acest lucru urmărește peste ce sponsori ai sărit pentru a informa utilizatorii cât de mult înregistrările lor i-au ajutat pe alții și\neste folosit ca un contor împreună cu upvoturile pentru a ne asigura că spamul nu pătrunde în baza de date. Extensia trimite un mesaj\nserverului de fiecare dată când sari peste un sponsor. Sperăm că majoritatea oamenilor nu vor schimba această setare astfel că numerele să fie exacte. :)"
+    },
+    "showNotice": {
+        "message": "Arată Notificarea Din Nou"
+    },
+    "longDescription": {
+        "message": "SponsorBlock este o extensie care va sări peste segmentele sponsorizate din videoclipurile de pe YouTube. SponsorBlock este o extensie crowdsourced care lasă pe oricine să trimită începutul și finalul segmentelor sponsorizate din videoclipurile de pe YouTube. Odată ce o persoană trimite aceste informații, toată lumea cu această extensie va sări peste acel segment sponsorizat.",
+        "description": "Full description of the extension on the store pages."
+    },
+    "website": {
+        "message": "Website",
+        "description": "Used on Firefox Store Page"
+    },
+    "sourceCode": {
+        "message": "Cod Sursă",
+        "description": "Used on Firefox Store Page"
+    },
+    "noticeUpdate": {
+        "message": "Notificarea a fost actualizată!",
+        "description": "The first line of the message displayed after the notice was upgraded."
+    },
+    "noticeUpdate2": {
+        "message": "Dacă nu îți place, apasă butonul nu mai arăta niciodată.",
+        "description": "The second line of the message displayed after the notice was upgraded."
+    },
+    "setStartSponsorShortcut": {
+        "message": "Setează tasta pentru pornirea sponsorizării"
+    },
+    "setSubmitKeybind": {
+        "message": "Setează tasta pentru trimiterea sponsorizării"
+    },
+    "keybindDescription": {
+        "message": "Selectează o tastă apasând-o"
+    },
+    "keybindDescriptionComplete": {
+        "message": "Tasta a fost setată la: "
+    },
+    "0": {
+        "message": "Eroare de Conexiune. Verifică-ți conexiunea la internet. Daca internetul functionează, serverul este probabil supraîncărcat sau a căzut."
+    },
+    "disableSkipping": {
+        "message": "Dezactivează SponsorBlock"
+    },
+    "enableSkipping": {
+        "message": "Activează SponsorBlock"
+    },
+    "yourWork": {
+        "message": "Munca Ta",
+        "description": "Used to describe the section that will show you the statistics from your submissions."
+    },
+    "502": {
+        "message": "Serverul pare să fie supraîncărcat. Încercați din nou în câteva secunde."
+    },
+    "errorCode": {
+        "message": "Codul Erorii: "
+    },
+    "skip": {
+        "message": "Sari"
+    },
+    "skipped": {
+        "message": "Sărit"
+    },
+    "disableAutoSkip": {
+        "message": "Dezactivează Autoskip"
+    },
+    "enableAutoSkip": {
+        "message": "Activează Autoskip"
+    },
+    "autoSkipDescription": {
+        "message": "Autoskip va sări automat peste segmentele sponsorizate pentru tine. Dacă este dezactivată, o notificare va apărea care vă va întreba dacă doriți să săriți peste."
+    },
+    "audioNotification": {
+        "message": "Notificare Audio Când Sari"
+    },
+    "audioNotificationDescription": {
+        "message": "Notificarea audio va reda un sunet atunci când sari peste un segement sponsorizat. Daca este dezactivat (sau autoskip este dezactivat), niciun sunet nu va fi redat."
+    },
+    "youHaveSkipped": {
+        "message": "Ai sărit peste "
+    },
+    "youHaveSaved": {
+        "message": "V-ați salvat "
+    },
+    "minLower": {
+        "message": "minut"
+    },
+    "minsLower": {
+        "message": "minute"
+    },
+    "hourLower": {
+        "message": "oră"
+    },
+    "hoursLower": {
+        "message": "ore"
+    },
+    "youHaveSavedTime": {
+        "message": "Ai salvat alte persoane"
+    },
+    "youHaveSavedTimeEnd": {
+        "message": " din viața lor."
+    },
+    "guildlinesSummary": {
+        "message": "- Asigurați-vă că segmentul conține doar promoții plătite, nimic altceva.\n- Asigurați-vă că dacă săriți peste acest segment nu săriți și peste conținut valoros\n- Dacă tot videoclipul este o sponsorizare, vă rugăm să nu îl trimiteți. Un sistem de trimitere a întregului videoclip este în lucru.\n- Vă rugăm să nu trimiteți mențiunile că videoclipul este sponsorizat care ar putea arăta favoritismul (spre exemplu dacă un videoclip de tip review este sponsorizat, nu trimiteți mențiunea că acel videoclip este sponsorizat)."
+    },
+    "statusReminder": {
+        "message": "Verificați status.sponsor.ajay.app pentru starea serverului."
+    },
+    "changeUserID": {
+        "message": "Importă/Exportă Id-ul Tău De Utilizator"
+    },
+    "whatChangeUserID": {
+        "message": "Acest lucru trebuie să fie păstrat. Este ca și o parolă și nu ar trebui împartășită cu nimeni. Daca cineva are acest lucru, se poate da drept tu."
+    },
+    "setUserID": {
+        "message": "Setează Id-ul Utilizatorului"
+    },
+    "userIDChangeWarning": {
+        "message": "Atenție: Schimbarea Id-ului Utilizatorului este permanentă. Sunteți sigur că doriți să faceți asta? Asigurați-vă că ați făcut o copie de rezervă."
+    },
+    "createdBy": {
+        "message": "Creat De"
+    },
+    "autoSkip": {
+        "message": "Sari Peste Automat"
+    },
+    "showSkipNotice": {
+        "message": "Arată O Notificare După Ce Am Sărit Peste O Sponsorizare"
+    },
+    "keybindCurrentlySet": {
+        "message": ". În prezent este setat:"
+    },
+    "supportInvidious": {
+        "message": "Sprijină Invidious"
+    },
+    "supportInvidiousDescription": {
+        "message": "Invidious (invidio.us) este un client YouTube terț. Pentru a susține, trebuie să acceptați permisiunile suprimentare. Această funcție NU funcționează în incognito pe Chrome sau în alte variante Chromium."
+    },
+    "optionsInfo": {
+        "message": "Activează suportul Invidious, dezactivează autoskip-ul, ascunde butoanele și altele."
+    },
+    "addInvidiousInstance": {
+        "message": "Adaugă O Instanță Invidious"
+    },
+    "addInvidiousInstanceDescription": {
+        "message": "Adaugă o instanță personalizată Invidious. Aceasta trebuie să fie formatată DOAR cu domeniul. Exemplu: invidious.ajay.app"
+    },
+    "add": {
+        "message": "Adaugă"
+    },
+    "addInvidiousInstanceError": {
+        "message": "Acesta este un domeniu invalid. Acesta trebuie să includă DOAR partea de domeniu. Exemplu: invidious.ajay.app"
+    },
+    "resetInvidiousInstance": {
+        "message": "Resetează Lista De Instanțe Invidious"
+    },
+    "resetInvidiousInstanceAlert": {
+        "message": "Sunteți pe cale să resetați lista de instanțe Invidious"
+    },
+    "currentInstances": {
+        "message": "Instanțele curente:"
+    },
+    "minDuration": {
+        "message": "Durată minimă (secunde):"
+    },
+    "minDurationDescription": {
+        "message": "Segmentele de sponsor mai scurte decât valoarea setată nu vor fi omise sau afișate în player."
+    },
+    "shortCheck": {
+        "message": "Următoarea înregistrare este mai mică decât opțiunea voastră de durată minimă. Acest lucru ar putea însemna că a fost deja trimisă și a fost ignorat datorită acestei opțiuni. Sunteți sigur că doriți să trimiteți?"
+    },
+    "showUploadButton": {
+        "message": "Arată Butonul De Încărcare"
+    },
+    "whatUploadButton": {
+        "message": "Acest buton apare pe playerul YouTube după ce ați selectat un marcaj de timp și sunteți gata să îl trimiteți."
+    },
+    "customServerAddress": {
+        "message": "Adresa Serverului SponsorBlock"
+    },
+    "customServerAddressDescription": {
+        "message": "Adresa SponsorBlock este folosită pentru a se efectua apeluri către server.\nDacă nu ai propriul tău server, acesta nu ar trebui modificat."
+    },
+    "save": {
+        "message": "Salvează"
+    },
+    "reset": {
+        "message": "Resetează"
+    },
+    "customAddressError": {
+        "message": "Adresa nu este în forma corectă. Asigurați-vă că http:// sau https:// se află la început."
+    },
+    "areYouSureReset": {
+        "message": "Sunteți sigur că doriți să resetați asta?"
+    },
+    "confirmPrivacy": {
+        "message": "Acest videoclip a fost detectat ca nelistat. Apasă anulați dacă nu doriți să verificați sponsorii."
+    },
+    "unlistedCheck": {
+        "message": "Ignoră Videoclipurile Nelistate/Private"
+    },
+    "whatUnlistedCheck": {
+        "message": "Această setare va încetini puțin SponsorBlock. Căutările segmentelor sponsorizate necesită trimiterea ID-ului videoclipului către server. Dacă sunteți îngrijorat de trimiterea ID-ul videoclipurilor nelistate, activați această opțiune."
+    },
+    "mobileUpdateInfo": {
+        "message": "m.youtube.com este acum suportat"
+    },
+    "exportOptions": {
+        "message": "Importă/Exportă Toate Opțiunile"
+    },
+    "whatExportOptions": {
+        "message": "Aceasta este întreaga configurație în format JSON. Asta include si ID-ul tău de utilizator, așa că fi sigur să împărtășești asta cu înțelepciune."
+    },
+    "setOptions": {
+        "message": "Setează Opțiuni"
+    },
+    "exportOptionsWarning": {
+        "message": "Atenție: Schimbarea acestei opțiuni este permanentă și poate strica instalarea. Sunteți sigur că doriți să faceți asta? Asigurati-vă că ați făcut o copie de rezervă."
+    },
+    "incorrectlyFormattedOptions": {
+        "message": "Acest JSON nu este formatat corect. Opțiunile dumneavoastră nu au fost modificate."
+    },
+    "confirmNoticeTitle": {
+        "message": "Trimite Segment"
+    },
+    "submit": {
+        "message": "Trimite"
+    },
+    "cancel": {
+        "message": "Anulează"
+    },
+    "delete": {
+        "message": "Șterge"
+    },
+    "preview": {
+        "message": "Previzualizare"
+    },
+    "edit": {
+        "message": "Editare"
+    },
+    "copyDebugInformation": {
+        "message": "Copiază Informațiile de Depanare În Clipboard"
+    },
+    "copyDebugInformationFailed": {
+        "message": "Eroare la scrierea în clipboard"
+    },
+    "copyDebugInformationOptions": {
+        "message": "Copiază informația în clipboard pentru a fi furnizată dezvoltatorului când se găsește o eroare / când un dezvoltator o cere. Informațiile sensibile precum ID-ul de utilizator, canale exceptate, și adresa serverului personalizat au fost șterse. Însă conține informații precum useragent-ul, browser-ul, sistemul de operare, și numărul versiunii extensiei. "
+    },
+    "copyDebugInformationComplete": {
+        "message": "Informația de depanare a fost copiată în clipboard. Puteți elimina orice informație pe care nu doriți să o partajați. Salvați într-un fișier sau lipiți-o în raportul de erori."
+    },
+    "theKey": {
+        "message": "Tasta"
+    },
+    "keyAlreadyUsedByYouTube": {
+        "message": "este deja utilizat de YouTube. Vă rugăm selectați o altă tastă."
+    },
+    "keyAlreadyUsed": {
+        "message": "este deja setată la o altă acțiune. Vă rugăm să selectați o altă tastă."
+    },
+    "to": {
+        "message": "până la",
+        "description": "Used between sponsor times. Example: 1:20 to 1:30"
+    },
+    "category_sponsor": {
+        "message": "Sponsor"
+    },
+    "category_sponsor_description": {
+        "message": "Promovare plătită, refferali plătiți și reclame directe. Nu pentru autopromovări sau promovări gratis ale cauzelor/creatorilor/website-urilor/produselor."
+    },
+    "category_intro": {
+        "message": "Animație de Început"
+    },
+    "category_intro_description": {
+        "message": "Animațiile de introducere care se repetă în serie sau care nu oferă nici o valoare directă. Această opțiune nu ar trebui folosită în videoclipurile muzicale."
+    },
+    "category_intro_short": {
+        "message": "Intro"
+    },
+    "category_outro": {
+        "message": "Ecran De Final/Credite"
+    },
+    "category_outro_description": {
+        "message": "Credite sau când ecranul de final YouTube apare. Nu pentru concluzii vorbite. Nu ar trebui să includă conținut util. Nu ar trebui folosit în videoclipuri muzicale."
+    },
+    "category_interaction": {
+        "message": "Reamintire de Interactiune (Abonare)"
+    },
+    "category_interaction_description": {
+        "message": "Când există o scurtă remintire pentru like, abonare sau urmărire în mijlocul conținutului. Daca este mai lung sau despre ceva specific, folosiți autopromovarea."
+    },
+    "category_interaction_short": {
+        "message": "Reamintire de Interacțiune"
+    },
+    "category_selfpromo": {
+        "message": "Promovare neplătită/autopromovare"
+    },
+    "category_selfpromo_description": {
+        "message": "Similar cu \"sponsorizare\" doar că este neplătit sau autopromovare. Aceasta include secțiuni despre merchandise, donații, sau informații despre cei cu care au colaborat."
+    },
+    "category_music_offtopic": {
+        "message": "Muzică: Secţiune Non-Muzicală"
+    },
+    "category_music_offtopic_description": {
+        "message": "Doar pentru videoclipuri muzicale. Include introducțiile sau outro-urile în videoclipurile muzicale."
+    },
+    "category_music_offtopic_short": {
+        "message": "Non-Muzical"
+    },
+    "category_livestream_messages": {
+        "message": "Transmisiune În Direct: Donație/Citirea Mesajelor"
+    },
+    "category_livestream_messages_short": {
+        "message": "Citire Mesaj"
+    },
+    "disable": {
+        "message": "Dezactivare"
+    },
+    "manualSkip": {
+        "message": "Sari Peste Manual"
+    },
+    "showOverlay": {
+        "message": "Arată În Bara de Derulare"
+    },
+    "colorFormatIncorrect": {
+        "message": "Culoarea ta este formatată incorect. Ar trebui să fie un cod hexadecimal de 3 sau 6 cifre cu un hash la început."
+    },
+    "previewColor": {
+        "message": "Previzualizare Culoare",
+        "description": "Referring to submissions that have not been sent to the server yet."
+    },
+    "seekBarColor": {
+        "message": "Culoarea Barei de Derulare"
+    },
+    "category": {
+        "message": "Categorie"
+    },
+    "skipOption": {
+        "message": "Opțiunea Săriturii",
+        "description": "Used on the options page to describe the ways to skip the segment (auto skip, manual, etc.)"
+    },
+    "enableTestingServer": {
+        "message": "Activează Serverul de Teste"
+    },
+    "whatEnableTestingServer": {
+        "message": "Înregistrările și voturile dumneavoastră NU VOR FI CONTORIZATE pe serverul principal. Utilizați asta doar pentru teste."
+    },
+    "testingServerWarning": {
+        "message": "Toate înregistrările și voturile dumneavoastră NU VOR FI CONTORIZATE pe serverul principal în timp ce vă conectați la serverul de teste. Asigurați-vă că dezactivați asta când vreți să trimiteți înregistrări reale."
+    },
+    "bracketNow": {
+        "message": "(Acum)"
+    },
+    "moreCategories": {
+        "message": "Mai multe categorii"
+    },
+    "bracketEnd": {
+        "message": "(Sfârșit)"
+    },
+    "hiddenDueToDownvote": {
+        "message": "ascuns: downvote"
+    },
+    "hiddenDueToDuration": {
+        "message": "ascuns: prea scurt"
+    },
+    "channelDataNotFound": {
+        "message": "ID-ul Canalului nu a fost încărcat încă."
+    },
+    "adblockerIssue": {
+        "message": "Se pare că ceva blocheaza abilitatea extensiei SponsorBlock pentru a obține datele videoclipului. Cel mai probabil este adblocker-ul dumneavoastră. Vă rugăm să verificați https://github.com/ajayyy/SponsorBlock/wiki/Fix-Ad-Blocker-Blocking-SponsorBlock's-Requests"
+    },
+    "itCouldBeAdblockerIssue": {
+        "message": "Dacă acest lucru continuă să se întample, ar putea fi cauzat de adblocker-ul dumneavoastră. Vă rugăm să verificați \nhttps://github.com/ajayyy/SponsorBlock/wiki/Fix-Ad-Blocker-Blocking-SponsorBlock's-Requests"
+    },
+    "forceChannelCheck": {
+        "message": "Forțează Verificarea Canalului Înainte De A Sări Peste Sponsorizări"
+    },
+    "whatForceChannelCheck": {
+        "message": "În mod implicit, va sări peste sponsorizări chiar și înainte de a ști ce canal este. În mod implicit, s-ar putea să se sară și peste unele sponsorizări ce încep la secunda zero din canalele excluse. Activând această opțiune va preveni asta, dar va face ca toate săriturile să aibă o ușoară întârziere, deoarece obținerea Id-ului canalului poate dura ceva timp. Această întărziere poate fi neobservată daca aveți internet rapid."
+    },
+    "forceChannelCheckPopup": {
+        "message": "Consideră Activarea Forțării Verificarii Canalului Înainte De A Sări Peste Sponsorizări"
+    },
+    "downvoteDescription": {
+        "message": "Timpi Incorecți/Greșiți"
+    },
+    "incorrectCategory": {
+        "message": "Categorie Greșită"
+    },
+    "nonMusicCategoryOnMusic": {
+        "message": "Categoria acestui videoclip este muzică. Sunteți sigur că doriți să trimiteți segmente non-muzicale? Dacă acest videoclip nu este de fapt muzică, nu ar trebui să trimiteți acest segment. Vă rugăm să citiți recomandările dacă sunteți confuz."
+    },
+    "multipleSegments": {
+        "message": "Segmente Multiple"
+    },
+    "guidelines": {
+        "message": "Instrucțiuni"
+    },
+    "readTheGuidelines": {
+        "message": "Citește Instrucțiunile!!",
+        "description": "Show the first time they submit or if they are \"high risk\""
+    },
+    "categoryUpdate1": {
+        "message": "Categoriile sunt aici!"
+    },
+    "categoryUpdate2": {
+        "message": "Deschide opțiunile pentru a sări peste intro-uri, outro-uri, merch, etc."
+    },
+    "unsubmittedWarning": {
+        "message": "Notificare Segmente Netrimise"
+    },
+    "unsubmittedWarningDescription": {
+        "message": "Trimite o notificare atunci când părăsești un video cu segmente care nu au fost încărcate"
+    }
+}
--- a/public/_locales/ru/messages.json
+++ b/public/_locales/ru/messages.json
@@ -95,9 +95,6 @@
    "voted": {
        "message": "Голос засчитан!"
    },
-    "voteFail": {
-        "message": "Вы уже проголосовали таким образом раньше."
-    },
    "connectionError": {
        "message": "Ошибка соединения. Код ошибки: "
    },
--- a/public/_locales/sv/messages.json
+++ b/public/_locales/sv/messages.json
@@ -1,4 +1,8 @@
 {
+    "Name": {
+        "message": "SponsorBlock",
+        "description": "Name of the extension."
+    },
    "fullName": {
        "message": "SponsorBlock för YouTube - Hoppa över sponsring",
        "description": "Name of the extension."
@@ -19,6 +23,9 @@
    "channelWhitelisted": {
        "message": "Kanal vitlistad!"
    },
+    "Sponsor": {
+        "message": "sponsor"
+    },
    "Sponsors": {
        "message": "sponsorer"
    },
@@ -31,6 +38,9 @@
    "reportButtonTitle": {
        "message": "Rapportera"
    },
+    "reportButtonInfo": {
+        "message": "Rapportera det här segmentet som inkorrekt."
+    },
    "Dismiss": {
        "message": "Avfärda"
    },
@@ -58,6 +68,9 @@
    "paused": {
        "message": "Pausad"
    },
+    "manualPaused": {
+        "message": "Timern stoppad"
+    },
    "confirmMSG": {
        "message": "Klicka på infoknappen eller öppna popup-rutan genom att klicka på tilläggets ikon i hörnet uppe till höger för att redigera eller ta bort inviduella värden."
    },
@@ -88,8 +101,8 @@
    "voted": {
        "message": "Röstat!"
    },
-    "voteFail": {
-        "message": "Du har redan röstat."
+    "serverDown": {
+        "message": "Det verkar som att servern är nere. Kontakta utvecklaren omedelbart."
    },
    "connectionError": {
        "message": "Anslutningsfel. Felkod: "
@@ -133,6 +146,9 @@
    "viewLeaderboard": {
        "message": "Se leaderboarden"
    },
+    "here": {
+        "message": "här"
+    },
    "recordTimesDescription": {
        "message": "Klicka på knappen nedan när sponsormeddelandet börjar och slutar för att spela in och rapportera till databasen."
    },
@@ -256,6 +272,9 @@
    "skip": {
        "message": "Hoppa över"
    },
+    "skipped": {
+        "message": "Skippat"
+    },
    "disableAutoSkip": {
        "message": "Avaktivera Hoppa Över Automatiskt"
    },
@@ -328,6 +347,9 @@
    "supportInvidious": {
        "message": "Stöd Invidious"
    },
+    "supportInvidiousDescription": {
+        "message": "Invidious (invidio.us) är en tredjeparts YouTube-klient. För att aktivera stöd måste du acceptera de extra behörigheterna. Detta kommer INTE att fungera i incognito i Chrome och andra Cromium-varianter."
+    },
    "optionsInfo": {
        "message": "Aktivera Invidious stöd, avaktivera hoppa över automatiskt, dölj knappar och mer."
    },
@@ -458,8 +480,20 @@
    "category_sponsor": {
        "message": "Sponsormeddelande"
    },
-    "category_selfpromo": {
-        "message": "Självreklam och egna produkter"
+    "category_intro": {
+        "message": "Intro-animation"
+    },
+    "category_intro_description": {
+        "message": "Intro-animationer som är återkommande i serien eller inte ger direkt värde. Detta bör inte användas på musikvideor."
+    },
+    "category_intro_short": {
+        "message": "Intro"
+    },
+    "category_music_offtopic_description": {
+        "message": "Endast för användning i musikvideor. Detta inkluderar intros och outros i musikvideor."
+    },
+    "category_music_offtopic_short": {
+        "message": "Icke-musik"
    },
    "disable": {
        "message": "Avaktivera"
@@ -470,6 +504,9 @@
    "showOverlay": {
        "message": "Visa Lager Ovanpå Spelare"
    },
+    "category": {
+        "message": "Kategori"
+    },
    "enableTestingServer": {
        "message": "Aktivera Server För Betatestning"
    },
@@ -488,6 +525,9 @@
    "bracketEnd": {
        "message": "(Slut)"
    },
+    "hiddenDueToDuration": {
+        "message": "dold: för kort"
+    },
    "channelDataNotFound": {
        "message": "Kanal-ID är inte inladdat än."
    },
@@ -496,5 +536,24 @@
    },
    "itCouldBeAdblockerIssue": {
        "message": "Om detta fortsätter att inträffa, kan orsaken vara din annonsblockerare. Vänligen kontrollera https://github.com/ajayyy/SponsorBlock/wiki/Fix-Ad-Blocker-Blocking-SponsorBlock's-Requests"
+    },
+    "downvoteDescription": {
+        "message": "Fel timing"
+    },
+    "incorrectCategory": {
+        "message": "Fel kategori"
+    },
+    "nonMusicCategoryOnMusic": {
+        "message": "Den här videon är kategoriserad som musik. Är du säker på att du vill skicka in segment med icke-musikkategorier? Om denna video faktiskt är musik, bör du inte skicka in detta segment. Vänligen läs riktlinjerna om du är förvirrad."
+    },
+    "multipleSegments": {
+        "message": "Flera segment"
+    },
+    "guidelines": {
+        "message": "Riktlinjer"
+    },
+    "readTheGuidelines": {
+        "message": "Läs riktlinjerna!!",
+        "description": "Show the first time they submit or if they are \"high risk\""
    }
 }
--- a/public/_locales/tr/messages.json
+++ b/public/_locales/tr/messages.json
@@ -104,9 +104,6 @@
    "voted": {
        "message": "Oylandı!"
    },
-    "voteFail": {
-        "message": "Bu şekilde zaten oy kullanmıştın."
-    },
    "serverDown": {
        "message": "Sunucu çökmüş gibi duruyor. Derhal geliştiriciyle iletişime geçin."
    },
@@ -496,7 +493,7 @@
        "message": "Etkileşim Hatırlatıcısı (Abonelik)"
    },
    "category_selfpromo": {
-        "message": "Kendi Reklamını Yapma ve Ürün"
+        "message": "Karşılıksız/Kendi Reklamı"
    },
    "category_music_offtopic": {
        "message": "Müzik: Müzik Olmayan Bölüm"
--- a/public/_locales/uk/messages.json
+++ b/public/_locales/uk/messages.json
@@ -95,9 +95,6 @@
    "voted": {
        "message": "Голос зарахований!"
    },
-    "voteFail": {
-        "message": "Ви вже проголосували таким чином раніше."
-    },
    "connectionError": {
        "message": "Помилка з'єднання. Код помилки: "
    },
--- a/public/_locales/zh_CN/messages.json
+++ b/public/_locales/zh_CN/messages.json
@@ -104,9 +104,6 @@
    "voted": {
        "message": "已投票！"
    },
-    "voteFail": {
-        "message": "您之前已经这样投过了。"
-    },
    "serverDown": {
        "message": "服务器似乎已宕机。请立即联系开发者。"
    },
@@ -496,7 +493,7 @@
        "message": "互动提醒（订阅）"
    },
    "category_selfpromo": {
-        "message": "自我推销和商品"
+        "message": "未收钱的/自我推销"
    },
    "category_music_offtopic": {
        "message": "音乐：非音乐部分"
--- a/public/content.css
+++ b/public/content.css
@@ -394,4 +394,22 @@ input::-webkit-inner-spin-button {
    color: white;
    border-width: 3px;
    padding: 3px;
+}
+
+.helpButton {
+
+}
+
+.helpButton {
+	height: 25px;
+	cursor: pointer;
+	padding: 5px;
+	
+	margin: auto;
+    top: 0;
+    bottom: 0;
+    position: absolute;
+}
+.helpButton:hover {
+	filter: brightness(80%);
 }
--- a/public/help/index_en.html
+++ b/public/help/index_en.html
@@ -30,15 +30,15 @@
 	  Come contribute, make some suggestions and help out in the Discord: <a href="https://discord.gg/QnmVMpU">https://discord.gg/QnmVMpU</a>
    </p>

-    <div class="center">
-      <a class="bigText" href="/options/options.html">Enable optional features</a>
-    </div>
+    <p style="margin-bottom: 0" class="bigText center">Please review the options below</p>

    <p>
-      Some features, such as support for non third-party YouTube sites, are disabled by default and can be enabled in the options. These can be enabled or disabled at any time.
+      Many features are disabled by default. If you want to skip Intros, outros, use Invidious, please enable the specific options. These can be enabled or disabled at any time.
      You can also hide/show all UI elements added to the YouTube page.
    </p>

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

    <p class="projectPreview">
--- a/public/icons/help.svg
+++ b/public/icons/help.svg
@@ -0,0 +1,58 @@
+<?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="24"
+   viewBox="0 0 24 24"
+   width="24"
+   version="1.1"
+   id="svg6"
+   sodipodi:docname="help.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="M11 18h2v-2h-2v2zm1-16C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm0 18c-4.41 0-8-3.59-8-8s3.59-8 8-8 8 3.59 8 8-3.59 8-8 8zm0-14c-2.21 0-4 1.79-4 4h2c0-1.1.9-2 2-2s2 .9 2 2c0 2-3 1.75-3 5h2c0-2.25 3-2.5 3-5 0-2.21-1.79-4-4-4z"
+     id="path4"
+     style="fill:#ffffff" />
+</svg>
--- a/public/options/options.css
+++ b/public/options/options.css
@@ -346,4 +346,8 @@ svg {
    font-size: 14px;
    padding: 5px;
    border-radius: 5px;
+}
+
+.categoryColorTextBox {
+    width: 60px;
 }
--- a/public/options/options.html
+++ b/public/options/options.html
@@ -12,13 +12,13 @@

 <body class="sponsorBlockPageBody">

-	<div id="title">
+	<div id="title" class="titleBar">
 		<img src="../icons/LogoSponsorBlocker256px.png" height="80" class="profilepic"/>
 		SponsorBlock
 	</div>

 	<div class="center">
-		<p class="createdBy">__MSG_createdBy__ <a href="https://ajay.app">Ajay Ramachandran</a> <img src="../icons/newprofilepic.jpg" height="30" class="profilepiccircle"/></p>
+		<p class="createdBy titleBar">__MSG_createdBy__ <a href="https://ajay.app">Ajay Ramachandran</a> <img src="../icons/newprofilepic.jpg" height="30" class="profilepiccircle"/></p>

 		<h1>__MSG_Options__</h1>
 	
@@ -149,6 +149,40 @@
 				</label>
 			</div>
 	
+			<br/>
+			<br/>
+
+			<div option-type="toggle" sync-option="unsubmittedWarning">
+				<label class="switch-container" label-name="__MSG_unsubmittedWarning__">
+					<label class="switch">
+						<input type="checkbox" checked>
+						<span class="slider round"></span>
+					</label>
+				</label>
+	
+				<br/>
+				<br/>
+	
+				<div class="small-description">__MSG_unsubmittedWarningDescription__</div>
+			</div>
+	
+			<br/>
+			<br/>
+
+			<div option-type="toggle" sync-option="forceChannelCheck">
+				<label class="switch-container" label-name="__MSG_forceChannelCheck__">
+					<label class="switch">
+						<input type="checkbox" checked>
+						<span class="slider round"></span>
+					</label>
+				</label>
+	
+				<br/>
+				<br/>
+	
+				<div class="small-description">__MSG_whatForceChannelCheck__</div>
+			</div>
+	
 			<br/>
 			<br/>
 	
@@ -234,6 +268,23 @@
 				<div class="small-description">__MSG_audioNotificationDescription__</div>
 			</div>

+			<br/>
+			<br/>
+
+			<div option-type="toggle" sync-option="showTimeWithSkips">
+				<label class="switch-container" label-name="__MSG_showTimeWithSkips__">
+					<label class="switch">
+						<input type="checkbox" checked>
+						<span class="slider round"></span>
+					</label>
+				</label>
+	
+				<br/>
+				<br/>
+	
+				<div class="small-description">__MSG_showTimeWithSkipsDescription__</div>
+			</div>
+
 			<br/>
 			<br/>
 	
--- a/public/popup.html
+++ b/public/popup.html
@@ -10,7 +10,7 @@
      <div id="app" class="popupBody sponsorBlockPageBody">
          <h1 class="popupElement logoText">
            <img src="icons/IconSponsorBlocker256px.png" height="32px" id="sponsorBlockPopupLogo"/>
-            __MSG_Name__
+            SponsorBlock
          </h1>

          <!-- Loading text -->
--- a/src/background.ts
+++ b/src/background.ts
@@ -40,21 +40,6 @@ chrome.runtime.onMessage.addListener(function (request, sender, callback) {
                });
            });
        
-            return true;
-        case "addSponsorTime":
-            addSponsorTime(request.time, request.videoID, callback);
-        
-            //this allows the callback to be called later
-            return true;
-        
-        case "getSponsorTimes":
-            getSponsorTimes(request.videoID, function(sponsorTimes) {
-                callback({
-                    sponsorTimes
-                });
-            });
-        
-            //this allows the callback to be called later
            return true;
        case "submitVote":
            submitVote(request.type, request.UUID, request.category).then(callback);
@@ -62,12 +47,14 @@ chrome.runtime.onMessage.addListener(function (request, sender, callback) {
            //this allows the callback to be called later
            return true;
        case "alertPrevious":
-            chrome.notifications.create("stillThere" + Math.random(), {
-                type: "basic",
-                title: chrome.i18n.getMessage("wantToSubmit") + " " + request.previousVideoID + "?",
-                message: chrome.i18n.getMessage("leftTimes"),
-                iconUrl: "./icons/LogoSponsorBlocker256px.png"
-            });
+            if (Config.config.unsubmittedWarning) {
+                chrome.notifications.create("stillThere" + Math.random(), {
+                    type: "basic",
+                    title: chrome.i18n.getMessage("wantToSubmit") + " " + request.previousVideoID + "?",
+                    message: chrome.i18n.getMessage("leftTimes"),
+                    iconUrl: "./icons/LogoSponsorBlocker256px.png"
+                });
+            }
        case "registerContentScript": 
            registerFirefoxContentScript(request);
            return false;
@@ -125,38 +112,6 @@ function unregisterFirefoxContentScript(id: string) {
    delete contentScriptRegistrations[id];
 }

-//gets the sponsor times from memory
-function getSponsorTimes(videoID, callback) {
-    let sponsorTimes = [];
-    let sponsorTimesStorage = Config.config.sponsorTimes.get(videoID);
-
-    if (sponsorTimesStorage != undefined && sponsorTimesStorage.length > 0) {
-        sponsorTimes = sponsorTimesStorage;
-    }
-	
-    callback(sponsorTimes);
-}
-
-function addSponsorTime(time, videoID, callback) {
-    getSponsorTimes(videoID, function(sponsorTimes) {
-        //add to sponsorTimes
-        if (sponsorTimes.length > 0 && sponsorTimes[sponsorTimes.length - 1].length < 2) {
-            //it is an end time
-            sponsorTimes[sponsorTimes.length - 1][1] = time;
-        } else {
-            //it is a start time
-            let sponsorTimesIndex = sponsorTimes.length;
-            sponsorTimes[sponsorTimesIndex] = [];
-
-            sponsorTimes[sponsorTimesIndex][0] = time;
-        }
-
-        //save this info
-		Config.config.sponsorTimes.set(videoID, sponsorTimes);
-		callback();
-    });
-}
-
 async function submitVote(type: number, UUID: string, category: string) {
    let userID = Config.config.userID;

--- a/src/components/CategoryChooserComponent.tsx
+++ b/src/components/CategoryChooserComponent.tsx
@@ -28,6 +28,26 @@ class CategoryChooserComponent extends React.Component<CategoryChooserProps, Cat
            <table id="categoryChooserTable"
                className="categoryChooserTable"> 
                <tbody>
+                    {/* Headers */}
+                    <tr id={"CategoryOptionsRow"}
+                            className="categoryTableElement categoryTableHeader">
+                        <td id={"CategoryOptionName"}>
+                            {chrome.i18n.getMessage("category")}
+                        </td>
+
+                        <td id={"CategorySkipOption"}>
+                            {chrome.i18n.getMessage("skipOption")}
+                        </td>
+
+                        <td id={"CategoryColorOption"}>
+                            {chrome.i18n.getMessage("seekBarColor")}
+                        </td>
+
+                        <td id={"CategoryPreviewColorOption"}>
+                            {chrome.i18n.getMessage("previewColor")}
+                        </td>
+                    </tr>
+
                    {this.getCategorySkipOptions()}
                </tbody> 
            </table>
@@ -40,7 +60,6 @@ class CategoryChooserComponent extends React.Component<CategoryChooserProps, Cat
        for (const category of CompileConfig.categoryList) {
            elements.push(
                <CategorySkipOptionsComponent category={category}
-                    defaultColor={"00d400"}
                    key={category}>
                </CategorySkipOptionsComponent>
            );
--- a/src/components/CategorySkipOptionsComponent.tsx
+++ b/src/components/CategorySkipOptionsComponent.tsx
@@ -2,14 +2,19 @@ import * as React from "react";

 import Config from "../config"
 import { CategorySkipOption } from "../types";
+import Utils from "../utils";
+
+const utils = new Utils();

 export interface CategorySkipOptionsProps { 
    category: string;
-    defaultColor: string;
+    defaultColor?: string;
+    defaultPreviewColor?: string;
 }

 export interface CategorySkipOptionsState {
    color: string;
+    previewColor: string;
 }

 class CategorySkipOptionsComponent extends React.Component<CategorySkipOptionsProps, CategorySkipOptionsState> {
@@ -19,7 +24,8 @@ class CategorySkipOptionsComponent extends React.Component<CategorySkipOptionsPr

        // Setup state
        this.state = {
-            color: props.defaultColor
+            color: props.defaultColor || Config.config.barTypes[this.props.category].color,
+            previewColor: props.defaultPreviewColor || Config.config.barTypes["preview-" + this.props.category].color,
        }
    }

@@ -39,28 +45,65 @@ class CategorySkipOptionsComponent extends React.Component<CategorySkipOptionsPr
                        defaultOption = "autoSkip";
                        break;
                }
+
+                break;
            }
        }

        return (
-            <tr id={this.props.category + "OptionsRow"}
-                className="categoryTableElement">
-                <td id={this.props.category + "OptionName"}
-                    className="categoryTableLabel">
-                        {chrome.i18n.getMessage("category_" + this.props.category)}
-                </td>
+            <>
+                <tr id={this.props.category + "OptionsRow"}
+                    className="categoryTableElement">
+                    <td id={this.props.category + "OptionName"}
+                        className="categoryTableLabel">
+                            {chrome.i18n.getMessage("category_" + this.props.category)}
+                    </td>

-                <td id={this.props.category + "SkipOption"}>
-                    <select
-                        className="categoryOptionsSelector"
-                        defaultValue={defaultOption}
-                        onChange={this.skipOptionSelected.bind(this)}>
-                            {this.getCategorySkipOptions()}
-                    </select>
-                </td>
+                    <td id={this.props.category + "SkipOption"}>
+                        <select
+                            className="categoryOptionsSelector"
+                            defaultValue={defaultOption}
+                            onChange={this.skipOptionSelected.bind(this)}>
+                                {this.getCategorySkipOptions()}
+                        </select>
+                    </td>
+                    
+                    <td id={this.props.category + "ColorOption"}>
+                        <input
+                            className="categoryColorTextBox option-text-box"
+                            type="text"
+                            onChange={(event) => this.setColorState(event, false)}
+                            value={this.state.color} />
+                    </td>

-                {/* TODO: Add colour chooser */}
-            </tr>
+                    <td id={this.props.category + "PreviewColorOption"}>
+                        <input
+                            className="categoryColorTextBox option-text-box"
+                            type="text"
+                            onChange={(event) => this.setColorState(event, true)}
+                            value={this.state.previewColor} />
+                    </td>
+
+                    <td id={this.props.category + "SaveButton"}>
+                        <div 
+                            className="option-button trigger-button"
+                            onClick={() => this.save()}>
+                            {chrome.i18n.getMessage("save")}
+                        </div>
+                    </td>
+
+                    
+                </tr>
+
+                <tr id={this.props.category + "DescriptionRow"}
+                    className="small-description">
+                        <td
+                            colSpan={2}>
+                            {chrome.i18n.getMessage("category_" + this.props.category + "_description")}
+                        </td>
+                </tr>
+
+            </>
        );
    }

@@ -112,7 +155,7 @@ class CategorySkipOptionsComponent extends React.Component<CategorySkipOptionsPr

    getCategorySkipOptions(): JSX.Element[] {
        let elements: JSX.Element[] = [];
-""
+
        let optionNames = ["disable", "showOverlay", "manualSkip", "autoSkip"];

        for (const optionName of optionNames) {
@@ -125,6 +168,36 @@ class CategorySkipOptionsComponent extends React.Component<CategorySkipOptionsPr

        return elements;
    }
+
+    setColorState(event: React.ChangeEvent<HTMLInputElement>, preview: boolean) {
+        if (preview) {
+            this.setState({
+                previewColor: event.target.value
+            });
+        } else {
+            this.setState({
+                color: event.target.value
+            });
+        }
+    }
+
+    // Save text box data
+    save() {
+        // Validate colors
+        let checkVar = [this.state.color, this.state.previewColor]
+        for (const color of checkVar) {
+            if (color[0] !== "#" || (color.length !== 7 && color.length !== 4) || !utils.isHex(color.slice(1))) {
+                alert(chrome.i18n.getMessage("colorFormatIncorrect") + " " + color.slice(1) + " " + utils.isHex(color.slice(1)) + " " + utils.isHex("abcd123"));
+                return;
+            }
+        }
+
+        // Save colors
+        Config.config.barTypes[this.props.category].color = this.state.color;
+        Config.config.barTypes["preview-" + this.props.category].color = this.state.previewColor;
+        // Make listener get called
+        Config.config.barTypes = Config.config.barTypes;
+    }
 }

 export default CategorySkipOptionsComponent;
--- a/src/components/NoticeTextSectionComponent.tsx
+++ b/src/components/NoticeTextSectionComponent.tsx
@@ -2,7 +2,8 @@ import * as React from "react";

 export interface NoticeTextSelectionProps {
    text: string,
-    idSuffix: string
+    idSuffix: string,
+    onClick?: (event: React.MouseEvent) => any
 }

 export interface NoticeTextSelectionState {
@@ -16,8 +17,16 @@ class NoticeTextSelectionComponent extends React.Component<NoticeTextSelectionPr
    }

    render() {
+        let style: React.CSSProperties = {};
+        if (this.props.onClick) {
+            style.cursor = "pointer";
+            style.textDecoration = "underline"
+        }
+
        return (
            <p id={"sponsorTimesInfoMessage" + this.props.idSuffix}
+                onClick={this.props.onClick}
+                style={style}
                className="sponsorTimesInfoMessage">
                    {this.props.text}
            </p>
--- a/src/components/SkipNoticeComponent.tsx
+++ b/src/components/SkipNoticeComponent.tsx
@@ -31,6 +31,7 @@ export interface SkipNoticeState {
    noticeTitle: string;

    messages: string[];
+    messageOnClick: (event: React.MouseEvent) => any;

    countdownTime: number;
    maxCountdownTime: () => number;
@@ -73,7 +74,8 @@ class SkipNoticeComponent extends React.Component<SkipNoticeProps, SkipNoticeSta
        this.contentContainer = props.contentContainer;
        this.audio = null;

-        let categoryName = chrome.i18n.getMessage(this.segments.length > 1 ? "multipleSegments" : "category_" + this.segments[0].category);
+        let 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") + " " + categoryName + "?";
@@ -104,6 +106,7 @@ class SkipNoticeComponent extends React.Component<SkipNoticeProps, SkipNoticeSta
        this.state = {
            noticeTitle,
            messages: [],
+            messageOnClick: null,

            //the countdown until this notice closes
            maxCountdownTime: () => 4,
@@ -324,6 +327,7 @@ class SkipNoticeComponent extends React.Component<SkipNoticeProps, SkipNoticeSta
            elements.push(
                <NoticeTextSelectionComponent idSuffix={this.idSuffix}
                    text={this.state.messages[i]}
+                    onClick={this.state.messageOnClick}
                    key={i}>
                </NoticeTextSelectionComponent>
            )
@@ -504,6 +508,13 @@ class SkipNoticeComponent extends React.Component<SkipNoticeProps, SkipNoticeSta
        }
    }

+    setNoticeInfoMessageWithOnClick(onClick: (event: React.MouseEvent) => any, ...messages: string[]) {
+        this.setState({
+            messages,
+            messageOnClick: (event) => onClick(event)
+        });
+    }
+
    setNoticeInfoMessage(...messages: string[]) {
        this.setState({
            messages
--- a/src/components/SponsorTimeEditComponent.tsx
+++ b/src/components/SponsorTimeEditComponent.tsx
@@ -182,14 +182,23 @@ class SponsorTimeEditComponent extends React.Component<SponsorTimeEditProps, Spo
                {timeDisplay}

                {/* Category */}
+                <div style={{position: "relative"}}>
+                    <select id={"sponsorTimeCategories" + this.idSuffix}
+                        className="sponsorTimeCategories"
+                        defaultValue={sponsorTime.category}
+                        ref={this.categoryOptionRef}
+                        onChange={this.categorySelectionChange.bind(this)}>
+                        {this.getCategoryOptions()}
+                    </select>

-                <select id={"sponsorTimeCategories" + this.idSuffix}
-                    className="sponsorTimeCategories"
-                    defaultValue={sponsorTime.category}
-                    ref={this.categoryOptionRef}
-                    onChange={this.categorySelectionChange.bind(this)}>
-                    {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>
+                </div>

                <br/>

@@ -313,7 +322,7 @@ class SponsorTimeEditComponent extends React.Component<SponsorTimeEditProps, Spo

        sponsorTimesSubmitting[this.props.index].category = this.categoryOptionRef.current.value;

-        Config.config.sponsorTimes.set(this.props.contentContainer().sponsorVideoID, utils.getSegmentsFromSponsorTimes(sponsorTimesSubmitting));
+        Config.config.segmentTimes.set(this.props.contentContainer().sponsorVideoID, sponsorTimesSubmitting);

        this.props.contentContainer().updatePreviewBar();
    }
@@ -345,7 +354,7 @@ class SponsorTimeEditComponent extends React.Component<SponsorTimeEditProps, Spo
        sponsorTimes.splice(index, 1);
  
        //save this
-        Config.config.sponsorTimes.set(this.props.contentContainer().sponsorVideoID, sponsorTimes);
+        Config.config.segmentTimes.set(this.props.contentContainer().sponsorVideoID, sponsorTimes);

        this.props.contentContainer().updatePreviewBar();
        
--- a/src/components/SubmissionNoticeComponent.tsx
+++ b/src/components/SubmissionNoticeComponent.tsx
@@ -86,13 +86,20 @@ class SubmissionNoticeComponent extends React.Component<SubmissionNoticeProps, S
                        {this.getSponsorTimeMessages()}
                    </td>
                </tr>
-              
+
                {/* Last Row */}
                <tr id={"sponsorSkipNoticeSecondRow" + this.state.idSuffix}>

                    <td className="sponsorSkipNoticeRightSection"
                        style={{position: "relative"}}>

+                        {/* Guidelines button */}
+                        <button className="sponsorSkipObject sponsorSkipNoticeButton sponsorSkipNoticeRightButton"
+                            onClick={() => window.open("https://github.com/ajayyy/SponsorBlock/wiki/Guidelines")}>
+
+                            {chrome.i18n.getMessage(Config.config.submissionCountSinceCategories > 3 ? "guidelines" : "readTheGuidelines")}
+                        </button>
+
                        {/* Submit Button */}
                        <button className="sponsorSkipObject sponsorSkipNoticeButton sponsorSkipNoticeRightButton"
                            onClick={this.submit.bind(this)}>
--- a/src/config.ts
+++ b/src/config.ts
@@ -1,12 +1,13 @@
 import * as CompileConfig from "../config.json";
-import { CategorySelection, CategorySkipOption } from "./types";
+import { CategorySelection, CategorySkipOption, PreviewBarOption, SponsorTime } from "./types";

 import Utils from "./utils";
 const utils = new Utils();

 interface SBConfig {
    userID: string,
-    sponsorTimes: SBMap<string, any>,
+    // sponsorTimes: SBMap<string, SponsorTime[]>,
+    segmentTimes: SBMap<string, SponsorTime[]>,
    whitelistedChannels: string[],
    forceChannelCheck: boolean,
    startSponsorKeybind: string,
@@ -14,6 +15,9 @@ interface SBConfig {
    minutesSaved: number,
    skipCount: number,
    sponsorTimesContributed: number,
+    submissionCountSinceCategories: number, // New count used to show the "Read The Guidelines!!" message
+    showTimeWithSkips: boolean,
+    unsubmittedWarning: boolean,
    disableSkipping: boolean,
    trackViewCount: boolean,
    dontShowNotice: boolean,
@@ -29,11 +33,26 @@ interface SBConfig {
    minDuration: number,
    audioNotificationOnSkip,
    checkForUnlistedVideos: boolean,
-    mobileUpdateShowCount: number,
    testingServer: boolean,

    // What categories should be skipped
-    categorySelections: CategorySelection[]
+    categorySelections: CategorySelection[],
+
+    // Preview bar
+    barTypes: {
+        "sponsor": PreviewBarOption,
+        "preview-sponsor": PreviewBarOption,
+        "intro": PreviewBarOption,
+        "preview-intro": PreviewBarOption,
+        "outro": PreviewBarOption,
+        "preview-outro": PreviewBarOption,
+        "interaction": PreviewBarOption,
+        "preview-interaction": PreviewBarOption,
+        "selfpromo": PreviewBarOption,
+        "preview-selfpromo": PreviewBarOption,
+        "music_offtopic": PreviewBarOption,
+        "preview-music_offtopic": PreviewBarOption,
+    }
 }

 interface SBObject {
@@ -65,35 +84,39 @@ class SBMap<T, U> extends Map {
        }
    }

-    set(key, value) {
-        const result = super.set(key, value);
+    get(key): U {
+        return super.get(key);
+    }

+    rawSet(key, value) {
+        return super.set(key, value);
+    }
+
+    update() {
        // Store updated SBMap locally
        chrome.storage.sync.set({
            [this.id]: encodeStoredItem(this)
        });
+    }

+    set(key: T, value: U) {
+        const result = super.set(key, value);
+
+        this.update();
        return result;
    }
 	
    delete(key) {
        const result = super.delete(key);

-	    // Store updated SBMap locally
-	    chrome.storage.sync.set({
-            [this.id]: encodeStoredItem(this)
-        });
-
+	    this.update();
        return result;
    }

    clear() {
        const result = super.clear();

-	    chrome.storage.sync.set({
-            [this.id]: encodeStoredItem(this)
-        });
-
+        this.update();
        return result;
    }
 }
@@ -105,7 +128,7 @@ var Config: SBObject = {
    configListeners: [],
    defaults: {
        userID: null,
-        sponsorTimes: new SBMap("sponsorTimes"),
+        segmentTimes: new SBMap("segmentTimes"),
        whitelistedChannels: [],
        forceChannelCheck: false,
        startSponsorKeybind: ";",
@@ -113,6 +136,9 @@ var Config: SBObject = {
        minutesSaved: 0,
        skipCount: 0,
        sponsorTimesContributed: 0,
+        submissionCountSinceCategories: 0,
+	    showTimeWithSkips: true,
+        unsubmittedWarning: true,
        disableSkipping: false,
        trackViewCount: true,
        dontShowNotice: false,
@@ -128,13 +154,64 @@ var Config: SBObject = {
        minDuration: 0,
        audioNotificationOnSkip: false,
        checkForUnlistedVideos: false,
-        mobileUpdateShowCount: 0,
        testingServer: false,

        categorySelections: [{
            name: "sponsor",
            option: CategorySkipOption.AutoSkip
-        }]
+        }],
+
+        // Preview bar
+        barTypes: {
+            "sponsor": {
+                color: "#00d400",
+                opacity: "0.7"
+            },
+            "preview-sponsor": {
+                color: "#007800",
+                opacity: "0.7"
+            },
+            "intro": {
+                color: "#00ffff",
+                opacity: "0.7"
+            },
+            "preview-intro": {
+                color: "#008080",
+                opacity: "0.7"
+            },
+            "outro": {
+                color: "#0202ed",
+                opacity: "0.7"
+            },
+            "preview-outro": {
+                color: "#000070",
+                opacity: "0.7"
+            },
+            "interaction": {
+                color: "#cc00ff",
+                opacity: "0.7"
+            },
+            "preview-interaction": {
+                color: "#6c0087",
+                opacity: "0.7"
+            },
+            "selfpromo": {
+                color: "#ffff00",
+                opacity: "0.7"
+            },
+            "preview-selfpromo": {
+                color: "#bfbf35",
+                opacity: "0.7"
+            },
+            "music_offtopic": {
+                color: "#ff9900",
+                opacity: "0.7"
+            },
+            "preview-music_offtopic": {
+                color: "#a6634a",
+                opacity: "0.7"
+            }
+        }
    },
    localConfig: null,
    config: null,
@@ -164,24 +241,13 @@ function encodeStoredItem<T>(data: T): T | Array<any>  {
 * 
 * @param {*} data 
 */
-function decodeStoredItem<T>(id: string, data: T): T | SBMap<string, any> {
+function decodeStoredItem<T>(id: string, data: T): T | SBMap<string, SponsorTime[]> {
    if (!Config.defaults[id]) return data;

    if (Config.defaults[id] instanceof SBMap) {
        try {
-            let jsonData: any = data;
-
-            // Check if data is stored in the old format for SBMap (a JSON string)
-            if (typeof data === "string") {
-                try {	
-                    jsonData = JSON.parse(data);	   
-                } catch(e) {
-                    // Continue normally (out of this if statement)
-                }
-            }
-
-            if (!Array.isArray(jsonData)) return data;
-            return new SBMap(id, jsonData);
+            if (!Array.isArray(data)) return data;
+            return new SBMap(id, data);
        } catch(e) {
            console.error("Failed to parse SBMap: " + id);
        }
@@ -239,9 +305,9 @@ function fetchConfig() {
    });
 }

-async function migrateOldFormats() {
-    if (Config.config["disableAutoSkip"]) {
-        for (const selection of Config.config.categorySelections) {
+function migrateOldFormats(config: SBConfig) {
+    if (config["disableAutoSkip"]) {
+        for (const selection of config.categorySelections) {
            if (selection.name === "sponsor") {
                selection.option = CategorySkipOption.ManualSkip;

@@ -251,57 +317,108 @@ async function migrateOldFormats() {
    }

    // Auto vote removal
-    if (Config.config["autoUpvote"]) {
+    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.config.whitelistedChannels.length > 0 && 
-            (Config.config.whitelistedChannels[0] == null || Config.config.whitelistedChannels[0].includes("/"))) {
-        let newChannelList: string[] = [];
-        for (const item of Config.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
-                    let 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
+    if (config.whitelistedChannels.length > 0 && 
+            (config.whitelistedChannels[0] == null || config.whitelistedChannels[0].includes("/"))) {
+        const channelURLFixer = async() => {
+            let 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
+                        let 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);
                    }
-                } 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;
        }

-        Config.config.whitelistedChannels = newChannelList;
+        channelURLFixer();
    }

    // Check if off-topic category needs to be removed
-    for (let i = 0; i < Config.config.categorySelections.length; i++) {
-        if (Config.config.categorySelections[i].name === "offtopic") {
-            Config.config.categorySelections.splice(i, 1);
+    for (let i = 0; i < config.categorySelections.length; i++) {
+        if (config.categorySelections[i].name === "offtopic") {
+            config.categorySelections.splice(i, 1);
            // Call set listener
-            Config.config.categorySelections = Config.config.categorySelections;
+            config.categorySelections = config.categorySelections;
            break;
        }
    }
+
+    // Migrate old "sponsorTimes"
+    if (config["sponsorTimes"]) {
+        let jsonData: any = 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)) {
+            let oldMap = new Map(jsonData);
+            oldMap.forEach((sponsorTimes: number[][], key) => {
+                let 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");
+    }
 }

 async function setupConfig() {
    await fetchConfig();
    addDefaults();
    convertJSON();
-    Config.config = configProxy();
-    migrateOldFormats();
+    const config = configProxy();
+    migrateOldFormats(config);
+
+    Config.config = config;
 }

 // Reset config
@@ -320,6 +437,12 @@ function addDefaults() {
    for (const key in Config.defaults) {
        if(!Config.localConfig.hasOwnProperty(key)) {
 	        Config.localConfig[key] = Config.defaults[key];
+        } else if (key === "barTypes") {
+            for (const key2 in Config.defaults[key]) {
+                if(!Config.localConfig[key].hasOwnProperty(key2)) {
+                    Config.localConfig[key][key2] = Config.defaults[key][key2];
+                }
+            }
        }
    }
 };
@@ -327,4 +450,4 @@ function addDefaults() {
 // Sync config
 setupConfig();

-export default Config;
+export default Config;
--- a/src/content.ts
+++ b/src/content.ts
@@ -323,13 +323,13 @@ async function videoIDChange(id) {
    //warn them if they had unsubmitted times
    if (previousVideoID != null) {
        //get the sponsor times from storage
-        let sponsorTimes = Config.config.sponsorTimes.get(previousVideoID);
+        let sponsorTimes = Config.config.segmentTimes.get(previousVideoID);
        if (sponsorTimes != undefined && sponsorTimes.length > 0) {
            //warn them that they have unsubmitted sponsor times
-                chrome.runtime.sendMessage({
-                    message: "alertPrevious",
-                    previousVideoID: previousVideoID
-                })
+            chrome.runtime.sendMessage({
+                message: "alertPrevious",
+                previousVideoID: previousVideoID
+            });
        }

        //set the previous video id to the currentID
@@ -347,10 +347,10 @@ async function videoIDChange(id) {
    //make sure everything is properly added
    updateVisibilityOfPlayerControlsButton().then(() => {
        //see if the onvideo control image needs to be changed
-        let segments = Config.config.sponsorTimes.get(sponsorVideoID);
-        if (segments != null && segments.length > 0 && segments[segments.length - 1].length >= 2) {
+        let segments = Config.config.segmentTimes.get(sponsorVideoID);
+        if (segments != null && segments.length > 0 && segments[segments.length - 1].segment.length >= 2) {
            changeStartSponsorButton(true, true);
-        } else if (segments != null && segments.length > 0 && segments[segments.length - 1].length < 2) {
+        } else if (segments != null && segments.length > 0 && segments[segments.length - 1].segment.length < 2) {
            changeStartSponsorButton(false, true);
        } else {
            changeStartSponsorButton(true, false);
@@ -801,7 +801,7 @@ function updatePreviewBar() {
    if (localSponsorTimes == null) localSponsorTimes = [];

    let allSponsorTimes = localSponsorTimes.concat(sponsorTimesSubmitting);
-
+	
    //create an array of the sponsor types
    let types = [];
    for (let i = 0; i < localSponsorTimes.length; i++) {
@@ -818,6 +818,10 @@ function updatePreviewBar() {

    previewBar.set(utils.getSegmentsFromSponsorTimes(allSponsorTimes), types, video.duration)

+    if (Config.config.showTimeWithSkips) {
+        showTimeWithoutSkips(allSponsorTimes);
+    }
+
    //update last video id
    lastPreviewBarUpdate = sponsorVideoID;
 }
@@ -973,7 +977,7 @@ 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) {
-            let skipNotice = new SkipNotice(skippingSegments, autoSkip, skipNoticeContentContainer);
+            new SkipNotice(skippingSegments, autoSkip, skipNoticeContentContainer);
        }
    }

@@ -1169,31 +1173,24 @@ function startSponsorClicked() {
        });
    }

-    // Create raw segment list
-    let segments: number[][] = [];
-    for (const sponsorTime of sponsorTimesSubmitting) {
-        segments.push(sponsorTime.segment);
-    }
-
    //save this info
-    Config.config.sponsorTimes.set(sponsorVideoID, segments);
+    Config.config.segmentTimes.set(sponsorVideoID, sponsorTimesSubmitting);

    updateSponsorTimesSubmitting(false)
 }

 function updateSponsorTimesSubmitting(getFromConfig: boolean = true) {
-    let segments = Config.config.sponsorTimes.get(sponsorVideoID);
+    let segmentTimes = Config.config.segmentTimes.get(sponsorVideoID);

    //see if this data should be saved in the sponsorTimesSubmitting variable
-    if (getFromConfig && segments != undefined) {
+    if (getFromConfig && segmentTimes != undefined) {
        sponsorTimesSubmitting = [];

-        for (const segment of segments) {
+        for (const segmentTime of segmentTimes) {
            sponsorTimesSubmitting.push({
-                segment: segment,
+                segment: segmentTime.segment,
                UUID: null,
-                // Default to sponsor
-                category: "sponsor"
+                category: segmentTime.category
            });
        }
    }
@@ -1317,7 +1314,7 @@ function clearSponsorTimes() {

    let currentVideoID = sponsorVideoID;

-    let sponsorTimes = Config.config.sponsorTimes.get(currentVideoID);
+    let sponsorTimes = Config.config.segmentTimes.get(currentVideoID);

    if (sponsorTimes != undefined && sponsorTimes.length > 0) {
        let confirmMessage = chrome.i18n.getMessage("clearThis") + getSegmentsMessage(sponsorTimes)
@@ -1325,7 +1322,7 @@ function clearSponsorTimes() {
        if(!confirm(confirmMessage)) return;

        //clear the sponsor times
-        Config.config.sponsorTimes.delete(currentVideoID);
+        Config.config.segmentTimes.delete(currentVideoID);

        //clear sponsor times submitting
        sponsorTimesSubmitting = [];
@@ -1447,14 +1444,14 @@ async function sendSubmitMessage(){
    }

    //update sponsorTimes
-    Config.config.sponsorTimes.set(sponsorVideoID, utils.getSegmentsFromSponsorTimes(sponsorTimesSubmitting));
+    Config.config.segmentTimes.set(sponsorVideoID, sponsorTimesSubmitting);

    // Check to see if any of the submissions are below the minimum duration set
    if (Config.config.minDuration > 0) {
        for (let i = 0; i < sponsorTimesSubmitting.length; i++) {
            if (sponsorTimesSubmitting[i].segment[1] - sponsorTimesSubmitting[i].segment[0] < Config.config.minDuration) {
                let confirmShort = chrome.i18n.getMessage("shortCheck") + "\n\n" + 
-                    getSegmentsMessage(utils.getSegmentsFromSponsorTimes(sponsorTimesSubmitting));
+                    getSegmentsMessage(sponsorTimesSubmitting);
                
                if(!confirm(confirmShort)) return;
            }
@@ -1484,7 +1481,7 @@ async function sendSubmitMessage(){
        submitButton.addEventListener("animationend", animationEndListener);

        //clear the sponsor times
-        Config.config.sponsorTimes.delete(sponsorVideoID);
+        Config.config.segmentTimes.delete(sponsorVideoID);

        //add submissions to current sponsors list
        if (sponsorTimes === null) sponsorTimes = [];
@@ -1494,6 +1491,10 @@ async function sendSubmitMessage(){
        // Increase contribution count
        Config.config.sponsorTimesContributed = Config.config.sponsorTimesContributed + sponsorTimesSubmitting.length;

+        // New count just used to see if a warning "Read The Guidelines!!" message needs to be shown
+        // One per time submitting
+        Config.config.submissionCountSinceCategories = Config.config.submissionCountSinceCategories + 1;
+
        // Empty the submitting times
        sponsorTimesSubmitting = [];

@@ -1508,12 +1509,12 @@ async function sendSubmitMessage(){
 }

 //get the message that visually displays the video times
-function getSegmentsMessage(segments: number[][]): string {
+function getSegmentsMessage(sponsorTimes: SponsorTime[]): string {
    let sponsorTimesMessage = "";

-    for (let i = 0; i < segments.length; i++) {
-        for (let s = 0; s < segments[i].length; s++) {
-            let timeMessage = utils.getFormattedTime(segments[i][s]);
+    for (let i = 0; i < sponsorTimes.length; i++) {
+        for (let s = 0; s < sponsorTimes[i].segment.length; s++) {
+            let timeMessage = utils.getFormattedTime(sponsorTimes[i].segment[s]);
            //if this is an end time
            if (s == 1) {
                timeMessage = " to " + timeMessage;
@@ -1589,3 +1590,36 @@ function updateAdFlag() {
        updateVisibilityOfPlayerControlsButton();
    }
 }
+
+function showTimeWithoutSkips(allSponsorTimes): void {
+	let skipDuration = 0;
+	
+	// Calculate skipDuration based from the segments in the preview bar
+	for (let i = 0; i < allSponsorTimes.length; i++) {
+        // If an end time exists
+        if (allSponsorTimes[i].segment[1]) {
+            skipDuration += allSponsorTimes[i].segment[1] - allSponsorTimes[i].segment[0];
+        }
+		
+	}
+	
+	// YouTube player time display
+	let display = document.getElementsByClassName("ytp-time-display notranslate")[0];
+	if (display === undefined) return
+	
+    let formatedTime = utils.getFormattedTime(video.duration - skipDuration);
+	
+	const durationID = "sponsorBlockDurationAfterSkips";	
+    let duration = document.getElementById(durationID);
+
+	// Create span if needed
+	if(duration === null) {
+		duration = document.createElement('span');
+        duration.id = durationID;
+        duration.classList.add("ytp-time-duration");
+
+		display.appendChild(duration);
+	}
+		
+    duration.innerText = (skipDuration <= 0 || isNaN(skipDuration)) ? "" : " ("+formatedTime+")";
+}
--- a/src/js-components/previewBar.ts
+++ b/src/js-components/previewBar.ts
@@ -5,60 +5,9 @@

 'use strict';

-let barTypes = {
-	"undefined": {
-		color: "#00d400",
-		opacity: "0.7"
-	},
-	"sponsor": {
-		color: "#00d400",
-		opacity: "0.7"
-	},
-	"preview-sponsor": {
-		color: "#007800",
-		opacity: "0.7"
-	},
-	"intro": {
-		color: "#00ffff",
-		opacity: "0.7"
-	},
-	"preview-intro": {
-		color: "#008080",
-		opacity: "0.7"
-	},
-	"outro": {
-		color: "#0202ed",
-		opacity: "0.7"
-	},
-	"preview-outro": {
-		color: "#000070",
-		opacity: "0.7"
-	},
-	"interaction": {
-		color: "#cc00ff",
-		opacity: "0.7"
-	},
-	"preview-interaction": {
-		color: "#6c0087",
-		opacity: "0.7"
-	},
-	"selfpromo": {
-		color: "#ffff00",
-		opacity: "0.7"
-	},
-	"preview-selfpromo": {
-		color: "#bfbf35",
-		opacity: "0.7"
-	},
-	"music_offtopic": {
-		color: "#ff9900",
-		opacity: "0.7"
-	},
-	"preview-music_offtopic": {
-		color: "#a6634a",
-		opacity: "0.7"
-	}
-};
+import Config from "../config";
+import Utils from "../utils";
+let utils = new Utils();

 class PreviewBar {
 	container: HTMLUListElement;
@@ -132,8 +81,8 @@ class PreviewBar {
 						tooltipTextWrapper.classList.remove("sbTooltipOneTitleThumbnailOffset");
 					} else if (category !== null) {
 						categoryTooltip.classList.remove("sbHidden");
-						categoryTooltip.textContent = chrome.i18n.getMessage("category_" + category) 
-							|| (chrome.i18n.getMessage("preview") + " " + chrome.i18n.getMessage("category_" + category.split("preview-")[1]));
+						categoryTooltip.textContent = utils.shortCategoryName(category)
+							|| (chrome.i18n.getMessage("preview") + " " + utils.shortCategoryName(category.split("preview-")[1]));

 						// There is a title now
 						tooltip.classList.remove("ytp-tooltip-text-no-title");
@@ -208,8 +157,8 @@ class PreviewBar {
 			let bar = this.createBar();
 			bar.setAttribute('data-vs-segment-type', types[i]);

-			bar.style.backgroundColor = barTypes[types[i]].color;
-			if (!this.onMobileYouTube) bar.style.opacity = barTypes[types[i]].opacity;
+			bar.style.backgroundColor = Config.config.barTypes[types[i]].color;
+			if (!this.onMobileYouTube) bar.style.opacity = Config.config.barTypes[types[i]].opacity;
 			bar.style.width = width + '%';
 			bar.style.left = (timestamps[i][0] / duration * 100) + "%";
 			bar.style.position = "absolute"
--- a/src/options.ts
+++ b/src/options.ts
@@ -13,6 +13,13 @@ window.addEventListener('DOMContentLoaded', init);
 async function init() {
    utils.localizeHtmlPage();

+    // Remove header if needed
+    if (window.location.hash === "#embed") {
+        for (const element of document.getElementsByClassName("titleBar")) {
+            element.classList.add("hidden");
+        }
+    }
+
    if (!Config.configListeners.includes(optionsConfigUpdateListener)) {
        Config.configListeners.push(optionsConfigUpdateListener);
    }
@@ -230,7 +237,7 @@ function invidiousInstanceAddInit(element: HTMLElement, option: string) {

    let setButton = element.querySelector(".text-change-set");
    setButton.addEventListener("click", async function(e) {
-        if (textBox.value == "" || textBox.value.includes("/") || textBox.value.includes("http") || textBox.value.includes(":")) {
+        if (textBox.value == "" || textBox.value.includes("/") || textBox.value.includes("http")) {
            alert(chrome.i18n.getMessage("addInvidiousInstanceError"));
        } else {
            // Add this
@@ -291,19 +298,23 @@ function invidiousInit(checkbox: HTMLInputElement, option: string) {
 * @param checkbox 
 * @param option 
 */
-function invidiousOnClick(checkbox: HTMLInputElement, option: string) {
-    if (checkbox.checked) {
-        utils.setupExtraSitePermissions(function (granted) {
-            if (!granted) {
-                Config.config[option] = false;
-                checkbox.checked = false;
-            } else {
-                checkbox.checked = true;
-            }
-        });
-    } else {
-        utils.removeExtraSiteRegistration();
-    }
+async function invidiousOnClick(checkbox: HTMLInputElement, option: string) {
+    return new Promise((resolve) => {
+        if (checkbox.checked) {
+            utils.setupExtraSitePermissions(function (granted) {
+                if (!granted) {
+                    Config.config[option] = false;
+                    checkbox.checked = false;
+                } else {
+                    checkbox.checked = true;
+                }
+
+                resolve();
+            });
+        } else {
+            utils.removeExtraSiteRegistration();
+        }
+    });
 }

 /**
@@ -351,15 +362,6 @@ function keybindKeyPressed(element: HTMLElement, e: KeyboardEvent) {
        let button: HTMLElement = element.querySelector(".trigger-button");
        let option = element.getAttribute("sync-option");

-        // Don't allow keys which are already listened for by youtube 
-        let restrictedKeys = "1234567890,.jklftcibmJKLFTCIBMNP/<> -+";
-        if (restrictedKeys.indexOf(key) !== -1 ) {
-            closeKeybindOption(element, button);
-
-            alert(chrome.i18n.getMessage("theKey") + " " + key + " " + chrome.i18n.getMessage("keyAlreadyUsedByYouTube"));
-            return;
-        }
-
        // Make sure keybind isn't used by the other listener
        // TODO: If other keybindings are going to be added, we need a better way to find the other keys used.
        let otherKeybind = (option === "startSponsorKeybind") ? Config.config['submitKeybind'] : Config.config['startSponsorKeybind'];
@@ -428,8 +430,8 @@ function activatePrivateTextChange(element: HTMLElement) {
        case "*":
            let jsonData = JSON.parse(JSON.stringify(Config.localConfig));

-            // Fix sponsorTimes data as it is destroyed from the JSON stringify
-            jsonData.sponsorTimes = Config.encodeStoredItem(Config.localConfig.sponsorTimes);
+            // Fix segmentTimes data as it is destroyed from the JSON stringify
+            jsonData.segmentTimes = Config.encodeStoredItem(Config.localConfig.segmentTimes);

            result = JSON.stringify(jsonData);
            break;
@@ -438,7 +440,7 @@ function activatePrivateTextChange(element: HTMLElement) {
    textBox.value = result;
    
    let setButton = element.querySelector(".text-change-set");
-    setButton.addEventListener("click", () => {
+    setButton.addEventListener("click", async () => {
        let confirmMessage = element.getAttribute("confirm-message");

        if (confirmMessage === null || confirm(chrome.i18n.getMessage(confirmMessage))) {
@@ -453,15 +455,14 @@ function activatePrivateTextChange(element: HTMLElement) {
                        }
                        Config.convertJSON();

-                        // Reload options on page
-                        init();
-
                        if (newConfig.supportInvidious) {
                            let checkbox = <HTMLInputElement> document.querySelector("#support-invidious > label > label > input");
                            
                            checkbox.checked = true;
-                            invidiousOnClick(checkbox, "supportInvidious");
+                            await invidiousOnClick(checkbox, "supportInvidious");
                        }
+
+                        window.location.reload();
                        
                    } catch (e) {
                        alert(chrome.i18n.getMessage("incorrectlyFormattedOptions"));
@@ -512,8 +513,8 @@ function copyDebugOutputToClipboard() {
        config: JSON.parse(JSON.stringify(Config.localConfig)) // Deep clone config object
    };

-    // Fix sponsorTimes data as it is destroyed from the JSON stringify
-    output.config.sponsorTimes = Config.encodeStoredItem(Config.localConfig.sponsorTimes);
+    // Fix segmentTimes data as it is destroyed from the JSON stringify
+    output.config.segmentTimes = Config.encodeStoredItem(Config.localConfig.segmentTimes);
    
    // Sanitise sensitive user config values
    delete output.config.userID;
--- a/src/popup.ts
+++ b/src/popup.ts
@@ -119,7 +119,7 @@ async function runThePopup(messageListener?: MessageListener) {
    let startTimeChosen = false;
  
    //the start and end time pairs (2d)
-    let sponsorTimes = [];
+    let sponsorTimes: SponsorTime[] = [];
  
    //current video ID of this tab
    let currentVideoID = null;
@@ -252,9 +252,9 @@ async function runThePopup(messageListener?: MessageListener) {
        }
  
        //load video times for this video 
-        let sponsorTimesStorage = Config.config.sponsorTimes.get(currentVideoID);
+        let sponsorTimesStorage = Config.config.segmentTimes.get(currentVideoID);
        if (sponsorTimesStorage != undefined && sponsorTimesStorage.length > 0) {
-            if (sponsorTimesStorage[sponsorTimesStorage.length - 1] != undefined && sponsorTimesStorage[sponsorTimesStorage.length - 1].length < 2) {
+            if (sponsorTimesStorage[sponsorTimesStorage.length - 1] != undefined && sponsorTimesStorage[sponsorTimesStorage.length - 1].segment.length < 2) {
                startTimeChosen = true;
                PageElements.sponsorStart.innerHTML = chrome.i18n.getMessage("sponsorEnd");
            }
@@ -336,13 +336,17 @@ async function runThePopup(messageListener?: MessageListener) {
        let sponsorTimesIndex = sponsorTimes.length - (startTimeChosen ? 1 : 0);
  
        if (sponsorTimes[sponsorTimesIndex] == undefined) {
-            sponsorTimes[sponsorTimesIndex] = [];
+            sponsorTimes[sponsorTimesIndex] = {
+                segment: [],
+                category: "sponsor",
+                UUID: null
+            };
        }
  
-        sponsorTimes[sponsorTimesIndex][startTimeChosen ? 1 : 0] = response.time;
+        sponsorTimes[sponsorTimesIndex].segment[startTimeChosen ? 1 : 0] = response.time;

        let localStartTimeChosen = startTimeChosen;
-        Config.config.sponsorTimes.set(currentVideoID, sponsorTimes);
+        Config.config.segmentTimes.set(currentVideoID, sponsorTimes);
        
        //send a message to the client script
        if (localStartTimeChosen) {
@@ -528,7 +532,7 @@ async function runThePopup(messageListener?: MessageListener) {
    }

    function previewSponsorTime(index) {
-        let skipTime = sponsorTimes[index][0];
+        let skipTime = sponsorTimes[index].segment[0];

        if (document.getElementById("startTimeMinutes" + index) != null) {
            //edit is currently open, use that time
@@ -575,28 +579,28 @@ async function runThePopup(messageListener?: MessageListener) {
        startTimeMinutes.id = "startTimeMinutes" + index;
        startTimeMinutes.className = "sponsorTime popupElement";
        startTimeMinutes.type = "text";
-        startTimeMinutes.value = String(getTimeInMinutes(sponsorTimes[index][0]));
+        startTimeMinutes.value = String(getTimeInMinutes(sponsorTimes[index].segment[0]));
        startTimeMinutes.style.width = "45px";
    
        let startTimeSeconds = document.createElement("input");
        startTimeSeconds.id = "startTimeSeconds" + index;
        startTimeSeconds.className = "sponsorTime popupElement";
        startTimeSeconds.type = "text";
-        startTimeSeconds.value = getTimeInFormattedSeconds(sponsorTimes[index][0]);
+        startTimeSeconds.value = getTimeInFormattedSeconds(sponsorTimes[index].segment[0]);
        startTimeSeconds.style.width = "60px";

        let endTimeMinutes = document.createElement("input");
        endTimeMinutes.id = "endTimeMinutes" + index;
        endTimeMinutes.className = "sponsorTime popupElement";
        endTimeMinutes.type = "text";
-        endTimeMinutes.value = String(getTimeInMinutes(sponsorTimes[index][1]));
+        endTimeMinutes.value = String(getTimeInMinutes(sponsorTimes[index].segment[1]));
        endTimeMinutes.style.width = "45px";
    
        let endTimeSeconds = document.createElement("input");
        endTimeSeconds.id = "endTimeSeconds" + index;
        endTimeSeconds.className = "sponsorTime popupElement";
        endTimeSeconds.type = "text";
-        endTimeSeconds.value = getTimeInFormattedSeconds(sponsorTimes[index][1]);
+        endTimeSeconds.value = getTimeInFormattedSeconds(sponsorTimes[index].segment[1]);
        endTimeSeconds.style.width = "60px";

        //the button to set the current time
@@ -668,11 +672,11 @@ async function runThePopup(messageListener?: MessageListener) {
    }
  
    function saveSponsorTimeEdit(index, closeEditMode = true) {
-        sponsorTimes[index][0] = getSponsorTimeEditTimes("startTime", index);
-        sponsorTimes[index][1] = getSponsorTimeEditTimes("endTime", index);
+        sponsorTimes[index].segment[0] = getSponsorTimeEditTimes("startTime", index);
+        sponsorTimes[index].segment[1] = getSponsorTimeEditTimes("endTime", index);
  
        //save this
-        Config.config.sponsorTimes.set(currentVideoID, sponsorTimes);
+        Config.config.segmentTimes.set(currentVideoID, sponsorTimes);
        
        messageHandler.query({
            active: true,
@@ -692,7 +696,7 @@ async function runThePopup(messageListener?: MessageListener) {
    //deletes the sponsor time submitted at an index
    function deleteSponsorTime(index) {
        //if it is not a complete sponsor time
-        if (sponsorTimes[index].length < 2) {
+        if (sponsorTimes[index].segment.length < 2) {
            messageHandler.query({
                active: true,
                currentWindow: true
@@ -710,7 +714,7 @@ async function runThePopup(messageListener?: MessageListener) {
        sponsorTimes.splice(index, 1);
  
        //save this
-        Config.config.sponsorTimes.set(currentVideoID, sponsorTimes);
+        Config.config.segmentTimes.set(currentVideoID, sponsorTimes);
        
        //if they are all removed
        if (sponsorTimes.length == 0) {
@@ -780,7 +784,7 @@ async function runThePopup(messageListener?: MessageListener) {
    //hides and shows the submit times button when needed
    function showSubmitTimesIfNecessary() {
        //check if an end time has been specified for the latest sponsor time
-        if (sponsorTimes.length > 0 && sponsorTimes[sponsorTimes.length - 1].length > 1) {
+        if (sponsorTimes.length > 0 && sponsorTimes[sponsorTimes.length - 1].segment.length > 1) {
            //show submit times button
            document.getElementById("submitTimesContainer").style.display = "unset";
        } else {
--- a/src/render/SkipNotice.tsx
+++ b/src/render/SkipNotice.tsx
@@ -12,6 +12,8 @@ class SkipNotice {

    noticeElement: HTMLDivElement;

+    skipNoticeRef: React.MutableRefObject<SkipNoticeComponent>;
+
    constructor(segments: SponsorTime[], autoSkip: boolean = false, contentContainer) {
        this.segments = segments;
        this.autoSkip = autoSkip;
@@ -51,6 +53,7 @@ class SkipNotice {
            <SkipNoticeComponent segments={segments} 
                autoSkip={autoSkip} 
                contentContainer={contentContainer}
+                ref={this.skipNoticeRef}
                closeListener={() => this.close()} />,
            this.noticeElement
        );
--- a/src/types.ts
+++ b/src/types.ts
@@ -58,6 +58,11 @@ interface SponsorTime {
    hidden?: SponsorHideType;
 }

+interface PreviewBarOption {
+    color: string,
+    opacity: string
+}
+
 type VideoID = string;

 export {
@@ -68,5 +73,6 @@ export {
    CategorySkipOption,
    SponsorTime,
    VideoID,
-    SponsorHideType
+    SponsorHideType,
+    PreviewBarOption
 };
--- a/src/utils.ts
+++ b/src/utils.ts
@@ -338,7 +338,7 @@ class Utils {
            secondsNum = Math.floor(secondsNum);
        }

-        let secondsDisplay: string = String(secondsNum.toFixed(3));
+        let secondsDisplay: string = String(precise ? secondsNum.toFixed(3) : secondsNum);
        
        if (secondsNum < 10) {
            //add a zero
@@ -350,6 +350,10 @@ class Utils {
        return formatted;
    }

+    shortCategoryName(categoryName: string): string {
+        return chrome.i18n.getMessage("category_" + categoryName + "_short") || chrome.i18n.getMessage("category_" + categoryName);
+    }
+
    getRawSeconds(minutes: number, seconds: number): number {
        return minutes * 60 + seconds;
    }
@@ -358,6 +362,10 @@ class Utils {
        return window.location.protocol === "http:" || window.location.protocol === "https:";
    }

+    isHex(num: string): boolean {
+        return Boolean(num.match(/^[0-9a-f]+$/i));
+    }
+
    /**
     * Is this Firefox (web-extensions)
     */
Author	SHA1	Message	Date
Ajay Ramachandran	fad3284c4f	Merge pull request #399 from ajayyy/react Save category in preview submissions and other fixes	2020-07-03 21:20:53 -04:00
Ajay Ramachandran	c69047c7f9	Show short names when hovering the preview bar	2020-07-03 21:16:38 -04:00
Ajay Ramachandran	4fc7a69dd5	Merge branch 'master' of https://github.com/ajayyy/SponsorBlock into react	2020-07-03 20:58:15 -04:00
Ajay Ramachandran	dd4c903c6a	Merge pull request #395 from NDevTK/patch-1 Added config option for excluding skipped content from the video duration	2020-07-03 20:58:01 -04:00
Ajay Ramachandran	c9a2edaf3d	Remove unused function	2020-07-03 20:56:45 -04:00
Ajay Ramachandran	8d41af073d	Added option to options page	2020-07-03 20:55:58 -04:00
Ajay Ramachandran	bfafcd07cc	Fix font issue, NaN issue and remove hide real time	2020-07-03 19:56:08 -04:00
Ajay Ramachandran	77abc1d031	Reuse existing functions	2020-07-03 19:44:15 -04:00
Ajay Ramachandran	809de0e0fd	Increased version number	2020-07-03 19:31:18 -04:00
Ajay Ramachandran	e55d1f5115	Removed intermission category and renamed intro to intermission.	2020-07-03 19:31:00 -04:00
Ajay Ramachandran	037bd511b0	Remove keybind restriction. Closes https://github.com/ajayyy/SponsorBlock/issues/379	2020-07-03 19:07:05 -04:00
Ajay Ramachandran	1265eeb941	Save category with the preview submissions.	2020-07-02 23:34:13 -04:00
Ajay Ramachandran	b3a94142c3	Allow colon on invidious options	2020-07-02 21:39:00 -04:00
Ajay Ramachandran	367657e44e	Added intermission category	2020-07-02 21:37:38 -04:00
Ajay Ramachandran	955ee32b46	Remove category update message	2020-07-02 21:13:07 -04:00
Ajay Ramachandran	cd0b1f4a31	Wait for permissions before reloading	2020-07-02 20:56:41 -04:00
Ajay Ramachandran	5c4f0c960c	Reload after importing options	2020-07-02 20:50:06 -04:00
Ajay Ramachandran	5ac6dd1a7f	Update description	2020-07-02 20:48:39 -04:00
NDevTK	8d53e776b8	Do not show if skipDuration is 0	2020-06-29 19:35:11 +01:00
NDevTK	ec2950786f	Skip if skipDuration is 0	2020-06-29 17:52:28 +01:00
Ajay Ramachandran	f33fa2f621	Moved Android to official	2020-06-27 11:38:49 -04:00
NDevTK	fd77748b15	Updated config	2020-06-27 15:20:00 +01:00
NDevTK	3b59389cab	Added different ui option	2020-06-27 15:16:36 +01:00
Ajay Ramachandran	e6f53a3ef9	Update README.md	2020-06-27 00:49:55 -04:00
Ajay Ramachandran	b2f1a737f5	Remove port without pre-built release	2020-06-27 00:44:38 -04:00
Ajay Ramachandran	e2c7f4d16f	Merge pull request #397 from daniel11420/patch-2 Add more unofficial ports to the Unofficial Ports section in the README	2020-06-27 00:44:00 -04:00
Ajay Ramachandran	4a89dfaac5	Merge pull request #396 from daniel11420/patch-1 Fix typo in README	2020-06-27 00:42:50 -04:00
daniel11420	e47330a79c	Add more unofficial ports to the Unofficial Ports section in the README	2020-06-27 06:38:29 +02:00
daniel11420	72fc3620bc	Fix typo in README	2020-06-27 06:32:21 +02:00
NDevTK	0ebd7f4f8d	Added duration override	2020-06-26 19:33:19 +01:00
NDevTK	beea8181a1	Added config option	2020-06-26 19:19:51 +01:00
Ajay Ramachandran	f0716e8bbb	Merge pull request #389 from kittenparry/patch-1 Fix typo in Chrome Users badge	2020-06-22 18:51:02 -04:00
Edvin Boul	783ea5cf5b	Fix typo in Chrome Users badge Chome -> Chrome	2020-06-22 18:29:08 +03:00
Ajay Ramachandran	42a813d325	Merge pull request #388 from ajayyy/react Another hotfix for name string issue	2020-06-21 15:54:25 -04:00
Ajay Ramachandran	e6dfb5041e	Another hotfix for name string issue	2020-06-21 15:53:26 -04:00
Ajay Ramachandran	c857308038	Merge pull request #387 from ajayyy/react Fixed wrong string removed	2020-06-21 12:55:27 -04:00
Ajay Ramachandran	f73abdbabc	Fixed wrong string removed	2020-06-21 12:55:10 -04:00
Ajay Ramachandran	43184e466f	Merge pull request #385 from ajayyy/react Fixed options page issues	2020-06-20 00:20:01 -04:00
Ajay Ramachandran	627c7769b0	New Crowdin updates (#380 ) * New translations messages.json (French) * New translations messages.json (French) * New translations messages.json (French) * New translations messages.json (French)	2020-06-19 18:54:17 -04:00
Ajay Ramachandran	759dba9cd3	Increased version number	2020-06-19 18:53:39 -04:00
Ajay Ramachandran	7cac2c4045	Fix help page not hiding options title bar	2020-06-19 18:53:24 -04:00
Ajay Ramachandran	27bb44189f	Remove name from localisation	2020-06-19 18:49:49 -04:00
Ajay Ramachandran	4c44f3da25	Merge pull request #378 from ajayyy/react Fixed missing options from options page	2020-06-16 22:01:55 -04:00
Ajay Ramachandran	e917a3e94a	New Crowdin translations (#369 ) * New translations messages.json (French) * New translations messages.json (French) * New translations messages.json (Dutch) * New translations messages.json (Portuguese, Brazilian) * New translations messages.json (Finnish) * New translations messages.json (German) * New translations messages.json (German) * New translations messages.json (Hungarian) * New translations messages.json (Swedish) * New translations messages.json (Swedish) * New translations messages.json (Bulgarian) * New translations messages.json (Finnish) * New translations messages.json (French)	2020-06-16 22:01:08 -04:00
Ajay Ramachandran	1570bfdd0a	Fixed missing options from options page	2020-06-16 22:00:49 -04:00
Ajay Ramachandran	e511de9f88	Update README.md	2020-06-14 20:29:12 -04:00
drlellinger	e694393edc	Improve German translation (#371 )	2020-06-10 19:53:35 -04:00
Ajay Ramachandran	e1cb86e6b4	New Crowdin translations (#368 ) * New translations messages.json (Romanian) * New translations messages.json (German)	2020-06-07 21:24:15 -04:00
Ajay Ramachandran	22221ba9bd	Update version number	2020-06-07 21:21:38 -04:00
Ajay Ramachandran	9ad67c1a03	Merge pull request #363 from ajayyy/react Category Improvements	2020-06-07 11:30:33 -04:00
Ajay Ramachandran	53071a9291	New Crowdin translations (#362 ) * New translations messages.json (Portuguese, Brazilian) * New translations messages.json (Swedish) * New translations messages.json (Ukrainian) * New translations messages.json (Chinese Simplified) * New translations messages.json (Russian) * New translations messages.json (Turkish) * New translations messages.json (Bulgarian) * New translations messages.json (French) * New translations messages.json (Spanish) * New translations messages.json (German) * New translations messages.json (Finnish) * New translations messages.json (Portuguese) * New translations messages.json (Italian) * New translations messages.json (Dutch) * New translations messages.json (Polish) * New translations messages.json (Turkish) * New translations messages.json (Chinese Simplified) * New translations messages.json (Romanian) * New translations messages.json (Romanian)	2020-06-07 11:30:10 -04:00
Ajay Ramachandran	56e40b791f	Increased version number	2020-06-07 11:28:41 -04:00
Ajay Ramachandran	93316bf463	Added option to disable notification	2020-06-07 11:27:35 -04:00
Ajay Ramachandran	3f98e2fc73	Remove options page header on help page	2020-06-07 11:21:21 -04:00
Ajay Ramachandran	9f4fec2a43	Added category update info on the notice	2020-06-07 11:16:24 -04:00
Ajay Ramachandran	89cc6ed184	Added "read the guidelines button.	2020-06-05 21:38:38 -04:00
Ajay Ramachandran	730d966019	Lowered category description width	2020-06-05 21:26:07 -04:00
Ajay Ramachandran	c509b8807c	Shortened sponsor description	2020-06-05 19:37:39 -04:00
Ajay Ramachandran	7de907fa23	Added help button to submission notice	2020-06-04 21:46:56 -04:00
Ajay Ramachandran	b4e03ae055	Added category descriptions	2020-06-03 21:00:32 -04:00
Ajay Ramachandran	c9460bd6c6	Added short category names	2020-06-03 20:42:38 -04:00
Ajay Ramachandran	d9800b3c14	Added options page to help page as iframe	2020-06-03 20:31:14 -04:00
Ajay Ramachandran	fa7f577177	Fix skip options	2020-06-03 20:30:25 -04:00
Ajay Ramachandran	ca2727655e	Added customizable seek bar colors	2020-06-03 20:20:02 -04:00