Update CHANGELOG and bump version

Remove source map URL from videojs.hotkeys.min.js
Update fix for HTTP Client
2025-12-23 20:40:17 +00:00 · 2019-05-05 23:02:43 -05:00 · 2019-05-05 20:45:46 -05:00 · 2019-05-05 19:03:56 -05:00 · 2019-05-05 17:47:45 -05:00 · 2019-05-05 17:46:58 -05:00
97 changed files with 8158 additions and 7023 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,58 @@
+# 0.17.0 (2019-05-06)
+
+# Version 0.17.0: Player and Authentication API
+
+Hello everyone! This past month there have been [130 commits](https://github.com/omarroth/invidious/compare/0.16.0..0.17.0) from 11 contributors. Large focus has been on improving the player as well as adding API access for other projects to make use of Invidious.
+
+There have also been significant changes in preparation of native notifications (see [#195](https://github.com/omarroth/invidious/issues/195), [#469](https://github.com/omarroth/invidious/issues/469), [#473](https://github.com/omarroth/invidious/issues/473), and [#502](https://github.com/omarroth/invidious/issues/502)), and playlists. I expect to see both of these to be added in the next release.
+
+I'm quite happy to mention that new translations have been added for Esperanto (`eo`) and Ukranian (`uk`). Support for pluralization has also been added, so it should now be possible to make a more native experience for speakers in other languages. The system currently in place is a bit cumbersome, so for any help using this feature please get in touch!
+
+## For Administrators
+
+A `check_tables` option has been added to automatically migrate without the use of custom scripts. This method will likely prove to be much more robust, and is currently enabled for the official instance. To prevent any unintended changes to the DB, `check_tables` is disabled by default and will print commands before executing. Having this makes features that require schema changes much easier to implement, and also makes it easier to upgrade from older instances.
+
+As part of [#303](https://github.com/omarroth/invidious/issues/303), a `cache_annotations` option has been added to speed up access from `/api/v1/annotations/:id`. This vastly improves the experience for videos with annotations. Currently, only videos that contain legacy annotations will be cached, which should help keep down the size of the cache. `cache_annotations` is disabled by default.
+
+## For Developers
+
+An authorization API has been added which allows other applications to read and modify user subscriptions and preferences (see [#473](https://github.com/omarroth/invidious/issues/473)). Support for accessing user feeds and notifications is also planned. I believe this feature is a large step forward in supporting syncing subscriptions and preferences with other services, and I'm excited to see what other developers do with this functionality.
+
+Support for server-to-client push notifications is currently underway. This allows Invidious users, as well as applications using the Invidious API, to receive notifications about uploads in near real-time (see #469). An `/api/v1/auth/notifications` endpoint is currently available. I'm very excited for this to be integrated into the site, and to see how other developers use it in their own projects.
+
+An `/api/v1/storyboards/:id` endpoint has been added for accessing storyboard URLs, which allows developers to add video previews to their players (see below).
+
+## Player
+
+Support for annotations has been merged into master with [#303](https://github.com/omarroth/invidious/issues/303), thanks @glmdgrielson! Annotations can be enabled by default or only for subscribed channels, and can also be toggled per video. I'm extremely proud of the progress made here, and I'm so thankful to everyone that has made this possible. I expect this to be the last update with regards to supporting annotations, but I do plan on continuing to improve the experience as much as possible.
+
+The Invidious player now supports video previews and a corresponding API endpoint `/api/v1/storyboards/:id` has been added for developers looking to add similar functionality to their own players. Not much else to say here. Overall it's a very nice quality of life improvement and an attractive addition to the site.
+
+It is now possible to select specific sources for videos provided using DASH (see [#34](https://github.com/omarroth/invidious/issues/34)). I would consider support largely feature complete, although there are still several issues to be fixed before I would consider it ready for larger rollout. You can watch videos in 1080p by setting `Default quality` to `dash` in your preferences, or by adding `&quality=dash` to the end of video URLs.
+
+## Finances
+
+### Donations
+
+- [Patreon](https://www.patreon.com/omarroth) : \$49.73
+- [Liberapay](https://liberapay.com/omarroth) : \$63.03
+- Crypto : ~\$0.00 (converted from BCH, BTC)
+- Total : \$112.76
+
+### Expenses
+
+- invidious-load1 (nyc1) : \$10.00 (load balancer)
+- invidious-update1 (s-1vcpu-1gb) : \$5.00 (updates feeds)
+- invidious-node1 (s-1vcpu-1gb) : \$5.00 (web server)
+- invidious-node2 (s-1vcpu-1gb) : \$5.00 (web server)
+- invidious-node3 (s-1vcpu-1gb) : \$5.00 (web server)
+- invidious-node4 (s-1vcpu-1gb) : \$5.00 (web server)
+- invidious-node5 (s-1vcpu-1gb) : \$5.00 (web server)
+- invidious-db1 (s-4vcpu-8gb) : \$40.00 (database)
+- Total : \$80.00
+
+That's all for now. Thanks!
+
 # 0.16.0 (2019-04-06)

 # Version 0.16.0: API Improvements and Annotations
--- a/README.md
+++ b/README.md
@@ -101,14 +101,15 @@ $ exit
 $ sudo systemctl enable postgresql
 $ sudo systemctl start postgresql
 $ sudo -i -u postgres
-$ psql -c "CREATE USER kemal WITH PASSWORD 'kemal';"
+$ psql -c "CREATE USER kemal WITH PASSWORD 'kemal';" # Change 'kemal' here to a stronger password, and update `password` in config/config.yml
 $ createdb -O kemal invidious
-$ psql invidious < /home/invidious/invidious/config/sql/channels.sql
-$ psql invidious < /home/invidious/invidious/config/sql/videos.sql
-$ psql invidious < /home/invidious/invidious/config/sql/channel_videos.sql
-$ psql invidious < /home/invidious/invidious/config/sql/users.sql
-$ psql invidious < /home/invidious/invidious/config/sql/session_ids.sql
-$ psql invidious < /home/invidious/invidious/config/sql/nonces.sql
+$ psql invidious kemal < /home/invidious/invidious/config/sql/channels.sql
+$ psql invidious kemal < /home/invidious/invidious/config/sql/videos.sql
+$ psql invidious kemal < /home/invidious/invidious/config/sql/channel_videos.sql
+$ psql invidious kemal < /home/invidious/invidious/config/sql/users.sql
+$ psql invidious kemal < /home/invidious/invidious/config/sql/session_ids.sql
+$ psql invidious kemal < /home/invidious/invidious/config/sql/nonces.sql
+$ psql invidious kemal < /home/invidious/invidious/config/sql/annotations.sql
 $ exit
 ```

@@ -143,14 +144,15 @@ $ brew install shards crystal-lang postgres imagemagick librsvg
 $ git clone https://github.com/omarroth/invidious
 $ cd invidious
 $ brew services start postgresql
-$ psql -c "CREATE ROLE kemal WITH LOGIN PASSWORD 'kemal';"
-$ createdb invidious -U kemal
-$ psql invidious < config/sql/channels.sql
-$ psql invidious < config/sql/videos.sql
-$ psql invidious < config/sql/channel_videos.sql
-$ psql invidious < config/sql/users.sql
-$ psql invidious < config/sql/session_ids.sql
-$ psql invidious < config/sql/nonces.sql
+$ psql -c "CREATE ROLE kemal WITH PASSWORD 'kemal';" # Change 'kemal' here to a stronger password, and update `password` in config/config.yml
+$ createdb -O kemal invidious
+$ psql invidious kemal < config/sql/channels.sql
+$ psql invidious kemal < config/sql/videos.sql
+$ psql invidious kemal < config/sql/channel_videos.sql
+$ psql invidious kemal < config/sql/users.sql
+$ psql invidious kemal < config/sql/session_ids.sql
+$ psql invidious kemal < config/sql/nonces.sql
+$ psql invidious kemal < config/sql/annotations.sql

 # Setup Invidious
 $ shards update && shards install
@@ -172,15 +174,12 @@ Usage: invidious [arguments]
    --ssl-key-file FILE              SSL key file
    --ssl-cert-file FILE             SSL certificate file
    -h, --help                       Shows this help
-    -t THREADS, --crawl-threads=THREADS
-                                     Number of threads for crawling YouTube (default: 0)
    -c THREADS, --channel-threads=THREADS
                                     Number of threads for refreshing channels (default: 1)
    -f THREADS, --feed-threads=THREADS
                                     Number of threads for refreshing feeds (default: 1)
-    -v THREADS, --video-threads=THREADS
-                                     Number of threads for refreshing videos (default: 0)
    -o OUTPUT, --output=OUTPUT       Redirect output (default: STDOUT)
+    -v, --version                    Print version
 ```

 Or for development:
@@ -188,6 +187,7 @@ Or for development:
 ```bash
 $ curl -fsSLo- https://raw.githubusercontent.com/samueleaton/sentry/master/install.cr | crystal eval
 $ ./sentry
+🤖  Your SentryBot is vigilant. beep-boop...
 ```

 ## Documentation
--- a/assets/css/default.css
+++ b/assets/css/default.css
@@ -103,8 +103,8 @@ img.thumbnail {
  padding: 2px;
  font-size: 16px;
  font-family: sans-serif;
-  right: 0.5em;
-  bottom: -0.5em;
+  right: 0.25em;
+  bottom: -0.75em;
 }

 .watched {
@@ -279,7 +279,8 @@ input[type="search"]::-webkit-search-cancel-button {
  order: 2;
 }

-.vjs-quality-selector {
+.vjs-quality-selector,
+.video-js .vjs-http-source-selector {
  order: 3;
 }

@@ -300,6 +301,10 @@ input[type="search"]::-webkit-search-cancel-button {
  flex-direction: row;
 }

+.video-js .vjs-icon-cog {
+  font-size: 18px;
+}
+
 .video-js .vjs-control-bar,
 .vjs-menu-button-popup .vjs-menu .vjs-menu-content {
  background-color: rgba(35, 35, 35, 0.75);
--- a/assets/css/lighttheme.css
+++ b/assets/css/lighttheme.css
@@ -10,7 +10,7 @@ a {

 /* All links that do not fit with the default color goes here */
 a:not([data-id]) > .icon,
-.pure-u-md-1-5 > .h-box > a[href^="/watch?"],
+.pure-u-lg-1-5 > .h-box > a[href^="/watch?"],
 .playlist-restricted > ol > li > a {
  color: #303030;
 }
--- a/assets/css/video-js.min.css
+++ b/assets/css/video-js.min.css
--- a/assets/css/videojs-http-source-selector.css
+++ b/assets/css/videojs-http-source-selector.css
@@ -0,0 +1,7 @@
+/**
+ * videojs-http-source-selector
+ * @version 1.1.5
+ * @copyright 2019 Justin Fujita <Justin@pivotshare.com>
+ * @license MIT
+ */
+.video-js.vjs-http-source-selector{display:block}
--- a/assets/css/videojs-share.css
+++ b/assets/css/videojs-share.css
@@ -1,7 +1,7 @@
 /**
 * videojs-share
 * @version 3.0.0
- * @copyright 2018 Mikhail Khazov <mkhazov.work@gmail.com>
+ * @copyright 2019 Mikhail Khazov <mkhazov.work@gmail.com>
 * @license MIT
 */
-.video-js.vjs-videojs-share_open .vjs-modal-dialog .vjs-modal-dialog-content{display:flex;align-items:center;padding:0;background-image:linear-gradient(to bottom, rgba(0,0,0,0.77), rgba(0,0,0,0.75))}.video-js.vjs-videojs-share_open .vjs-modal-dialog .vjs-close-button{position:absolute;right:0;top:5px;width:30px;height:30px;color:#fff;cursor:pointer;opacity:0.9;transition:opacity 0.25s ease-out}.video-js.vjs-videojs-share_open .vjs-modal-dialog .vjs-close-button:before{content:'×';font-size:20px;line-height:15px}.video-js.vjs-videojs-share_open .vjs-modal-dialog .vjs-close-button:hover{opacity:1}.video-js .vjs-share{display:flex;flex-direction:column;justify-content:space-around;align-items:center;width:100%;height:100%;max-height:400px}.video-js .vjs-share__top,.video-js .vjs-share__middle,.video-js .vjs-share__bottom{display:flex}.video-js .vjs-share__top,.video-js .vjs-share__middle{flex-direction:column;justify-content:space-between}.video-js .vjs-share__middle{padding:0 25px}.video-js .vjs-share__title{align-self:center;font-size:22px;color:#fff}.video-js .vjs-share__subtitle{width:100%;margin:0 auto 12px;font-size:16px;color:#fff;opacity:0.7}.video-js .vjs-share__short-link-wrapper{position:relative;display:block;width:100%;height:40px;margin:0 auto;margin-bottom:15px;border:0;color:rgba(255,255,255,0.65);background-color:#363636;outline:none;overflow:hidden;flex-shrink:0}.video-js .vjs-share__short-link{display:block;width:100%;height:100%;padding:0 40px 0 15px;border:0;color:rgba(255,255,255,0.65);background-color:#363636;outline:none}.video-js .vjs-share__btn{position:absolute;right:0;bottom:0;height:40px;width:40px;display:flex;align-items:center;padding:0 11px;border:0;color:#fff;background-color:#2e2e2e;background-size:18px 19px;background-position:center;background-repeat:no-repeat;cursor:pointer;outline:none;transition:width 0.3s ease-out, padding 0.3s ease-out}.video-js .vjs-share__btn svg{flex-shrink:0}.video-js .vjs-share__btn span{position:relative;padding-left:10px;opacity:0;transition:opacity 0.3s ease-out}.video-js .vjs-share__btn:hover{justify-content:center;width:100%;padding:0 40px;background-image:none}.video-js .vjs-share__btn:hover span{opacity:1}.video-js .vjs-share__socials{display:flex;flex-wrap:wrap;justify-content:center;align-content:flex-start;transition:width 0.3s ease-out, height 0.3s ease-out}.video-js .vjs-share__social{display:flex;justify-content:center;align-items:center;flex-shrink:0;width:32px;height:32px;margin-right:6px;margin-bottom:6px;cursor:pointer;font-size:8px;transition:transform 0.3s ease-out, filter 0.2s ease-out;border:none;outline:none}.video-js .vjs-share__social:hover{filter:brightness(115%)}.video-js .vjs-share__social svg{overflow:visible;max-height:24px}.video-js .vjs-share__social_vk{background-color:#5d7294}.video-js .vjs-share__social_ok{background-color:#ed7c20}.video-js .vjs-share__social_mail{background-color:#134785}.video-js .vjs-share__social_tw{background-color:#76aaeb}.video-js .vjs-share__social_reddit{background-color:#ff4500}.video-js .vjs-share__social_fbFeed{background-color:#475995}.video-js .vjs-share__social_messenger{background-color:#0084ff}.video-js .vjs-share__social_gp{background-color:#d53f35}.video-js .vjs-share__social_linkedin{background-color:#0077b5}.video-js .vjs-share__social_viber{background-color:#766db5}.video-js .vjs-share__social_telegram{background-color:#4bb0e2}.video-js .vjs-share__social_whatsapp{background-color:#78c870}.video-js .vjs-share__bottom{justify-content:center}@media (max-height: 220px){.video-js .vjs-share .hidden-xs{display:none}}@media (max-height: 350px){.video-js .vjs-share .hidden-sm{display:none}}@media (min-height: 400px){.video-js .vjs-share__title{margin-bottom:15px}.video-js .vjs-share__short-link-wrapper{margin-bottom:30px}}@media (min-width: 320px){.video-js.vjs-videojs-share_open .vjs-modal-dialog .vjs-close-button{right:5px;top:10px}}@media (min-width: 660px){.video-js.vjs-videojs-share_open .vjs-modal-dialog .vjs-close-button{right:20px;top:20px}.video-js .vjs-share__social{width:40px;height:40px}}
+.video-js.vjs-videojs-share_open .vjs-modal-dialog .vjs-modal-dialog-content{display:flex;align-items:center;padding:0;background-image:linear-gradient(to bottom, rgba(0,0,0,0.77), rgba(0,0,0,0.75))}.video-js.vjs-videojs-share_open .vjs-modal-dialog .vjs-close-button{position:absolute;right:0;top:5px;width:30px;height:30px;color:#fff;cursor:pointer;opacity:0.9;transition:opacity 0.25s ease-out}.video-js.vjs-videojs-share_open .vjs-modal-dialog .vjs-close-button:before{content:'×';font-size:20px;line-height:15px}.video-js.vjs-videojs-share_open .vjs-modal-dialog .vjs-close-button:hover{opacity:1}.video-js .vjs-share{display:flex;flex-direction:column;justify-content:space-around;align-items:center;width:100%;height:100%;max-height:400px}.video-js .vjs-share__top,.video-js .vjs-share__middle,.video-js .vjs-share__bottom{display:flex}.video-js .vjs-share__top,.video-js .vjs-share__middle{flex-direction:column;justify-content:space-between}.video-js .vjs-share__middle{padding:0 25px}.video-js .vjs-share__title{align-self:center;font-size:22px;color:#fff}.video-js .vjs-share__subtitle{width:100%;margin:0 auto 12px;font-size:16px;color:#fff;opacity:0.7}.video-js .vjs-share__short-link-wrapper{position:relative;display:block;width:100%;height:40px;margin:0 auto;margin-bottom:15px;border:0;color:rgba(255,255,255,0.65);background-color:#363636;outline:none;overflow:hidden;flex-shrink:0}.video-js .vjs-share__short-link{display:block;width:100%;height:100%;padding:0 40px 0 15px;border:0;color:rgba(255,255,255,0.65);background-color:#363636;outline:none}.video-js .vjs-share__btn{position:absolute;right:0;bottom:0;height:40px;width:40px;display:flex;align-items:center;padding:0 11px;border:0;color:#fff;background-color:#2e2e2e;background-size:18px 19px;background-position:center;background-repeat:no-repeat;cursor:pointer;outline:none;transition:width 0.3s ease-out, padding 0.3s ease-out}.video-js .vjs-share__btn svg{flex-shrink:0}.video-js .vjs-share__btn span{position:relative;padding-left:10px;opacity:0;transition:opacity 0.3s ease-out}.video-js .vjs-share__btn:hover{justify-content:center;width:100%;padding:0 40px;background-image:none}.video-js .vjs-share__btn:hover span{opacity:1}.video-js .vjs-share__socials{display:flex;flex-wrap:wrap;justify-content:center;align-content:flex-start;transition:width 0.3s ease-out, height 0.3s ease-out}.video-js .vjs-share__social{display:flex;justify-content:center;align-items:center;flex-shrink:0;width:32px;height:32px;margin-right:6px;margin-bottom:6px;cursor:pointer;font-size:8px;transition:transform 0.3s ease-out, filter 0.2s ease-out;border:none;outline:none}.video-js .vjs-share__social:hover{filter:brightness(115%)}.video-js .vjs-share__social svg{overflow:visible;max-height:24px}.video-js .vjs-share__social_vk{background-color:#5d7294}.video-js .vjs-share__social_ok{background-color:#ed7c20}.video-js .vjs-share__social_mail,.video-js .vjs-share__social_email{background-color:#134785}.video-js .vjs-share__social_tw{background-color:#76aaeb}.video-js .vjs-share__social_reddit{background-color:#ff4500}.video-js .vjs-share__social_fbFeed{background-color:#475995}.video-js .vjs-share__social_messenger{background-color:#0084ff}.video-js .vjs-share__social_gp{background-color:#d53f35}.video-js .vjs-share__social_linkedin{background-color:#0077b5}.video-js .vjs-share__social_viber{background-color:#766db5}.video-js .vjs-share__social_telegram{background-color:#4bb0e2}.video-js .vjs-share__social_whatsapp{background-color:#78c870}.video-js .vjs-share__bottom{justify-content:center}@media (max-height: 220px){.video-js .vjs-share .hidden-xs{display:none}}@media (max-height: 350px){.video-js .vjs-share .hidden-sm{display:none}}@media (min-height: 400px){.video-js .vjs-share__title{margin-bottom:15px}.video-js .vjs-share__short-link-wrapper{margin-bottom:30px}}@media (min-width: 320px){.video-js.vjs-videojs-share_open .vjs-modal-dialog .vjs-close-button{right:5px;top:10px}}@media (min-width: 660px){.video-js.vjs-videojs-share_open .vjs-modal-dialog .vjs-close-button{right:20px;top:20px}.video-js .vjs-share__social{width:40px;height:40px}}
--- a/assets/css/videojs-vtt-thumbnails.css
+++ b/assets/css/videojs-vtt-thumbnails.css
@@ -0,0 +1,7 @@
+/**
+ * videojs-vtt-thumbnails
+ * @version 0.0.13
+ * @copyright 2019 Chris Boustead <chris@forgemotion.com>
+ * @license MIT
+ */
+.video-js.vjs-vtt-thumbnails{display:block}.video-js .vjs-vtt-thumbnail-display{position:absolute;bottom:85%;pointer-events:none;box-shadow:0 0 7px rgba(0,0,0,0.6)}
--- a/assets/css/videojs-youtube-annotations.min.css
+++ b/assets/css/videojs-youtube-annotations.min.css
@@ -0,0 +1 @@
+.__cxt-ar-annotations-container__{--annotation-close-size: 20px;position:absolute;width:100%;height:100%;top:0;left:0;pointer-events:none;overflow:hidden}.__cxt-ar-annotation__{position:absolute;box-sizing:border-box;font-family:Arial,sans-serif;color:#fff;z-index:20;pointer-events:auto}.__cxt-ar-annotation__ span{position:absolute;left:0;top:0;overflow:hidden;word-wrap:break-word;white-space:pre-wrap;pointer-events:none;box-sizing:border-box;padding:2%;user-select:none;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none}.__cxt-ar-annotation-close__{display:none;position:absolute;width:var(--annotation-close-size);height:var(--annotation-close-size);cursor:pointer;right:calc(var(--annotation-close-size)/-1.8);top:calc(var(--annotation-close-size)/-1.8);z-index:1}.__cxt-ar-annotation__:hover:not([hidden]):not([data-ar-closed]) .__cxt-ar-annotation-close__{display:block}.__cxt-ar-annotation__[hidden]{display:none!important}.__cxt-ar-annotation__[data-ar-type=highlight]{border:1px solid rgba(255,255,255,.1);background-color:transparent}.__cxt-ar-annotation__[data-ar-type=highlight]:hover{border:1px solid rgba(255,255,255,.5);background-color:transparent}.__cxt-ar-annotation__ svg{pointer-events:all}
--- a/assets/js/dash.mediaplayer.min.js
+++ b/assets/js/dash.mediaplayer.min.js
--- a/assets/js/silvermine-videojs-quality-selector.js
+++ b/assets/js/silvermine-videojs-quality-selector.js
--- a/assets/js/subscribe_widget.js
+++ b/assets/js/subscribe_widget.js
@@ -0,0 +1,78 @@
+var subscribe_button = document.getElementById('subscribe');
+subscribe_button.parentNode['action'] = 'javascript:void(0)';
+
+if (subscribe_button.getAttribute('data-type') === 'subscribe') {
+    subscribe_button.onclick = subscribe;
+} else {
+    subscribe_button.onclick = unsubscribe;
+}
+
+function subscribe(timeouts = 0) {
+    if (timeouts > 10) {
+        console.log('Failed to subscribe.');
+        return;
+    }
+
+    var url = '/subscription_ajax?action_create_subscription_to_channel=1&redirect=false' +
+        '&c=' + subscribe_data.ucid +
+        '&referer=' + location.pathname + location.search;
+    var xhr = new XMLHttpRequest();
+    xhr.responseType = 'json';
+    xhr.timeout = 20000;
+    xhr.open('POST', url, true);
+    xhr.setRequestHeader("Content-Type", "application/x-www-form-urlencoded");
+    xhr.send('csrf_token=' + subscribe_data.csrf_token);
+
+    var fallback = subscribe_button.innerHTML;
+    subscribe_button.onclick = unsubscribe;
+    subscribe_button.innerHTML = '<b>' + subscribe_data.unsubscribe_text + ' | ' + subscribe_data.sub_count_text + '</b>';
+
+    xhr.onreadystatechange = function () {
+        if (xhr.readyState == 4) {
+            if (xhr.status != 200) {
+                subscribe_button.onclick = subscribe;
+                subscribe_button.innerHTML = fallback;
+            }
+        }
+    }
+
+    xhr.ontimeout = function () {
+        console.log('Subscribing timed out.');
+        subscribe(timeouts + 1);
+    };
+}
+
+function unsubscribe(timeouts = 0) {
+    if (timeouts > 10) {
+        console.log('Failed to subscribe');
+        return;
+    }
+
+    var url = '/subscription_ajax?action_remove_subscriptions=1&redirect=false' +
+        '&c=' + subscribe_data.ucid +
+        '&referer=' + location.pathname + location.search;
+    var xhr = new XMLHttpRequest();
+    xhr.responseType = 'json';
+    xhr.timeout = 20000;
+    xhr.open('POST', url, true);
+    xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
+    xhr.send('csrf_token=' + subscribe_data.csrf_token);
+
+    var fallback = subscribe_button.innerHTML;
+    subscribe_button.onclick = subscribe;
+    subscribe_button.innerHTML = '<b>' + subscribe_data.subscribe_text + ' | ' + subscribe_data.sub_count_text + '</b>';
+
+    xhr.onreadystatechange = function () {
+        if (xhr.readyState == 4) {
+            if (xhr.status != 200) {
+                subscribe_button.onclick = unsubscribe;
+                subscribe_button.innerHTML = fallback;
+            }
+        }
+    }
+
+    xhr.ontimeout = function () {
+        console.log('Unsubscribing timed out.');
+        unsubscribe(timeouts + 1);
+    };
+}
--- a/assets/js/video.min.js
+++ b/assets/js/video.min.js
--- a/assets/js/videojs-contrib-quality-levels.min.js
+++ b/assets/js/videojs-contrib-quality-levels.min.js
@@ -1,2 +1,2 @@
-/*! @name videojs-contrib-quality-levels @version 2.0.7 @license Apache-2.0 */
-!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?module.exports=t(require("video.js"),require("global/document")):"function"==typeof define&&define.amd?define(["video.js","global/document"],t):e.videojsContribQualityLevels=t(e.videojs,e.document)}(this,function(e,t){"use strict";e=e&&e.hasOwnProperty("default")?e.default:e,t=t&&t.hasOwnProperty("default")?t.default:t;var n=function(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")},r=function(e,t){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!t||"object"!=typeof t&&"function"!=typeof t?e:t},i=function(i){function o(){n(this,o);var l=r(this,i.call(this)),s=l;if(e.browser.IS_IE8)for(var u in s=t.createElement("custom"),o.prototype)"constructor"!==u&&(s[u]=o.prototype[u]);return s.levels_=[],s.selectedIndex_=-1,Object.defineProperty(s,"selectedIndex",{get:function(){return s.selectedIndex_}}),Object.defineProperty(s,"length",{get:function(){return s.levels_.length}}),r(l,s)}return function(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)}(o,i),o.prototype.addQualityLevel=function(r){var i=this.getQualityLevelById(r.id);if(i)return i;var o=this.levels_.length;return i=new function r(i){n(this,r);var o=this;if(e.browser.IS_IE8)for(var l in o=t.createElement("custom"),r.prototype)"constructor"!==l&&(o[l]=r.prototype[l]);return o.id=i.id,o.label=o.id,o.width=i.width,o.height=i.height,o.bitrate=i.bandwidth,o.enabled_=i.enabled,Object.defineProperty(o,"enabled",{get:function(){return o.enabled_()},set:function(e){o.enabled_(e)}}),o}(r),""+o in this||Object.defineProperty(this,o,{get:function(){return this.levels_[o]}}),this.levels_.push(i),this.trigger({qualityLevel:i,type:"addqualitylevel"}),i},o.prototype.removeQualityLevel=function(e){for(var t=null,n=0,r=this.length;n<r;n++)if(this[n]===e){t=this.levels_.splice(n,1)[0],this.selectedIndex_===n?this.selectedIndex_=-1:this.selectedIndex_>n&&this.selectedIndex_--;break}return t&&this.trigger({qualityLevel:e,type:"removequalitylevel"}),t},o.prototype.getQualityLevelById=function(e){for(var t=0,n=this.length;t<n;t++){var r=this[t];if(r.id===e)return r}return null},o.prototype.dispose=function(){this.selectedIndex_=-1,this.levels_.length=0},o}(e.EventTarget);for(var o in i.prototype.allowedEvents_={change:"change",addqualitylevel:"addqualitylevel",removequalitylevel:"removequalitylevel"},i.prototype.allowedEvents_)i.prototype["on"+o]=null;var l=function(t){return n=this,e.mergeOptions({},t),r=n.qualityLevels,o=new i,n.on("dispose",function e(){o.dispose(),n.qualityLevels=r,n.off("dispose",e)}),n.qualityLevels=function(){return o},n.qualityLevels.VERSION="__VERSION__",o;var n,r,o};return(e.registerPlugin||e.plugin)("qualityLevels",l),l.VERSION="__VERSION__",l});
+/*! @name videojs-contrib-quality-levels @version 2.0.9 @license Apache-2.0 */
+!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?module.exports=t(require("video.js"),require("global/document")):"function"==typeof define&&define.amd?define(["video.js","global/document"],t):e.videojsContribQualityLevels=t(e.videojs,e.document)}(this,function(e,t){"use strict";function n(e){if(void 0===e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return e}e=e&&e.hasOwnProperty("default")?e.default:e,t=t&&t.hasOwnProperty("default")?t.default:t;var r=function(r){var i,l;function o(){var i,l=n(n(i=r.call(this)||this));if(e.browser.IS_IE8)for(var s in l=t.createElement("custom"),o.prototype)"constructor"!==s&&(l[s]=o.prototype[s]);return l.levels_=[],l.selectedIndex_=-1,Object.defineProperty(l,"selectedIndex",{get:function(){return l.selectedIndex_}}),Object.defineProperty(l,"length",{get:function(){return l.levels_.length}}),l||n(i)}l=r,(i=o).prototype=Object.create(l.prototype),i.prototype.constructor=i,i.__proto__=l;var s=o.prototype;return s.addQualityLevel=function(n){var r=this.getQualityLevelById(n.id);if(r)return r;var i=this.levels_.length;return r=new function n(r){var i=this;if(e.browser.IS_IE8)for(var l in i=t.createElement("custom"),n.prototype)"constructor"!==l&&(i[l]=n.prototype[l]);return i.id=r.id,i.label=i.id,i.width=r.width,i.height=r.height,i.bitrate=r.bandwidth,i.enabled_=r.enabled,Object.defineProperty(i,"enabled",{get:function(){return i.enabled_()},set:function(e){i.enabled_(e)}}),i}(n),""+i in this||Object.defineProperty(this,i,{get:function(){return this.levels_[i]}}),this.levels_.push(r),this.trigger({qualityLevel:r,type:"addqualitylevel"}),r},s.removeQualityLevel=function(e){for(var t=null,n=0,r=this.length;n<r;n++)if(this[n]===e){t=this.levels_.splice(n,1)[0],this.selectedIndex_===n?this.selectedIndex_=-1:this.selectedIndex_>n&&this.selectedIndex_--;break}return t&&this.trigger({qualityLevel:e,type:"removequalitylevel"}),t},s.getQualityLevelById=function(e){for(var t=0,n=this.length;t<n;t++){var r=this[t];if(r.id===e)return r}return null},s.dispose=function(){this.selectedIndex_=-1,this.levels_.length=0},o}(e.EventTarget);for(var i in r.prototype.allowedEvents_={change:"change",addqualitylevel:"addqualitylevel",removequalitylevel:"removequalitylevel"},r.prototype.allowedEvents_)r.prototype["on"+i]=null;var l=function(t){return n=this,e.mergeOptions({},t),i=n.qualityLevels,l=new r,n.on("dispose",function e(){l.dispose(),n.qualityLevels=i,n.off("dispose",e)}),n.qualityLevels=function(){return l},n.qualityLevels.VERSION="2.0.9",l;var n,i,l};return(e.registerPlugin||e.plugin)("qualityLevels",l),l.VERSION="2.0.9",l});
--- a/assets/js/videojs-dash.min.js
+++ b/assets/js/videojs-dash.min.js
--- a/assets/js/videojs-http-source-selector.min.js
+++ b/assets/js/videojs-http-source-selector.min.js
@@ -0,0 +1,7 @@
+/**
+ * videojs-http-source-selector
+ * @version 1.1.5
+ * @copyright 2019 Justin Fujita <Justin@pivotshare.com>
+ * @license MIT
+ */
+!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?module.exports=t(require("video.js")):"function"==typeof define&&define.amd?define(["video.js"],t):(e=e||self)["videojs-http-source-selector"]=t(e.videojs)}(this,function(i){"use strict";function o(e,t){e.prototype=Object.create(t.prototype),(e.prototype.constructor=e).__proto__=t}var a=function(n){function e(e,t){var o;return o=n.call(this,e,t)||this,t.selectable=!0,o}o(e,n);var t=e.prototype;return t.handleClick=function(){var e=this.options_;console.log("Changing quality to:",e.label),this.selected_=!0,this.selected(!0);for(var t=this.player().qualityLevels(),o=0;o<t.length;o++)e.index==t.length?t[o].enabled=!0:e.index==o?t[o].enabled=!0:t[o].enabled=!1},t.update=function(){var e=this.player().qualityLevels().selectedIndex;this.selected(this.options_.index==e),this.selected_=this.options_.index===e},e}((i=i&&i.hasOwnProperty("default")?i.default:i).getComponent("MenuItem")),r=i.getComponent("MenuButton"),n=function(l){function e(e,t){var o;o=l.call(this,e,t)||this,r.apply(function(e){if(void 0===e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return e}(o),arguments);var n=o.player().qualityLevels();if(t&&t.default)if("low"==t.default)for(var i=0;i<n.length;i++)n[i].enabled=0==i;else if(t.default="high")for(i=0;i<n.length;i++)n[i].enabled=i==n.length-1;return o}o(e,l);var t=e.prototype;return t.createEl=function(){return i.dom.createEl("div",{className:"vjs-http-source-selector vjs-menu-button vjs-menu-button-popup vjs-control vjs-button"})},t.buildCSSClass=function(){return r.prototype.buildCSSClass.call(this)+" vjs-icon-cog"},t.update=function(){return r.prototype.update.call(this)},t.createItems=function(){for(var e=[],t=this.player().qualityLevels(),o=[],n=0;n<t.length;n++){var i=t.length-(n+1),l=i===t.selectedIndex,r=""+i,s=i;t[i].height?(r=t[i].height+"p",s=parseInt(t[i].height,10)):t[i].bitrate&&(r=Math.floor(t[i].bitrate/1e3)+" kbps",s=parseInt(t[i].bitrate,10)),0<=o.indexOf(r)||(o.push(r),e.push(new a(this.player_,{label:r,index:i,selected:l,sortVal:s})))}return 1<t.length&&e.push(new a(this.player_,{label:"Auto",index:t.length,selected:!1,sortVal:99999})),e.sort(function(e,t){return e.options_.sortVal<t.options_.sortVal?1:e.options_.sortVal>t.options_.sortVal?-1:0}),e},e}(r),l={},e=i.registerPlugin||i.plugin,t=function(e){var t=this;this.ready(function(){!function(n,e){if(n.addClass("vjs-http-source-selector"),console.log("videojs-http-source-selector initialized!"),console.log("player.techName_:"+n.techName_),"Html5"!=n.techName_)return;n.on(["loadedmetadata"],function(e){if(n.qualityLevels(),i.log("loadmetadata event"),"undefined"==n.videojs_http_source_selector_initialized||1==n.videojs_http_source_selector_initialized)console.log("player.videojs_http_source_selector_initialized == true");else{console.log("player.videojs_http_source_selector_initialized == false"),n.videojs_http_source_selector_initialized=!0;var t=n.controlBar,o=t.getChild("fullscreenToggle").el();t.el().insertBefore(t.addChild("SourceMenuButton").el(),o)}})}(t,i.mergeOptions(l,e))}),i.registerComponent("SourceMenuButton",n),i.registerComponent("SourceMenuItem",a)};return e("httpSourceSelector",t),t.VERSION="1.1.5",t});
--- a/assets/js/videojs-http-streaming.min.js
+++ b/assets/js/videojs-http-streaming.min.js
--- a/assets/js/videojs-share.min.js
+++ b/assets/js/videojs-share.min.js
--- a/assets/js/videojs-vtt-thumbnails.min.js
+++ b/assets/js/videojs-vtt-thumbnails.min.js
--- a/assets/js/videojs-youtube-annotations.min.js
+++ b/assets/js/videojs-youtube-annotations.min.js
--- a/assets/js/videojs.hotkeys.min.js
+++ b/assets/js/videojs.hotkeys.min.js
@@ -1,3 +1,2 @@
 /* videojs-hotkeys v0.2.25 - https://github.com/ctd1500/videojs-hotkeys */
-!function(e,n){"undefined"!=typeof window&&window.videojs?n(window.videojs):"function"==typeof define&&define.amd?define("videojs-hotkeys",["video.js"],function(e){return n(e.default||e)}):"undefined"!=typeof module&&module.exports&&(module.exports=n(require("video.js")))}(0,function(e){"use strict";"undefined"!=typeof window&&(window.videojs_hotkeys={version:"0.2.25"});(e.registerPlugin||e.plugin)("hotkeys",function(n){function t(e){return"function"==typeof s?s(e):s}function r(e){null!=e&&"function"==typeof e.then&&e.then(null,function(e){})}var o=this,u=o.el(),l=document,i={volumeStep:.1,seekStep:5,enableMute:!0,enableVolumeScroll:!0,enableHoverScroll:!1,enableFullscreen:!0,enableNumbers:!0,enableJogStyle:!1,alwaysCaptureHotkeys:!1,enableModifiersForNumbers:!0,enableInactiveFocus:!0,skipInitialFocus:!1,playPauseKey:function(e){return 32===e.which||179===e.which},rewindKey:function(e){return 37===e.which||177===e.which},forwardKey:function(e){return 39===e.which||176===e.which},volumeUpKey:function(e){return 38===e.which},volumeDownKey:function(e){return 40===e.which},muteKey:function(e){return 77===e.which},fullscreenKey:function(e){return 70===e.which},customKeys:{}},c=e.mergeOptions||e.util.mergeOptions,a=(n=c(i,n||{})).volumeStep,s=n.seekStep,m=n.enableMute,f=n.enableVolumeScroll,y=n.enableHoverScroll,v=n.enableFullscreen,d=n.enableNumbers,p=n.enableJogStyle,b=n.alwaysCaptureHotkeys,h=n.enableModifiersForNumbers,w=n.enableInactiveFocus,k=n.skipInitialFocus,S=e.VERSION;u.hasAttribute("tabIndex")||u.setAttribute("tabIndex","-1"),u.style.outline="none",!b&&o.autoplay()||k||o.one("play",function(){u.focus()}),w&&o.on("userinactive",function(){var e=function(){clearTimeout(n)},n=setTimeout(function(){o.off("useractive",e);var n=l.activeElement,t=u.querySelector(".vjs-control-bar");n&&n.parentElement==t&&u.focus()},10);o.one("useractive",e)}),o.on("play",function(){var e=u.querySelector(".iframeblocker");e&&""===e.style.display&&(e.style.display="block",e.style.bottom="39px")});var K=!1,q=u.querySelector(".vjs-volume-menu-button")||u.querySelector(".vjs-volume-panel");null!=q&&(q.onmouseover=function(){K=!0},q.onmouseout=function(){K=!1});var j=function(e){if(y)n=0;else var n=l.activeElement;if(o.controls()&&(b||n==u||n==u.querySelector(".vjs-tech")||n==u.querySelector(".iframeblocker")||n==u.querySelector(".vjs-control-bar")||K)&&f){e=window.event||e;var t=Math.max(-1,Math.min(1,e.wheelDelta||-e.detail));e.preventDefault(),1==t?o.volume(o.volume()+a):-1==t&&o.volume(o.volume()-a)}},F=function(e,t){return n.playPauseKey(e,t)?1:n.rewindKey(e,t)?2:n.forwardKey(e,t)?3:n.volumeUpKey(e,t)?4:n.volumeDownKey(e,t)?5:n.muteKey(e,t)?6:n.fullscreenKey(e,t)?7:void 0};return o.on("keydown",function(e){var i,c,s=e.which,f=e.preventDefault,y=o.duration();if(o.controls()){var w=l.activeElement;if(b||w==u||w==u.querySelector(".vjs-tech")||w==u.querySelector(".vjs-control-bar")||w==u.querySelector(".iframeblocker"))switch(F(e,o)){case 1:f(),b&&e.stopPropagation(),o.paused()?r(o.play()):o.pause();break;case 2:i=!o.paused(),f(),i&&o.pause(),(c=o.currentTime()-t(e))<=0&&(c=0),o.currentTime(c),i&&r(o.play());break;case 3:i=!o.paused(),f(),i&&o.pause(),(c=o.currentTime()+t(e))>=y&&(c=i?y-.001:y),o.currentTime(c),i&&r(o.play());break;case 5:f(),p?(c=o.currentTime()-1,o.currentTime()<=1&&(c=0),o.currentTime(c)):o.volume(o.volume()-a);break;case 4:f(),p?((c=o.currentTime()+1)>=y&&(c=y),o.currentTime(c)):o.volume(o.volume()+a);break;case 6:m&&o.muted(!o.muted());break;case 7:v&&(o.isFullscreen()?o.exitFullscreen():o.requestFullscreen());break;default:if((s>47&&s<59||s>95&&s<106)&&(h||!(e.metaKey||e.ctrlKey||e.altKey))&&d){var k=48;s>95&&(k=96);var S=s-k;f(),o.currentTime(o.duration()*S*.1)}for(var K in n.customKeys){var q=n.customKeys[K];q&&q.key&&q.handler&&q.key(e)&&(f(),q.handler(o,n,e))}}}}),o.on("dblclick",function(e){if(null!=S&&S<="7.1.0"&&o.controls()){var n=e.relatedTarget||e.toElement||l.activeElement;n!=u&&n!=u.querySelector(".vjs-tech")&&n!=u.querySelector(".iframeblocker")||v&&(o.isFullscreen()?o.exitFullscreen():o.requestFullscreen())}}),o.on("mousewheel",j),o.on("DOMMouseScroll",j),this})});
-//# sourceMappingURL=videojs.hotkeys.min.js.map
+!function(e,n){"undefined"!=typeof window&&window.videojs?n(window.videojs):"function"==typeof define&&define.amd?define("videojs-hotkeys",["video.js"],function(e){return n(e.default||e)}):"undefined"!=typeof module&&module.exports&&(module.exports=n(require("video.js")))}(0,function(e){"use strict";"undefined"!=typeof window&&(window.videojs_hotkeys={version:"0.2.25"});(e.registerPlugin||e.plugin)("hotkeys",function(n){function t(e){return"function"==typeof s?s(e):s}function r(e){null!=e&&"function"==typeof e.then&&e.then(null,function(e){})}var o=this,u=o.el(),l=document,i={volumeStep:.1,seekStep:5,enableMute:!0,enableVolumeScroll:!0,enableHoverScroll:!1,enableFullscreen:!0,enableNumbers:!0,enableJogStyle:!1,alwaysCaptureHotkeys:!1,enableModifiersForNumbers:!0,enableInactiveFocus:!0,skipInitialFocus:!1,playPauseKey:function(e){return 32===e.which||179===e.which},rewindKey:function(e){return 37===e.which||177===e.which},forwardKey:function(e){return 39===e.which||176===e.which},volumeUpKey:function(e){return 38===e.which},volumeDownKey:function(e){return 40===e.which},muteKey:function(e){return 77===e.which},fullscreenKey:function(e){return 70===e.which},customKeys:{}},c=e.mergeOptions||e.util.mergeOptions,a=(n=c(i,n||{})).volumeStep,s=n.seekStep,m=n.enableMute,f=n.enableVolumeScroll,y=n.enableHoverScroll,v=n.enableFullscreen,d=n.enableNumbers,p=n.enableJogStyle,b=n.alwaysCaptureHotkeys,h=n.enableModifiersForNumbers,w=n.enableInactiveFocus,k=n.skipInitialFocus,S=e.VERSION;u.hasAttribute("tabIndex")||u.setAttribute("tabIndex","-1"),u.style.outline="none",!b&&o.autoplay()||k||o.one("play",function(){u.focus()}),w&&o.on("userinactive",function(){var e=function(){clearTimeout(n)},n=setTimeout(function(){o.off("useractive",e);var n=l.activeElement,t=u.querySelector(".vjs-control-bar");n&&n.parentElement==t&&u.focus()},10);o.one("useractive",e)}),o.on("play",function(){var e=u.querySelector(".iframeblocker");e&&""===e.style.display&&(e.style.display="block",e.style.bottom="39px")});var K=!1,q=u.querySelector(".vjs-volume-menu-button")||u.querySelector(".vjs-volume-panel");null!=q&&(q.onmouseover=function(){K=!0},q.onmouseout=function(){K=!1});var j=function(e){if(y)n=0;else var n=l.activeElement;if(o.controls()&&(b||n==u||n==u.querySelector(".vjs-tech")||n==u.querySelector(".iframeblocker")||n==u.querySelector(".vjs-control-bar")||K)&&f){e=window.event||e;var t=Math.max(-1,Math.min(1,e.wheelDelta||-e.detail));e.preventDefault(),1==t?o.volume(o.volume()+a):-1==t&&o.volume(o.volume()-a)}},F=function(e,t){return n.playPauseKey(e,t)?1:n.rewindKey(e,t)?2:n.forwardKey(e,t)?3:n.volumeUpKey(e,t)?4:n.volumeDownKey(e,t)?5:n.muteKey(e,t)?6:n.fullscreenKey(e,t)?7:void 0};return o.on("keydown",function(e){var i,c,s=e.which,f=e.preventDefault,y=o.duration();if(o.controls()){var w=l.activeElement;if(b||w==u||w==u.querySelector(".vjs-tech")||w==u.querySelector(".vjs-control-bar")||w==u.querySelector(".iframeblocker"))switch(F(e,o)){case 1:f(),b&&e.stopPropagation(),o.paused()?r(o.play()):o.pause();break;case 2:i=!o.paused(),f(),i&&o.pause(),(c=o.currentTime()-t(e))<=0&&(c=0),o.currentTime(c),i&&r(o.play());break;case 3:i=!o.paused(),f(),i&&o.pause(),(c=o.currentTime()+t(e))>=y&&(c=i?y-.001:y),o.currentTime(c),i&&r(o.play());break;case 5:f(),p?(c=o.currentTime()-1,o.currentTime()<=1&&(c=0),o.currentTime(c)):o.volume(o.volume()-a);break;case 4:f(),p?((c=o.currentTime()+1)>=y&&(c=y),o.currentTime(c)):o.volume(o.volume()+a);break;case 6:m&&o.muted(!o.muted());break;case 7:v&&(o.isFullscreen()?o.exitFullscreen():o.requestFullscreen());break;default:if((s>47&&s<59||s>95&&s<106)&&(h||!(e.metaKey||e.ctrlKey||e.altKey))&&d){var k=48;s>95&&(k=96);var S=s-k;f(),o.currentTime(o.duration()*S*.1)}for(var K in n.customKeys){var q=n.customKeys[K];q&&q.key&&q.handler&&q.key(e)&&(f(),q.handler(o,n,e))}}}}),o.on("dblclick",function(e){if(null!=S&&S<="7.1.0"&&o.controls()){var n=e.relatedTarget||e.toElement||l.activeElement;n!=u&&n!=u.querySelector(".vjs-tech")&&n!=u.querySelector(".iframeblocker")||v&&(o.isFullscreen()?o.exitFullscreen():o.requestFullscreen())}}),o.on("mousewheel",j),o.on("DOMMouseScroll",j),this})});
--- a/assets/js/watch.js
+++ b/assets/js/watch.js
@@ -1,52 +1,52 @@
 function toggle_parent(target) {
-  body = target.parentNode.parentNode.children[1];
-  if (body.style.display === null || body.style.display === "") {
-    target.innerHTML = "[ + ]";
-    body.style.display = "none";
-  } else {
-    target.innerHTML = "[ - ]";
-    body.style.display = "";
-  }
+    body = target.parentNode.parentNode.children[1];
+    if (body.style.display === null || body.style.display === "") {
+        target.innerHTML = "[ + ]";
+        body.style.display = "none";
+    } else {
+        target.innerHTML = "[ - ]";
+        body.style.display = "";
+    }
 }

 function toggle_comments(target) {
-  body = target.parentNode.parentNode.parentNode.children[1];
-  if (body.style.display === null || body.style.display === "") {
-    target.innerHTML = "[ + ]";
-    body.style.display = "none";
-  } else {
-    target.innerHTML = "[ - ]";
-    body.style.display = "";
-  }
+    body = target.parentNode.parentNode.parentNode.children[1];
+    if (body.style.display === null || body.style.display === "") {
+        target.innerHTML = "[ + ]";
+        body.style.display = "none";
+    } else {
+        target.innerHTML = "[ - ]";
+        body.style.display = "";
+    }
 }

 function swap_comments(source) {
-  if (source == "youtube") {
-    get_youtube_comments();
-  } else if (source == "reddit") {
-    get_reddit_comments();
-  }
+    if (source == "youtube") {
+        get_youtube_comments();
+    } else if (source == "reddit") {
+        get_reddit_comments();
+    }
 }

-String.prototype.supplant = function(o) {
-  return this.replace(/{([^{}]*)}/g, function(a, b) {
-    var r = o[b];
-    return typeof r === "string" || typeof r === "number" ? r : a;
-  });
+String.prototype.supplant = function (o) {
+    return this.replace(/{([^{}]*)}/g, function (a, b) {
+        var r = o[b];
+        return typeof r === "string" || typeof r === "number" ? r : a;
+    });
 };

 function show_youtube_replies(target, inner_text, sub_text) {
-  body = target.parentNode.parentNode.children[1];
-  body.style.display = "";
+    body = target.parentNode.parentNode.children[1];
+    body.style.display = "";

-  target.innerHTML = inner_text;
-  target.setAttribute("onclick", "hide_youtube_replies(this, \'" + inner_text + "\', \'" + sub_text + "\')");
+    target.innerHTML = inner_text;
+    target.setAttribute("onclick", "hide_youtube_replies(this, \'" + inner_text + "\', \'" + sub_text + "\')");
 }

 function hide_youtube_replies(target, inner_text, sub_text) {
-  body = target.parentNode.parentNode.children[1];
-  body.style.display = "none";
+    body = target.parentNode.parentNode.children[1];
+    body.style.display = "none";

-  target.innerHTML = sub_text;
-  target.setAttribute("onclick", "show_youtube_replies(this, \'" + inner_text + "\', \'" + sub_text + "\')");
+    target.innerHTML = sub_text;
+    target.setAttribute("onclick", "show_youtube_replies(this, \'" + inner_text + "\', \'" + sub_text + "\')");
 }
--- a/config/migrate-scripts/migrate-db-17cf077.sh
+++ b/config/migrate-scripts/migrate-db-17cf077.sh
@@ -1,4 +1,4 @@
 #!/bin/sh

-psql invidious -c "ALTER TABLE channels ADD COLUMN subscribed bool;"
-psql invidious -c "UPDATE channels SET subscribed = false;"
+psql invidious kemal -c "ALTER TABLE channels ADD COLUMN subscribed bool;"
+psql invidious kemal -c "UPDATE channels SET subscribed = false;"
--- a/config/migrate-scripts/migrate-db-1c8075c.sh
+++ b/config/migrate-scripts/migrate-db-1c8075c.sh
@@ -1,7 +1,7 @@
 #!/bin/sh

-psql invidious -c "ALTER TABLE channel_videos DROP COLUMN live_now CASCADE"
-psql invidious -c "ALTER TABLE channel_videos DROP COLUMN premiere_timestamp CASCADE"
+psql invidious kemal -c "ALTER TABLE channel_videos DROP COLUMN live_now CASCADE"
+psql invidious kemal -c "ALTER TABLE channel_videos DROP COLUMN premiere_timestamp CASCADE"

-psql invidious -c "ALTER TABLE channel_videos ADD COLUMN live_now bool"
-psql invidious -c "ALTER TABLE channel_videos ADD COLUMN premiere_timestamp timestamptz"
+psql invidious kemal -c "ALTER TABLE channel_videos ADD COLUMN live_now bool"
+psql invidious kemal -c "ALTER TABLE channel_videos ADD COLUMN premiere_timestamp timestamptz"
--- a/config/migrate-scripts/migrate-db-30e6d29.sh
+++ b/config/migrate-scripts/migrate-db-30e6d29.sh
@@ -1,4 +1,4 @@
 #!/bin/sh

-psql invidious -c "ALTER TABLE channels ADD COLUMN deleted bool;"
-psql invidious -c "UPDATE channels SET deleted = false;"
+psql invidious kemal -c "ALTER TABLE channels ADD COLUMN deleted bool;"
+psql invidious kemal -c "UPDATE channels SET deleted = false;"
--- a/config/migrate-scripts/migrate-db-3646395.sh
+++ b/config/migrate-scripts/migrate-db-3646395.sh
@@ -1,5 +1,5 @@
 #!/bin/sh

 psql invidious < config/sql/session_ids.sql
-psql invidious -c "INSERT INTO session_ids (SELECT unnest(id), email, CURRENT_TIMESTAMP FROM users) ON CONFLICT (id) DO NOTHING"
-psql invidious -c "ALTER TABLE users DROP COLUMN id"
+psql invidious kemal -c "INSERT INTO session_ids (SELECT unnest(id), email, CURRENT_TIMESTAMP FROM users) ON CONFLICT (id) DO NOTHING"
+psql invidious kemal -c "ALTER TABLE users DROP COLUMN id"
--- a/config/migrate-scripts/migrate-db-3bcb98e.sh
+++ b/config/migrate-scripts/migrate-db-3bcb98e.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+psql invidious kemal < config/sql/annotations.sql
--- a/config/migrate-scripts/migrate-db-6e51189.sh
+++ b/config/migrate-scripts/migrate-db-6e51189.sh
@@ -1,4 +1,4 @@
 #!/bin/sh

-psql invidious -c "ALTER TABLE channel_videos ADD COLUMN live_now bool;"
-psql invidious -c "UPDATE channel_videos SET live_now = false;"
+psql invidious kemal -c "ALTER TABLE channel_videos ADD COLUMN live_now bool;"
+psql invidious kemal -c "UPDATE channel_videos SET live_now = false;"
--- a/config/migrate-scripts/migrate-db-88b7097.sh
+++ b/config/migrate-scripts/migrate-db-88b7097.sh
@@ -1,3 +1,3 @@
 #!/bin/sh

-psql invidious -c "ALTER TABLE channel_videos ADD COLUMN premiere_timestamp timestamptz;"
+psql invidious kemal -c "ALTER TABLE channel_videos ADD COLUMN premiere_timestamp timestamptz;"
--- a/config/migrate-scripts/migrate-db-8e884fe.sh
+++ b/config/migrate-scripts/migrate-db-8e884fe.sh
@@ -1,5 +1,5 @@
 #!/bin/sh

-psql invidious -c "ALTER TABLE channels DROP COLUMN subscribed"
-psql invidious -c "ALTER TABLE channels ADD COLUMN subscribed timestamptz"
-psql invidious -c "UPDATE channels SET subscribed = '2019-01-01 00:00:00+00'"
+psql invidious kemal -c "ALTER TABLE channels DROP COLUMN subscribed"
+psql invidious kemal -c "ALTER TABLE channels ADD COLUMN subscribed timestamptz"
+psql invidious kemal -c "UPDATE channels SET subscribed = '2019-01-01 00:00:00+00'"
--- a/config/sql/annotations.sql
+++ b/config/sql/annotations.sql
@@ -0,0 +1,12 @@
+-- Table: public.annotations
+
+-- DROP TABLE public.annotations;
+
+CREATE TABLE public.annotations
+(
+  id text NOT NULL,
+  annotations xml,
+  CONSTRAINT annotations_id_key UNIQUE (id)
+);
+
+GRANT ALL ON TABLE public.annotations TO kemal;
--- a/config/sql/channel_videos.sql
+++ b/config/sql/channel_videos.sql
@@ -18,15 +18,6 @@ CREATE TABLE public.channel_videos

 GRANT ALL ON TABLE public.channel_videos TO kemal;

-- Index: public.channel_videos_published_idx
-
-- DROP INDEX public.channel_videos_published_idx;
-
-CREATE INDEX channel_videos_published_idx
-  ON public.channel_videos
-  USING btree
-  (published);
-
 -- Index: public.channel_videos_ucid_idx

 -- DROP INDEX public.channel_videos_ucid_idx;
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,7 +1,7 @@
 FROM archlinux/base

 RUN pacman -Sy --noconfirm shards crystal imagemagick librsvg \
-    which pkgconf gcc ttf-liberation
+    which pkgconf gcc ttf-liberation glibc
 # base-devel contains many other basic packages, that are normally assumed to already exist on a clean arch system

 ADD . /invidious
--- a/docker/entrypoint.postgres.sh
+++ b/docker/entrypoint.postgres.sh
@@ -12,12 +12,13 @@ if [ ! -f /var/lib/postgresql/data/setupFinished ]; then
    >&2 echo "### importing table schemas"
    su postgres -c 'createdb invidious'
    su postgres -c 'psql -c "CREATE USER kemal WITH PASSWORD '"'kemal'"'"'
-    su postgres -c 'psql invidious < config/sql/channels.sql'
-    su postgres -c 'psql invidious < config/sql/videos.sql'
-    su postgres -c 'psql invidious < config/sql/channel_videos.sql'
-    su postgres -c 'psql invidious < config/sql/users.sql'
-    su postgres -c 'psql invidious < config/sql/session_ids.sql'
-    su postgres -c 'psql invidious < config/sql/nonces.sql'
+    su postgres -c 'psql invidious kemal < config/sql/channels.sql'
+    su postgres -c 'psql invidious kemal < config/sql/videos.sql'
+    su postgres -c 'psql invidious kemal < config/sql/channel_videos.sql'
+    su postgres -c 'psql invidious kemal < config/sql/users.sql'
+    su postgres -c 'psql invidious kemal < config/sql/session_ids.sql'
+    su postgres -c 'psql invidious kemal < config/sql/nonces.sql'
+    su postgres -c 'psql invidious kemal < config/sql/annotations.sql'
    touch /var/lib/postgresql/data/setupFinished
    echo "### invidious database setup finished"
    exit
--- a/locales/ar.json
+++ b/locales/ar.json
@@ -1,297 +1,314 @@
 {
-  "`x` subscribers": "`x` المشتركين",
-  "`x` videos": "`x` الفيديوهات",
-  "LIVE": "مباشر",
-  "Shared `x` ago": "تم رفع الفيديو منذ `x`",
-  "Unsubscribe": "إلغاء الإشتراك",
-  "Subscribe": "إشتراك",
-  "Login to subscribe to `x`": "سجل الدخول للإشتراك فى `x`",
-  "View channel on YouTube": "زيارة القناة على موقع يوتيوب",
-  "newest": "الأجدد",
-  "oldest": "الأقدم",
-  "popular": "الاكثر شعبية",
-  "last": "اخر الفيديوهات المعدلة",
-  "Next page": "الصفحة الثانية",
-  "Previous page": "الصفحة السابقة",
-  "Clear watch history?": "مسح السجل ؟",
-  "Yes": "نعم",
-  "No": "لا",
-  "Import and Export Data": "استخراج و إضافة البيانات",
-  "Import": "إضافة",
-  "Import Invidious data": "إضافة بيانات Invidious",
-  "Import YouTube subscriptions": "إضافةالإشتراكات من موقع يوتيوب",
-  "Import FreeTube subscriptions (.db)": "إضافةالمشتركين من FreeTube (.db)",
-  "Import NewPipe subscriptions (.json)": "إضافة المشتركين من NewPipe (.json)",
-  "Import NewPipe data (.zip)": "إضافة بيانات NewPipe (.zip)",
-  "Export": "استخراج",
-  "Export subscriptions as OPML": "استخراج المشتركين كـ OPML",
-  "Export subscriptions as OPML (for NewPipe & FreeTube)": "استخراج المشتركين كـ OPML (لـ NewPipe و FreeTube)",
-  "Export data as JSON": "استخراج البيانات كـ JSON",
-  "Delete account?": "حذف الحساب ؟",
-  "History": "السجل",
-  "An alternative front-end to YouTube": "البديل الكامل لموقع يوتيوب",
-  "JavaScript license information": "معلومات ترخيص JavaScript",
-  "source": "المصدر",
-  "Login": "تسجيل الدخول",
-  "Login/Register": "تسجيل الدخول\\إنشاء حساب",
-  "Login to Google": "تسجيل الدخول بإستخدام جوجل",
-  "User ID:": "إسم المستخدم:",
-  "Password:": "الرقم السرى:",
-  "Time (h:mm:ss):": "(يجب ان يكتب مثل هذا التنسيق) الوقت (h(ساعات):mm(دقائق):ss(ثوانى)):",
-  "Text CAPTCHA": "CAPTCHA كلامية",
-  "Image CAPTCHA": "CAPTCHA صورية",
-  "Sign In": "تسجيل الدخول",
-  "Register": "انشاء الحساب",
-  "Email:": "الإيميل:",
-  "Google verification code:": "رمز تحقق جوجل:",
-  "Preferences": "التفضيلات",
-  "Player preferences": "التفضيلات المشغل",
-  "Always loop: ": "كرر الفيديو دائما: ",
-  "Autoplay: ": "تشغيل تلقائى: ",
-  "Autoplay next video: ": "شغل الفيديو التالى تلقائى: ",
-  "Listen by default: ": "تشغيل النسخة السمعية تلقائى: ",
-  "Proxy videos? ": "عرض الفيديوهات عن طريق الوكيل(proxy) ؟",
-  "Default speed: ": "السرعة الإفتراضية: ",
-  "Preferred video quality: ": "الجودة المفضلة للفيديوهات: ",
-  "Player volume: ": "صوت المشغل: ",
-  "Default comments: ": "إضهار التعليقات الإفتراضية لـ: ",
-  "youtube": "يوتيوب",
-  "reddit": "Reddit",
-  "Default captions: ": "الترجمات الإفتراضية: ",
-  "Fallback captions: ": "الترجمات المصاحبة: ",
-  "Show related videos? ": "عرض مقاطع الفيديو ذات الصلة؟",
-  "Visual preferences": "التفضيلات المرئية",
-  "Dark mode: ": "الوضع الليلى: ",
-  "Thin mode: ": "الوضع الخفيف: ",
-  "Subscription preferences": "تفضيلات الإشتراك",
-  "Redirect homepage to feed: ": "إعادة التوجية من الصفحة الرئيسية لصفحة المشتركين (لرؤية اخر فيديوهات المشتركين): ",
-  "Number of videos shown in feed: ": "عدد الفيديوهات التى ستظهر فى صفحة المشتركين: ",
-  "Sort videos by: ": "ترتيب الفيديو بـ: ",
-  "published": "احدث فيديو",
-  "published - reverse": "احدث فيديو - عكسى",
-  "alphabetically": "ترتيب ابجدى",
-  "alphabetically - reverse": "ابجدى - عكسى",
-  "channel name": "بإسم القناة",
-  "channel name - reverse": "بإسم القناة - عكسى",
-  "Only show latest video from channel: ": "فقط إظهر اخر فيديو من القناة: ",
-  "Only show latest unwatched video from channel: ": "فقط اظهر اخر فيديو لم يتم رؤيتة من القناة: ",
-  "Only show unwatched: ": "فقط اظهر الذى لم يتم رؤيتة: ",
-  "Only show notifications (if there are any): ": "إظهار الإشعارات فقط (إذا كان هناك أي): ",
-  "Data preferences": "إعدادات التفضيلات",
-  "Clear watch history": "حذف سجل المشاهدة",
-  "Import/Export data": "إضافة\\إستخراج البيانات",
-  "Manage subscriptions": "إدارة المشتركين",
-  "Watch history": "سجل المشاهدة",
-  "Delete account": "حذف الحساب",
-  "Administrator preferences": "إعدادات المدير",
-  "Default homepage: ": "الصفحة الرئيسية الافتراضية ",
-  "Feed menu: ": "قائمة التغذية",
-  "Top enabled? ": "تفعيل 'الأفضل' ؟ ",
-  "CAPTCHA enabled? ": "تفعيل الكابتشا ؟",
-  "Login enabled? ": "تفعيل تسجيل الدخول ؟",
-  "Registration enabled? ": "تفعيل التسجيل ؟",
-  "Report statistics? ": "إبلاغ الإحصائيات",
-  "Save preferences": "حفظ التفضيلات",
-  "Subscription manager": "مدير الإشتراكات",
-  "`x` subscriptions": "`x` مشتركين",
-  "Import/Export": "إضافة\\إستخراج",
-  "unsubscribe": "إلغاء الإشتراك",
-  "Subscriptions": "الإشتراكات",
-  "`x` unseen notifications": "`x` إشعارات لم تشاهدها بعد ",
-  "search": "بحث",
-  "Sign out": "تسجيل الخروج",
-  "Released under the AGPLv3 by Omar Roth.": "تم الإنشاء تحت AGPLv3 بواسطة عمر روث.",
-  "Source available here.": "الأكواد متوفرة هنا.",
-  "View JavaScript license information.": "مشاهدة معلومات حول تراخيص الجافاسكريبت.",
-  "View privacy policy.": "عرض سياسة الخصوصية",
-  "Trending": "الشائع",
-  "Unlisted": "غير مصنف",
-  "Watch video on Youtube": "مشاهدة الفيديو على اليوتيوب",
-  "Genre: ": "النوع: ",
-  "License: ": "التراخيص: ",
-  "Family friendly? ": "محتوى عائلى? ",
-  "Wilson score: ": "درجة ويلسون: ",
-  "Engagement: ": "نسبة المشاركة (عدد المشاهدات\\عدد الإعجابات): ",
-  "Whitelisted regions: ": "الدول المسموح فيها هذا الفيديو: ",
-  "Blacklisted regions: ": "الدول الحظور فيها هذا الفيديو: ",
-  "Shared `x`": "شارك منذ `x`",
-  "Premieres in `x`": "يعرض فى 'x'",
-  "Hi! Looks like you have JavaScript disabled. Click here to view comments, keep in mind it may take a bit longer to load.": "اهلا! يبدو ان الجافاسكريبت معطلة. اضغط هنا لعرض التعليقات, ضع فى إعتبارك انها ستأخذ وقت اطول للعرض.",
-  "View YouTube comments": "عرض تعليقات اليوتيوب",
-  "View more comments on Reddit": "عرض المزيد من التعليقات على\\من موقع Reddit",
-  "View `x` comments": "عرض `x` تعليقات",
-  "View Reddit comments": "عرض تعليقات ريدإت Reddit",
-  "Hide replies": "إخفاء الردود",
-  "Show replies": "عرض الردود",
-  "Incorrect password": "الرقم السرى غير صحيح",
-  "Quota exceeded, try again in a few hours": "تم تجاوز عدد المرات المسموح بها, حاول مرة اخرى بعد عدة ساعات",
-  "Unable to login, make sure two-factor authentication (Authenticator or SMS) is enabled.": "غير قادر على تسجيل الدخول, تأكد من تشغيل المصادقة الثنائية 2FA.",
-  "Invalid TFA code": "كود مصادقة ثنائية 2FA غير صحيح",
-  "Login failed. This may be because two-factor authentication is not enabled on your account.": "لم يتم تسجيل الدخول. هذا ربما بسبب ان المصادقة الثنائية 2FA معطلة فى حسابك.",
-  "Invalid answer": "إجابة خاطئة",
-  "Invalid CAPTCHA": "الكابتشا CAPTCHA غير صاحلة",
-  "CAPTCHA is a required field": "مكان الكابتشا CAPTCHA مطلوب",
-  "User ID is a required field": "مكان إسم المستخدم مطلوب",
-  "Password is a required field": "مكان الرقم السرى مطلوب",
-  "Invalid username or password": "إسم المستخدم او الرقم السرى غير صحيح",
-  "Please sign in using 'Sign in with Google'": "الرجاء تسجيل الدخول 'تسجيل الدخول بواسطة جوجل'",
-  "Password cannot be empty": "الرقم السرى لايمكن ان يكون فارغ",
-  "Password cannot be longer than 55 characters": "الرقم السرى لا يتعدى 55 حرف",
-  "Please sign in": "الرجاء تسجيل الدخول",
-  "Invidious Private Feed for `x`": "صفحة Invidious للمشتركين الخاصة\\مخفية لـ `x`",
-  "channel:`x`": "قناة:`x`",
-  "Deleted or invalid channel": "قناة ممسوحة او غير صالحة",
-  "This channel does not exist.": "القناة غير موجودة.",
-  "Could not get channel info.": "لم يستطع الحصول على معلومات القناة.",
-  "Could not fetch comments": "لم يتمكن من إحضار التعليقات",
-  "View `x` replies": "عرض `x` ردود",
-  "`x` ago": "`x` منذ",
-  "Load more": "عرض المزيد",
-  "`x` points": "`x` نقاط",
-  "Could not create mix.": "لم يستطع عمل خلط.",
-  "Playlist is empty": "قائمة التشغيل فارغة",
-  "Invalid playlist.": "قائمة التشغيل غير صالحة.",
-  "Playlist does not exist.": "قائمة التشغيل غير موجودة.",
-  "Could not pull trending pages.": "لم يستطع عرض الصفحات الراجئة.",
-  "Hidden field \"challenge\" is a required field": "مكان مخفى \"تحدى\" مكان مطلوب",
-  "Hidden field \"token\" is a required field": "مكان مخفى \"رمز\" مكان مطلوب",
-  "Invalid challenge": "تحدى غير صالح",
-  "Invalid token": "روز غير صالح",
-  "Invalid user": "مستخدم غير صالح",
-  "Token is expired, please try again": "الرمز منتهى الصلاحية , الرجاء المحاولة مرة اخرى",
-  "English": "إنجليزى",
-  "English (auto-generated)": "إنجليزى (تم إنشائة تلقائى)",
-  "Afrikaans": "الأفريكانية",
-  "Albanian": "الألبانية",
-  "Amharic": "الأمهرية",
-  "Arabic": "العربية",
-  "Armenian": "الأرميني",
-  "Azerbaijani": "أذربيجان",
-  "Bangla": "البنغالية",
-  "Basque": "الباسكي",
-  "Belarusian": "البيلاروسية",
-  "Bosnian": "البوسنية",
-  "Bulgarian": "البلغارية",
-  "Burmese": "البورمية",
-  "Catalan": "الكاتالونية",
-  "Cebuano": "السيبيونو",
-  "Chinese (Simplified)": "الصينية (المبسطة)",
-  "Chinese (Traditional)": "الصينية (التقليدية)",
-  "Corsican": "الكورسيكية",
-  "Croatian": "الكرواتية",
-  "Czech": "تشيكي",
-  "Danish": "دانماركي",
-  "Dutch": "هولندي",
-  "Esperanto": "الاسبرانتو",
-  "Estonian": "الإستونية",
-  "Filipino": "الفلبينية",
-  "Finnish": "الفنلندية",
-  "French": "الفرنسية",
-  "Galician": "الجاليكية",
-  "Georgian": "الجورجية",
-  "German": "ألمانية",
-  "Greek": "الإغريقي",
-  "Gujarati": "الغوجاراتية",
-  "Haitian Creole": "الكاثوليكية الهايتية",
-  "Hausa": "الهوسا",
-  "Hawaiian": "هاواي",
-  "Hebrew": "العبرية",
-  "Hindi": "الهندية",
-  "Hmong": "همونغ",
-  "Hungarian": "الهنغارية",
-  "Icelandic": "أيسلندي",
-  "Igbo": "الإيبو",
-  "Indonesian": "الأندونيسية",
-  "Irish": "الأيرلندية",
-  "Italian": "الإيطالي",
-  "Japanese": "اليابانية",
-  "Javanese": "جاوي",
-  "Kannada": "الكانادا",
-  "Kazakh": "الكازاخية",
-  "Khmer": "الخمير",
-  "Korean": "الكورية",
-  "Kurdish": "كردي",
-  "Kyrgyz": "قيرغيزستان",
-  "Lao": "لاو",
-  "Latin": "لاتينية",
-  "Latvian": "اللاتفية",
-  "Lithuanian": "اللتوانية",
-  "Luxembourgish": "اللوكسمبرجية",
-  "Macedonian": "المقدونية",
-  "Malagasy": "مدجشقر\\مدغشقر",
-  "Malay": "الملايو",
-  "Malayalam": "المالايالامية",
-  "Maltese": "المالطية",
-  "Maori": "الماوري",
-  "Marathi": "المهاراتية",
-  "Mongolian": "المنغولية",
-  "Nepali": "النيبالية",
-  "Norwegian": "النرويجية",
-  "Nyanja": "نيانجا",
-  "Pashto": "الباشتو",
-  "Persian": "الفارسية",
-  "Polish": "البولندي",
-  "Portuguese": "البرتغالية",
-  "Punjabi": "البنجابية",
-  "Romanian": "روماني",
-  "Russian": "الروسية",
-  "Samoan": "ساموا",
-  "Scottish Gaelic": "الغيلية الاسكتلندية",
-  "Serbian": "صربي",
-  "Shona": "شونا",
-  "Sindhi": "السندية",
-  "Sinhala": "السنهالية",
-  "Slovak": "السلوفاكية",
-  "Slovenian": "سلوفيني",
-  "Somali": "الصومالية",
-  "Southern Sotho": "جنوب سوثو",
-  "Spanish": "الأسبانية",
-  "Spanish (Latin America)": "الأسبانية (أمريكا اللاتينية)",
-  "Sundanese": "السودانية",
-  "Swahili": "السواحلية",
-  "Swedish": "السويدية",
-  "Tajik": "الطاجيكية",
-  "Tamil": "التاميل",
-  "Telugu": "التيلجو",
-  "Thai": "التايلاندية",
-  "Turkish": "التركية",
-  "Ukrainian": "الأوكراني",
-  "Urdu": "الأردية",
-  "Uzbek": "الأوزبكي",
-  "Vietnamese": "الفيتنامية",
-  "Welsh": "الولزية",
-  "Western Frisian": "الفريزية الغربية",
-  "Xhosa": "زوسا",
-  "Yiddish": "اليديشية",
-  "Yoruba": "اليوروبا",
-  "Zulu": "الزولو",
-  "`x` years": "`x` سنوات",
-  "`x` months": "`x` شهور",
-  "`x` weeks": "`x` اسابيع",
-  "`x` days": "`x` ايام",
-  "`x` hours": "`x` ساعات",
-  "`x` minutes": "`x` دقائق",
-  "`x` seconds": "`x` ثوانى",
-  "Fallback comments: ": "التعليقات المصاحبة",
-  "Popular": "لاكثر شعبية",
-  "Top": "الأفضل",
-  "About": "حول",
-  "Rating: ": "التقييم",
-  "Language: ": "اللغة",
-  "Default": "الكل",
-  "Music": "الاغانى",
-  "Gaming": "الألعاب",
-  "News": "الأخبار",
-  "Movies": "الأفلام",
-  "Download as: ": "تحميل كـ",
-  "Download": "تحميل",
-  "%A %B %-d, %Y": "",
-  "(edited)": "(تم تعديلة)",
-  "Youtube permalink of the comment": "رابط التعليق على اليوتيوب",
-  "`x` marked it with a ❤": "'x' اعجب بهذا",
-  "Audio mode": "الوضع الصوتى",
-  "Video mode": "وضع الفيديو",
-  "Videos": "الفيديوهات",
-  "Playlists": "قوائم التشغيل",
-  "Current version: ": "الإصدار الحالى"
-}
+    "`x` subscribers": "`x` المشتركين",
+    "`x` videos": "`x` الفيديوهات",
+    "LIVE": "مباشر",
+    "Shared `x` ago": "تم رفع الفيديو منذ `x`",
+    "Unsubscribe": "إلغاء الإشتراك",
+    "Subscribe": "إشتراك",
+    "View channel on YouTube": "زيارة القناة على موقع يوتيوب",
+    "newest": "الأجدد",
+    "oldest": "الأقدم",
+    "popular": "الاكثر شعبية",
+    "last": "اخر قوائم التشغيل المعدلة",
+    "Next page": "الصفحة الثانية",
+    "Previous page": "الصفحة السابقة",
+    "Clear watch history?": "مسح السجل ؟",
+    "New password": "الرقم السرى الجديد",
+    "New passwords must match": "الأرقام السرية يجب ان تكون متطابقة",
+    "Cannot change password for Google accounts": "لا يستطيع تغيير الرقم السرى لحساب جوجل",
+    "Authorize token?": "رمز الإذن ؟",
+    "Authorize token for `x`?": "رمز الإذن لـ `x` ?",
+    "Yes": "نعم",
+    "No": "لا",
+    "Import and Export Data": "استخراج و إضافة البيانات",
+    "Import": "إضافة",
+    "Import Invidious data": "إضافة بيانات Invidious",
+    "Import YouTube subscriptions": "إضافةالإشتراكات من موقع يوتيوب",
+    "Import FreeTube subscriptions (.db)": "إضافةالمشتركين من FreeTube (.db)",
+    "Import NewPipe subscriptions (.json)": "إضافة المشتركين من NewPipe (.json)",
+    "Import NewPipe data (.zip)": "إضافة بيانات NewPipe (.zip)",
+    "Export": "استخراج",
+    "Export subscriptions as OPML": "استخراج المشتركين كـ OPML",
+    "Export subscriptions as OPML (for NewPipe & FreeTube)": "استخراج المشتركين كـ OPML (لـ NewPipe و FreeTube)",
+    "Export data as JSON": "استخراج البيانات كـ JSON",
+    "Delete account?": "حذف الحساب ؟",
+    "History": "السجل",
+    "An alternative front-end to YouTube": "البديل الكامل لموقع يوتيوب",
+    "JavaScript license information": "معلومات ترخيص JavaScript",
+    "source": "المصدر",
+    "Log in": "تسجيل الدخول",
+    "Log in/register": "تسجيل الدخول\\إنشاء حساب",
+    "Log in with Google": "تسجيل الدخول بإستخدام جوجل",
+    "User ID": "إسم المستخدم",
+    "Password": "الرقم السرى",
+    "Time (h:mm:ss):": "(يجب ان يكتب مثل هذا التنسيق) الوقت (h(ساعات):mm(دقائق):ss(ثوانى)):",
+    "Text CAPTCHA": "CAPTCHA كلامية",
+    "Image CAPTCHA": "CAPTCHA صورية",
+    "Sign In": "تسجيل الدخول",
+    "Register": "انشاء الحساب",
+    "E-mail": "الإيميل",
+    "Google verification code": "رمز تحقق جوجل",
+    "Preferences": "التفضيلات",
+    "Player preferences": "التفضيلات المشغل",
+    "Always loop: ": "كرر الفيديو دائما: ",
+    "Autoplay: ": "تشغيل تلقائى: ",
+    "Play next by default: ": "",
+    "Autoplay next video: ": "شغل الفيديو التالى تلقائى: ",
+    "Listen by default: ": "تشغيل النسخة السمعية تلقائى: ",
+    "Proxy videos? ": "عرض الفيديوهات عن طريق الوكيل(proxy) ؟",
+    "Default speed: ": "السرعة الإفتراضية: ",
+    "Preferred video quality: ": "الجودة المفضلة للفيديوهات: ",
+    "Player volume: ": "صوت المشغل: ",
+    "Default comments: ": "إضهار التعليقات الإفتراضية لـ: ",
+    "youtube": "يوتيوب",
+    "reddit": "Reddit",
+    "Default captions: ": "الترجمات الإفتراضية: ",
+    "Fallback captions: ": "الترجمات المصاحبة: ",
+    "Show related videos? ": "عرض مقاطع الفيديو ذات الصلة؟",
+    "Show annotations by default? ": "",
+    "Visual preferences": "التفضيلات المرئية",
+    "Dark mode: ": "الوضع الليلى: ",
+    "Thin mode: ": "الوضع الخفيف: ",
+    "Subscription preferences": "تفضيلات الإشتراك",
+    "Show annotations by default for subscribed channels? ": "",
+    "Redirect homepage to feed: ": "إعادة التوجية من الصفحة الرئيسية لصفحة المشتركين (لرؤية اخر فيديوهات المشتركين): ",
+    "Number of videos shown in feed: ": "عدد الفيديوهات التى ستظهر فى صفحة المشتركين: ",
+    "Sort videos by: ": "ترتيب الفيديو بـ: ",
+    "published": "احدث فيديو",
+    "published - reverse": "احدث فيديو - عكسى",
+    "alphabetically": "ترتيب ابجدى",
+    "alphabetically - reverse": "ابجدى - عكسى",
+    "channel name": "بإسم القناة",
+    "channel name - reverse": "بإسم القناة - عكسى",
+    "Only show latest video from channel: ": "فقط إظهر اخر فيديو من القناة: ",
+    "Only show latest unwatched video from channel: ": "فقط اظهر اخر فيديو لم يتم رؤيتة من القناة: ",
+    "Only show unwatched: ": "فقط اظهر الذى لم يتم رؤيتة: ",
+    "Only show notifications (if there are any): ": "إظهار الإشعارات فقط (إذا كان هناك أي): ",
+    "Data preferences": "إعدادات التفضيلات",
+    "Clear watch history": "حذف سجل المشاهدة",
+    "Import/export data": "إضافة\\إستخراج البيانات",
+    "Change password": "غير الرقم السرى",
+    "Manage subscriptions": "إدارة المشتركين",
+    "Manage tokens": "إدارة الرموز",
+    "Watch history": "سجل المشاهدة",
+    "Delete account": "حذف الحساب",
+    "Administrator preferences": "إعدادات المدير",
+    "Default homepage: ": "الصفحة الرئيسية الافتراضية ",
+    "Feed menu: ": "قائمة التغذية",
+    "Top enabled? ": "تفعيل 'الأفضل' ؟ ",
+    "CAPTCHA enabled? ": "تفعيل الكابتشا ؟",
+    "Login enabled? ": "تفعيل تسجيل الدخول ؟",
+    "Registration enabled? ": "تفعيل التسجيل ؟",
+    "Report statistics? ": "إبلاغ الإحصائيات",
+    "Save preferences": "حفظ التفضيلات",
+    "Subscription manager": "مدير الإشتراكات",
+    "Token manager": "إداره الرمز",
+    "Token": "الرمز",
+    "`x` subscriptions": "`x` مشتركين",
+    "`x` tokens": "`x` رموز",
+    "Import/export": "إضافة\\إستخراج",
+    "unsubscribe": "إلغاء الإشتراك",
+    "revoke": "مسح",
+    "Subscriptions": "الإشتراكات",
+    "`x` unseen notifications": "`x` إشعارات لم تشاهدها بعد ",
+    "search": "بحث",
+    "Log out": "تسجيل الخروج",
+    "Released under the AGPLv3 by Omar Roth.": "تم الإنشاء تحت AGPLv3 بواسطة عمر روث.",
+    "Source available here.": "الأكواد متوفرة هنا.",
+    "View JavaScript license information.": "مشاهدة معلومات حول تراخيص الجافاسكريبت.",
+    "View privacy policy.": "عرض سياسة الخصوصية",
+    "Trending": "الشائع",
+    "Unlisted": "غير مصنف",
+    "Watch on YouTube": "مشاهدة الفيديو على اليوتيوب",
+    "Hide annotations": "",
+    "Show annotations": "",
+    "Genre: ": "النوع: ",
+    "License: ": "التراخيص: ",
+    "Family friendly? ": "محتوى عائلى? ",
+    "Wilson score: ": "درجة ويلسون: ",
+    "Engagement: ": "نسبة المشاركة (عدد المشاهدات\\عدد الإعجابات): ",
+    "Whitelisted regions: ": "الدول المسموح فيها هذا الفيديو: ",
+    "Blacklisted regions: ": "الدول الحظور فيها هذا الفيديو: ",
+    "Shared `x`": "شارك منذ `x`",
+    "`x` views": "`x` مشاهدون",
+    "Premieres in `x`": "يعرض فى `x`",
+    "Hi! Looks like you have JavaScript turned off. Click here to view comments, keep in mind they may take a bit longer to load.": "اهلا! يبدو ان الجافاسكريبت معطلة. اضغط هنا لعرض التعليقات, ضع فى إعتبارك انها ستأخذ وقت اطول للعرض.",
+    "View YouTube comments": "عرض تعليقات اليوتيوب",
+    "View more comments on Reddit": "عرض المزيد من التعليقات على\\من موقع Reddit",
+    "View `x` comments": "عرض `x` تعليقات",
+    "View Reddit comments": "عرض تعليقات ريدإت Reddit",
+    "Hide replies": "إخفاء الردود",
+    "Show replies": "عرض الردود",
+    "Incorrect password": "الرقم السرى غير صحيح",
+    "Quota exceeded, try again in a few hours": "تم تجاوز عدد المرات المسموح بها, حاول مرة اخرى بعد عدة ساعات",
+    "Unable to log in, make sure two-factor authentication (Authenticator or SMS) is turned on.": "غير قادر على تسجيل الدخول, تأكد من تشغيل المصادقة الثنائية 2FA.",
+    "Invalid TFA code": "كود مصادقة ثنائية 2FA غير صحيح",
+    "Login failed. This may be because two-factor authentication is not turned on for your account.": "لم يتم تسجيل الدخول. هذا ربما بسبب ان المصادقة الثنائية 2FA معطلة فى حسابك.",
+    "Wrong answer": "إجابة خاطئة",
+    "Erroneous CAPTCHA": "الكابتشا CAPTCHA غير صاحلة",
+    "CAPTCHA is a required field": "مكان الكابتشا CAPTCHA مطلوب",
+    "User ID is a required field": "مكان إسم المستخدم مطلوب",
+    "Password is a required field": "مكان الرقم السرى مطلوب",
+    "Wrong username or password": "إسم المستخدم او الرقم السرى غير صحيح",
+    "Please sign in using 'Log in with Google'": "الرجاء تسجيل الدخول 'تسجيل الدخول بواسطة جوجل'",
+    "Password cannot be empty": "الرقم السرى لايمكن ان يكون فارغ",
+    "Password cannot be longer than 55 characters": "الرقم السرى لا يتعدى 55 حرف",
+    "Please log in": "الرجاء تسجيل الدخول",
+    "Invidious Private Feed for `x`": "صفحة Invidious للمشتركين الخاصة\\مخفية لـ `x`",
+    "channel:`x`": "قناة:`x`",
+    "Deleted or invalid channel": "قناة ممسوحة او غير صالحة",
+    "This channel does not exist.": "القناة غير موجودة.",
+    "Could not get channel info.": "لم يستطع الحصول على معلومات القناة.",
+    "Could not fetch comments": "لم يتمكن من إحضار التعليقات",
+    "View `x` replies": "عرض `x` ردود",
+    "`x` ago": "`x` منذ",
+    "Load more": "عرض المزيد",
+    "`x` points": "`x` نقاط",
+    "Could not create mix.": "لم يستطع عمل خلط.",
+    "Empty playlist": "قائمة التشغيل فارغة",
+    "Not a playlist.": "قائمة التشغيل غير صالحة.",
+    "Playlist does not exist.": "قائمة التشغيل غير موجودة.",
+    "Could not pull trending pages.": "لم يستطع عرض الصفحات الراجئة.",
+    "Hidden field \"challenge\" is a required field": "مكان مخفى \"تحدى\" مكان مطلوب",
+    "Hidden field \"token\" is a required field": "مكان مخفى \"رمز\" مكان مطلوب",
+    "Erroneous challenge": "تحدى غير صالح",
+    "Erroneous token": "روز غير صالح",
+    "No such user": "مستخدم غير صالح",
+    "Token is expired, please try again": "الرمز منتهى الصلاحية , الرجاء المحاولة مرة اخرى",
+    "English": "إنجليزى",
+    "English (auto-generated)": "إنجليزى (تم إنشائة تلقائى)",
+    "Afrikaans": "الأفريكانية",
+    "Albanian": "الألبانية",
+    "Amharic": "الأمهرية",
+    "Arabic": "العربية",
+    "Armenian": "الأرميني",
+    "Azerbaijani": "أذربيجان",
+    "Bangla": "البنغالية",
+    "Basque": "الباسكي",
+    "Belarusian": "البيلاروسية",
+    "Bosnian": "البوسنية",
+    "Bulgarian": "البلغارية",
+    "Burmese": "البورمية",
+    "Catalan": "الكاتالونية",
+    "Cebuano": "السيبيونو",
+    "Chinese (Simplified)": "الصينية (المبسطة)",
+    "Chinese (Traditional)": "الصينية (التقليدية)",
+    "Corsican": "الكورسيكية",
+    "Croatian": "الكرواتية",
+    "Czech": "تشيكي",
+    "Danish": "دانماركي",
+    "Dutch": "هولندي",
+    "Esperanto": "الاسبرانتو",
+    "Estonian": "الإستونية",
+    "Filipino": "الفلبينية",
+    "Finnish": "الفنلندية",
+    "French": "الفرنسية",
+    "Galician": "الجاليكية",
+    "Georgian": "الجورجية",
+    "German": "ألمانية",
+    "Greek": "الإغريقي",
+    "Gujarati": "الغوجاراتية",
+    "Haitian Creole": "الكاثوليكية الهايتية",
+    "Hausa": "الهوسا",
+    "Hawaiian": "هاواي",
+    "Hebrew": "العبرية",
+    "Hindi": "الهندية",
+    "Hmong": "همونغ",
+    "Hungarian": "الهنغارية",
+    "Icelandic": "أيسلندي",
+    "Igbo": "الإيبو",
+    "Indonesian": "الأندونيسية",
+    "Irish": "الأيرلندية",
+    "Italian": "الإيطالي",
+    "Japanese": "اليابانية",
+    "Javanese": "جاوي",
+    "Kannada": "الكانادا",
+    "Kazakh": "الكازاخية",
+    "Khmer": "الخمير",
+    "Korean": "الكورية",
+    "Kurdish": "كردي",
+    "Kyrgyz": "قيرغيزستان",
+    "Lao": "لاو",
+    "Latin": "لاتينية",
+    "Latvian": "اللاتفية",
+    "Lithuanian": "اللتوانية",
+    "Luxembourgish": "اللوكسمبرجية",
+    "Macedonian": "المقدونية",
+    "Malagasy": "مدجشقر\\مدغشقر",
+    "Malay": "الملايو",
+    "Malayalam": "المالايالامية",
+    "Maltese": "المالطية",
+    "Maori": "الماوري",
+    "Marathi": "المهاراتية",
+    "Mongolian": "المنغولية",
+    "Nepali": "النيبالية",
+    "Norwegian Bokmål": "النرويجية",
+    "Nyanja": "نيانجا",
+    "Pashto": "الباشتو",
+    "Persian": "الفارسية",
+    "Polish": "البولندي",
+    "Portuguese": "البرتغالية",
+    "Punjabi": "البنجابية",
+    "Romanian": "روماني",
+    "Russian": "الروسية",
+    "Samoan": "ساموا",
+    "Scottish Gaelic": "الغيلية الاسكتلندية",
+    "Serbian": "صربي",
+    "Shona": "شونا",
+    "Sindhi": "السندية",
+    "Sinhala": "السنهالية",
+    "Slovak": "السلوفاكية",
+    "Slovenian": "سلوفيني",
+    "Somali": "الصومالية",
+    "Southern Sotho": "جنوب سوثو",
+    "Spanish": "الأسبانية",
+    "Spanish (Latin America)": "الأسبانية (أمريكا اللاتينية)",
+    "Sundanese": "السودانية",
+    "Swahili": "السواحلية",
+    "Swedish": "السويدية",
+    "Tajik": "الطاجيكية",
+    "Tamil": "التاميل",
+    "Telugu": "التيلجو",
+    "Thai": "التايلاندية",
+    "Turkish": "التركية",
+    "Ukrainian": "الأوكراني",
+    "Urdu": "الأردية",
+    "Uzbek": "الأوزبكي",
+    "Vietnamese": "الفيتنامية",
+    "Welsh": "الولزية",
+    "Western Frisian": "الفريزية الغربية",
+    "Xhosa": "زوسا",
+    "Yiddish": "اليديشية",
+    "Yoruba": "اليوروبا",
+    "Zulu": "الزولو",
+    "`x` years": "`x` سنوات",
+    "`x` months": "`x` شهور",
+    "`x` weeks": "`x` اسابيع",
+    "`x` days": "`x` ايام",
+    "`x` hours": "`x` ساعات",
+    "`x` minutes": "`x` دقائق",
+    "`x` seconds": "`x` ثوانى",
+    "Fallback comments: ": "التعليقات المصاحبة",
+    "Popular": "لاكثر شعبية",
+    "Top": "الأفضل",
+    "About": "حول",
+    "Rating: ": "التقييم",
+    "Language: ": "اللغة",
+    "View as playlist": "عرض كا قائمة التشغيل",
+    "Default": "الكل",
+    "Music": "الاغانى",
+    "Gaming": "الألعاب",
+    "News": "الأخبار",
+    "Movies": "الأفلام",
+    "Download": "تحميل كـ",
+    "Download as: ": "تحميل",
+    "%A %B %-d, %Y": "",
+    "(edited)": "(تم تعديلة)",
+    "YouTube comment permalink": "رابط التعليق على اليوتيوب",
+    "`x` marked it with a ❤": "`x` اعجب بهذا",
+    "Audio mode": "الوضع الصوتى",
+    "Video mode": "وضع الفيديو",
+    "Videos": "الفيديوهات",
+    "Playlists": "قوائم التشغيل",
+    "Current version: ": "الإصدار الحالى"
+}
--- a/locales/de.json
+++ b/locales/de.json
@@ -1,297 +1,314 @@
 {
-  "`x` subscribers": "`x` Abonnenten",
-  "`x` videos": "`x` Videos",
-  "LIVE": "LIVE",
-  "Shared `x` ago": "Vor `x` geteilt",
-  "Unsubscribe": "Abbestellen",
-  "Subscribe": "Abonnieren",
-  "Login to subscribe to `x`": "Einloggen um `x` zu abonnieren",
-  "View channel on YouTube": "Kanal auf YouTube anzeigen",
-  "newest": "neueste",
-  "oldest": "älteste",
-  "popular": "beliebt",
-  "last": "",
-  "Next page": "Nächste Seite",
-  "Previous page": "Vorherige Seite",
-  "Clear watch history?": "Verlauf löschen?",
-  "Yes": "Ja",
-  "No": "Nein",
-  "Import and Export Data": "Import und Export Daten",
-  "Import": "Importieren",
-  "Import Invidious data": "Invidious Daten importieren",
-  "Import YouTube subscriptions": "YouTube Abonnements importieren",
-  "Import FreeTube subscriptions (.db)": "FreeTube Abonnements importieren (.db)",
-  "Import NewPipe subscriptions (.json)": "NewPipe Abonnements importieren (.json)",
-  "Import NewPipe data (.zip)": "NewPipe Daten importieren (.zip)",
-  "Export": "Exportieren",
-  "Export subscriptions as OPML": "Abonnements als OPML exportieren",
-  "Export subscriptions as OPML (for NewPipe & FreeTube)": "Abonnements als OPML exportieren (für NewPipe & FreeTube)",
-  "Export data as JSON": "Daten als JSON exportieren",
-  "Delete account?": "Account löschen?",
-  "History": "Verlauf",
-  "An alternative front-end to YouTube": "Eine alternative Oberfläche für YouTube",
-  "JavaScript license information": "JavaScript Lizenzinformationen",
-  "source": "Quelle",
-  "Login": "Einloggen",
-  "Login/Register": "Einloggen/Registrieren",
-  "Login to Google": "In Google einloggen",
-  "User ID:": "Benutzer ID:",
-  "Password:": "Passwort:",
-  "Time (h:mm:ss):": "Zeit (h:mm:ss):",
-  "Text CAPTCHA": "Text CAPTCHA",
-  "Image CAPTCHA": "Image CAPTCHA",
-  "Sign In": "Einloggen",
-  "Register": "Registrieren",
-  "Email:": "Email:",
-  "Google verification code:": "Google Bestätigungscode:",
-  "Preferences": "Einstellungen",
-  "Player preferences": "Playereinstellungen",
-  "Always loop: ": "Immer wiederholen: ",
-  "Autoplay: ": "Automatisch abspielen: ",
-  "Autoplay next video: ": "nächstes Video automatisch abspielen: ",
-  "Listen by default: ": "Nur Ton als Standard: ",
-  "Proxy videos? ": "",
-  "Default speed: ": "Standardgeschwindigkeit: ",
-  "Preferred video quality: ": "Bevorzugte Videoqualität: ",
-  "Player volume: ": "Playerlautstärke: ",
-  "Default comments: ": "Standardkommentare: ",
-  "youtube": "youtube",
-  "reddit": "reddit",
-  "Default captions: ": "Standarduntertitel: ",
-  "Fallback captions: ": "Ersatzuntertitel: ",
-  "Show related videos? ": "Ähnliche Videos anzeigen? ",
-  "Visual preferences": "Anzeigeeinstellungen",
-  "Dark mode: ": "Nachtmodus: ",
-  "Thin mode: ": "Schlanker Modus: ",
-  "Subscription preferences": "Abonnementeinstellungen",
-  "Redirect homepage to feed: ": "Startseite zu Feed umleiten: ",
-  "Number of videos shown in feed: ": "Anzahl von Videos die im Feed angezeigt werden: ",
-  "Sort videos by: ": "Videos sortieren nach: ",
-  "published": "veröffentlicht",
-  "published - reverse": "veröffentlicht - invertiert",
-  "alphabetically": "alphabetisch",
-  "alphabetically - reverse": "alphabetisch - invertiert",
-  "channel name": "Kanalname",
-  "channel name - reverse": "Kanalname - invertiert",
-  "Only show latest video from channel: ": "Nur neueste Videos des Kanals anzeigen: ",
-  "Only show latest unwatched video from channel: ": "Nur neueste ungesehene Videos des Kanals anzeigen: ",
-  "Only show unwatched: ": "Nur ungesehene anzeigen: ",
-  "Only show notifications (if there are any): ": "Nur Benachrichtigungen anzeigen (wenn es welche gibt): ",
-  "Data preferences": "Dateneinstellungen",
-  "Clear watch history": "Verlauf löschen",
-  "Import/Export data": "Daten im- exportieren",
-  "Manage subscriptions": "Abonnements verwalten",
-  "Watch history": "Verlauf",
-  "Delete account": "Account löschen",
-  "Administrator preferences": "",
-  "Default homepage: ": "",
-  "Feed menu: ": "",
-  "Top enabled? ": "",
-  "CAPTCHA enabled? ": "",
-  "Login enabled? ": "",
-  "Registration enabled? ": "",
-  "Report statistics? ": "",
-  "Save preferences": "Einstellungen speichern",
-  "Subscription manager": "Abonnementverwaltung",
-  "`x` subscriptions": "`x` Abonnements",
-  "Import/Export": "Importieren/Exportieren",
-  "unsubscribe": "abbestellen",
-  "Subscriptions": "Abonnements",
-  "`x` unseen notifications": "`x` ungesehene Benachrichtigungen",
-  "search": "Suchen",
-  "Sign out": "Abmelden",
-  "Released under the AGPLv3 by Omar Roth.": "Veröffentlicht unter AGPLv3 von Omar Roth.",
-  "Source available here.": "Quellcode verfügbar hier.",
-  "View JavaScript license information.": "Javascript Lizenzinformationen anzeigen.",
-  "View privacy policy.": "",
-  "Trending": "Trending",
-  "Unlisted": "",
-  "Watch video on Youtube": "Video auf YouTube ansehen",
-  "Genre: ": "Genre: ",
-  "License: ": "Lizenz: ",
-  "Family friendly? ": "Familienfreundlich? ",
-  "Wilson score: ": "Wilson-Score: ",
-  "Engagement: ": "Engagement: ",
-  "Whitelisted regions: ": "Erlaubte Regionen: ",
-  "Blacklisted regions: ": "Unerlaubte Regionen: ",
-  "Shared `x`": "Geteilt `x`",
-  "Premieres in `x`": "",
-  "Hi! Looks like you have JavaScript disabled. Click here to view comments, keep in mind it may take a bit longer to load.": "Hallo! Anscheinend haben Sie JavaScript deaktiviert. Klicken Sie hier um Kommentare anzuzeigen, beachten sie dass es etwas länger dauern kann um sie zu laden.",
-  "View YouTube comments": "YouTube Kommentare anzeigen",
-  "View more comments on Reddit": "Mehr Kommentare auf Reddit anzeigen",
-  "View `x` comments": "`x` Kommentare anzeigen",
-  "View Reddit comments": "Reddit Kommentare anzeigen",
-  "Hide replies": "Antworten verstecken",
-  "Show replies": "Antworten anzeigen",
-  "Incorrect password": "Falsches Passwort",
-  "Quota exceeded, try again in a few hours": "Kontingent überschritten, versuche es in ein paar Stunden erneut",
-  "Unable to login, make sure two-factor authentication (Authenticator or SMS) is enabled.": "Login nicht möglich, stellen Sie sicher dass two-factor Authentifikation (Authentifizierung oder SMS) aktiviert ist.",
-  "Invalid TFA code": "Ungültiger TFA Code",
-  "Login failed. This may be because two-factor authentication is not enabled on your account.": "Login fehlgeschlagen. Das kann daran liegen dass two-factor Authentifizierung in ihrem Account nicht aktiviert ist.",
-  "Invalid answer": "Ungültige Antwort",
-  "Invalid CAPTCHA": "Ungültiges CAPTCHA",
-  "CAPTCHA is a required field": "CAPTCHA ist eine erforderliche Eingabe",
-  "User ID is a required field": "Benutzer ID ist eine erforderliche Eingabe",
-  "Password is a required field": "Passwort ist eine erforderliche Eingabe",
-  "Invalid username or password": "Ungültiger Benutzername oder Passwort",
-  "Please sign in using 'Sign in with Google'": "Bitte melden sie sich mit 'Mit Google anmelden' an",
-  "Password cannot be empty": "Passwort darf nicht leer sein",
-  "Password cannot be longer than 55 characters": "Passwort darf nicht länger als 55 Zeichen sein",
-  "Please sign in": "Bitte anmelden",
-  "Invidious Private Feed for `x`": "Invidious Persönlicher Feed für `x`",
-  "channel:`x`": "Kanal:`x`",
-  "Deleted or invalid channel": "Gelöschter oder ungültiger Kanal",
-  "This channel does not exist.": "Dieser Kanal existiert nicht.",
-  "Could not get channel info.": "Kanalinformationen konnten nicht geladen werden.",
-  "Could not fetch comments": "Kommentare konnten nicht geladen werden",
-  "View `x` replies": "Zeige `x` Antworten",
-  "`x` ago": "vor `x`",
-  "Load more": "Mehr laden",
-  "`x` points": "`x` Punkte",
-  "Could not create mix.": "Mix konnte nicht erstellt werden.",
-  "Playlist is empty": "Playlist ist leer",
-  "Invalid playlist.": "Ungültige Playlist.",
-  "Playlist does not exist.": "Playlist existiert nicht.",
-  "Could not pull trending pages.": "Trending Seiten konnten nicht geladen werden.",
-  "Hidden field \"challenge\" is a required field": "Verstecktes Feld \"challenge\" ist eine erforderliche Eingabe",
-  "Hidden field \"token\" is a required field": "Verstecktes Feld \"token\" ist eine erforderliche Eingabe",
-  "Invalid challenge": "Ungültiger Test",
-  "Invalid token": "Ungöltige Marke",
-  "Invalid user": "Ungültiger Benutzer",
-  "Token is expired, please try again": "Marke ist abgelaufen, bitte erneut versuchen",
-  "English": "Englisch",
-  "English (auto-generated)": "Englisch (automatisch erzeugt)",
-  "Afrikaans": "Afrikaans",
-  "Albanian": "Albanisch",
-  "Amharic": "Amharisch",
-  "Arabic": "Arabisch",
-  "Armenian": "Armenisch",
-  "Azerbaijani": "Aserbaidschanisch",
-  "Bangla": "Bengalisch",
-  "Basque": "Baskisch",
-  "Belarusian": "Weißrussisch",
-  "Bosnian": "Bosnisch",
-  "Bulgarian": "Bulgarisch",
-  "Burmese": "Burmesisch",
-  "Catalan": "Katalanisch",
-  "Cebuano": "Cebuano",
-  "Chinese (Simplified)": "Chinesisch (vereinfacht)",
-  "Chinese (Traditional)": "Chinesisch (traditionell)",
-  "Corsican": "Korsisch",
-  "Croatian": "Kroatisch",
-  "Czech": "Tschechisch",
-  "Danish": "Dänisch",
-  "Dutch": "Niederländisch",
-  "Esperanto": "Esperanto",
-  "Estonian": "Estnisch",
-  "Filipino": "Philippinisch",
-  "Finnish": "Finnisch",
-  "French": "Französisch",
-  "Galician": "Galizisch",
-  "Georgian": "Georgisch",
-  "German": "Deutsch",
-  "Greek": "Griechisch",
-  "Gujarati": "Gujarati",
-  "Haitian Creole": "Haitianisches Kreolisch",
-  "Hausa": "Hausa",
-  "Hawaiian": "Hawaiianisch",
-  "Hebrew": "Hebräisch",
-  "Hindi": "Hindi",
-  "Hmong": "Hmong",
-  "Hungarian": "Ungarisch",
-  "Icelandic": "Isländisch",
-  "Igbo": "Igbo",
-  "Indonesian": "Indonesisch",
-  "Irish": "Irisch",
-  "Italian": "Italienisch",
-  "Japanese": "Japanisch",
-  "Javanese": "Javanisch",
-  "Kannada": "Kannada",
-  "Kazakh": "Kasachisch",
-  "Khmer": "Khmer",
-  "Korean": "Koreanisch",
-  "Kurdish": "Kurdisch",
-  "Kyrgyz": "Kirgisisch",
-  "Lao": "Laotisch",
-  "Latin": "Lateinisch",
-  "Latvian": "Lettisch",
-  "Lithuanian": "Litauisch",
-  "Luxembourgish": "Luxemburgisch",
-  "Macedonian": "Mazedonisch",
-  "Malagasy": "Madagassisch",
-  "Malay": "Malaiisch",
-  "Malayalam": "Malayalam",
-  "Maltese": "Maltesisch",
-  "Maori": "Maori",
-  "Marathi": "Marathi",
-  "Mongolian": "Mongolisch",
-  "Nepali": "Nepalesisch",
-  "Norwegian": "Norwegisch",
-  "Nyanja": "Nyanja",
-  "Pashto": "Paschtunisch",
-  "Persian": "Persisch",
-  "Polish": "Polnisch",
-  "Portuguese": "Portugiesisch",
-  "Punjabi": "Pandschabi",
-  "Romanian": "Rumänisch",
-  "Russian": "Russisch",
-  "Samoan": "Samoanisch",
-  "Scottish Gaelic": "Schottisches Gälisch",
-  "Serbian": "Serbisch",
-  "Shona": "Schona",
-  "Sindhi": "Sindhi",
-  "Sinhala": "Singhalesisch",
-  "Slovak": "Slowakisch",
-  "Slovenian": "Slowenisch",
-  "Somali": "Somali",
-  "Southern Sotho": "Südliches Sotho",
-  "Spanish": "Spanisch",
-  "Spanish (Latin America)": "Spanisch (Lateinamerika)",
-  "Sundanese": "Sundanesisch",
-  "Swahili": "Suaheli",
-  "Swedish": "Schwedisch",
-  "Tajik": "Tadschikisch",
-  "Tamil": "Tamilisch",
-  "Telugu": "Telugu",
-  "Thai": "Thailändisch",
-  "Turkish": "Türkisch",
-  "Ukrainian": "Ukrainisch",
-  "Urdu": "Urdu",
-  "Uzbek": "Usbekisch",
-  "Vietnamese": "Vietnamesisch",
-  "Welsh": "Walisisch",
-  "Western Frisian": "Westfriesisch",
-  "Xhosa": "Xhosa",
-  "Yiddish": "Jiddisch",
-  "Yoruba": "Joruba",
-  "Zulu": "Zulu",
-  "`x` years": "`x` Jahre",
-  "`x` months": "`x` Monate",
-  "`x` weeks": "`x` Wochen",
-  "`x` days": "`x` Tage",
-  "`x` hours": "`x` Stunden",
-  "`x` minutes": "`x` Minuten",
-  "`x` seconds": "`x` Sekunden",
-  "Fallback comments: ": "Alternative Kommentare: ",
-  "Popular": "Populär",
-  "Top": "Top",
-  "About": "Über",
-  "Rating: ": "Bewertung: ",
-  "Language: ": "Sprache: ",
-  "Default": "",
-  "Music": "",
-  "Gaming": "",
-  "News": "",
-  "Movies": "",
-  "Download": "",
-  "Download as: ": "",
-  "%A %B %-d, %Y": "",
-  "(edited)": "",
-  "Youtube permalink of the comment": "",
-  "`x` marked it with a ❤": "",
-  "Audio mode": "",
-  "Video mode": "",
-  "Videos": "",
-  "Playlists": "",
-  "Current version: ": ""
-}
+    "`x` subscribers": "`x` Abonnenten",
+    "`x` videos": "`x` Videos",
+    "LIVE": "LIVE",
+    "Shared `x` ago": "Vor `x` geteilt",
+    "Unsubscribe": "Abbestellen",
+    "Subscribe": "Abonnieren",
+    "View channel on YouTube": "Kanal auf YouTube anzeigen",
+    "newest": "neueste",
+    "oldest": "älteste",
+    "popular": "beliebt",
+    "last": "",
+    "Next page": "Nächste Seite",
+    "Previous page": "Vorherige Seite",
+    "Clear watch history?": "Verlauf löschen?",
+    "New password": "",
+    "New passwords must match": "",
+    "Cannot change password for Google accounts": "",
+    "Authorize token?": "",
+    "Authorize token for `x`?": "",
+    "Yes": "Ja",
+    "No": "Nein",
+    "Import and Export Data": "Import und Export Daten",
+    "Import": "Importieren",
+    "Import Invidious data": "Invidious Daten importieren",
+    "Import YouTube subscriptions": "YouTube Abonnements importieren",
+    "Import FreeTube subscriptions (.db)": "FreeTube Abonnements importieren (.db)",
+    "Import NewPipe subscriptions (.json)": "NewPipe Abonnements importieren (.json)",
+    "Import NewPipe data (.zip)": "NewPipe Daten importieren (.zip)",
+    "Export": "Exportieren",
+    "Export subscriptions as OPML": "Abonnements als OPML exportieren",
+    "Export subscriptions as OPML (for NewPipe & FreeTube)": "Abonnements als OPML exportieren (für NewPipe & FreeTube)",
+    "Export data as JSON": "Daten als JSON exportieren",
+    "Delete account?": "Account löschen?",
+    "History": "Verlauf",
+    "An alternative front-end to YouTube": "Eine alternative Oberfläche für YouTube",
+    "JavaScript license information": "JavaScript Lizenzinformationen",
+    "source": "Quelle",
+    "Log in": "Einloggen",
+    "Log in/register": "Einloggen/Registrieren",
+    "Log in with Google": "In Google einloggen",
+    "User ID": "Benutzer ID",
+    "Password": "Passwort",
+    "Time (h:mm:ss):": "Zeit (h:mm:ss):",
+    "Text CAPTCHA": "Text CAPTCHA",
+    "Image CAPTCHA": "Image CAPTCHA",
+    "Sign In": "Einloggen",
+    "Register": "Registrieren",
+    "E-mail": "Email",
+    "Google verification code": "Google Bestätigungscode",
+    "Preferences": "Einstellungen",
+    "Player preferences": "Playereinstellungen",
+    "Always loop: ": "Immer wiederholen: ",
+    "Autoplay: ": "Automatisch abspielen: ",
+    "Play next by default: ": "",
+    "Autoplay next video: ": "nächstes Video automatisch abspielen: ",
+    "Listen by default: ": "Nur Ton als Standard: ",
+    "Proxy videos? ": "",
+    "Default speed: ": "Standardgeschwindigkeit: ",
+    "Preferred video quality: ": "Bevorzugte Videoqualität: ",
+    "Player volume: ": "Playerlautstärke: ",
+    "Default comments: ": "Standardkommentare: ",
+    "youtube": "youtube",
+    "reddit": "reddit",
+    "Default captions: ": "Standarduntertitel: ",
+    "Fallback captions: ": "Ersatzuntertitel: ",
+    "Show related videos? ": "Ähnliche Videos anzeigen? ",
+    "Show annotations by default? ": "",
+    "Visual preferences": "Anzeigeeinstellungen",
+    "Dark mode: ": "Nachtmodus: ",
+    "Thin mode: ": "Schlanker Modus: ",
+    "Subscription preferences": "Abonnementeinstellungen",
+    "Show annotations by default for subscribed channels? ": "",
+    "Redirect homepage to feed: ": "Startseite zu Feed umleiten: ",
+    "Number of videos shown in feed: ": "Anzahl von Videos die im Feed angezeigt werden: ",
+    "Sort videos by: ": "Videos sortieren nach: ",
+    "published": "veröffentlicht",
+    "published - reverse": "veröffentlicht - invertiert",
+    "alphabetically": "alphabetisch",
+    "alphabetically - reverse": "alphabetisch - invertiert",
+    "channel name": "Kanalname",
+    "channel name - reverse": "Kanalname - invertiert",
+    "Only show latest video from channel: ": "Nur neueste Videos des Kanals anzeigen: ",
+    "Only show latest unwatched video from channel: ": "Nur neueste ungesehene Videos des Kanals anzeigen: ",
+    "Only show unwatched: ": "Nur ungesehene anzeigen: ",
+    "Only show notifications (if there are any): ": "Nur Benachrichtigungen anzeigen (wenn es welche gibt): ",
+    "Data preferences": "Dateneinstellungen",
+    "Clear watch history": "Verlauf löschen",
+    "Import/export data": "Daten im- exportieren",
+    "Change password": "",
+    "Manage subscriptions": "Abonnements verwalten",
+    "Manage tokens": "",
+    "Watch history": "Verlauf",
+    "Delete account": "Account löschen",
+    "Administrator preferences": "",
+    "Default homepage: ": "",
+    "Feed menu: ": "",
+    "Top enabled? ": "",
+    "CAPTCHA enabled? ": "",
+    "Login enabled? ": "",
+    "Registration enabled? ": "",
+    "Report statistics? ": "",
+    "Save preferences": "Einstellungen speichern",
+    "Subscription manager": "Abonnementverwaltung",
+    "Token manager": "",
+    "Token": "",
+    "`x` subscriptions": "`x` Abonnements",
+    "`x` tokens": "",
+    "Import/export": "Importieren/Exportieren",
+    "unsubscribe": "abbestellen",
+    "revoke": "",
+    "Subscriptions": "Abonnements",
+    "`x` unseen notifications": "`x` ungesehene Benachrichtigungen",
+    "search": "Suchen",
+    "Log out": "Abmelden",
+    "Released under the AGPLv3 by Omar Roth.": "Veröffentlicht unter AGPLv3 von Omar Roth.",
+    "Source available here.": "Quellcode verfügbar hier.",
+    "View JavaScript license information.": "Javascript Lizenzinformationen anzeigen.",
+    "View privacy policy.": "",
+    "Trending": "Trending",
+    "Unlisted": "",
+    "Watch on YouTube": "Video auf YouTube ansehen",
+    "Hide annotations": "",
+    "Show annotations": "",
+    "Genre: ": "Genre: ",
+    "License: ": "Lizenz: ",
+    "Family friendly? ": "Familienfreundlich? ",
+    "Wilson score: ": "Wilson-Score: ",
+    "Engagement: ": "Engagement: ",
+    "Whitelisted regions: ": "Erlaubte Regionen: ",
+    "Blacklisted regions: ": "Unerlaubte Regionen: ",
+    "Shared `x`": "Geteilt `x`",
+    "`x` views": "",
+    "Premieres in `x`": "",
+    "Hi! Looks like you have JavaScript turned off. Click here to view comments, keep in mind they may take a bit longer to load.": "Hallo! Anscheinend haben Sie JavaScript deaktiviert. Klicken Sie hier um Kommentare anzuzeigen, beachten sie dass es etwas länger dauern kann um sie zu laden.",
+    "View YouTube comments": "YouTube Kommentare anzeigen",
+    "View more comments on Reddit": "Mehr Kommentare auf Reddit anzeigen",
+    "View `x` comments": "`x` Kommentare anzeigen",
+    "View Reddit comments": "Reddit Kommentare anzeigen",
+    "Hide replies": "Antworten verstecken",
+    "Show replies": "Antworten anzeigen",
+    "Incorrect password": "Falsches Passwort",
+    "Quota exceeded, try again in a few hours": "Kontingent überschritten, versuche es in ein paar Stunden erneut",
+    "Unable to log in, make sure two-factor authentication (Authenticator or SMS) is turned on.": "Login nicht möglich, stellen Sie sicher dass two-factor Authentifikation (Authentifizierung oder SMS) aktiviert ist.",
+    "Invalid TFA code": "Ungültiger TFA Code",
+    "Login failed. This may be because two-factor authentication is not turned on for your account.": "Login fehlgeschlagen. Das kann daran liegen dass two-factor Authentifizierung in ihrem Account nicht aktiviert ist.",
+    "Wrong answer": "Ungültige Antwort",
+    "Erroneous CAPTCHA": "Ungültiges CAPTCHA",
+    "CAPTCHA is a required field": "CAPTCHA ist eine erforderliche Eingabe",
+    "User ID is a required field": "Benutzer ID ist eine erforderliche Eingabe",
+    "Password is a required field": "Passwort ist eine erforderliche Eingabe",
+    "Wrong username or password": "Ungültiger Benutzername oder Passwort",
+    "Please sign in using 'Log in with Google'": "Bitte melden sie sich mit 'Mit Google anmelden' an",
+    "Password cannot be empty": "Passwort darf nicht leer sein",
+    "Password cannot be longer than 55 characters": "Passwort darf nicht länger als 55 Zeichen sein",
+    "Please log in": "Bitte anmelden",
+    "Invidious Private Feed for `x`": "Invidious Persönlicher Feed für `x`",
+    "channel:`x`": "Kanal:`x`",
+    "Deleted or invalid channel": "Gelöschter oder ungültiger Kanal",
+    "This channel does not exist.": "Dieser Kanal existiert nicht.",
+    "Could not get channel info.": "Kanalinformationen konnten nicht geladen werden.",
+    "Could not fetch comments": "Kommentare konnten nicht geladen werden",
+    "View `x` replies": "Zeige `x` Antworten",
+    "`x` ago": "vor `x`",
+    "Load more": "Mehr laden",
+    "`x` points": "`x` Punkte",
+    "Could not create mix.": "Mix konnte nicht erstellt werden.",
+    "Empty playlist": "Playlist ist leer",
+    "Not a playlist.": "Ungültige Playlist.",
+    "Playlist does not exist.": "Playlist existiert nicht.",
+    "Could not pull trending pages.": "Trending Seiten konnten nicht geladen werden.",
+    "Hidden field \"challenge\" is a required field": "Verstecktes Feld \"challenge\" ist eine erforderliche Eingabe",
+    "Hidden field \"token\" is a required field": "Verstecktes Feld \"token\" ist eine erforderliche Eingabe",
+    "Erroneous challenge": "Ungültiger Test",
+    "Erroneous token": "Ungöltige Marke",
+    "No such user": "Ungültiger Benutzer",
+    "Token is expired, please try again": "Marke ist abgelaufen, bitte erneut versuchen",
+    "English": "Englisch",
+    "English (auto-generated)": "Englisch (automatisch erzeugt)",
+    "Afrikaans": "Afrikaans",
+    "Albanian": "Albanisch",
+    "Amharic": "Amharisch",
+    "Arabic": "Arabisch",
+    "Armenian": "Armenisch",
+    "Azerbaijani": "Aserbaidschanisch",
+    "Bangla": "Bengalisch",
+    "Basque": "Baskisch",
+    "Belarusian": "Weißrussisch",
+    "Bosnian": "Bosnisch",
+    "Bulgarian": "Bulgarisch",
+    "Burmese": "Burmesisch",
+    "Catalan": "Katalanisch",
+    "Cebuano": "Cebuano",
+    "Chinese (Simplified)": "Chinesisch (vereinfacht)",
+    "Chinese (Traditional)": "Chinesisch (traditionell)",
+    "Corsican": "Korsisch",
+    "Croatian": "Kroatisch",
+    "Czech": "Tschechisch",
+    "Danish": "Dänisch",
+    "Dutch": "Niederländisch",
+    "Esperanto": "Esperanto",
+    "Estonian": "Estnisch",
+    "Filipino": "Philippinisch",
+    "Finnish": "Finnisch",
+    "French": "Französisch",
+    "Galician": "Galizisch",
+    "Georgian": "Georgisch",
+    "German": "Deutsch",
+    "Greek": "Griechisch",
+    "Gujarati": "Gujarati",
+    "Haitian Creole": "Haitianisches Kreolisch",
+    "Hausa": "Hausa",
+    "Hawaiian": "Hawaiianisch",
+    "Hebrew": "Hebräisch",
+    "Hindi": "Hindi",
+    "Hmong": "Hmong",
+    "Hungarian": "Ungarisch",
+    "Icelandic": "Isländisch",
+    "Igbo": "Igbo",
+    "Indonesian": "Indonesisch",
+    "Irish": "Irisch",
+    "Italian": "Italienisch",
+    "Japanese": "Japanisch",
+    "Javanese": "Javanisch",
+    "Kannada": "Kannada",
+    "Kazakh": "Kasachisch",
+    "Khmer": "Khmer",
+    "Korean": "Koreanisch",
+    "Kurdish": "Kurdisch",
+    "Kyrgyz": "Kirgisisch",
+    "Lao": "Laotisch",
+    "Latin": "Lateinisch",
+    "Latvian": "Lettisch",
+    "Lithuanian": "Litauisch",
+    "Luxembourgish": "Luxemburgisch",
+    "Macedonian": "Mazedonisch",
+    "Malagasy": "Madagassisch",
+    "Malay": "Malaiisch",
+    "Malayalam": "Malayalam",
+    "Maltese": "Maltesisch",
+    "Maori": "Maori",
+    "Marathi": "Marathi",
+    "Mongolian": "Mongolisch",
+    "Nepali": "Nepalesisch",
+    "Norwegian Bokmål": "Norwegisch",
+    "Nyanja": "Nyanja",
+    "Pashto": "Paschtunisch",
+    "Persian": "Persisch",
+    "Polish": "Polnisch",
+    "Portuguese": "Portugiesisch",
+    "Punjabi": "Pandschabi",
+    "Romanian": "Rumänisch",
+    "Russian": "Russisch",
+    "Samoan": "Samoanisch",
+    "Scottish Gaelic": "Schottisches Gälisch",
+    "Serbian": "Serbisch",
+    "Shona": "Schona",
+    "Sindhi": "Sindhi",
+    "Sinhala": "Singhalesisch",
+    "Slovak": "Slowakisch",
+    "Slovenian": "Slowenisch",
+    "Somali": "Somali",
+    "Southern Sotho": "Südliches Sotho",
+    "Spanish": "Spanisch",
+    "Spanish (Latin America)": "Spanisch (Lateinamerika)",
+    "Sundanese": "Sundanesisch",
+    "Swahili": "Suaheli",
+    "Swedish": "Schwedisch",
+    "Tajik": "Tadschikisch",
+    "Tamil": "Tamilisch",
+    "Telugu": "Telugu",
+    "Thai": "Thailändisch",
+    "Turkish": "Türkisch",
+    "Ukrainian": "Ukrainisch",
+    "Urdu": "Urdu",
+    "Uzbek": "Usbekisch",
+    "Vietnamese": "Vietnamesisch",
+    "Welsh": "Walisisch",
+    "Western Frisian": "Westfriesisch",
+    "Xhosa": "Xhosa",
+    "Yiddish": "Jiddisch",
+    "Yoruba": "Joruba",
+    "Zulu": "Zulu",
+    "`x` years": "`x` Jahre",
+    "`x` months": "`x` Monate",
+    "`x` weeks": "`x` Wochen",
+    "`x` days": "`x` Tage",
+    "`x` hours": "`x` Stunden",
+    "`x` minutes": "`x` Minuten",
+    "`x` seconds": "`x` Sekunden",
+    "Fallback comments: ": "Alternative Kommentare: ",
+    "Popular": "Populär",
+    "Top": "Top",
+    "About": "Über",
+    "Rating: ": "Bewertung: ",
+    "Language: ": "Sprache: ",
+    "View as playlist": "",
+    "Default": "",
+    "Music": "",
+    "Gaming": "",
+    "News": "",
+    "Movies": "",
+    "Download": "",
+    "Download as: ": "",
+    "%A %B %-d, %Y": "",
+    "(edited)": "",
+    "YouTube comment permalink": "",
+    "`x` marked it with a ❤": "",
+    "Audio mode": "",
+    "Video mode": "",
+    "Videos": "",
+    "Playlists": "",
+    "Current version: ": ""
+}
--- a/locales/en-US.json
+++ b/locales/en-US.json
@@ -1,295 +1,359 @@
 {
-  "`x` subscribers": "`x` subscribers",
-  "`x` videos": "`x` videos",
-  "LIVE": "LIVE",
-  "Shared `x` ago": "Shared `x` ago",
-  "Unsubscribe": "Unsubscribe",
-  "Subscribe": "Subscribe",
-  "Login to subscribe to `x`": "Login to subscribe to `x`",
-  "View channel on YouTube": "View channel on YouTube",
-  "newest": "newest",
-  "oldest": "oldest",
-  "popular": "popular",
-  "last": "last",
-  "Next page": "Next page",
-  "Previous page": "Previous page",
-  "Clear watch history?": "Clear watch history?",
-  "Yes": "Yes",
-  "No": "No",
-  "Import and Export Data": "Import and Export Data",
-  "Import": "Import",
-  "Import Invidious data": "Import Invidious data",
-  "Import YouTube subscriptions": "Import YouTube subscriptions",
-  "Import FreeTube subscriptions (.db)": "Import FreeTube subscriptions (.db)",
-  "Import NewPipe subscriptions (.json)": "Import NewPipe subscriptions (.json)",
-  "Import NewPipe data (.zip)": "Import NewPipe data (.zip)",
-  "Export": "Export",
-  "Export subscriptions as OPML": "Export subscriptions as OPML",
-  "Export subscriptions as OPML (for NewPipe & FreeTube)": "Export subscriptions as OPML (for NewPipe & FreeTube)",
-  "Export data as JSON": "Export data as JSON",
-  "Delete account?": "Delete account?",
-  "History": "History",
-  "An alternative front-end to YouTube": "An alternative front-end to YouTube",
-  "JavaScript license information": "JavaScript license information",
-  "source": "source",
-  "Login": "Login",
-  "Login/Register": "Login/Register",
-  "Login to Google": "Login to Google",
-  "User ID:": "User ID:",
-  "Password:": "Password:",
-  "Time (h:mm:ss):": "Time (h:mm:ss):",
-  "Text CAPTCHA": "Text CAPTCHA",
-  "Image CAPTCHA": "Image CAPTCHA",
-  "Sign In": "Sign In",
-  "Register": "Register",
-  "Email:": "Email:",
-  "Google verification code:": "Google verification code:",
-  "Preferences": "Preferences",
-  "Player preferences": "Player preferences",
-  "Always loop: ": "Always loop: ",
-  "Autoplay: ": "Autoplay: ",
-  "Autoplay next video: ": "Autoplay next video: ",
-  "Listen by default: ": "Listen by default: ",
-  "Proxy videos? ": "Proxy videos? ",
-  "Default speed: ": "Default speed: ",
-  "Preferred video quality: ": "Preferred video quality: ",
-  "Player volume: ": "Player volume: ",
-  "Default comments: ": "Default comments: ",
-  "Default captions: ": "Default captions: ",
-  "Fallback captions: ": "Fallback captions: ",
-  "Show related videos? ": "Show related videos? ",
-  "Visual preferences": "Visual preferences",
-  "Dark mode: ": "Dark mode: ",
-  "Thin mode: ": "Thin mode: ",
-  "Subscription preferences": "Subscription preferences",
-  "Redirect homepage to feed: ": "Redirect homepage to feed: ",
-  "Number of videos shown in feed: ": "Number of videos shown in feed: ",
-  "Sort videos by: ": "Sort videos by: ",
-  "published": "published",
-  "published - reverse": "published - reverse",
-  "alphabetically": "alphabetically",
-  "alphabetically - reverse": "alphabetically - reverse",
-  "channel name": "channel name",
-  "channel name - reverse": "channel name - reverse",
-  "Only show latest video from channel: ": "Only show latest video from channel: ",
-  "Only show latest unwatched video from channel: ": "Only show latest unwatched video from channel: ",
-  "Only show unwatched: ": "Only show unwatched: ",
-  "Only show notifications (if there are any): ": "Only show notifications (if there are any): ",
-  "Data preferences": "Data preferences",
-  "Clear watch history": "Clear watch history",
-  "Import/Export data": "Import/Export data",
-  "Manage subscriptions": "Manage subscriptions",
-  "Watch history": "Watch history",
-  "Delete account": "Delete account",
-  "Administrator preferences": "Administrator preferences",
-  "Default homepage: ": "Default homepage: ",
-  "Feed menu: ": "Feed menu: ",
-  "Top enabled? ": "Top enabled? ",
-  "CAPTCHA enabled? ": "CAPTCHA enabled? ",
-  "Login enabled? ": "Login enabled? ",
-  "Registration enabled? ": "Registration enabled? ",
-  "Report statistics? ": "Report statistics? ",
-  "Save preferences": "Save preferences",
-  "Subscription manager": "Subscription manager",
-  "`x` subscriptions": "`x` subscriptions",
-  "Import/Export": "Import/Export",
-  "unsubscribe": "unsubscribe",
-  "Subscriptions": "Subscriptions",
-  "`x` unseen notifications": "`x` unseen notifications",
-  "search": "search",
-  "Sign out": "Sign out",
-  "Released under the AGPLv3 by Omar Roth.": "Released under the AGPLv3 by Omar Roth.",
-  "Source available here.": "Source available here.",
-  "View JavaScript license information.": "View JavaScript license information.",
-  "View privacy policy.": "View privacy policy.",
-  "Trending": "Trending",
-  "Unlisted": "",
-  "Watch video on Youtube": "Watch video on Youtube",
-  "Genre: ": "Genre: ",
-  "License: ": "License: ",
-  "Family friendly? ": "Family friendly? ",
-  "Wilson score: ": "Wilson score: ",
-  "Engagement: ": "Engagement: ",
-  "Whitelisted regions: ": "Whitelisted regions: ",
-  "Blacklisted regions: ": "Blacklisted regions: ",
-  "Shared `x`": "Shared `x`",
-  "Premieres in `x`": "",
-  "Hi! Looks like you have JavaScript disabled. Click here to view comments, keep in mind it may take a bit longer to load.": "Hi! Looks like you have JavaScript disabled. Click here to view comments, keep in mind it may take a bit longer to load.",
-  "View YouTube comments": "View YouTube comments",
-  "View more comments on Reddit": "View more comments on Reddit",
-  "View `x` comments": "View `x` comments",
-  "View Reddit comments": "View Reddit comments",
-  "Hide replies": "Hide replies",
-  "Show replies": "Show replies",
-  "Incorrect password": "Incorrect password",
-  "Quota exceeded, try again in a few hours": "Quota exceeded, try again in a few hours",
-  "Unable to login, make sure two-factor authentication (Authenticator or SMS) is enabled.": "Unable to login, make sure two-factor authentication (Authenticator or SMS) is enabled.",
-  "Invalid TFA code": "Invalid TFA code",
-  "Login failed. This may be because two-factor authentication is not enabled on your account.": "Login failed. This may be because two-factor authentication is not enabled on your account.",
-  "Invalid answer": "Invalid answer",
-  "Invalid CAPTCHA": "Invalid CAPTCHA",
-  "CAPTCHA is a required field": "CAPTCHA is a required field",
-  "User ID is a required field": "User ID is a required field",
-  "Password is a required field": "Password is a required field",
-  "Invalid username or password": "Invalid username or password",
-  "Please sign in using 'Sign in with Google'": "Please sign in using 'Sign in with Google'",
-  "Password cannot be empty": "Password cannot be empty",
-  "Password cannot be longer than 55 characters": "Password cannot be longer than 55 characters",
-  "Please sign in": "Please sign in",
-  "Invidious Private Feed for `x`": "Invidious Private Feed for `x`",
-  "channel:`x`": "channel:`x`",
-  "Deleted or invalid channel": "Deleted or invalid channel",
-  "This channel does not exist.": "This channel does not exist.",
-  "Could not get channel info.": "Could not get channel info.",
-  "Could not fetch comments": "Could not fetch comments",
-  "View `x` replies": "View `x` replies",
-  "`x` ago": "`x` ago",
-  "Load more": "Load more",
-  "`x` points": "`x` points",
-  "Could not create mix.": "Could not create mix.",
-  "Playlist is empty": "Playlist is empty",
-  "Invalid playlist.": "Invalid playlist.",
-  "Playlist does not exist.": "Playlist does not exist.",
-  "Could not pull trending pages.": "Could not pull trending pages.",
-  "Hidden field \"challenge\" is a required field": "Hidden field \"challenge\" is a required field",
-  "Hidden field \"token\" is a required field": "Hidden field \"token\" is a required field",
-  "Invalid challenge": "Invalid challenge",
-  "Invalid token": "Invalid token",
-  "Invalid user": "Invalid user",
-  "Token is expired, please try again": "Token is expired, please try again",
-  "English": "English",
-  "English (auto-generated)": "English (auto-generated)",
-  "Afrikaans": "Afrikaans",
-  "Albanian": "Albanian",
-  "Amharic": "Amharic",
-  "Arabic": "Arabic",
-  "Armenian": "Armenian",
-  "Azerbaijani": "Azerbaijani",
-  "Bangla": "Bangla",
-  "Basque": "Basque",
-  "Belarusian": "Belarusian",
-  "Bosnian": "Bosnian",
-  "Bulgarian": "Bulgarian",
-  "Burmese": "Burmese",
-  "Catalan": "Catalan",
-  "Cebuano": "Cebuano",
-  "Chinese (Simplified)": "Chinese (Simplified)",
-  "Chinese (Traditional)": "Chinese (Traditional)",
-  "Corsican": "Corsican",
-  "Croatian": "Croatian",
-  "Czech": "Czech",
-  "Danish": "Danish",
-  "Dutch": "Dutch",
-  "Esperanto": "Esperanto",
-  "Estonian": "Estonian",
-  "Filipino": "Filipino",
-  "Finnish": "Finnish",
-  "French": "French",
-  "Galician": "Galician",
-  "Georgian": "Georgian",
-  "German": "German",
-  "Greek": "Greek",
-  "Gujarati": "Gujarati",
-  "Haitian Creole": "Haitian Creole",
-  "Hausa": "Hausa",
-  "Hawaiian": "Hawaiian",
-  "Hebrew": "Hebrew",
-  "Hindi": "Hindi",
-  "Hmong": "Hmong",
-  "Hungarian": "Hungarian",
-  "Icelandic": "Icelandic",
-  "Igbo": "Igbo",
-  "Indonesian": "Indonesian",
-  "Irish": "Irish",
-  "Italian": "Italian",
-  "Japanese": "Japanese",
-  "Javanese": "Javanese",
-  "Kannada": "Kannada",
-  "Kazakh": "Kazakh",
-  "Khmer": "Khmer",
-  "Korean": "Korean",
-  "Kurdish": "Kurdish",
-  "Kyrgyz": "Kyrgyz",
-  "Lao": "Lao",
-  "Latin": "Latin",
-  "Latvian": "Latvian",
-  "Lithuanian": "Lithuanian",
-  "Luxembourgish": "Luxembourgish",
-  "Macedonian": "Macedonian",
-  "Malagasy": "Malagasy",
-  "Malay": "Malay",
-  "Malayalam": "Malayalam",
-  "Maltese": "Maltese",
-  "Maori": "Maori",
-  "Marathi": "Marathi",
-  "Mongolian": "Mongolian",
-  "Nepali": "Nepali",
-  "Norwegian": "Norwegian",
-  "Nyanja": "Nyanja",
-  "Pashto": "Pashto",
-  "Persian": "Persian",
-  "Polish": "Polish",
-  "Portuguese": "Portuguese",
-  "Punjabi": "Punjabi",
-  "Romanian": "Romanian",
-  "Russian": "Russian",
-  "Samoan": "Samoan",
-  "Scottish Gaelic": "Scottish Gaelic",
-  "Serbian": "Serbian",
-  "Shona": "Shona",
-  "Sindhi": "Sindhi",
-  "Sinhala": "Sinhala",
-  "Slovak": "Slovak",
-  "Slovenian": "Slovenian",
-  "Somali": "Somali",
-  "Southern Sotho": "Southern Sotho",
-  "Spanish": "Spanish",
-  "Spanish (Latin America)": "Spanish (Latin America)",
-  "Sundanese": "Sundanese",
-  "Swahili": "Swahili",
-  "Swedish": "Swedish",
-  "Tajik": "Tajik",
-  "Tamil": "Tamil",
-  "Telugu": "Telugu",
-  "Thai": "Thai",
-  "Turkish": "Turkish",
-  "Ukrainian": "Ukrainian",
-  "Urdu": "Urdu",
-  "Uzbek": "Uzbek",
-  "Vietnamese": "Vietnamese",
-  "Welsh": "Welsh",
-  "Western Frisian": "Western Frisian",
-  "Xhosa": "Xhosa",
-  "Yiddish": "Yiddish",
-  "Yoruba": "Yoruba",
-  "Zulu": "Zulu",
-  "`x` years": "`x` years",
-  "`x` months": "`x` months",
-  "`x` weeks": "`x` weeks",
-  "`x` days": "`x` days",
-  "`x` hours": "`x` hours",
-  "`x` minutes": "`x` minutes",
-  "`x` seconds": "`x` seconds",
-  "Fallback comments: ": "Fallback comments: ",
-  "Popular": "Popular",
-  "Top": "Top",
-  "About": "About",
-  "Rating: ": "Rating: ",
-  "Language: ": "Language: ",
-  "Default": "Default",
-  "Music": "Music",
-  "Gaming": "Gaming",
-  "News": "News",
-  "Movies": "Movies",
-  "Download": "Download",
-  "Download as: ": "Download as: ",
-  "%A %B %-d, %Y": "%A %B %-d, %Y",
-  "(edited)": "(edited)",
-  "Youtube permalink of the comment": "Youtube permalink of the comment",
-  "`x` marked it with a ❤": "`x` marked it with a ❤",
-  "Audio mode": "Audio mode",
-  "Video mode": "Video mode",
-  "Videos": "Videos",
-  "Playlists": "Playlists",
-  "Current version: ": "Current version: "
-}
+    "`x` subscribers": {
+        "(\\D|^)1(\\D|$)": "`x` subscriber",
+        "": "`x` subscribers"
+    },
+    "`x` videos": {
+        "(\\D|^)1(\\D|$)": "`x` video",
+        "": "`x` videos"
+    },
+    "LIVE": "LIVE",
+    "Shared `x` ago": "Shared `x` ago",
+    "Unsubscribe": "Unsubscribe",
+    "Subscribe": "Subscribe",
+    "View channel on YouTube": "View channel on YouTube",
+    "newest": "newest",
+    "oldest": "oldest",
+    "popular": "popular",
+    "last": "last",
+    "Next page": "Next page",
+    "Previous page": "Previous page",
+    "Clear watch history?": "Clear watch history?",
+    "New password": "New password",
+    "New passwords must match": "New passwords must match",
+    "Cannot change password for Google accounts": "Cannot change password for Google accounts",
+    "Authorize token?": "Authorize token?",
+    "Authorize token for `x`?": "Authorize token for `x`?",
+    "Yes": "Yes",
+    "No": "No",
+    "Import and Export Data": "Import and Export Data",
+    "Import": "Import",
+    "Import Invidious data": "Import Invidious data",
+    "Import YouTube subscriptions": "Import YouTube subscriptions",
+    "Import FreeTube subscriptions (.db)": "Import FreeTube subscriptions (.db)",
+    "Import NewPipe subscriptions (.json)": "Import NewPipe subscriptions (.json)",
+    "Import NewPipe data (.zip)": "Import NewPipe data (.zip)",
+    "Export": "Export",
+    "Export subscriptions as OPML": "Export subscriptions as OPML",
+    "Export subscriptions as OPML (for NewPipe & FreeTube)": "Export subscriptions as OPML (for NewPipe & FreeTube)",
+    "Export data as JSON": "Export data as JSON",
+    "Delete account?": "Delete account?",
+    "History": "History",
+    "An alternative front-end to YouTube": "An alternative front-end to YouTube",
+    "JavaScript license information": "JavaScript license information",
+    "source": "source",
+    "Log in": "Log in",
+    "Log in/register": "Log in/register",
+    "Log in with Google": "Log in with Google",
+    "User ID": "User ID",
+    "Password": "Password",
+    "Time (h:mm:ss):": "Time (h:mm:ss):",
+    "Text CAPTCHA": "Text CAPTCHA",
+    "Image CAPTCHA": "Image CAPTCHA",
+    "Sign In": "Sign In",
+    "Register": "Register",
+    "E-mail": "E-mail",
+    "Google verification code": "Google verification code",
+    "Preferences": "Preferences",
+    "Player preferences": "Player preferences",
+    "Always loop: ": "Always loop: ",
+    "Autoplay: ": "Autoplay: ",
+    "Play next by default: ": "Play next by default: ",
+    "Autoplay next video: ": "Autoplay next video: ",
+    "Listen by default: ": "Listen by default: ",
+    "Proxy videos? ": "Proxy videos? ",
+    "Default speed: ": "Default speed: ",
+    "Preferred video quality: ": "Preferred video quality: ",
+    "Player volume: ": "Player volume: ",
+    "Default comments: ": "Default comments: ",
+    "youtube": "youtube",
+    "reddit": "reddit",
+    "Default captions: ": "Default captions: ",
+    "Fallback captions: ": "Fallback captions: ",
+    "Show related videos? ": "Show related videos? ",
+    "Show annotations by default? ": "Show annotations by default? ",
+    "Visual preferences": "Visual preferences",
+    "Dark mode: ": "Dark mode: ",
+    "Thin mode: ": "Thin mode: ",
+    "Subscription preferences": "Subscription preferences",
+    "Show annotations by default for subscribed channels? ": "Show annotations by default for subscribed channels? ",
+    "Redirect homepage to feed: ": "Redirect homepage to feed: ",
+    "Number of videos shown in feed: ": "Number of videos shown in feed: ",
+    "Sort videos by: ": "Sort videos by: ",
+    "published": "published",
+    "published - reverse": "published - reverse",
+    "alphabetically": "alphabetically",
+    "alphabetically - reverse": "alphabetically - reverse",
+    "channel name": "channel name",
+    "channel name - reverse": "channel name - reverse",
+    "Only show latest video from channel: ": "Only show latest video from channel: ",
+    "Only show latest unwatched video from channel: ": "Only show latest unwatched video from channel: ",
+    "Only show unwatched: ": "Only show unwatched: ",
+    "Only show notifications (if there are any): ": "Only show notifications (if there are any): ",
+    "Data preferences": "Data preferences",
+    "Clear watch history": "Clear watch history",
+    "Import/export data": "Import/export data",
+    "Change password": "Change password",
+    "Manage subscriptions": "Manage subscriptions",
+    "Manage tokens": "Manage tokens",
+    "Watch history": "Watch history",
+    "Delete account": "Delete account",
+    "Administrator preferences": "Administrator preferences",
+    "Default homepage: ": "Default homepage: ",
+    "Feed menu: ": "Feed menu: ",
+    "Top enabled? ": "Top enabled? ",
+    "CAPTCHA enabled? ": "CAPTCHA enabled? ",
+    "Login enabled? ": "Login enabled? ",
+    "Registration enabled? ": "Registration enabled? ",
+    "Report statistics? ": "Report statistics? ",
+    "Save preferences": "Save preferences",
+    "Subscription manager": "Subscription manager",
+    "Token manager": "Token manager",
+    "Token": "Token",
+    "`x` subscriptions": {
+        "(\\D|^)1(\\D|$)": "`x` subscription",
+        "": "`x` subscriptions"
+    },
+    "`x` tokens": {
+        "(\\D|^)1(\\D|$)": "`x` token",
+        "": "`x` tokens"
+    },
+    "Import/export": "Import/export",
+    "unsubscribe": "unsubscribe",
+    "revoke": "revoke",
+    "Subscriptions": "Subscriptions",
+    "`x` unseen notifications": {
+        "(\\D|^)1(\\D|$)": "`x` unseen notification",
+        "": "`x` unseen notifications"
+    },
+    "search": "search",
+    "Log out": "Log out",
+    "Released under the AGPLv3 by Omar Roth.": "Released under the AGPLv3 by Omar Roth.",
+    "Source available here.": "Source available here.",
+    "View JavaScript license information.": "View JavaScript license information.",
+    "View privacy policy.": "View privacy policy.",
+    "Trending": "Trending",
+    "Unlisted": "Unlisted",
+    "Watch on YouTube": "Watch on YouTube",
+    "Hide annotations": "Hide annotations",
+    "Show annotations": "Show annotations",
+    "Genre: ": "Genre: ",
+    "License: ": "License: ",
+    "Family friendly? ": "Family friendly? ",
+    "Wilson score: ": "Wilson score: ",
+    "Engagement: ": "Engagement: ",
+    "Whitelisted regions: ": "Whitelisted regions: ",
+    "Blacklisted regions: ": "Blacklisted regions: ",
+    "Shared `x`": "Shared `x`",
+    "`x` views": {
+        "(\\D|^)1(\\D|$)": "`x` views",
+        "": "`x` views"
+    },
+    "Premieres in `x`": "Premieres in `x`",
+    "Hi! Looks like you have JavaScript turned off. Click here to view comments, keep in mind they may take a bit longer to load.": "Hi! Looks like you have JavaScript turned off. Click here to view comments, keep in mind they may take a bit longer to load.",
+    "View YouTube comments": "View YouTube comments",
+    "View more comments on Reddit": "View more comments on Reddit",
+    "View `x` comments": "View `x` comments",
+    "View Reddit comments": "View Reddit comments",
+    "Hide replies": "Hide replies",
+    "Show replies": "Show replies",
+    "Incorrect password": "Incorrect password",
+    "Quota exceeded, try again in a few hours": "Quota exceeded, try again in a few hours",
+    "Unable to log in, make sure two-factor authentication (Authenticator or SMS) is turned on.": "Unable to log in, make sure two-factor authentication (Authenticator or SMS) is turned on.",
+    "Invalid TFA code": "Invalid TFA code",
+    "Login failed. This may be because two-factor authentication is not turned on for your account.": "Login failed. This may be because two-factor authentication is not turned on for your account.",
+    "Wrong answer": "Wrong answer",
+    "Erroneous CAPTCHA": "Erroneous CAPTCHA",
+    "CAPTCHA is a required field": "CAPTCHA is a required field",
+    "User ID is a required field": "User ID is a required field",
+    "Password is a required field": "Password is a required field",
+    "Wrong username or password": "Wrong username or password",
+    "Please sign in using 'Log in with Google'": "Please sign in using 'Log in with Google'",
+    "Password cannot be empty": "Password cannot be empty",
+    "Password cannot be longer than 55 characters": "Password cannot be longer than 55 characters",
+    "Please log in": "Please log in",
+    "Invidious Private Feed for `x`": "Invidious Private Feed for `x`",
+    "channel:`x`": "channel:`x`",
+    "Deleted or invalid channel": "Deleted or invalid channel",
+    "This channel does not exist.": "This channel does not exist.",
+    "Could not get channel info.": "Could not get channel info.",
+    "Could not fetch comments": "Could not fetch comments",
+    "View `x` replies": {
+        "(\\D|^)1(\\D|$)": "View `x` reply",
+        "": "View `x` replies"
+    },
+    "`x` ago": "`x` ago",
+    "Load more": "Load more",
+    "`x` points": {
+        "(\\D|^)1(\\D|$)": "`x` point",
+        "": "`x` points"
+    },
+    "Could not create mix.": "Could not create mix.",
+    "Empty playlist": "Empty playlist",
+    "Not a playlist.": "Not a playlist.",
+    "Playlist does not exist.": "Playlist does not exist.",
+    "Could not pull trending pages.": "Could not pull trending pages.",
+    "Hidden field \"challenge\" is a required field": "Hidden field \"challenge\" is a required field",
+    "Hidden field \"token\" is a required field": "Hidden field \"token\" is a required field",
+    "Erroneous challenge": "Erroneous challenge",
+    "Erroneous token": "Erroneous token",
+    "No such user": "No such user",
+    "Token is expired, please try again": "Token is expired, please try again",
+    "English": "English",
+    "English (auto-generated)": "English (auto-generated)",
+    "Afrikaans": "Afrikaans",
+    "Albanian": "Albanian",
+    "Amharic": "Amharic",
+    "Arabic": "Arabic",
+    "Armenian": "Armenian",
+    "Azerbaijani": "Azerbaijani",
+    "Bangla": "Bangla",
+    "Basque": "Basque",
+    "Belarusian": "Belarusian",
+    "Bosnian": "Bosnian",
+    "Bulgarian": "Bulgarian",
+    "Burmese": "Burmese",
+    "Catalan": "Catalan",
+    "Cebuano": "Cebuano",
+    "Chinese (Simplified)": "Chinese (Simplified)",
+    "Chinese (Traditional)": "Chinese (Traditional)",
+    "Corsican": "Corsican",
+    "Croatian": "Croatian",
+    "Czech": "Czech",
+    "Danish": "Danish",
+    "Dutch": "Dutch",
+    "Esperanto": "Esperanto",
+    "Estonian": "Estonian",
+    "Filipino": "Filipino",
+    "Finnish": "Finnish",
+    "French": "French",
+    "Galician": "Galician",
+    "Georgian": "Georgian",
+    "German": "German",
+    "Greek": "Greek",
+    "Gujarati": "Gujarati",
+    "Haitian Creole": "Haitian Creole",
+    "Hausa": "Hausa",
+    "Hawaiian": "Hawaiian",
+    "Hebrew": "Hebrew",
+    "Hindi": "Hindi",
+    "Hmong": "Hmong",
+    "Hungarian": "Hungarian",
+    "Icelandic": "Icelandic",
+    "Igbo": "Igbo",
+    "Indonesian": "Indonesian",
+    "Irish": "Irish",
+    "Italian": "Italian",
+    "Japanese": "Japanese",
+    "Javanese": "Javanese",
+    "Kannada": "Kannada",
+    "Kazakh": "Kazakh",
+    "Khmer": "Khmer",
+    "Korean": "Korean",
+    "Kurdish": "Kurdish",
+    "Kyrgyz": "Kyrgyz",
+    "Lao": "Lao",
+    "Latin": "Latin",
+    "Latvian": "Latvian",
+    "Lithuanian": "Lithuanian",
+    "Luxembourgish": "Luxembourgish",
+    "Macedonian": "Macedonian",
+    "Malagasy": "Malagasy",
+    "Malay": "Malay",
+    "Malayalam": "Malayalam",
+    "Maltese": "Maltese",
+    "Maori": "Maori",
+    "Marathi": "Marathi",
+    "Mongolian": "Mongolian",
+    "Nepali": "Nepali",
+    "Norwegian Bokmål": "Norwegian Bokmål",
+    "Nyanja": "Nyanja",
+    "Pashto": "Pashto",
+    "Persian": "Persian",
+    "Polish": "Polish",
+    "Portuguese": "Portuguese",
+    "Punjabi": "Punjabi",
+    "Romanian": "Romanian",
+    "Russian": "Russian",
+    "Samoan": "Samoan",
+    "Scottish Gaelic": "Scottish Gaelic",
+    "Serbian": "Serbian",
+    "Shona": "Shona",
+    "Sindhi": "Sindhi",
+    "Sinhala": "Sinhala",
+    "Slovak": "Slovak",
+    "Slovenian": "Slovenian",
+    "Somali": "Somali",
+    "Southern Sotho": "Southern Sotho",
+    "Spanish": "Spanish",
+    "Spanish (Latin America)": "Spanish (Latin America)",
+    "Sundanese": "Sundanese",
+    "Swahili": "Swahili",
+    "Swedish": "Swedish",
+    "Tajik": "Tajik",
+    "Tamil": "Tamil",
+    "Telugu": "Telugu",
+    "Thai": "Thai",
+    "Turkish": "Turkish",
+    "Ukrainian": "Ukrainian",
+    "Urdu": "Urdu",
+    "Uzbek": "Uzbek",
+    "Vietnamese": "Vietnamese",
+    "Welsh": "Welsh",
+    "Western Frisian": "Western Frisian",
+    "Xhosa": "Xhosa",
+    "Yiddish": "Yiddish",
+    "Yoruba": "Yoruba",
+    "Zulu": "Zulu",
+    "`x` years": {
+        "(\\D|^)1(\\D|$)": "`x` year",
+        "": "`x` years"
+    },
+    "`x` months": {
+        "(\\D|^)1(\\D|$)": "`x` month",
+        "": "`x` months"
+    },
+    "`x` weeks": {
+        "(\\D|^)1(\\D|$)": "`x` week",
+        "": "`x` weeks"
+    },
+    "`x` days": {
+        "(\\D|^)1(\\D|$)": "`x` day",
+        "": "`x` days"
+    },
+    "`x` hours": {
+        "(\\D|^)1(\\D|$)": "`x` hour",
+        "": "`x` hours"
+    },
+    "`x` minutes": {
+        "(\\D|^)1(\\D|$)": "`x` minute",
+        "": "`x` minutes"
+    },
+    "`x` seconds": {
+        "(\\D|^)1(\\D|$)": "`x` second",
+        "": "`x` seconds"
+    },
+    "Fallback comments: ": "Fallback comments: ",
+    "Popular": "Popular",
+    "Top": "Top",
+    "About": "About",
+    "Rating: ": "Rating: ",
+    "Language: ": "Language: ",
+    "View as playlist": "View as playlist",
+    "Default": "Default",
+    "Music": "Music",
+    "Gaming": "Gaming",
+    "News": "News",
+    "Movies": "Movies",
+    "Download": "Download",
+    "Download as: ": "Download as: ",
+    "%A %B %-d, %Y": "%A %B %-d, %Y",
+    "(edited)": "(edited)",
+    "YouTube comment permalink": "YouTube comment permalink",
+    "`x` marked it with a ❤": "`x` marked it with a ❤",
+    "Audio mode": "Audio mode",
+    "Video mode": "Video mode",
+    "Videos": "Videos",
+    "Playlists": "Playlists",
+    "Current version: ": "Current version: "
+}
--- a/locales/eo.json
+++ b/locales/eo.json
@@ -0,0 +1,314 @@
+{
+    "`x` subscribers": "`x` abonantoj",
+    "`x` videos": "`x` videoj",
+    "LIVE": "NUNA",
+    "Shared `x` ago": "Konigita antaŭ `x`",
+    "Unsubscribe": "Malaboni",
+    "Subscribe": "Aboni",
+    "View channel on YouTube": "Vidi kanalon en YouTube",
+    "newest": "pli novaj",
+    "oldest": "pli malnovaj",
+    "popular": "popularaj",
+    "last": "lasta",
+    "Next page": "Sekva paĝo",
+    "Previous page": "Antaŭa paĝo",
+    "Clear watch history?": "Ĉu forigi vidohistorion?",
+    "New password": "Nova pasvorto",
+    "New passwords must match": "Novaj pasvortoj devas kongrui",
+    "Cannot change password for Google accounts": "Ne eblas ŝanĝi pasvorton por kontoj de Google",
+    "Authorize token?": "Ĉu rajtigi ĵetonon?",
+    "Authorize token for `x`?": "Ĉu rajtigi ĵetonon por `x`?",
+    "Yes": "Jes",
+    "No": "Ne",
+    "Import and Export Data": "Importi kaj Eksporti Datumojn",
+    "Import": "Importi",
+    "Import Invidious data": "Importi datumojn de Invidious",
+    "Import YouTube subscriptions": "Importi abonojn de YouTube",
+    "Import FreeTube subscriptions (.db)": "Importi abonojn de FreeTube (.db)",
+    "Import NewPipe subscriptions (.json)": "Importi abonojn de NewPipe (.json)",
+    "Import NewPipe data (.zip)": "Importi datumojn de NewPipe (.zip)",
+    "Export": "Eksporti",
+    "Export subscriptions as OPML": "Eksporti abonojn kiel OPML",
+    "Export subscriptions as OPML (for NewPipe & FreeTube)": "Eksporti abonojn kiel OPML (por NewPipe kaj FreeTube)",
+    "Export data as JSON": "Eksporti datumojn kiel JSON",
+    "Delete account?": "Ĉu forigi konton?",
+    "History": "Historio",
+    "An alternative front-end to YouTube": "Alternativa fasado al YouTube",
+    "JavaScript license information": "Ĝavoskripta licenca informo",
+    "source": "fonto",
+    "Log in": "Ensaluti",
+    "Log in/register": "Ensaluti/Registriĝi",
+    "Log in with Google": "Ensaluti al Google",
+    "User ID": "Uzula identigilo",
+    "Password": "Pasvorto",
+    "Time (h:mm:ss):": "Horo (h:mm:ss):",
+    "Text CAPTCHA": "Teksta CAPTCHA",
+    "Image CAPTCHA": "Bilda CAPTCHA",
+    "Sign In": "Ensaluti",
+    "Register": "Registriĝi",
+    "E-mail": "Retpoŝto",
+    "Google verification code": "Kontrolkodo de Google",
+    "Preferences": "Agordoj",
+    "Player preferences": "Spektilaj agordoj",
+    "Always loop: ": "Ĉiam ripeti: ",
+    "Autoplay: ": "Aŭtomate ludi: ",
+    "Play next by default: ": "Ludi sekvan defaŭlte: ",
+    "Autoplay next video: ": "Aŭtomate ludi sekvan videon: ",
+    "Listen by default: ": "Aŭskulti defaŭlte: ",
+    "Proxy videos? ": "Ĉu uzi prokuran servilon por videoj? ",
+    "Default speed: ": "Defaŭlta rapido: ",
+    "Preferred video quality: ": "Preferita videkvalito: ",
+    "Player volume: ": "Ludila sonforteco: ",
+    "Default comments: ": "Defaŭltaj komentoj: ",
+    "youtube": "youtube",
+    "reddit": "reddit",
+    "Default captions: ": "Defaŭltaj subtekstoj: ",
+    "Fallback captions: ": "Retrodefaŭltaj subtekstoj: ",
+    "Show related videos? ": "Ĉu montri rilatajn videojn? ",
+    "Show annotations by default? ": "Ĉu montri prinotojn defaŭlte? ",
+    "Visual preferences": "Vidaj preferoj",
+    "Dark mode: ": "Malhela reĝimo: ",
+    "Thin mode: ": "Maldika reĝimo: ",
+    "Subscription preferences": "Abonaj agordoj",
+    "Show annotations by default for subscribed channels? ": "Ĉu montri prinotojn defaŭlte por abonitaj kanaloj? ",
+    "Redirect homepage to feed: ": "Alidirekti hejmpâgon al fluo: ",
+    "Number of videos shown in feed: ": "Nombro da videoj montritaj en fluo: ",
+    "Sort videos by: ": "Ordi videojn laŭ: ",
+    "published": "publikigo",
+    "published - reverse": "publitigo - renverse",
+    "alphabetically": "alfabete",
+    "alphabetically - reverse": "alfabete - renverse",
+    "channel name": "kanala nombro",
+    "channel name - reverse": "kanala nombro - renverse",
+    "Only show latest video from channel: ": "Nur montri pli novan videon el kanalo: ",
+    "Only show latest unwatched video from channel: ": "Nur montri pli novan malviditan videon el kanalo: ",
+    "Only show unwatched: ": "Nur montri malviditajn: ",
+    "Only show notifications (if there are any): ": "Nur montri sciigojn (se estas): ",
+    "Data preferences": "Datumagordoj",
+    "Clear watch history": "Forigi vidohistorion",
+    "Import/export data": "Importi/Eksporti datumojn",
+    "Change password": "Ŝanĝi pasvorton",
+    "Manage subscriptions": "Administri abonojn",
+    "Manage tokens": "Administri ĵetonojn",
+    "Watch history": "Vidohistorio",
+    "Delete account": "Forigi konton",
+    "Administrator preferences": "Agordoj de administranto",
+    "Default homepage: ": "Defaŭlta hejmpaĝo: ",
+    "Feed menu: ": "Flua menuo: ",
+    "Top enabled? ": "Ĉu pli bonaj ŝaltitaj? ",
+    "CAPTCHA enabled? ": "Ĉu CAPTCHA ŝaltita? ",
+    "Login enabled? ": "Ĉu ensaluto aktivita? ",
+    "Registration enabled? ": "Ĉu registriĝo aktivita? ",
+    "Report statistics? ": "Ĉu raporti statistikojn? ",
+    "Save preferences": "Konservi agordojn",
+    "Subscription manager": "Administrilo de abonoj",
+    "Token manager": "Ĵetona administrilo",
+    "Token": "Ĵetono",
+    "`x` subscriptions": "`x` abonoj",
+    "`x` tokens": "`x` ĵetonoj",
+    "Import/export": "Importi/Eksporti",
+    "unsubscribe": "malaboni",
+    "revoke": "senvalidigi",
+    "Subscriptions": "Abonoj",
+    "`x` unseen notifications": "`x` neviditaj sciigoj",
+    "search": "serĉi",
+    "Log out": "Elsaluti",
+    "Released under the AGPLv3 by Omar Roth.": "Eldonita sub la AGPLv3 de Omar Roth.",
+    "Source available here.": "Fonto havebla ĉi tie.",
+    "View JavaScript license information.": "Vidi Ĝavoskriptan licencan informon.",
+    "View privacy policy.": "Vidi regularon pri privateco.",
+    "Trending": "Tendencoj",
+    "Unlisted": "Ne listigita",
+    "Watch on YouTube": "Vidi videon en Youtube",
+    "Hide annotations": "Kaŝi prinotojn",
+    "Show annotations": "Montri prinotojn",
+    "Genre: ": "Ĝenro: ",
+    "License: ": "Licenco: ",
+    "Family friendly? ": "Ĉu familie amika? ",
+    "Wilson score: ": "Poentaro de Wilson: ",
+    "Engagement: ": "Intereso: ",
+    "Whitelisted regions: ": "Regionoj listigitaj en blanka listo: ",
+    "Blacklisted regions: ": "Regionoj listigitaj en nigra listo: ",
+    "Shared `x`": "Konigita `x`",
+    "`x` views": "`x` spektaĵoj",
+    "Premieres in `x`": "Premieras en `x`",
+    "Hi! Looks like you have JavaScript turned off. Click here to view comments, keep in mind they may take a bit longer to load.": "Saluton! Ŝajnas, ke vi havas Ĝavoskripton malebligitan. Klaku ĉi tie por vidi komentojn, memoru, ke la ŝargado povus daŭri iom pli.",
+    "View YouTube comments": "Vidi komentojn de YouTube",
+    "View more comments on Reddit": "Vidi pli komentoj en Reddit",
+    "View `x` comments": "Vidi `x` komentojn",
+    "View Reddit comments": "Vidi komentojn de Reddit",
+    "Hide replies": "Kaŝi respondojn",
+    "Show replies": "Montri respondojn",
+    "Incorrect password": "Malbona pasvorto",
+    "Quota exceeded, try again in a few hours": "Kvoto transpasita, provu denove post iuj horoj",
+    "Unable to log in, make sure two-factor authentication (Authenticator or SMS) is turned on.": "Ne povas ensaluti, certigu, ke dufaktora aŭtentigo (Authenticator aŭ SMS) estas ebligita.",
+    "Invalid TFA code": "Nevalida TFA-kodo",
+    "Login failed. This may be because two-factor authentication is not turned on for your account.": "Ensalutado fiaskis. Eble ĉar la dufaktora aŭtentigo estas malebligita en via konto.",
+    "Wrong answer": "Nevalida respondo",
+    "Erroneous CAPTCHA": "Nevalida CAPTCHA",
+    "CAPTCHA is a required field": "CAPTCHA estas deviga kampo",
+    "User ID is a required field": "Uzula identigilo estas deviga kampo",
+    "Password is a required field": "Pasvorto estas deviga kampo",
+    "Wrong username or password": "Nevalida uzantnomo aŭ pasvorto",
+    "Please sign in using 'Log in with Google'": "Bonvolu ensaluti per 'Ensaluti per Google'",
+    "Password cannot be empty": "Pasvorto ne povas esti malplena",
+    "Password cannot be longer than 55 characters": "Pasvorto ne povas esti pli longa ol 55 signoj",
+    "Please log in": "Bonvolu ensaluti",
+    "Invidious Private Feed for `x`": "Privata Fluo de Invidious por `x`",
+    "channel:`x`": "kanalo:`x`",
+    "Deleted or invalid channel": "Forigita aŭ nevalida kanalo",
+    "This channel does not exist.": "Ĉi tiu kanalo ne ekzistas.",
+    "Could not get channel info.": "Ne povis havigi kanalan informon.",
+    "Could not fetch comments": "Ne povis venigi komentojn",
+    "View `x` replies": "Vidi `x` respondojn",
+    "`x` ago": "antaŭ `x`",
+    "Load more": "Ŝarĝi pli",
+    "`x` points": "`x` poentoj",
+    "Could not create mix.": "Ne povis krei mikson.",
+    "Empty playlist": "Ludlisto estas malplena",
+    "Not a playlist.": "Nevalida ludlisto.",
+    "Playlist does not exist.": "Ludlisto ne ekzistas.",
+    "Could not pull trending pages.": "Ne povis venigi tendencajn paĝojn.",
+    "Hidden field \"challenge\" is a required field": "Kaŝita kampo \"challenge\" estas deviga kampo",
+    "Hidden field \"token\" is a required field": "Kaŝita kampo \"token\" estas deviga kampo",
+    "Erroneous challenge": "Nevalida defio",
+    "Erroneous token": "Nevalida ĵetono",
+    "No such user": "Nevalida uzanto",
+    "Token is expired, please try again": "Ĵetono senvalidiĝis, bonvolu provi denove",
+    "English": "Angla",
+    "English (auto-generated)": "Angla (aŭtomate generita)",
+    "Afrikaans": "Afrikansa",
+    "Albanian": "Albana",
+    "Amharic": "Amhara",
+    "Arabic": "Araba",
+    "Armenian": "Armena",
+    "Azerbaijani": "Azerbajĝana",
+    "Bangla": "Bengala",
+    "Basque": "Eŭska",
+    "Belarusian": "Belorusa",
+    "Bosnian": "Bosna",
+    "Bulgarian": "Bulgara",
+    "Burmese": "Birma",
+    "Catalan": "Kataluna",
+    "Cebuano": "Cebua",
+    "Chinese (Simplified)": "Ĉina (simpligita)",
+    "Chinese (Traditional)": "Ĉina (tradicia)",
+    "Corsican": "Korsika",
+    "Croatian": "Kroata",
+    "Czech": "Ĉeĥa",
+    "Danish": "Dana",
+    "Dutch": "Nederlanda",
+    "Esperanto": "Esperanto",
+    "Estonian": "Estona",
+    "Filipino": "Filipina",
+    "Finnish": "Finna",
+    "French": "Franca",
+    "Galician": "Galega",
+    "Georgian": "Kartvela",
+    "German": "Germana",
+    "Greek": "Greka",
+    "Gujarati": "Guĝarata",
+    "Haitian Creole": "Haitia kreola",
+    "Hausa": "Haŭsa",
+    "Hawaiian": "Havaja",
+    "Hebrew": "Hebrea",
+    "Hindi": "Hindia",
+    "Hmong": "Miaa",
+    "Hungarian": "Hungara",
+    "Icelandic": "Islanda",
+    "Igbo": "Igba",
+    "Indonesian": "Indonezia",
+    "Irish": "Irlanda",
+    "Italian": "Itala",
+    "Japanese": "Japana",
+    "Javanese": "Java",
+    "Kannada": "Kanara",
+    "Kazakh": "Kazaĥa",
+    "Khmer": "Kmera",
+    "Korean": "Korea",
+    "Kurdish": "Kurda",
+    "Kyrgyz": "Kirgiza",
+    "Lao": "Laosa",
+    "Latin": "Latina",
+    "Latvian": "Latva",
+    "Lithuanian": "Litova",
+    "Luxembourgish": "Luksemburga",
+    "Macedonian": "Makedona",
+    "Malagasy": "Malagasa",
+    "Malay": "Malaja",
+    "Malayalam": "Malajala",
+    "Maltese": "Malta",
+    "Maori": "Maoria",
+    "Marathi": "Marata",
+    "Mongolian": "Mongola",
+    "Nepali": "Nepala",
+    "Norwegian Bokmål": "Norvega",
+    "Nyanja": "Njanĝa",
+    "Pashto": "Paŝtuna",
+    "Persian": "Persa",
+    "Polish": "Pola",
+    "Portuguese": "Portugala",
+    "Punjabi": "Panĝaba",
+    "Romanian": "Rumana",
+    "Russian": "Rusa",
+    "Samoan": "Samoa",
+    "Scottish Gaelic": "Skotgaela",
+    "Serbian": "Serba",
+    "Shona": "Ŝona",
+    "Sindhi": "Sinda",
+    "Sinhala": "Sinhala",
+    "Slovak": "Slovaka",
+    "Slovenian": "Slovena",
+    "Somali": "Somala",
+    "Southern Sotho": "Sota",
+    "Spanish": "Hispana",
+    "Spanish (Latin America)": "Hispana (Latinameriko)",
+    "Sundanese": "Sunda",
+    "Swahili": "Svahila",
+    "Swedish": "Sveda",
+    "Tajik": "Taĝika",
+    "Tamil": "Tamila",
+    "Telugu": "Telugua",
+    "Thai": "Taja",
+    "Turkish": "Turka",
+    "Ukrainian": "Ukraina",
+    "Urdu": "Urduo",
+    "Uzbek": "Uzbeka",
+    "Vietnamese": "Vjetnama",
+    "Welsh": "Kimra",
+    "Western Frisian": "Okcidentfrisa",
+    "Xhosa": "Kosa",
+    "Yiddish": "Jida",
+    "Yoruba": "Joruba",
+    "Zulu": "Zulua",
+    "`x` years": "`x` jaroj",
+    "`x` months": "`x` monatoj",
+    "`x` weeks": "`x` semajnoj",
+    "`x` days": "`x` tagoj",
+    "`x` hours": "`x` horoj",
+    "`x` minutes": "`x` minutoj",
+    "`x` seconds": "`x` sekundoj",
+    "Fallback comments: ": "Retrodefaŭltaj komentoj: ",
+    "Popular": "Popularaj",
+    "Top": "Supraj",
+    "About": "Pri",
+    "Rating: ": "Takso: ",
+    "Language: ": "Lingvo: ",
+    "View as playlist": "Vidi kiel ludlisto",
+    "Default": "Defaŭlte",
+    "Music": "Musiko",
+    "Gaming": "Komputiloludoj",
+    "News": "Novaĵoj",
+    "Movies": "Filmoj",
+    "Download": "Elŝuti",
+    "Download as: ": "Elŝuti kiel: ",
+    "%A %B %-d, %Y": "%A %-d de %B %Y",
+    "(edited)": "(redaktita)",
+    "YouTube comment permalink": "Fiksligilo de la komento en YouTube",
+    "`x` marked it with a ❤": "`x` markis ĝin per ❤",
+    "Audio mode": "Aŭda reĝimo",
+    "Video mode": "Videa reĝimo",
+    "Videos": "Videoj",
+    "Playlists": "Ludlistoj",
+    "Current version: ": "Nuna versio: "
+}
--- a/locales/es.json
+++ b/locales/es.json
@@ -1,295 +1,314 @@
 {
-  "`x` subscribers": "`x` suscriptores",
-  "`x` videos": "`x` vídeos",
-  "LIVE": "DIRECTO",
-  "Shared `x` ago": "Compartido hace `x`",
-  "Unsubscribe": "Desuscribirse",
-  "Subscribe": "Suscribirse",
-  "Login to subscribe to `x`": "Inicie sesión para suscribirse a `x`",
-  "View channel on YouTube": "Ver el canal en YouTube",
-  "newest": "más nuevos",
-  "oldest": "más viejos",
-  "popular": "populares",
-  "last": "último",
-  "Next page": "Página siguiente",
-  "Previous page": "Página anterior",
-  "Clear watch history?": "¿Quiere borrar el historial de reproducción?",
-  "Yes": "Sí",
-  "No": "No",
-  "Import and Export Data": "Importación y exportación de datos",
-  "Import": "Importar",
-  "Import Invidious data": "Importar datos de Invidious",
-  "Import YouTube subscriptions": "Importar suscripciones de YouTube",
-  "Import FreeTube subscriptions (.db)": "Importar suscripciones de FreeTube (.db)",
-  "Import NewPipe subscriptions (.json)": "Importar suscripciones de NewPipe (.json)",
-  "Import NewPipe data (.zip)": "Importar datos de NewPipe (.zip)",
-  "Export": "Exportar",
-  "Export subscriptions as OPML": "Exportar suscripciones como OPML",
-  "Export subscriptions as OPML (for NewPipe & FreeTube)": "Exportar suscripciones como OPML (para NewPipe y FreeTube)",
-  "Export data as JSON": "Exportar datos como JSON",
-  "Delete account?": "¿Quiere borrar la cuenta?",
-  "History": "Historial",
-  "An alternative front-end to YouTube": "Una interfaz alternativa para YouTube",
-  "JavaScript license information": "Información de licencia de JavaScript",
-  "source": "código fuente",
-  "Login": "Iniciar sesión",
-  "Login/Register": "Iniciar sesión/Registrarse",
-  "Login to Google": "Iniciar sesión en Google",
-  "User ID:": "Nombre:",
-  "Password:": "Contraseña:",
-  "Time (h:mm:ss):": "Hora (h:mm:ss):",
-  "Text CAPTCHA": "CAPTCHA en texto",
-  "Image CAPTCHA": "CAPTCHA en imagen",
-  "Sign In": "Iniciar sesión",
-  "Register": "Registrarse",
-  "Email:": "Correo:",
-  "Google verification code:": "Código de verificación de Google:",
-  "Preferences": "Preferencias",
-  "Player preferences": "Preferencias del reproductor",
-  "Always loop: ": "Repetir siempre: ",
-  "Autoplay: ": "Reproducción automática: ",
-  "Autoplay next video: ": "Reproducir automáticamente el vídeo siguiente: ",
-  "Listen by default: ": "Activar el sonido por defecto: ",
-  "Proxy videos? ": "¿Usar un proxy para los vídeos? ",
-  "Default speed: ": "Velocidad por defecto: ",
-  "Preferred video quality: ": "Calidad de vídeo preferida: ",
-  "Player volume: ": "Volumen del reproductor: ",
-  "Default comments: ": "Comentarios por defecto: ",
-  "Default captions: ": "Subtítulos por defecto: ",
-  "Fallback captions: ": "Subtítulos alternativos: ",
-  "Show related videos? ": "¿Mostrar vídeos relacionados? ",
-  "Visual preferences": "Preferencias visuales",
-  "Dark mode: ": "Modo oscuro: ",
-  "Thin mode: ": "Modo compacto: ",
-  "Subscription preferences": "Preferencias de la suscripción",
-  "Redirect homepage to feed: ": "Redirigir la página de inicio a la fuente: ",
-  "Number of videos shown in feed: ": "Número de vídeos mostrados en la fuente: ",
-  "Sort videos by: ": "Ordenar los vídeos por: ",
-  "published": "fecha de publicación",
-  "published - reverse": "fecha de publicación: orden inverso",
-  "alphabetically": "alfabéticamente",
-  "alphabetically - reverse": "alfabéticamente: orden inverso",
-  "channel name": "nombre del canal",
-  "channel name - reverse": "nombre del canal: orden inverso",
-  "Only show latest video from channel: ": "Mostrar solo el último vídeo del canal: ",
-  "Only show latest unwatched video from channel: ": "Mostrar solo el último vídeo sin ver del canal: ",
-  "Only show unwatched: ": "Mostrar solo los no vistos: ",
-  "Only show notifications (if there are any): ": "Mostrar solo notificaciones (si hay alguna): ",
-  "Data preferences": "Preferencias de los datos",
-  "Clear watch history": "Borrar el historial de reproducción",
-  "Import/Export data": "Importar/Exportar datos",
-  "Manage subscriptions": "Gestionar las suscripciones",
-  "Watch history": "Historial de reproducción",
-  "Delete account": "Borrar cuenta",
-  "Administrator preferences": "Preferencias de administrador",
-  "Default homepage: ": "Página de inicio por defecto: ",
-  "Feed menu: ": "Menú de fuentes: ",
-  "Top enabled? ": "¿Habilitar los destacados? ",
-  "CAPTCHA enabled? ": "¿Habilitar los CAPTCHA? ",
-  "Login enabled? ": "¿Habilitar el inicio de sesión? ",
-  "Registration enabled? ": "¿Habilitar el registro? ",
-  "Report statistics? ": "¿Enviar estadísticas? ",
-  "Save preferences": "Guardar las preferencias",
-  "Subscription manager": "Gestor de suscripciones",
-  "`x` subscriptions": "`x` suscripciones",
-  "Import/Export": "Importar/Exportar",
-  "unsubscribe": "Desuscribirse",
-  "Subscriptions": "Suscripciones",
-  "`x` unseen notifications": "`x` notificaciones sin ver",
-  "search": "buscar",
-  "Sign out": "Cerrar la sesión",
-  "Released under the AGPLv3 by Omar Roth.": "Publicado bajo licencia AGPLv3 por Omar Roth.",
-  "Source available here.": "Código fuente disponible aquí.",
-  "View JavaScript license information.": "Ver información de licencia de JavaScript.",
-  "View privacy policy.": "Ver la política de privacidad.",
-  "Trending": "Tendencias",
-  "Unlisted": "",
-  "Watch video on Youtube": "Ver el vídeo en Youtube",
-  "Genre: ": "Género: ",
-  "License: ": "Licencia: ",
-  "Family friendly? ": "¿Filtrar contenidos? ",
-  "Wilson score: ": "Puntuación Wilson: ",
-  "Engagement: ": "Compromiso: ",
-  "Whitelisted regions: ": "Regiones permitidas: ",
-  "Blacklisted regions: ": "Regiones bloqueadas: ",
-  "Shared `x`": "Compartido `x`",
-  "Premieres in `x`": "",
-  "Hi! Looks like you have JavaScript disabled. Click here to view comments, keep in mind it may take a bit longer to load.": "¡Hola! Parece que tiene JavaScript desactivado. Haga clic aquí para ver los comentarios, pero tenga en cuenta que pueden tardar un poco más en cargarse.",
-  "View YouTube comments": "Ver los comentarios de YouTube",
-  "View more comments on Reddit": "Ver más comentarios en Reddit",
-  "View `x` comments": "Ver `x` comentarios",
-  "View Reddit comments": "Ver los comentarios de Reddit",
-  "Hide replies": "Ocultar las respuestas",
-  "Show replies": "Mostrar las respuestas",
-  "Incorrect password": "Contraseña incorrecta",
-  "Quota exceeded, try again in a few hours": "Cuota excedida, pruebe otra vez en unas horas",
-  "Unable to login, make sure two-factor authentication (Authenticator or SMS) is enabled.": "No se puede iniciar sesión, asegúrese de que la autentificación de dos factores (autentificador o SMS) esté habilitada.",
-  "Invalid TFA code": "Código TFA no válido",
-  "Login failed. This may be because two-factor authentication is not enabled on your account.": "Error de inicio de sesion. Puede deberse a que la autentificación de dos factores no está habilitada en su cuenta.",
-  "Invalid answer": "Respuesta no válida",
-  "Invalid CAPTCHA": "CAPTCHA no válido",
-  "CAPTCHA is a required field": "El CAPTCHA es un campo obligatorio",
-  "User ID is a required field": "El nombre es un campo obligatorio",
-  "Password is a required field": "La contraseña es un campo obligatorio",
-  "Invalid username or password": "Nombre o contraseña incorrecto",
-  "Please sign in using 'Sign in with Google'": "Inicie sesión con «Iniciar sesión con Google»",
-  "Password cannot be empty": "La contraseña no puede estar en blanco",
-  "Password cannot be longer than 55 characters": "La contraseña no puede tener más de 55 caracteres",
-  "Please sign in": "Inicie sesión, por favor",
-  "Invidious Private Feed for `x`": "Fuente privada de Invidious para `x`",
-  "channel:`x`": "canal: `x`",
-  "Deleted or invalid channel": "El canal no es válido o ha sido borrado",
-  "This channel does not exist.": "El canal no existe.",
-  "Could not get channel info.": "No se ha podido obtener información del canal.",
-  "Could not fetch comments": "No se han podido recuperar los comentarios.",
-  "View `x` replies": "Ver `x` respuestas",
-  "`x` ago": "hace `x`",
-  "Load more": "Cargar más",
-  "`x` points": "`x` puntos",
-  "Could not create mix.": "No se ha podido crear la mezcla.",
-  "Playlist is empty": "La lista de reproducción está vacía",
-  "Invalid playlist.": "Lista de reproducción no válida.",
-  "Playlist does not exist.": "La lista de reproducción no existe.",
-  "Could not pull trending pages.": "No se han podido obtener las páginas de tendencias.",
-  "Hidden field \"challenge\" is a required field": "El campo oculto «desafío» es un campo obligatorio",
-  "Hidden field \"token\" is a required field": "El campo oculto «símbolo» es un campo obligatorio",
-  "Invalid challenge": "Desafío no válido",
-  "Invalid token": "Símbolo no válido",
-  "Invalid user": "Usuario no válido",
-  "Token is expired, please try again": "El símbolo ha caducado, inténtelo de nuevo",
-  "English": "Inglés",
-  "English (auto-generated)": "Inglés (autogenerado)",
-  "Afrikaans": "Afrikáans",
-  "Albanian": "Albanés",
-  "Amharic": "Amárico",
-  "Arabic": "Árabe",
-  "Armenian": "Armenio",
-  "Azerbaijani": "Azerbaiyano",
-  "Bangla": "Bengalí",
-  "Basque": "Euskera",
-  "Belarusian": "Bielorruso",
-  "Bosnian": "Bosnio",
-  "Bulgarian": "Búlgaro",
-  "Burmese": "Birmano",
-  "Catalan": "Catalán",
-  "Cebuano": "Cebuano",
-  "Chinese (Simplified)": "Chino (simplificado)",
-  "Chinese (Traditional)": "Chino (tradicional)",
-  "Corsican": "Corso",
-  "Croatian": "Croata",
-  "Czech": "Checo",
-  "Danish": "Danés",
-  "Dutch": "Holandés",
-  "Esperanto": "Esperanto",
-  "Estonian": "Estonio",
-  "Filipino": "Filipino",
-  "Finnish": "Finés",
-  "French": "Francés",
-  "Galician": "Gallego",
-  "Georgian": "Georgiano",
-  "German": "Alemán",
-  "Greek": "Griego",
-  "Gujarati": "Guyaratí",
-  "Haitian Creole": "Criollo haitiano",
-  "Hausa": "Hausa",
-  "Hawaiian": "Hawaiano",
-  "Hebrew": "Hebreo",
-  "Hindi": "Hindi",
-  "Hmong": "Hmong",
-  "Hungarian": "Húngaro",
-  "Icelandic": "Islandés",
-  "Igbo": "Igbo",
-  "Indonesian": "Indonesio",
-  "Irish": "Irlandés",
-  "Italian": "Italiano",
-  "Japanese": "Japonés",
-  "Javanese": "Javanés",
-  "Kannada": "Canarés",
-  "Kazakh": "Kazajo",
-  "Khmer": "Camboyano",
-  "Korean": "Coreano",
-  "Kurdish": "Kurdo",
-  "Kyrgyz": "Kirguís",
-  "Lao": "Laosiano",
-  "Latin": "Latín",
-  "Latvian": "Letón",
-  "Lithuanian": "Lituano",
-  "Luxembourgish": "Luxemburgués",
-  "Macedonian": "Macedonio",
-  "Malagasy": "Malgache",
-  "Malay": "Malayo",
-  "Malayalam": "Malabar",
-  "Maltese": "Maltés",
-  "Maori": "Maorí",
-  "Marathi": "Maratí",
-  "Mongolian": "Mongol",
-  "Nepali": "Nepalí",
-  "Norwegian": "Noruego",
-  "Nyanja": "Chichewa",
-  "Pashto": "Pastún",
-  "Persian": "Persa",
-  "Polish": "Polaco",
-  "Portuguese": "Portugués",
-  "Punjabi": "Panyabí",
-  "Romanian": "Rumano",
-  "Russian": "Ruso",
-  "Samoan": "Samoano",
-  "Scottish Gaelic": "Gaélico escocés",
-  "Serbian": "Serbio",
-  "Shona": "Shona",
-  "Sindhi": "Sindi",
-  "Sinhala": "Cingalés",
-  "Slovak": "Eslovaco",
-  "Slovenian": "Esloveno",
-  "Somali": "Somalí",
-  "Southern Sotho": "Sesoto",
-  "Spanish": "Español",
-  "Spanish (Latin America)": "Español (Hispanoamérica)",
-  "Sundanese": "Sondanés",
-  "Swahili": "Suajili",
-  "Swedish": "Sueco",
-  "Tajik": "Tayiko",
-  "Tamil": "Tamil",
-  "Telugu": "Telugu",
-  "Thai": "Tailandés",
-  "Turkish": "Turco",
-  "Ukrainian": "Ucraniano",
-  "Urdu": "Urdu",
-  "Uzbek": "Uzbeko",
-  "Vietnamese": "Vietnamita",
-  "Welsh": "Galés",
-  "Western Frisian": "Frisón",
-  "Xhosa": "Xhosa",
-  "Yiddish": "Yidis",
-  "Yoruba": "Yoruba",
-  "Zulu": "Zulú",
-  "`x` years": "`x` años",
-  "`x` months": "`x` meses",
-  "`x` weeks": "`x` semanas",
-  "`x` days": "`x` días",
-  "`x` hours": "`x` horas",
-  "`x` minutes": "`x` minutos",
-  "`x` seconds": "`x` segundos",
-  "Fallback comments: ": "Comentarios alternativos: ",
-  "Popular": "Populares",
-  "Top": "Destacados",
-  "About": "Acerca de",
-  "Rating: ": "Valoración: ",
-  "Language: ": "Idioma: ",
-  "Default": "Por defecto",
-  "Music": "Música",
-  "Gaming": "Videojuegos",
-  "News": "Noticias",
-  "Movies": "Películas",
-  "Download": "Descargar",
-  "Download as: ": "Descargar como: ",
-  "%A %B %-d, %Y": "%A %B %-d, %Y",
-  "(edited)": "(editado)",
-  "Youtube permalink of the comment": "Enlace permanente de YouTube del comentario",
-  "`x` marked it with a ❤": "`x` lo ha marcado con un ❤",
-  "Audio mode": "Modo de audio",
-  "Video mode": "Modo de vídeo",
-  "Videos": "Vídeos",
-  "Playlists": "Listas de reproducción",
-  "Current version: ": "Versión actual: "
-}
+    "`x` subscribers": "`x` suscriptores",
+    "`x` videos": "`x` vídeos",
+    "LIVE": "DIRECTO",
+    "Shared `x` ago": "Compartido hace `x`",
+    "Unsubscribe": "Desuscribirse",
+    "Subscribe": "Suscribirse",
+    "View channel on YouTube": "Ver el canal en YouTube",
+    "newest": "más nuevos",
+    "oldest": "más viejos",
+    "popular": "populares",
+    "last": "último",
+    "Next page": "Página siguiente",
+    "Previous page": "Página anterior",
+    "Clear watch history?": "¿Quiere borrar el historial de reproducción?",
+    "New password": "",
+    "New passwords must match": "",
+    "Cannot change password for Google accounts": "",
+    "Authorize token?": "",
+    "Authorize token for `x`?": "",
+    "Yes": "Sí",
+    "No": "No",
+    "Import and Export Data": "Importación y exportación de datos",
+    "Import": "Importar",
+    "Import Invidious data": "Importar datos de Invidious",
+    "Import YouTube subscriptions": "Importar suscripciones de YouTube",
+    "Import FreeTube subscriptions (.db)": "Importar suscripciones de FreeTube (.db)",
+    "Import NewPipe subscriptions (.json)": "Importar suscripciones de NewPipe (.json)",
+    "Import NewPipe data (.zip)": "Importar datos de NewPipe (.zip)",
+    "Export": "Exportar",
+    "Export subscriptions as OPML": "Exportar suscripciones como OPML",
+    "Export subscriptions as OPML (for NewPipe & FreeTube)": "Exportar suscripciones como OPML (para NewPipe y FreeTube)",
+    "Export data as JSON": "Exportar datos como JSON",
+    "Delete account?": "¿Quiere borrar la cuenta?",
+    "History": "Historial",
+    "An alternative front-end to YouTube": "Una interfaz alternativa para YouTube",
+    "JavaScript license information": "Información de licencia de JavaScript",
+    "source": "código fuente",
+    "Log in": "Iniciar sesión",
+    "Log in/register": "Iniciar sesión/Registrarse",
+    "Log in with Google": "Iniciar sesión en Google",
+    "User ID": "Nombre",
+    "Password": "Contraseña",
+    "Time (h:mm:ss):": "Hora (h:mm:ss):",
+    "Text CAPTCHA": "CAPTCHA en texto",
+    "Image CAPTCHA": "CAPTCHA en imagen",
+    "Sign In": "Iniciar sesión",
+    "Register": "Registrarse",
+    "E-mail": "Correo",
+    "Google verification code": "Código de verificación de Google",
+    "Preferences": "Preferencias",
+    "Player preferences": "Preferencias del reproductor",
+    "Always loop: ": "Repetir siempre: ",
+    "Autoplay: ": "Reproducción automática: ",
+    "Play next by default: ": "",
+    "Autoplay next video: ": "Reproducir automáticamente el vídeo siguiente: ",
+    "Listen by default: ": "Activar el sonido por defecto: ",
+    "Proxy videos? ": "¿Usar un proxy para los vídeos? ",
+    "Default speed: ": "Velocidad por defecto: ",
+    "Preferred video quality: ": "Calidad de vídeo preferida: ",
+    "Player volume: ": "Volumen del reproductor: ",
+    "Default comments: ": "Comentarios por defecto: ",
+    "youtube": "",
+    "reddit": "",
+    "Default captions: ": "Subtítulos por defecto: ",
+    "Fallback captions: ": "Subtítulos alternativos: ",
+    "Show related videos? ": "¿Mostrar vídeos relacionados? ",
+    "Show annotations by default? ": "",
+    "Visual preferences": "Preferencias visuales",
+    "Dark mode: ": "Modo oscuro: ",
+    "Thin mode: ": "Modo compacto: ",
+    "Subscription preferences": "Preferencias de la suscripción",
+    "Show annotations by default for subscribed channels? ": "",
+    "Redirect homepage to feed: ": "Redirigir la página de inicio a la fuente: ",
+    "Number of videos shown in feed: ": "Número de vídeos mostrados en la fuente: ",
+    "Sort videos by: ": "Ordenar los vídeos por: ",
+    "published": "fecha de publicación",
+    "published - reverse": "fecha de publicación: orden inverso",
+    "alphabetically": "alfabéticamente",
+    "alphabetically - reverse": "alfabéticamente: orden inverso",
+    "channel name": "nombre del canal",
+    "channel name - reverse": "nombre del canal: orden inverso",
+    "Only show latest video from channel: ": "Mostrar solo el último vídeo del canal: ",
+    "Only show latest unwatched video from channel: ": "Mostrar solo el último vídeo sin ver del canal: ",
+    "Only show unwatched: ": "Mostrar solo los no vistos: ",
+    "Only show notifications (if there are any): ": "Mostrar solo notificaciones (si hay alguna): ",
+    "Data preferences": "Preferencias de los datos",
+    "Clear watch history": "Borrar el historial de reproducción",
+    "Import/export data": "Importar/Exportar datos",
+    "Change password": "",
+    "Manage subscriptions": "Gestionar las suscripciones",
+    "Manage tokens": "",
+    "Watch history": "Historial de reproducción",
+    "Delete account": "Borrar cuenta",
+    "Administrator preferences": "Preferencias de administrador",
+    "Default homepage: ": "Página de inicio por defecto: ",
+    "Feed menu: ": "Menú de fuentes: ",
+    "Top enabled? ": "¿Habilitar los destacados? ",
+    "CAPTCHA enabled? ": "¿Habilitar los CAPTCHA? ",
+    "Login enabled? ": "¿Habilitar el inicio de sesión? ",
+    "Registration enabled? ": "¿Habilitar el registro? ",
+    "Report statistics? ": "¿Enviar estadísticas? ",
+    "Save preferences": "Guardar las preferencias",
+    "Subscription manager": "Gestor de suscripciones",
+    "Token manager": "",
+    "Token": "",
+    "`x` subscriptions": "`x` suscripciones",
+    "`x` tokens": "",
+    "Import/export": "Importar/Exportar",
+    "unsubscribe": "Desuscribirse",
+    "revoke": "",
+    "Subscriptions": "Suscripciones",
+    "`x` unseen notifications": "`x` notificaciones sin ver",
+    "search": "buscar",
+    "Log out": "Cerrar la sesión",
+    "Released under the AGPLv3 by Omar Roth.": "Publicado bajo licencia AGPLv3 por Omar Roth.",
+    "Source available here.": "Código fuente disponible aquí.",
+    "View JavaScript license information.": "Ver información de licencia de JavaScript.",
+    "View privacy policy.": "Ver la política de privacidad.",
+    "Trending": "Tendencias",
+    "Unlisted": "No listado",
+    "Watch on YouTube": "Ver el vídeo en Youtube",
+    "Hide annotations": "",
+    "Show annotations": "",
+    "Genre: ": "Género: ",
+    "License: ": "Licencia: ",
+    "Family friendly? ": "¿Filtrar contenidos? ",
+    "Wilson score: ": "Puntuación Wilson: ",
+    "Engagement: ": "Compromiso: ",
+    "Whitelisted regions: ": "Regiones permitidas: ",
+    "Blacklisted regions: ": "Regiones bloqueadas: ",
+    "Shared `x`": "Compartido `x`",
+    "`x` views": "`x` visualizaciones",
+    "Premieres in `x`": "Se estrena en `x`",
+    "Hi! Looks like you have JavaScript turned off. Click here to view comments, keep in mind they may take a bit longer to load.": "¡Hola! Parece que tiene JavaScript desactivado. Haga clic aquí para ver los comentarios, pero tenga en cuenta que pueden tardar un poco más en cargarse.",
+    "View YouTube comments": "Ver los comentarios de YouTube",
+    "View more comments on Reddit": "Ver más comentarios en Reddit",
+    "View `x` comments": "Ver `x` comentarios",
+    "View Reddit comments": "Ver los comentarios de Reddit",
+    "Hide replies": "Ocultar las respuestas",
+    "Show replies": "Mostrar las respuestas",
+    "Incorrect password": "Contraseña incorrecta",
+    "Quota exceeded, try again in a few hours": "Cuota excedida, pruebe otra vez en unas horas",
+    "Unable to log in, make sure two-factor authentication (Authenticator or SMS) is turned on.": "No se puede iniciar sesión, asegúrese de que la autentificación de dos factores (autentificador o SMS) esté habilitada.",
+    "Invalid TFA code": "Código TFA no válido",
+    "Login failed. This may be because two-factor authentication is not turned on for your account.": "Error de inicio de sesion. Puede deberse a que la autentificación de dos factores no está habilitada en su cuenta.",
+    "Wrong answer": "Respuesta no válida",
+    "Erroneous CAPTCHA": "CAPTCHA no válido",
+    "CAPTCHA is a required field": "El CAPTCHA es un campo obligatorio",
+    "User ID is a required field": "El nombre es un campo obligatorio",
+    "Password is a required field": "La contraseña es un campo obligatorio",
+    "Wrong username or password": "Nombre o contraseña incorrecto",
+    "Please sign in using 'Log in with Google'": "Inicie sesión con «Iniciar sesión con Google»",
+    "Password cannot be empty": "La contraseña no puede estar en blanco",
+    "Password cannot be longer than 55 characters": "La contraseña no puede tener más de 55 caracteres",
+    "Please log in": "Inicie sesión, por favor",
+    "Invidious Private Feed for `x`": "Fuente privada de Invidious para `x`",
+    "channel:`x`": "canal: `x`",
+    "Deleted or invalid channel": "El canal no es válido o ha sido borrado",
+    "This channel does not exist.": "El canal no existe.",
+    "Could not get channel info.": "No se ha podido obtener información del canal.",
+    "Could not fetch comments": "No se han podido recuperar los comentarios",
+    "View `x` replies": "Ver `x` respuestas",
+    "`x` ago": "hace `x`",
+    "Load more": "Cargar más",
+    "`x` points": "`x` puntos",
+    "Could not create mix.": "No se ha podido crear la mezcla.",
+    "Empty playlist": "La lista de reproducción está vacía",
+    "Not a playlist.": "Lista de reproducción no válida.",
+    "Playlist does not exist.": "La lista de reproducción no existe.",
+    "Could not pull trending pages.": "No se han podido obtener las páginas de tendencias.",
+    "Hidden field \"challenge\" is a required field": "El campo oculto «desafío» es un campo obligatorio",
+    "Hidden field \"token\" is a required field": "El campo oculto «símbolo» es un campo obligatorio",
+    "Erroneous challenge": "Desafío no válido",
+    "Erroneous token": "Símbolo no válido",
+    "No such user": "Usuario no válido",
+    "Token is expired, please try again": "El símbolo ha caducado, inténtelo de nuevo",
+    "English": "Inglés",
+    "English (auto-generated)": "Inglés (autogenerado)",
+    "Afrikaans": "Afrikáans",
+    "Albanian": "Albanés",
+    "Amharic": "Amárico",
+    "Arabic": "Árabe",
+    "Armenian": "Armenio",
+    "Azerbaijani": "Azerbaiyano",
+    "Bangla": "Bengalí",
+    "Basque": "Euskera",
+    "Belarusian": "Bielorruso",
+    "Bosnian": "Bosnio",
+    "Bulgarian": "Búlgaro",
+    "Burmese": "Birmano",
+    "Catalan": "Catalán",
+    "Cebuano": "Cebuano",
+    "Chinese (Simplified)": "Chino (simplificado)",
+    "Chinese (Traditional)": "Chino (tradicional)",
+    "Corsican": "Corso",
+    "Croatian": "Croata",
+    "Czech": "Checo",
+    "Danish": "Danés",
+    "Dutch": "Holandés",
+    "Esperanto": "Esperanto",
+    "Estonian": "Estonio",
+    "Filipino": "Filipino",
+    "Finnish": "Finés",
+    "French": "Francés",
+    "Galician": "Gallego",
+    "Georgian": "Georgiano",
+    "German": "Alemán",
+    "Greek": "Griego",
+    "Gujarati": "Guyaratí",
+    "Haitian Creole": "Criollo haitiano",
+    "Hausa": "Hausa",
+    "Hawaiian": "Hawaiano",
+    "Hebrew": "Hebreo",
+    "Hindi": "Hindi",
+    "Hmong": "Hmong",
+    "Hungarian": "Húngaro",
+    "Icelandic": "Islandés",
+    "Igbo": "Igbo",
+    "Indonesian": "Indonesio",
+    "Irish": "Irlandés",
+    "Italian": "Italiano",
+    "Japanese": "Japonés",
+    "Javanese": "Javanés",
+    "Kannada": "Canarés",
+    "Kazakh": "Kazajo",
+    "Khmer": "Camboyano",
+    "Korean": "Coreano",
+    "Kurdish": "Kurdo",
+    "Kyrgyz": "Kirguís",
+    "Lao": "Laosiano",
+    "Latin": "Latín",
+    "Latvian": "Letón",
+    "Lithuanian": "Lituano",
+    "Luxembourgish": "Luxemburgués",
+    "Macedonian": "Macedonio",
+    "Malagasy": "Malgache",
+    "Malay": "Malayo",
+    "Malayalam": "Malabar",
+    "Maltese": "Maltés",
+    "Maori": "Maorí",
+    "Marathi": "Maratí",
+    "Mongolian": "Mongol",
+    "Nepali": "Nepalí",
+    "Norwegian Bokmål": "Noruego",
+    "Nyanja": "Chichewa",
+    "Pashto": "Pastún",
+    "Persian": "Persa",
+    "Polish": "Polaco",
+    "Portuguese": "Portugués",
+    "Punjabi": "Panyabí",
+    "Romanian": "Rumano",
+    "Russian": "Ruso",
+    "Samoan": "Samoano",
+    "Scottish Gaelic": "Gaélico escocés",
+    "Serbian": "Serbio",
+    "Shona": "Shona",
+    "Sindhi": "Sindi",
+    "Sinhala": "Cingalés",
+    "Slovak": "Eslovaco",
+    "Slovenian": "Esloveno",
+    "Somali": "Somalí",
+    "Southern Sotho": "Sesoto",
+    "Spanish": "Español",
+    "Spanish (Latin America)": "Español (Hispanoamérica)",
+    "Sundanese": "Sondanés",
+    "Swahili": "Suajili",
+    "Swedish": "Sueco",
+    "Tajik": "Tayiko",
+    "Tamil": "Tamil",
+    "Telugu": "Telugu",
+    "Thai": "Tailandés",
+    "Turkish": "Turco",
+    "Ukrainian": "Ucraniano",
+    "Urdu": "Urdu",
+    "Uzbek": "Uzbeko",
+    "Vietnamese": "Vietnamita",
+    "Welsh": "Galés",
+    "Western Frisian": "Frisón",
+    "Xhosa": "Xhosa",
+    "Yiddish": "Yidis",
+    "Yoruba": "Yoruba",
+    "Zulu": "Zulú",
+    "`x` years": "`x` años",
+    "`x` months": "`x` meses",
+    "`x` weeks": "`x` semanas",
+    "`x` days": "`x` días",
+    "`x` hours": "`x` horas",
+    "`x` minutes": "`x` minutos",
+    "`x` seconds": "`x` segundos",
+    "Fallback comments: ": "Comentarios alternativos: ",
+    "Popular": "Populares",
+    "Top": "Destacados",
+    "About": "Acerca de",
+    "Rating: ": "Valoración: ",
+    "Language: ": "Idioma: ",
+    "View as playlist": "Ver como lista de reproducción",
+    "Default": "Por defecto",
+    "Music": "Música",
+    "Gaming": "Videojuegos",
+    "News": "Noticias",
+    "Movies": "Películas",
+    "Download": "Descargar",
+    "Download as: ": "Descargar como: ",
+    "%A %B %-d, %Y": "%A %B %-d, %Y",
+    "(edited)": "(editado)",
+    "YouTube comment permalink": "Enlace permanente de YouTube del comentario",
+    "`x` marked it with a ❤": "`x` lo ha marcado con un ❤",
+    "Audio mode": "Modo de audio",
+    "Video mode": "Modo de vídeo",
+    "Videos": "Vídeos",
+    "Playlists": "Listas de reproducción",
+    "Current version: ": "Versión actual: "
+}
--- a/locales/eu.json
+++ b/locales/eu.json
@@ -1,295 +1,312 @@
 {
-  "`x` subscribers": "`x` harpidedun",
-  "`x` videos": "`x` bideo",
-  "LIVE": "ZUZENEAN",
-  "Shared `x` ago": "Duela `x` partekatua",
-  "Unsubscribe": "Harpidetza kendu",
-  "Subscribe": "Harpidetu",
-  "Login to subscribe to `x`": "Saioa hasi `x`(e)ra harpidetzeko",
-  "View channel on YouTube": "Ikusi kanala YouTuben",
-  "newest": "berrienak",
-  "oldest": "zaharrenak",
-  "popular": "ospetsuenak",
-  "last": "",
-  "Next page": "Hurrengo orria",
-  "Previous page": "Aurreko orria",
-  "Clear watch history?": "Garbitu ikusitakoen historia?",
-  "Yes": "Bai",
-  "No": "Ez",
-  "Import and Export Data": "Datuak inportatu eta esportatu",
-  "Import": "Inportatu",
-  "Import Invidious data": "Invidiouseko datuak inportatu",
-  "Import YouTube subscriptions": "YouTubeko harpidetzak inportatu",
-  "Import FreeTube subscriptions (.db)": "FreeTubeko harpidetzak inportatu (.db)",
-  "Import NewPipe subscriptions (.json)": "NewPipeko harpidetzak inportatu (.json)",
-  "Import NewPipe data (.zip)": "NewPipeko datuak inportatu (.zip)",
-  "Export": "Esportatu",
-  "Export subscriptions as OPML": "Esportatu harpidetzak OPML bezala",
-  "Export subscriptions as OPML (for NewPipe & FreeTube)": "Harpidetzak OPML bezala esportatu (NewPipe eta FreeTuberako)",
-  "Export data as JSON": "Datuak JSON bezala esportatu",
-  "Delete account?": "Kontua ezabatu?",
-  "History": "Historia",
-  "An alternative front-end to YouTube": "YouTuberako interfaze alternatibo bat",
-  "JavaScript license information": "JavaScript lizentzia informazioa",
-  "source": "iturburua",
-  "Login": "Saioa hasi",
-  "Login/Register": "Saioa hasi/Izena eman",
-  "Login to Google": "Googlekin hasi saioa",
-  "User ID:": "Erabiltzaile IDa:",
-  "Password:": "Pasahitza:",
-  "Time (h:mm:ss):": "Denbora (o:mm:ss):",
-  "Text CAPTCHA": "Testu CAPTCHA",
-  "Image CAPTCHA": "Irudi CAPTCHA",
-  "Sign In": "",
-  "Register": "",
-  "Email:": "",
-  "Google verification code:": "",
-  "Preferences": "",
-  "Player preferences": "",
-  "Always loop: ": "",
-  "Autoplay: ": "",
-  "Autoplay next video: ": "",
-  "Listen by default: ": "",
-  "Proxy videos? ": "",
-  "Default speed: ": "",
-  "Preferred video quality: ": "",
-  "Player volume: ": "",
-  "Default comments: ": "",
-  "Default captions: ": "",
-  "Fallback captions: ": "",
-  "Show related videos? ": "",
-  "Visual preferences": "",
-  "Dark mode: ": "",
-  "Thin mode: ": "",
-  "Subscription preferences": "",
-  "Redirect homepage to feed: ": "",
-  "Number of videos shown in feed: ": "",
-  "Sort videos by: ": "",
-  "published": "",
-  "published - reverse": "",
-  "alphabetically": "",
-  "alphabetically - reverse": "",
-  "channel name": "",
-  "channel name - reverse": "",
-  "Only show latest video from channel: ": "",
-  "Only show latest unwatched video from channel: ": "",
-  "Only show unwatched: ": "",
-  "Only show notifications (if there are any): ": "",
-  "Data preferences": "",
-  "Clear watch history": "",
-  "Import/Export data": "",
-  "Manage subscriptions": "",
-  "Watch history": "",
-  "Delete account": "",
-  "Administrator preferences": "",
-  "Default homepage: ": "",
-  "Feed menu: ": "",
-  "Top enabled? ": "",
-  "CAPTCHA enabled? ": "",
-  "Login enabled? ": "",
-  "Registration enabled? ": "",
-  "Report statistics? ": "",
-  "Save preferences": "",
-  "Subscription manager": "",
-  "`x` subscriptions": "",
-  "Import/Export": "",
-  "unsubscribe": "",
-  "Subscriptions": "",
-  "`x` unseen notifications": "",
-  "search": "",
-  "Sign out": "",
-  "Released under the AGPLv3 by Omar Roth.": "",
-  "Source available here.": "",
-  "View JavaScript license information.": "",
-  "View privacy policy.": "",
-  "Unlisted": "",
-  "Trending": "",
-  "Watch video on Youtube": "",
-  "Genre: ": "",
-  "License: ": "",
-  "Family friendly? ": "",
-  "Wilson score: ": "",
-  "Engagement: ": "",
-  "Whitelisted regions: ": "",
-  "Blacklisted regions: ": "",
-  "Shared `x`": "",
-  "Premieres in `x`": "",
-  "Hi! Looks like you have JavaScript disabled. Click here to view comments, keep in mind it may take a bit longer to load.": "",
-  "View YouTube comments": "",
-  "View more comments on Reddit": "",
-  "View `x` comments": "",
-  "View Reddit comments": "",
-  "Hide replies": "",
-  "Show replies": "",
-  "Incorrect password": "",
-  "Quota exceeded, try again in a few hours": "",
-  "Unable to login, make sure two-factor authentication (Authenticator or SMS) is enabled.": "",
-  "Invalid TFA code": "",
-  "Login failed. This may be because two-factor authentication is not enabled on your account.": "",
-  "Invalid answer": "",
-  "Invalid CAPTCHA": "",
-  "CAPTCHA is a required field": "",
-  "User ID is a required field": "",
-  "Password is a required field": "",
-  "Invalid username or password": "",
-  "Please sign in using 'Sign in with Google'": "",
-  "Password cannot be empty": "",
-  "Password cannot be longer than 55 characters": "",
-  "Please sign in": "",
-  "Invidious Private Feed for `x`": "",
-  "channel:`x`": "",
-  "Deleted or invalid channel": "",
-  "This channel does not exist.": "",
-  "Could not get channel info.": "",
-  "Could not fetch comments": "",
-  "View `x` replies": "",
-  "`x` ago": "",
-  "Load more": "",
-  "`x` points": "",
-  "Could not create mix.": "",
-  "Playlist is empty": "",
-  "Invalid playlist.": "",
-  "Playlist does not exist.": "",
-  "Could not pull trending pages.": "",
-  "Hidden field \"challenge\" is a required field": "",
-  "Hidden field \"token\" is a required field": "",
-  "Invalid challenge": "",
-  "Invalid token": "",
-  "Invalid user": "",
-  "Token is expired, please try again": "",
-  "English": "",
-  "English (auto-generated)": "",
-  "Afrikaans": "",
-  "Albanian": "",
-  "Amharic": "",
-  "Arabic": "",
-  "Armenian": "",
-  "Azerbaijani": "",
-  "Bangla": "",
-  "Basque": "",
-  "Belarusian": "",
-  "Bosnian": "",
-  "Bulgarian": "",
-  "Burmese": "",
-  "Catalan": "",
-  "Cebuano": "",
-  "Chinese (Simplified)": "",
-  "Chinese (Traditional)": "",
-  "Corsican": "",
-  "Croatian": "",
-  "Czech": "",
-  "Danish": "",
-  "Dutch": "",
-  "Esperanto": "",
-  "Estonian": "",
-  "Filipino": "",
-  "Finnish": "",
-  "French": "",
-  "Galician": "",
-  "Georgian": "",
-  "German": "",
-  "Greek": "",
-  "Gujarati": "",
-  "Haitian Creole": "",
-  "Hausa": "",
-  "Hawaiian": "",
-  "Hebrew": "",
-  "Hindi": "",
-  "Hmong": "",
-  "Hungarian": "",
-  "Icelandic": "",
-  "Igbo": "",
-  "Indonesian": "",
-  "Irish": "",
-  "Italian": "",
-  "Japanese": "",
-  "Javanese": "",
-  "Kannada": "",
-  "Kazakh": "",
-  "Khmer": "",
-  "Korean": "",
-  "Kurdish": "",
-  "Kyrgyz": "",
-  "Lao": "",
-  "Latin": "",
-  "Latvian": "",
-  "Lithuanian": "",
-  "Luxembourgish": "",
-  "Macedonian": "",
-  "Malagasy": "",
-  "Malay": "",
-  "Malayalam": "",
-  "Maltese": "",
-  "Maori": "",
-  "Marathi": "",
-  "Mongolian": "",
-  "Nepali": "",
-  "Norwegian": "",
-  "Nyanja": "",
-  "Pashto": "",
-  "Persian": "",
-  "Polish": "",
-  "Portuguese": "",
-  "Punjabi": "",
-  "Romanian": "",
-  "Russian": "",
-  "Samoan": "",
-  "Scottish Gaelic": "",
-  "Serbian": "",
-  "Shona": "",
-  "Sindhi": "",
-  "Sinhala": "",
-  "Slovak": "",
-  "Slovenian": "",
-  "Somali": "",
-  "Southern Sotho": "",
-  "Spanish": "",
-  "Spanish (Latin America)": "",
-  "Sundanese": "",
-  "Swahili": "",
-  "Swedish": "",
-  "Tajik": "",
-  "Tamil": "",
-  "Telugu": "",
-  "Thai": "",
-  "Turkish": "",
-  "Ukrainian": "",
-  "Urdu": "",
-  "Uzbek": "",
-  "Vietnamese": "",
-  "Welsh": "",
-  "Western Frisian": "",
-  "Xhosa": "",
-  "Yiddish": "",
-  "Yoruba": "",
-  "Zulu": "",
-  "`x` years": "",
-  "`x` months": "",
-  "`x` weeks": "",
-  "`x` days": "",
-  "`x` hours": "",
-  "`x` minutes": "",
-  "`x` seconds": "",
-  "Fallback comments: ": "",
-  "Popular": "",
-  "Top": "",
-  "About": "",
-  "Rating: ": "",
-  "Language: ": "",
-  "Default": "",
-  "Music": "",
-  "Gaming": "",
-  "News": "",
-  "Movies": "",
-  "Download": "",
-  "Download as: ": "",
-  "%A %B %-d, %Y": "",
-  "(edited)": "",
-  "Youtube permalink of the comment": "",
-  "`x` marked it with a ❤": "",
-  "Audio mode": "",
-  "Video mode": "",
-  "Videos": "",
-  "Playlists": "",
-  "Current version: ": ""
+    "`x` subscribers": "`x` harpidedun",
+    "`x` videos": "`x` bideo",
+    "LIVE": "ZUZENEAN",
+    "Shared `x` ago": "Duela `x` partekatua",
+    "Unsubscribe": "Harpidetza kendu",
+    "Subscribe": "Harpidetu",
+    "View channel on YouTube": "Ikusi kanala YouTuben",
+    "newest": "berrienak",
+    "oldest": "zaharrenak",
+    "popular": "ospetsuenak",
+    "last": "azkena",
+    "Next page": "Hurrengo orria",
+    "Previous page": "Aurreko orria",
+    "Clear watch history?": "Garbitu ikusitakoen historia?",
+    "New password": "Pasahitz berria",
+    "New passwords must match": "",
+    "Cannot change password for Google accounts": "",
+    "Authorize token?": "",
+    "Authorize token for `x`?": "",
+    "Yes": "Bai",
+    "No": "Ez",
+    "Import and Export Data": "Datuak inportatu eta esportatu",
+    "Import": "Inportatu",
+    "Import Invidious data": "Invidiouseko datuak inportatu",
+    "Import YouTube subscriptions": "YouTubeko harpidetzak inportatu",
+    "Import FreeTube subscriptions (.db)": "FreeTubeko harpidetzak inportatu (.db)",
+    "Import NewPipe subscriptions (.json)": "NewPipeko harpidetzak inportatu (.json)",
+    "Import NewPipe data (.zip)": "NewPipeko datuak inportatu (.zip)",
+    "Export": "Esportatu",
+    "Export subscriptions as OPML": "Esportatu harpidetzak OPML bezala",
+    "Export subscriptions as OPML (for NewPipe & FreeTube)": "Harpidetzak OPML bezala esportatu (NewPipe eta FreeTuberako)",
+    "Export data as JSON": "Datuak JSON bezala esportatu",
+    "Delete account?": "Kontua ezabatu?",
+    "History": "Historia",
+    "An alternative front-end to YouTube": "YouTuberako interfaze alternatibo bat",
+    "JavaScript license information": "JavaScript lizentzia informazioa",
+    "source": "iturburua",
+    "Log in": "Saioa hasi",
+    "Log in/register": "Saioa hasi/Izena eman",
+    "Log in with Google": "Googlekin hasi saioa",
+    "User ID": "Erabiltzaile IDa",
+    "Password": "Pasahitza",
+    "Time (h:mm:ss):": "Denbora (o:mm:ss):",
+    "Text CAPTCHA": "Testu CAPTCHA",
+    "Image CAPTCHA": "Irudi CAPTCHA",
+    "Sign In": "",
+    "Register": "",
+    "E-mail": "",
+    "Google verification code": "",
+    "Preferences": "",
+    "Player preferences": "",
+    "Always loop: ": "",
+    "Autoplay: ": "",
+    "Play next by default: ": "",
+    "Autoplay next video: ": "",
+    "Listen by default: ": "",
+    "Proxy videos? ": "",
+    "Default speed: ": "",
+    "Preferred video quality: ": "",
+    "Player volume: ": "",
+    "Default comments: ": "",
+    "youtube": "",
+    "reddit": "",
+    "Default captions: ": "",
+    "Fallback captions: ": "",
+    "Show related videos? ": "",
+    "Show annotations by default? ": "",
+    "Visual preferences": "",
+    "Dark mode: ": "",
+    "Thin mode: ": "",
+    "Subscription preferences": "",
+    "Show annotations by default for subscribed channels? ": "",
+    "Redirect homepage to feed: ": "",
+    "Number of videos shown in feed: ": "",
+    "Sort videos by: ": "",
+    "published": "",
+    "published - reverse": "",
+    "alphabetically": "",
+    "alphabetically - reverse": "",
+    "channel name": "",
+    "channel name - reverse": "",
+    "Only show latest video from channel: ": "",
+    "Only show latest unwatched video from channel: ": "",
+    "Only show unwatched: ": "",
+    "Only show notifications (if there are any): ": "",
+    "Data preferences": "",
+    "Clear watch history": "",
+    "Import/export data": "",
+    "Change password": "",
+    "Manage subscriptions": "",
+    "Manage tokens": "",
+    "Watch history": "",
+    "Delete account": "",
+    "Administrator preferences": "",
+    "Default homepage: ": "",
+    "Feed menu: ": "",
+    "Top enabled? ": "",
+    "CAPTCHA enabled? ": "",
+    "Login enabled? ": "",
+    "Registration enabled? ": "",
+    "Report statistics? ": "",
+    "Save preferences": "",
+    "Subscription manager": "",
+    "Token manager": "",
+    "Token": "",
+    "`x` subscriptions": "",
+    "`x` tokens": "",
+    "Import/export": "",
+    "unsubscribe": "",
+    "revoke": "",
+    "Subscriptions": "",
+    "`x` unseen notifications": "",
+    "search": "",
+    "Log out": "",
+    "Released under the AGPLv3 by Omar Roth.": "",
+    "Source available here.": "",
+    "View JavaScript license information.": "",
+    "View privacy policy.": "",
+    "Trending": "",
+    "Unlisted": "",
+    "Watch on YouTube": "",
+    "Hide annotations": "",
+    "Show annotations": "",
+    "Genre: ": "",
+    "License: ": "",
+    "Family friendly? ": "",
+    "Wilson score: ": "",
+    "Engagement: ": "",
+    "Whitelisted regions: ": "",
+    "Blacklisted regions: ": "",
+    "Shared `x`": "",
+    "`x` views": "",
+    "Premieres in `x`": "",
+    "Hi! Looks like you have JavaScript turned off. Click here to view comments, keep in mind they may take a bit longer to load.": "",
+    "View YouTube comments": "",
+    "View more comments on Reddit": "",
+    "View `x` comments": "",
+    "View Reddit comments": "",
+    "Hide replies": "",
+    "Show replies": "",
+    "Incorrect password": "",
+    "Quota exceeded, try again in a few hours": "",
+    "Unable to log in, make sure two-factor authentication (Authenticator or SMS) is turned on.": "",
+    "Invalid TFA code": "",
+    "Login failed. This may be because two-factor authentication is not turned on for your account.": "",
+    "Wrong answer": "",
+    "Erroneous CAPTCHA": "",
+    "CAPTCHA is a required field": "",
+    "User ID is a required field": "",
+    "Password is a required field": "",
+    "Wrong username or password": "",
+    "Please sign in using 'Log in with Google'": "",
+    "Password cannot be empty": "",
+    "Password cannot be longer than 55 characters": "",
+    "Please log in": "",
+    "Invidious Private Feed for `x`": "",
+    "channel:`x`": "",
+    "Deleted or invalid channel": "",
+    "This channel does not exist.": "",
+    "Could not get channel info.": "",
+    "Could not fetch comments": "",
+    "View `x` replies": "",
+    "`x` ago": "",
+    "Load more": "",
+    "`x` points": "",
+    "Could not create mix.": "",
+    "Empty playlist": "",
+    "Not a playlist.": "",
+    "Playlist does not exist.": "",
+    "Could not pull trending pages.": "",
+    "Hidden field \"challenge\" is a required field": "",
+    "Hidden field \"token\" is a required field": "",
+    "Erroneous challenge": "",
+    "Erroneous token": "",
+    "No such user": "",
+    "Token is expired, please try again": "",
+    "English": "",
+    "English (auto-generated)": "",
+    "Afrikaans": "",
+    "Albanian": "",
+    "Amharic": "",
+    "Arabic": "",
+    "Armenian": "",
+    "Azerbaijani": "",
+    "Bangla": "",
+    "Basque": "",
+    "Belarusian": "",
+    "Bosnian": "",
+    "Bulgarian": "",
+    "Burmese": "",
+    "Catalan": "",
+    "Cebuano": "",
+    "Chinese (Simplified)": "",
+    "Chinese (Traditional)": "",
+    "Corsican": "",
+    "Croatian": "",
+    "Czech": "",
+    "Danish": "",
+    "Dutch": "",
+    "Esperanto": "",
+    "Estonian": "",
+    "Filipino": "",
+    "Finnish": "",
+    "French": "",
+    "Galician": "",
+    "Georgian": "",
+    "German": "",
+    "Greek": "",
+    "Gujarati": "",
+    "Haitian Creole": "",
+    "Hausa": "",
+    "Hawaiian": "",
+    "Hebrew": "",
+    "Hindi": "",
+    "Hmong": "",
+    "Hungarian": "",
+    "Icelandic": "",
+    "Igbo": "",
+    "Indonesian": "",
+    "Irish": "",
+    "Italian": "",
+    "Japanese": "",
+    "Javanese": "",
+    "Kannada": "",
+    "Kazakh": "",
+    "Khmer": "",
+    "Korean": "",
+    "Kurdish": "",
+    "Kyrgyz": "",
+    "Lao": "",
+    "Latin": "",
+    "Latvian": "",
+    "Lithuanian": "",
+    "Luxembourgish": "",
+    "Macedonian": "",
+    "Malagasy": "",
+    "Malay": "",
+    "Malayalam": "",
+    "Maltese": "",
+    "Maori": "",
+    "Marathi": "",
+    "Mongolian": "",
+    "Nepali": "",
+    "Norwegian Bokmål": "",
+    "Nyanja": "",
+    "Pashto": "",
+    "Persian": "",
+    "Polish": "",
+    "Portuguese": "",
+    "Punjabi": "",
+    "Romanian": "",
+    "Russian": "",
+    "Samoan": "",
+    "Scottish Gaelic": "",
+    "Serbian": "",
+    "Shona": "",
+    "Sindhi": "",
+    "Sinhala": "",
+    "Slovak": "",
+    "Slovenian": "",
+    "Somali": "",
+    "Southern Sotho": "",
+    "Spanish": "",
+    "Spanish (Latin America)": "",
+    "Sundanese": "",
+    "Swahili": "",
+    "Swedish": "",
+    "Tajik": "",
+    "Tamil": "",
+    "Telugu": "",
+    "Thai": "",
+    "Turkish": "",
+    "Ukrainian": "",
+    "Urdu": "",
+    "Uzbek": "",
+    "Vietnamese": "",
+    "Welsh": "",
+    "Western Frisian": "",
+    "Xhosa": "",
+    "Yiddish": "",
+    "Yoruba": "",
+    "Zulu": "",
+    "`x` years": "",
+    "`x` months": "",
+    "`x` weeks": "",
+    "`x` days": "",
+    "`x` hours": "",
+    "`x` minutes": "",
+    "`x` seconds": "",
+    "Fallback comments: ": "",
+    "Popular": "",
+    "Top": "",
+    "About": "",
+    "Rating: ": "",
+    "Language: ": "",
+    "View as playlist": "",
+    "Default": "",
+    "Music": "",
+    "Gaming": "",
+    "News": "",
+    "Movies": "",
+    "Download": "",
+    "Download as: ": "",
+    "%A %B %-d, %Y": "",
+    "(edited)": "",
+    "YouTube comment permalink": "",
+    "`x` marked it with a ❤": "",
+    "Audio mode": "",
+    "Video mode": "",
+    "Videos": ""
 }
--- a/locales/fr.json
+++ b/locales/fr.json
@@ -1,295 +1,314 @@
 {
-  "`x` subscribers": "`x` abonnés",
-  "`x` videos": "`x` vidéos",
-  "LIVE": "EN DIRECT",
-  "Shared `x` ago": "Ajoutée il y a `x`",
-  "Unsubscribe": "Se désabonner",
-  "Subscribe": "S'abonner",
-  "Login to subscribe to `x`": "Vous devez vous connecter pour vous abonner à `x`",
-  "View channel on YouTube": "Voir la chaîne sur YouTube",
-  "newest": "Date d'ajout (la plus récente)",
-  "oldest": "Date d'ajout (la plus ancienne)",
-  "popular": "Les plus populaires",
-  "last": "Dernières",
-  "Next page": "Page suivante",
-  "Previous page": "Page précédente",
-  "Clear watch history?": "Êtes-vous sûr de vouloir supprimer l'historique des vidéos regardées ?",
-  "Yes": "Oui",
-  "No": "Non",
-  "Import and Export Data": "Importer et exporter des données",
-  "Import": "Importer",
-  "Import Invidious data": "Importer des données Invidious",
-  "Import YouTube subscriptions": "Importer des abonnements YouTube",
-  "Import FreeTube subscriptions (.db)": "Importer des abonnements FreeTube (.db)",
-  "Import NewPipe subscriptions (.json)": "Importer des abonnements NewPipe (.json)",
-  "Import NewPipe data (.zip)": "Importer des données NewPipe (.zip)",
-  "Export": "Exporter",
-  "Export subscriptions as OPML": "Exporter les abonnements en OPML",
-  "Export subscriptions as OPML (for NewPipe & FreeTube)": "Exporter les abonnements en OPML (pour NewPipe & FreeTube)",
-  "Export data as JSON": "Exporter les données au format JSON",
-  "Delete account?": "Êtes-vous sûr de vouloir supprimer votre compte ?",
-  "History": "Historique",
-  "An alternative front-end to YouTube": "Un front-end alternatif à YouTube",
-  "JavaScript license information": "Informations sur les licences JavaScript",
-  "source": "source",
-  "Login": "Se connecter",
-  "Login/Register": "Se connecter/Créer un compte",
-  "Login to Google": "Se connecter avec Google",
-  "User ID:": "Identifiant utilisateur :",
-  "Password:": "Mot de passe :",
-  "Time (h:mm:ss):": "Heure (h:mm:ss) :",
-  "Text CAPTCHA": "CAPTCHA Texte",
-  "Image CAPTCHA": "CAPTCHA Image",
-  "Sign In": "Se connecter",
-  "Register": "S'inscrire",
-  "Email:": "E-mail :",
-  "Google verification code:": "Code de vérification Google :",
-  "Preferences": "Préférences",
-  "Player preferences": "Préférences du lecteur",
-  "Always loop: ": "Lire en boucle : ",
-  "Autoplay: ": "Lire automatiquement : ",
-  "Autoplay next video: ": "Lire automatiquement la vidéo suivante : ",
-  "Listen by default: ": "Audio uniquement : ",
-  "Proxy videos? ": "Charger les vidéos à travers un proxy ? ",
-  "Default speed: ": "Vitesse par défaut : ",
-  "Preferred video quality: ": "Qualité vidéo souhaitée : ",
-  "Player volume: ": "Volume du lecteur : ",
-  "Default comments: ": "Source des commentaires : ",
-  "Default captions: ": "Sous-titres par défaut : ",
-  "Fallback captions: ": "Fallback captions: ",
-  "Show related videos? ": "Voir les vidéos liées ? ",
-  "Visual preferences": "Préférences du site",
-  "Dark mode: ": "Mode Sombre : ",
-  "Thin mode: ": "Mode Simplifié : ",
-  "Subscription preferences": "Préférences de la page d'abonnements",
-  "Redirect homepage to feed: ": "Rediriger la page d'accueil vers la page d'abonnements : ",
-  "Number of videos shown in feed: ": "Nombre de vidéos montrées dans la page d'abonnements : ",
-  "Sort videos by: ": "Trier les vidéos par : ",
-  "published": "publication",
-  "published - reverse": "publication - inversé",
-  "alphabetically": "alphabétiquement",
-  "alphabetically - reverse": "alphabétiquement - inversé",
-  "channel name": "nom de la chaîne",
-  "channel name - reverse": "nom de la chaîne - inversé",
-  "Only show latest video from channel: ": "Afficher uniquement la dernière vidéo de la chaîne : ",
-  "Only show latest unwatched video from channel: ": "Afficher uniquement la dernière vidéo de la chaîne non regardée : ",
-  "Only show unwatched: ": "Afficher uniquement les vidéos non regardées : ",
-  "Only show notifications (if there are any): ": "Afficher uniquement les notifications (s'il y en a) : ",
-  "Data preferences": "Préférences liées aux données",
-  "Clear watch history": "Supprimer l'historique des vidéos regardées",
-  "Import/Export data": "Importer/exporter les données",
-  "Manage subscriptions": "Gérer les abonnements",
-  "Watch history": "Historique de visionnage",
-  "Delete account": "Supprimer votre compte",
-  "Administrator preferences": "Préferences d'Administrateur",
-  "Default homepage: ": "Page d'accueil par défaut : ",
-  "Feed menu: ": "Menu des Flux : ",
-  "Top enabled? ": "Top activé ? ",
-  "CAPTCHA enabled? ": "CAPTCHA activé ? ",
-  "Login enabled? ": "Connexion activé ? ",
-  "Registration enabled? ": "Inscription activée ? ",
-  "Report statistics? ": "Télémétrie activé ? ",
-  "Save preferences": "Enregistrer les préférences",
-  "Subscription manager": "Gestionnaire d'abonnement",
-  "`x` subscriptions": "`x` abonnements",
-  "Import/Export": "Importer/Exporter",
-  "unsubscribe": "se désabonner",
-  "Subscriptions": "Abonnements",
-  "`x` unseen notifications": "`x` notifications non vues",
-  "search": "Rechercher",
-  "Sign out": "Déconnexion",
-  "Released under the AGPLv3 by Omar Roth.": "Publié sous licence AGPLv3 par Omar Roth.",
-  "Source available here.": "Code Source.",
-  "View JavaScript license information.": "Voir les informations des licences JavaScript.",
-  "View privacy policy.": "Politique de confidentialité",
-  "Trending": "Tendances",
-  "Unlisted": "Non répertoriée",
-  "Watch video on Youtube": "Voir la vidéo sur Youtube",
-  "Genre: ": "Genre : ",
-  "License: ": "Licence : ",
-  "Family friendly? ": "Tout Public ? ",
-  "Wilson score: ": "Score de Wilson : ",
-  "Engagement: ": "Poucentage de spectateur aillant aimé Like ou Dislike la vidéo : ",
-  "Whitelisted regions: ": "Régions en liste blanche : ",
-  "Blacklisted regions: ": "Régions sur liste noire : ",
-  "Shared `x`": "Ajoutée le `x`",
-  "Premieres in `x`": "Première dans `x`",
-  "Hi! Looks like you have JavaScript disabled. Click here to view comments, keep in mind it may take a bit longer to load.": "Il semblerait que JavaScript soit désactivé. Cliquez ici pour voir les commentaires sans. Gardez à l'esprit que le chargement peut prendre plus de temps.",
-  "View YouTube comments": "Voir les commentaires YouTube",
-  "View more comments on Reddit": "Voir plus de commentaires sur Reddit",
-  "View `x` comments": "Voir `x` commentaires",
-  "View Reddit comments": "Voir les commentaires Reddit",
-  "Hide replies": "Masquer les réponses",
-  "Show replies": "Afficher les réponses",
-  "Incorrect password": "Mot de passe incorrect",
-  "Quota exceeded, try again in a few hours": "Nombre de tentative de connexion dépassé, réessayez dans quelques heures",
-  "Unable to login, make sure two-factor authentication (Authenticator or SMS) is enabled.": "Si vous ne parvenez pas à vous connecter, assurez-vous que l'authentification à deux facteurs (Authenticator ou SMS) est activée.",
-  "Invalid TFA code": "Code d'authentification à deux facteurs invalide",
-  "Login failed. This may be because two-factor authentication is not enabled on your account.": "La connexion a échoué. Cela peut être dû au fait que l'authentification à deux facteurs n'est pas activée sur votre compte.",
-  "Invalid answer": "Réponse invalide",
-  "Invalid CAPTCHA": "CAPTCHA invalide",
-  "CAPTCHA is a required field": "Veuillez entrer un CAPTCHA",
-  "User ID is a required field": "Veuillez entrer un Identifiant Utilisateur",
-  "Password is a required field": "Veuillez entrer un Mot de passe",
-  "Invalid username or password": "Nom d'utilisateur ou mot de passe invalide",
-  "Please sign in using 'Sign in with Google'": "Veuillez vous connecter en utilisant \"Se connecter avec Google\"",
-  "Password cannot be empty": "Le mot de passe ne peut pas être vide",
-  "Password cannot be longer than 55 characters": "Le mot de passe ne doit pas comporter plus de 55 caractères",
-  "Please sign in": "Veuillez vous connecter",
-  "Invidious Private Feed for `x`": "Flux RSS privé pour `x`",
-  "channel:`x`": "chaîne:`x`",
-  "Deleted or invalid channel": "Chaîne supprimée ou invalide",
-  "This channel does not exist.": "Cette chaine n'existe pas.",
-  "Could not get channel info.": "Impossible de charger les informations de cette chaîne.",
-  "Could not fetch comments": "Impossible de charger les commentaires",
-  "View `x` replies": "Voir `x` réponses",
-  "`x` ago": "il y a `x`",
-  "Load more": "Charger plus",
-  "`x` points": "`x` points",
-  "Could not create mix.": "Impossible de charger cette liste de lecture.",
-  "Playlist is empty": "La liste de lecture est vide",
-  "Invalid playlist.": "Liste de lecture invalide.",
-  "Playlist does not exist.": "La liste de lecture n'existe pas.",
-  "Could not pull trending pages.": "Impossible de charger les pages de tendances.",
-  "Hidden field \"challenge\" is a required field": "Hidden field \"challenge\" is a required field",
-  "Hidden field \"token\" is a required field": "Hidden field \"token\" is a required field",
-  "Invalid challenge": "Invalid challenge",
-  "Invalid token": "Invalid token",
-  "Invalid user": "Invalid user",
-  "Token is expired, please try again": "Token is expired, please try again",
-  "English": "Anglais",
-  "English (auto-generated)": "Anglais (générés automatiquement)",
-  "Afrikaans": "Afrikaans",
-  "Albanian": "Albanais",
-  "Amharic": "Amharique",
-  "Arabic": "Arabe",
-  "Armenian": "Arménien",
-  "Azerbaijani": "Azerbaïdjanais",
-  "Bangla": "Bangla",
-  "Basque": "Basque",
-  "Belarusian": "Belarusian",
-  "Bosnian": "Bosnian",
-  "Bulgarian": "Bulgarian",
-  "Burmese": "Birman",
-  "Catalan": "Catalan",
-  "Cebuano": "Cebuano",
-  "Chinese (Simplified)": "Chinois (Simplifié)",
-  "Chinese (Traditional)": "Chinois (Traditionnel)",
-  "Corsican": "Corse",
-  "Croatian": "Croate",
-  "Czech": "Tchèque",
-  "Danish": "Danois",
-  "Dutch": "Hollandais",
-  "Esperanto": "Espéranto",
-  "Estonian": "Estonien",
-  "Filipino": "Philippin",
-  "Finnish": "Finlandais",
-  "French": "Français",
-  "Galician": "Galicien",
-  "Georgian": "Géorgien",
-  "German": "Allemand",
-  "Greek": "Grec",
-  "Gujarati": "Gujarati",
-  "Haitian Creole": "Créole Haïtien",
-  "Hausa": "Haoussa",
-  "Hawaiian": "Hawaïen",
-  "Hebrew": "Hébraïque",
-  "Hindi": "Hindi",
-  "Hmong": "Hmong",
-  "Hungarian": "Hongrois",
-  "Icelandic": "Islandais",
-  "Igbo": "Igbo",
-  "Indonesian": "Indonésien",
-  "Irish": "Irlandais",
-  "Italian": "Italien",
-  "Japanese": "Japonais",
-  "Javanese": "Javanais",
-  "Kannada": "Kannada",
-  "Kazakh": "Kazakh",
-  "Khmer": "Khmer",
-  "Korean": "Coréen",
-  "Kurdish": "Kurde",
-  "Kyrgyz": "Kirghize",
-  "Lao": "Lao",
-  "Latin": "Latin",
-  "Latvian": "Letton",
-  "Lithuanian": "Lituanien",
-  "Luxembourgish": "Luxembourgeois",
-  "Macedonian": "Macédonien",
-  "Malagasy": "Malgache",
-  "Malay": "Malais",
-  "Malayalam": "Malayalam",
-  "Maltese": "Maltais",
-  "Maori": "Maori",
-  "Marathi": "Marathi",
-  "Mongolian": "Mongol",
-  "Nepali": "Népalais",
-  "Norwegian": "Norvégien",
-  "Nyanja": "Nyanja",
-  "Pashto": "Pachtou",
-  "Persian": "Persan",
-  "Polish": "Polonais",
-  "Portuguese": "Portugais",
-  "Punjabi": "Punjabi",
-  "Romanian": "Roumain",
-  "Russian": "Russe",
-  "Samoan": "Samoan",
-  "Scottish Gaelic": "Eaélique Ècossais",
-  "Serbian": "Serbe",
-  "Shona": "Shona",
-  "Sindhi": "Sindhi",
-  "Sinhala": "Cinghalais",
-  "Slovak": "Slovaque",
-  "Slovenian": "Slovène",
-  "Somali": "Somalien",
-  "Southern Sotho": "Sotho du Sud",
-  "Spanish": "Espagnol",
-  "Spanish (Latin America)": "Espagnol (Amérique latine)",
-  "Sundanese": "Sundanais",
-  "Swahili": "Swahili",
-  "Swedish": "Suédois",
-  "Tajik": "Tajik",
-  "Tamil": "Tamil",
-  "Telugu": "Telugu",
-  "Thai": "Thaï",
-  "Turkish": "Turc",
-  "Ukrainian": "Ukrainien",
-  "Urdu": "Ourdou",
-  "Uzbek": "Ouzbek",
-  "Vietnamese": "Vietnamien",
-  "Welsh": "Gallois",
-  "Western Frisian": "Frison occidental",
-  "Xhosa": "Xhosa",
-  "Yiddish": "Yiddish",
-  "Yoruba": "Yoruba",
-  "Zulu": "Zoulou",
-  "`x` years": "`x` ans",
-  "`x` months": "`x` mois",
-  "`x` weeks": "`x` semaines",
-  "`x` days": "`x` jours",
-  "`x` hours": "`x` heures",
-  "`x` minutes": "`x` minutes",
-  "`x` seconds": "`x` secondes",
-  "Fallback comments: ": "Fallback comments: ",
-  "Popular": "Populaire",
-  "Top": "Top",
-  "About": "A Propos",
-  "Rating: ": "Évaluation : ",
-  "Language: ": "Langue : ",
-  "Default": "Défaut",
-  "Music": "Musique",
-  "Gaming": "Jeux Vidéo",
-  "News": "Actualités",
-  "Movies": "Films",
-  "Download": "Télécharger",
-  "Download as: ": "Télécharger en : ",
-  "%A %B %-d, %Y": "%A %-d %B %Y",
-  "(edited)": "(modifié)",
-  "Youtube permalink of the comment": "Lien YouTube permanent vers le commentaire",
-  "`x` marked it with a ❤": "`x` l'a marqué d'un ❤",
-  "Audio mode": "Mode Audio",
-  "Video mode": "Mode Vidéo",
-  "Videos": "Vidéos",
-  "Playlists": "Liste de lecture",
-  "Current version: ": "Version :"
-}
+    "`x` subscribers": "`x` abonnés",
+    "`x` videos": "`x` vidéos",
+    "LIVE": "EN DIRECT",
+    "Shared `x` ago": "Ajoutée il y a `x`",
+    "Unsubscribe": "Se désabonner",
+    "Subscribe": "S'abonner",
+    "View channel on YouTube": "Voir la chaîne sur YouTube",
+    "newest": "Date d'ajout (la plus récente)",
+    "oldest": "Date d'ajout (la plus ancienne)",
+    "popular": "Les plus populaires",
+    "last": "Dernières",
+    "Next page": "Page suivante",
+    "Previous page": "Page précédente",
+    "Clear watch history?": "Êtes-vous sûr de vouloir supprimer l'historique des vidéos regardées ?",
+    "New password": "",
+    "New passwords must match": "",
+    "Cannot change password for Google accounts": "",
+    "Authorize token?": "",
+    "Authorize token for `x`?": "",
+    "Yes": "Oui",
+    "No": "Non",
+    "Import and Export Data": "Importer et exporter des données",
+    "Import": "Importer",
+    "Import Invidious data": "Importer des données Invidious",
+    "Import YouTube subscriptions": "Importer des abonnements YouTube",
+    "Import FreeTube subscriptions (.db)": "Importer des abonnements FreeTube (.db)",
+    "Import NewPipe subscriptions (.json)": "Importer des abonnements NewPipe (.json)",
+    "Import NewPipe data (.zip)": "Importer des données NewPipe (.zip)",
+    "Export": "Exporter",
+    "Export subscriptions as OPML": "Exporter les abonnements en OPML",
+    "Export subscriptions as OPML (for NewPipe & FreeTube)": "Exporter les abonnements en OPML (pour NewPipe & FreeTube)",
+    "Export data as JSON": "Exporter les données au format JSON",
+    "Delete account?": "Êtes-vous sûr de vouloir supprimer votre compte ?",
+    "History": "Historique",
+    "An alternative front-end to YouTube": "Un front-end alternatif à YouTube",
+    "JavaScript license information": "Informations sur les licences JavaScript",
+    "source": "source",
+    "Log in": "Se connecter",
+    "Log in/register": "Se connecter/Créer un compte",
+    "Log in with Google": "Se connecter avec Google",
+    "User ID": "Identifiant utilisateur",
+    "Password": "Mot de passe",
+    "Time (h:mm:ss):": "Heure (h:mm:ss) :",
+    "Text CAPTCHA": "CAPTCHA Texte",
+    "Image CAPTCHA": "CAPTCHA Image",
+    "Sign In": "Se connecter",
+    "Register": "S'inscrire",
+    "E-mail": "E-mail",
+    "Google verification code": "Code de vérification Google",
+    "Preferences": "Préférences",
+    "Player preferences": "Préférences du lecteur",
+    "Always loop: ": "Lire en boucle : ",
+    "Autoplay: ": "Lire automatiquement : ",
+    "Play next by default: ": "",
+    "Autoplay next video: ": "Lire automatiquement la vidéo suivante : ",
+    "Listen by default: ": "Audio uniquement : ",
+    "Proxy videos? ": "Charger les vidéos à travers un proxy ? ",
+    "Default speed: ": "Vitesse par défaut : ",
+    "Preferred video quality: ": "Qualité vidéo souhaitée : ",
+    "Player volume: ": "Volume du lecteur : ",
+    "Default comments: ": "Source des commentaires : ",
+    "youtube": "",
+    "reddit": "",
+    "Default captions: ": "Sous-titres par défaut : ",
+    "Fallback captions: ": "Fallback captions: ",
+    "Show related videos? ": "Voir les vidéos liées ? ",
+    "Show annotations by default? ": "",
+    "Visual preferences": "Préférences du site",
+    "Dark mode: ": "Mode Sombre : ",
+    "Thin mode: ": "Mode Simplifié : ",
+    "Subscription preferences": "Préférences de la page d'abonnements",
+    "Show annotations by default for subscribed channels? ": "",
+    "Redirect homepage to feed: ": "Rediriger la page d'accueil vers la page d'abonnements : ",
+    "Number of videos shown in feed: ": "Nombre de vidéos montrées dans la page d'abonnements : ",
+    "Sort videos by: ": "Trier les vidéos par : ",
+    "published": "publication",
+    "published - reverse": "publication - inversé",
+    "alphabetically": "alphabétiquement",
+    "alphabetically - reverse": "alphabétiquement - inversé",
+    "channel name": "nom de la chaîne",
+    "channel name - reverse": "nom de la chaîne - inversé",
+    "Only show latest video from channel: ": "Afficher uniquement la dernière vidéo de la chaîne : ",
+    "Only show latest unwatched video from channel: ": "Afficher uniquement la dernière vidéo de la chaîne non regardée : ",
+    "Only show unwatched: ": "Afficher uniquement les vidéos non regardées : ",
+    "Only show notifications (if there are any): ": "Afficher uniquement les notifications (s'il y en a) : ",
+    "Data preferences": "Préférences liées aux données",
+    "Clear watch history": "Supprimer l'historique des vidéos regardées",
+    "Import/export data": "Importer/exporter les données",
+    "Change password": "",
+    "Manage subscriptions": "Gérer les abonnements",
+    "Manage tokens": "",
+    "Watch history": "Historique de visionnage",
+    "Delete account": "Supprimer votre compte",
+    "Administrator preferences": "Préferences d'Administrateur",
+    "Default homepage: ": "Page d'accueil par défaut : ",
+    "Feed menu: ": "Menu des Flux : ",
+    "Top enabled? ": "Top activé ? ",
+    "CAPTCHA enabled? ": "CAPTCHA activé ? ",
+    "Login enabled? ": "Connexion activé ? ",
+    "Registration enabled? ": "Inscription activée ? ",
+    "Report statistics? ": "Télémétrie activé ? ",
+    "Save preferences": "Enregistrer les préférences",
+    "Subscription manager": "Gestionnaire d'abonnement",
+    "Token manager": "",
+    "Token": "",
+    "`x` subscriptions": "`x` abonnements",
+    "`x` tokens": "",
+    "Import/export": "Importer/Exporter",
+    "unsubscribe": "se désabonner",
+    "revoke": "",
+    "Subscriptions": "Abonnements",
+    "`x` unseen notifications": "`x` notifications non vues",
+    "search": "Rechercher",
+    "Log out": "Déconnexion",
+    "Released under the AGPLv3 by Omar Roth.": "Publié sous licence AGPLv3 par Omar Roth.",
+    "Source available here.": "Code Source.",
+    "View JavaScript license information.": "Voir les informations des licences JavaScript.",
+    "View privacy policy.": "Politique de confidentialité",
+    "Trending": "Tendances",
+    "Unlisted": "Non répertoriée",
+    "Watch on YouTube": "Voir la vidéo sur Youtube",
+    "Hide annotations": "",
+    "Show annotations": "",
+    "Genre: ": "Genre : ",
+    "License: ": "Licence : ",
+    "Family friendly? ": "Tout Public ? ",
+    "Wilson score: ": "Score de Wilson : ",
+    "Engagement: ": "Poucentage de spectateur aillant aimé Like ou Dislike la vidéo : ",
+    "Whitelisted regions: ": "Régions en liste blanche : ",
+    "Blacklisted regions: ": "Régions sur liste noire : ",
+    "Shared `x`": "Ajoutée le `x`",
+    "`x` views": "",
+    "Premieres in `x`": "Première dans `x`",
+    "Hi! Looks like you have JavaScript turned off. Click here to view comments, keep in mind they may take a bit longer to load.": "Il semblerait que JavaScript soit désactivé. Cliquez ici pour voir les commentaires sans. Gardez à l'esprit que le chargement peut prendre plus de temps.",
+    "View YouTube comments": "Voir les commentaires YouTube",
+    "View more comments on Reddit": "Voir plus de commentaires sur Reddit",
+    "View `x` comments": "Voir `x` commentaires",
+    "View Reddit comments": "Voir les commentaires Reddit",
+    "Hide replies": "Masquer les réponses",
+    "Show replies": "Afficher les réponses",
+    "Incorrect password": "Mot de passe incorrect",
+    "Quota exceeded, try again in a few hours": "Nombre de tentative de connexion dépassé, réessayez dans quelques heures",
+    "Unable to log in, make sure two-factor authentication (Authenticator or SMS) is turned on.": "Si vous ne parvenez pas à vous connecter, assurez-vous que l'authentification à deux facteurs (Authenticator ou SMS) est activée.",
+    "Invalid TFA code": "Code d'authentification à deux facteurs invalide",
+    "Login failed. This may be because two-factor authentication is not turned on for your account.": "La connexion a échoué. Cela peut être dû au fait que l'authentification à deux facteurs n'est pas activée sur votre compte.",
+    "Wrong answer": "Réponse invalide",
+    "Erroneous CAPTCHA": "CAPTCHA invalide",
+    "CAPTCHA is a required field": "Veuillez entrer un CAPTCHA",
+    "User ID is a required field": "Veuillez entrer un Identifiant Utilisateur",
+    "Password is a required field": "Veuillez entrer un Mot de passe",
+    "Wrong username or password": "Nom d'utilisateur ou mot de passe invalide",
+    "Please sign in using 'Log in with Google'": "Veuillez vous connecter en utilisant \"Se connecter avec Google\"",
+    "Password cannot be empty": "Le mot de passe ne peut pas être vide",
+    "Password cannot be longer than 55 characters": "Le mot de passe ne doit pas comporter plus de 55 caractères",
+    "Please log in": "Veuillez vous connecter",
+    "Invidious Private Feed for `x`": "Flux RSS privé pour `x`",
+    "channel:`x`": "chaîne:`x`",
+    "Deleted or invalid channel": "Chaîne supprimée ou invalide",
+    "This channel does not exist.": "Cette chaine n'existe pas.",
+    "Could not get channel info.": "Impossible de charger les informations de cette chaîne.",
+    "Could not fetch comments": "Impossible de charger les commentaires",
+    "View `x` replies": "Voir `x` réponses",
+    "`x` ago": "il y a `x`",
+    "Load more": "Charger plus",
+    "`x` points": "`x` points",
+    "Could not create mix.": "Impossible de charger cette liste de lecture.",
+    "Empty playlist": "La liste de lecture est vide",
+    "Not a playlist.": "Liste de lecture invalide.",
+    "Playlist does not exist.": "La liste de lecture n'existe pas.",
+    "Could not pull trending pages.": "Impossible de charger les pages de tendances.",
+    "Hidden field \"challenge\" is a required field": "Hidden field \"challenge\" is a required field",
+    "Hidden field \"token\" is a required field": "Hidden field \"token\" is a required field",
+    "Erroneous challenge": "Erroneous challenge",
+    "Erroneous token": "Erroneous token",
+    "No such user": "No such user",
+    "Token is expired, please try again": "Token is expired, please try again",
+    "English": "Anglais",
+    "English (auto-generated)": "Anglais (générés automatiquement)",
+    "Afrikaans": "Afrikaans",
+    "Albanian": "Albanais",
+    "Amharic": "Amharique",
+    "Arabic": "Arabe",
+    "Armenian": "Arménien",
+    "Azerbaijani": "Azerbaïdjanais",
+    "Bangla": "Bangla",
+    "Basque": "Basque",
+    "Belarusian": "Belarusian",
+    "Bosnian": "Bosnian",
+    "Bulgarian": "Bulgarian",
+    "Burmese": "Birman",
+    "Catalan": "Catalan",
+    "Cebuano": "Cebuano",
+    "Chinese (Simplified)": "Chinois (Simplifié)",
+    "Chinese (Traditional)": "Chinois (Traditionnel)",
+    "Corsican": "Corse",
+    "Croatian": "Croate",
+    "Czech": "Tchèque",
+    "Danish": "Danois",
+    "Dutch": "Hollandais",
+    "Esperanto": "Espéranto",
+    "Estonian": "Estonien",
+    "Filipino": "Philippin",
+    "Finnish": "Finlandais",
+    "French": "Français",
+    "Galician": "Galicien",
+    "Georgian": "Géorgien",
+    "German": "Allemand",
+    "Greek": "Grec",
+    "Gujarati": "Gujarati",
+    "Haitian Creole": "Créole Haïtien",
+    "Hausa": "Haoussa",
+    "Hawaiian": "Hawaïen",
+    "Hebrew": "Hébraïque",
+    "Hindi": "Hindi",
+    "Hmong": "Hmong",
+    "Hungarian": "Hongrois",
+    "Icelandic": "Islandais",
+    "Igbo": "Igbo",
+    "Indonesian": "Indonésien",
+    "Irish": "Irlandais",
+    "Italian": "Italien",
+    "Japanese": "Japonais",
+    "Javanese": "Javanais",
+    "Kannada": "Kannada",
+    "Kazakh": "Kazakh",
+    "Khmer": "Khmer",
+    "Korean": "Coréen",
+    "Kurdish": "Kurde",
+    "Kyrgyz": "Kirghize",
+    "Lao": "Lao",
+    "Latin": "Latin",
+    "Latvian": "Letton",
+    "Lithuanian": "Lituanien",
+    "Luxembourgish": "Luxembourgeois",
+    "Macedonian": "Macédonien",
+    "Malagasy": "Malgache",
+    "Malay": "Malais",
+    "Malayalam": "Malayalam",
+    "Maltese": "Maltais",
+    "Maori": "Maori",
+    "Marathi": "Marathi",
+    "Mongolian": "Mongol",
+    "Nepali": "Népalais",
+    "Norwegian Bokmål": "Norvégien",
+    "Nyanja": "Nyanja",
+    "Pashto": "Pachtou",
+    "Persian": "Persan",
+    "Polish": "Polonais",
+    "Portuguese": "Portugais",
+    "Punjabi": "Punjabi",
+    "Romanian": "Roumain",
+    "Russian": "Russe",
+    "Samoan": "Samoan",
+    "Scottish Gaelic": "Eaélique Ècossais",
+    "Serbian": "Serbe",
+    "Shona": "Shona",
+    "Sindhi": "Sindhi",
+    "Sinhala": "Cinghalais",
+    "Slovak": "Slovaque",
+    "Slovenian": "Slovène",
+    "Somali": "Somalien",
+    "Southern Sotho": "Sotho du Sud",
+    "Spanish": "Espagnol",
+    "Spanish (Latin America)": "Espagnol (Amérique latine)",
+    "Sundanese": "Sundanais",
+    "Swahili": "Swahili",
+    "Swedish": "Suédois",
+    "Tajik": "Tajik",
+    "Tamil": "Tamil",
+    "Telugu": "Telugu",
+    "Thai": "Thaï",
+    "Turkish": "Turc",
+    "Ukrainian": "Ukrainien",
+    "Urdu": "Ourdou",
+    "Uzbek": "Ouzbek",
+    "Vietnamese": "Vietnamien",
+    "Welsh": "Gallois",
+    "Western Frisian": "Frison occidental",
+    "Xhosa": "Xhosa",
+    "Yiddish": "Yiddish",
+    "Yoruba": "Yoruba",
+    "Zulu": "Zoulou",
+    "`x` years": "`x` ans",
+    "`x` months": "`x` mois",
+    "`x` weeks": "`x` semaines",
+    "`x` days": "`x` jours",
+    "`x` hours": "`x` heures",
+    "`x` minutes": "`x` minutes",
+    "`x` seconds": "`x` secondes",
+    "Fallback comments: ": "Fallback comments: ",
+    "Popular": "Populaire",
+    "Top": "Top",
+    "About": "A Propos",
+    "Rating: ": "Évaluation : ",
+    "Language: ": "Langue : ",
+    "View as playlist": "",
+    "Default": "Défaut",
+    "Music": "Musique",
+    "Gaming": "Jeux Vidéo",
+    "News": "Actualités",
+    "Movies": "Films",
+    "Download": "Télécharger",
+    "Download as: ": "Télécharger en : ",
+    "%A %B %-d, %Y": "%A %-d %B %Y",
+    "(edited)": "(modifié)",
+    "YouTube comment permalink": "Lien YouTube permanent vers le commentaire",
+    "`x` marked it with a ❤": "`x` l'a marqué d'un ❤",
+    "Audio mode": "Mode Audio",
+    "Video mode": "Mode Vidéo",
+    "Videos": "Vidéos",
+    "Playlists": "Liste de lecture",
+    "Current version: ": "Version :"
+}
--- a/locales/it.json
+++ b/locales/it.json
@@ -1,295 +1,314 @@
 {
-  "`x` subscribers": "`x` iscritti",
-  "`x` videos": "`x` video",
-  "LIVE": "IN DIRETTA",
-  "Shared `x` ago": "Condiviso `x` fa",
-  "Unsubscribe": "Disiscriviti",
-  "Subscribe": "Iscriviti",
-  "Login to subscribe to `x`": "Accedi per iscriverti a `x`",
-  "View channel on YouTube": "Vedi canale su YouTube",
-  "newest": "Data di aggiunta (più recente)",
-  "oldest": "Data di aggiunta (più vecchia)",
-  "popular": "Tendenze",
-  "last": "",
-  "Next page": "Pagina successiva",
-  "Previous page": "Pagina precedente",
-  "Clear watch history?": "Sei sicuro di voler cancellare la cronologia dei video guardati?",
-  "Yes": "Si",
-  "No": "No",
-  "Import and Export Data": "Importazione ed esportazione dati",
-  "Import": "Importa",
-  "Import Invidious data": "Importa dati Invidious",
-  "Import YouTube subscriptions": "Importa le iscrizioni da YouTube",
-  "Import FreeTube subscriptions (.db)": "Importa le iscrizioni da FreeTube (.db)",
-  "Import NewPipe subscriptions (.json)": "Importa le iscrizioni da NewPipe (.json)",
-  "Import NewPipe data (.zip)": "Importa i dati di NewPipe (.zip)",
-  "Export": "Esporta",
-  "Export subscriptions as OPML": "Esporta gli abbonamenti come OPML",
-  "Export subscriptions as OPML (for NewPipe & FreeTube)": "Esporta gli abbonamenti come OPML (per NewPipe e FreeTube)",
-  "Export data as JSON": "Esporta i dati in formato JSON",
-  "Delete account?": "Sei sicuro di voler cancellare l'account?",
-  "History": "Cronologia",
-  "An alternative front-end to YouTube": "Un'interfaccia alternativa per YouTube",
-  "JavaScript license information": "Info licenze JavaScript",
-  "source": "sorgente",
-  "Login": "Entra",
-  "Login/Register": "Entra/Registrati",
-  "Login to Google": "Entra con Google",
-  "User ID:": "ID utente:",
-  "Password:": "Password:",
-  "Time (h:mm:ss):": "Orario (h:mm:ss):",
-  "Text CAPTCHA": "Testo del CAPTCHA",
-  "Image CAPTCHA": "Immagine CAPTCHA",
-  "Sign In": "Entra",
-  "Register": "Registrati",
-  "Email:": "Email:",
-  "Google verification code:": "Codice di verifica Google:",
-  "Preferences": "Preferenze",
-  "Player preferences": "Preferenze del riproduttore",
-  "Always loop: ": "Ripeti sempre: ",
-  "Autoplay: ": "Riproduzione automatica: ",
-  "Autoplay next video: ": "Riproduci automaticamente il prossimo video: ",
-  "Listen by default: ": "Modalità solo audio come predefinita: ",
-  "Proxy videos? ": "",
-  "Default speed: ": "Velocità di riproduzione predefinita: ",
-  "Preferred video quality: ": "Preferenza sulla qualità video: ",
-  "Player volume: ": "Volume di riproduzione: ",
-  "Default comments: ": "Origine dei commenti: ",
-  "Default captions: ": "Sottotitoli predefiniti: ",
-  "Fallback captions: ": "Sottotitoli alternativi: ",
-  "Show related videos? ": "Mostra video correlati? ",
-  "Visual preferences": "Preferenze grafiche",
-  "Dark mode: ": "Tema scuro: ",
-  "Thin mode: ": "Modalità per connessioni lente: ",
-  "Subscription preferences": "Preferenze iscrizioni",
-  "Redirect homepage to feed: ": "Reindirizza la pagina principale a quella delle iscrizioni: ",
-  "Number of videos shown in feed: ": "Numero di video da mostrare nelle iscrizioni: ",
-  "Sort videos by: ": "Ordinare i video per: ",
-  "published": "data di pubblicazione",
-  "published - reverse": "data di pubblicazione - decrescente",
-  "alphabetically": "ordine alfabetico",
-  "alphabetically - reverse": "ordine alfabetico - decrescente",
-  "channel name": "nome del canale",
-  "channel name - reverse": "nome del canale - decrescente",
-  "Only show latest video from channel: ": "Mostra solo il video più recente del canale: ",
-  "Only show latest unwatched video from channel: ": "Mostra solo il video più recente non guardato del canale: ",
-  "Only show unwatched: ": "Mostra solo i video non guardati: ",
-  "Only show notifications (if there are any): ": "Mostra solo le notifiche (se presenti): ",
-  "Data preferences": "Preferenze dati",
-  "Clear watch history": "Cancella la cronologia dei video guardati",
-  "Import/Export data": "Importazione/esportazione dati",
-  "Manage subscriptions": "Gestisci le iscrizioni",
-  "Watch history": "Cronologia dei video",
-  "Delete account": "Elimina l'account",
-  "Administrator preferences": "",
-  "Default homepage: ": "",
-  "Feed menu: ": "",
-  "Top enabled? ": "",
-  "CAPTCHA enabled? ": "",
-  "Login enabled? ": "",
-  "Registration enabled? ": "",
-  "Report statistics? ": "",
-  "Save preferences": "Salva le preferenze",
-  "Subscription manager": "Gestisci le iscrizioni",
-  "`x` subscriptions": "`x` iscrizioni",
-  "Import/Export": "Importa/esporta",
-  "unsubscribe": "disiscriviti",
-  "Subscriptions": "Iscrizioni",
-  "`x` unseen notifications": "`x` notifiche non visualizzate",
-  "search": "Cerca",
-  "Sign out": "Esci",
-  "Released under the AGPLv3 by Omar Roth.": "Pubblicato con licenza AGPLv3 da Omar Roth.",
-  "Source available here.": "Codice sorgente.",
-  "View JavaScript license information.": "Guarda le informazioni di licenza del codice JavaScript.",
-  "View privacy policy.": "",
-  "Trending": "Tendenze",
-  "Unlisted": "",
-  "Watch video on Youtube": "Guarda il video su YouTube",
-  "Genre: ": "Genere: ",
-  "License: ": "Licenza: ",
-  "Family friendly? ": "Per tutti? ",
-  "Wilson score: ": "Punteggio di Wilson: ",
-  "Engagement: ": "Tasso di coinvolgimento: ",
-  "Whitelisted regions: ": "Regioni nella lista bianca: ",
-  "Blacklisted regions: ": "Regioni nella lista nera: ",
-  "Shared `x`": "Condiviso `x`",
-  "Premieres in `x`": "",
-  "Hi! Looks like you have JavaScript disabled. Click here to view comments, keep in mind it may take a bit longer to load.": "Ciao! Sembra che tu abbia disattivato JavaScript. Clicca qui per visualizzare i commenti. Considera che potrebbe volerci più tempo.",
-  "View YouTube comments": "Visualizza i commenti da YouTube",
-  "View more comments on Reddit": "Visualizza più commenti su Reddit",
-  "View `x` comments": "Visualizza `x` commenti",
-  "View Reddit comments": "Visualizza i commenti da Reddit",
-  "Hide replies": "Nascondi le risposte",
-  "Show replies": "Mostra le risposte",
-  "Incorrect password": "Password sbagliata",
-  "Quota exceeded, try again in a few hours": "Limite superato, prova di nuovo fra qualche ora",
-  "Unable to login, make sure two-factor authentication (Authenticator or SMS) is enabled.": "Impossibile autenticarsi, controlla che l'autenticazione in due passaggi (Authenticator o SMS) sia attiva.",
-  "Invalid TFA code": "Codice di autenticazione a due fattori non valido",
-  "Login failed. This may be because two-factor authentication is not enabled on your account.": "Login fallito. L'errore potrebbe essere causato dal fatto che la verifica in due passaggi non è attiva sul tuo account.",
-  "Invalid answer": "Risposta errata",
-  "Invalid CAPTCHA": "CAPTCHA errato",
-  "CAPTCHA is a required field": "Il CAPTCHA è un campo obbligatorio",
-  "User ID is a required field": "L'ID utente è obbligatorio",
-  "Password is a required field": "La password è un campo obbligatorio",
-  "Invalid username or password": "Nome utente o password errati",
-  "Please sign in using 'Sign in with Google'": "Per favore accedi con \"Entra con Google\"",
-  "Password cannot be empty": "La password non può essere vuota",
-  "Password cannot be longer than 55 characters": "La password non può contenere più di 55 caratteri",
-  "Please sign in": "Per favore, entra",
-  "Invidious Private Feed for `x`": "Feed privato Invidious per `x`",
-  "channel:`x`": "canale:`x`",
-  "Deleted or invalid channel": "Canale cancellato o invalido",
-  "This channel does not exist.": "Canale inesistente.",
-  "Could not get channel info.": "Impossibile ottenere le informazioni del canale.",
-  "Could not fetch comments": "Impossibile recuperare i commenti",
-  "View `x` replies": "Visualizza `x` risposte",
-  "`x` ago": "`x` fa",
-  "Load more": "Carica altro",
-  "`x` points": "`x` punti",
-  "Could not create mix.": "Impossibile creare il mix.",
-  "Playlist is empty": "Playlist vuota",
-  "Invalid playlist.": "Playlist invalida.",
-  "Playlist does not exist.": "Playlist inesistente.",
-  "Could not pull trending pages.": "Impossibile recuperare le tendenze.",
-  "Hidden field \"challenge\" is a required field": "Il campo nascosto \"challenge\" è obbligatorio",
-  "Hidden field \"token\" is a required field": "Il campo nascosto \"token\" è obbligatorio",
-  "Invalid challenge": "Campo \"challenge\" invalido",
-  "Invalid token": "Campo \"token\" invalido",
-  "Invalid user": "Utente invalido",
-  "Token is expired, please try again": "Token scaduto, riprova",
-  "English": "Inglese",
-  "English (auto-generated)": "Inglese (generati automaticamente)",
-  "Afrikaans": "Afrikaans",
-  "Albanian": "Albanese",
-  "Amharic": "Amarico",
-  "Arabic": "Arabo",
-  "Armenian": "Armeno",
-  "Azerbaijani": "Azero",
-  "Bangla": "Bengalese",
-  "Basque": "Basco",
-  "Belarusian": "Biellorusso",
-  "Bosnian": "Bosniaco",
-  "Bulgarian": "Bulgaro",
-  "Burmese": "Birmano",
-  "Catalan": "Catalano",
-  "Cebuano": "Sugbuanon",
-  "Chinese (Simplified)": "Cinese semplifiato",
-  "Chinese (Traditional)": "Cinese tradizionale",
-  "Corsican": "Corso",
-  "Croatian": "Croato",
-  "Czech": "Ceco",
-  "Danish": "Danese",
-  "Dutch": "Olandese",
-  "Esperanto": "Esperanto",
-  "Estonian": "Estone",
-  "Filipino": "Filippino",
-  "Finnish": "Finlandese",
-  "French": "Francese",
-  "Galician": "Galiziano",
-  "Georgian": "Georgiano",
-  "German": "Tedesco",
-  "Greek": "Greco",
-  "Gujarati": "Gujarati",
-  "Haitian Creole": "Creolo haitiano",
-  "Hausa": "Lingua hausa",
-  "Hawaiian": "Hawaiano",
-  "Hebrew": "Ebreo",
-  "Hindi": "Hindi",
-  "Hmong": "Hmong",
-  "Hungarian": "Ungarese",
-  "Icelandic": "Islandese",
-  "Igbo": "Igbo",
-  "Indonesian": "Indonesiano",
-  "Irish": "Irlandese",
-  "Italian": "Italiano",
-  "Japanese": "Giapponese",
-  "Javanese": "Giavanese",
-  "Kannada": "Kannada",
-  "Kazakh": "Kazaco",
-  "Khmer": "Khmer",
-  "Korean": "Coreano",
-  "Kurdish": "Curdo",
-  "Kyrgyz": "Kirghize",
-  "Lao": "Lao",
-  "Latin": "Latino",
-  "Latvian": "Lettone",
-  "Lithuanian": "Lituano",
-  "Luxembourgish": "Lussemburghese",
-  "Macedonian": "Macedone",
-  "Malagasy": "Malgascio",
-  "Malay": "Malese",
-  "Malayalam": "Lingua malayalam",
-  "Maltese": "Maltese",
-  "Maori": "Maori",
-  "Marathi": "Marathi",
-  "Mongolian": "Mongolo",
-  "Nepali": "Nepalese",
-  "Norwegian": "Norvegese",
-  "Nyanja": "Nyanja",
-  "Pashto": "Lingua pashtu",
-  "Persian": "Persiano",
-  "Polish": "Polacco",
-  "Portuguese": "Portoghese",
-  "Punjabi": "Punjabi",
-  "Romanian": "Rumeno",
-  "Russian": "Russo",
-  "Samoan": "Samoan",
-  "Scottish Gaelic": "Gaelico scozzese",
-  "Serbian": "Serbo",
-  "Shona": "Shona",
-  "Sindhi": "Sindhi",
-  "Sinhala": "Cingalese",
-  "Slovak": "Slovacco",
-  "Slovenian": "Sloveno",
-  "Somali": "Somalo",
-  "Southern Sotho": "Sotho del Sud",
-  "Spanish": "Spagnolo",
-  "Spanish (Latin America)": "Spagnolo (America latina)",
-  "Sundanese": "Sudanese",
-  "Swahili": "Swahili",
-  "Swedish": "Svedese",
-  "Tajik": "Tajik",
-  "Tamil": "Tamil",
-  "Telugu": "Telugu",
-  "Thai": "Thaï",
-  "Turkish": "Turco",
-  "Ukrainian": "Ucraino",
-  "Urdu": "Urdu",
-  "Uzbek": "Uzbeco",
-  "Vietnamese": "Vietnamese",
-  "Welsh": "Gallese",
-  "Western Frisian": "Frisone occidentale",
-  "Xhosa": "Xhosa",
-  "Yiddish": "Yiddish",
-  "Yoruba": "Yoruba",
-  "Zulu": "Zulu",
-  "`x` years": "`x` anni",
-  "`x` months": "`x` mesi",
-  "`x` weeks": "`x` settimane",
-  "`x` days": "`x` giorni",
-  "`x` hours": "`x` ore",
-  "`x` minutes": "`x` minuti",
-  "`x` seconds": "`x` secondi",
-  "Fallback comments: ": "Commenti alternativi: ",
-  "Popular": "Popolare",
-  "Top": "Top",
-  "About": "A proposito",
-  "Rating: ": "Punteggio: ",
-  "Language: ": "Lingua: ",
-  "Default": "Predefinito",
-  "Music": "Musica",
-  "Gaming": "Videogiochi",
-  "News": "Notizie",
-  "Movies": "Film",
-  "Download": "Scarica",
-  "Download as: ": "Scarica come: ",
-  "%A %B %-d, %Y": "%A %-d %B %Y",
-  "(edited)": "(modificato)",
-  "Youtube permalink of the comment": "Link permanente al commento di YouTube",
-  "`x` marked it with a ❤": "`x` l'ha contrassegnato con un ❤",
-  "Audio mode": "Modalità audio",
-  "Video mode": "Modalità video",
-  "Videos": "",
-  "Playlists": "",
-  "Current version: ": ""
-}
+    "`x` subscribers": "`x` iscritti",
+    "`x` videos": "`x` video",
+    "LIVE": "IN DIRETTA",
+    "Shared `x` ago": "Condiviso `x` fa",
+    "Unsubscribe": "Disiscriviti",
+    "Subscribe": "Iscriviti",
+    "View channel on YouTube": "Vedi canale su YouTube",
+    "newest": "Data di aggiunta (più recente)",
+    "oldest": "Data di aggiunta (più vecchia)",
+    "popular": "Tendenze",
+    "last": "",
+    "Next page": "Pagina successiva",
+    "Previous page": "Pagina precedente",
+    "Clear watch history?": "Sei sicuro di voler cancellare la cronologia dei video guardati?",
+    "New password": "",
+    "New passwords must match": "",
+    "Cannot change password for Google accounts": "",
+    "Authorize token?": "",
+    "Authorize token for `x`?": "",
+    "Yes": "Si",
+    "No": "No",
+    "Import and Export Data": "Importazione ed esportazione dati",
+    "Import": "Importa",
+    "Import Invidious data": "Importa dati Invidious",
+    "Import YouTube subscriptions": "Importa le iscrizioni da YouTube",
+    "Import FreeTube subscriptions (.db)": "Importa le iscrizioni da FreeTube (.db)",
+    "Import NewPipe subscriptions (.json)": "Importa le iscrizioni da NewPipe (.json)",
+    "Import NewPipe data (.zip)": "Importa i dati di NewPipe (.zip)",
+    "Export": "Esporta",
+    "Export subscriptions as OPML": "Esporta gli abbonamenti come OPML",
+    "Export subscriptions as OPML (for NewPipe & FreeTube)": "Esporta gli abbonamenti come OPML (per NewPipe e FreeTube)",
+    "Export data as JSON": "Esporta i dati in formato JSON",
+    "Delete account?": "Sei sicuro di voler cancellare l'account?",
+    "History": "Cronologia",
+    "An alternative front-end to YouTube": "Un'interfaccia alternativa per YouTube",
+    "JavaScript license information": "Info licenze JavaScript",
+    "source": "sorgente",
+    "Log in": "Entra",
+    "Log in/register": "Entra/Registrati",
+    "Log in with Google": "Entra con Google",
+    "User ID": "ID utente",
+    "Password": "Password",
+    "Time (h:mm:ss):": "Orario (h:mm:ss):",
+    "Text CAPTCHA": "Testo del CAPTCHA",
+    "Image CAPTCHA": "Immagine CAPTCHA",
+    "Sign In": "Entra",
+    "Register": "Registrati",
+    "E-mail": "Email",
+    "Google verification code": "Codice di verifica Google",
+    "Preferences": "Preferenze",
+    "Player preferences": "Preferenze del riproduttore",
+    "Always loop: ": "Ripeti sempre: ",
+    "Autoplay: ": "Riproduzione automatica: ",
+    "Play next by default: ": "",
+    "Autoplay next video: ": "Riproduci automaticamente il prossimo video: ",
+    "Listen by default: ": "Modalità solo audio come predefinita: ",
+    "Proxy videos? ": "",
+    "Default speed: ": "Velocità di riproduzione predefinita: ",
+    "Preferred video quality: ": "Preferenza sulla qualità video: ",
+    "Player volume: ": "Volume di riproduzione: ",
+    "Default comments: ": "Origine dei commenti: ",
+    "youtube": "",
+    "reddit": "",
+    "Default captions: ": "Sottotitoli predefiniti: ",
+    "Fallback captions: ": "Sottotitoli alternativi: ",
+    "Show related videos? ": "Mostra video correlati? ",
+    "Show annotations by default? ": "",
+    "Visual preferences": "Preferenze grafiche",
+    "Dark mode: ": "Tema scuro: ",
+    "Thin mode: ": "Modalità per connessioni lente: ",
+    "Subscription preferences": "Preferenze iscrizioni",
+    "Show annotations by default for subscribed channels? ": "",
+    "Redirect homepage to feed: ": "Reindirizza la pagina principale a quella delle iscrizioni: ",
+    "Number of videos shown in feed: ": "Numero di video da mostrare nelle iscrizioni: ",
+    "Sort videos by: ": "Ordinare i video per: ",
+    "published": "data di pubblicazione",
+    "published - reverse": "data di pubblicazione - decrescente",
+    "alphabetically": "ordine alfabetico",
+    "alphabetically - reverse": "ordine alfabetico - decrescente",
+    "channel name": "nome del canale",
+    "channel name - reverse": "nome del canale - decrescente",
+    "Only show latest video from channel: ": "Mostra solo il video più recente del canale: ",
+    "Only show latest unwatched video from channel: ": "Mostra solo il video più recente non guardato del canale: ",
+    "Only show unwatched: ": "Mostra solo i video non guardati: ",
+    "Only show notifications (if there are any): ": "Mostra solo le notifiche (se presenti): ",
+    "Data preferences": "Preferenze dati",
+    "Clear watch history": "Cancella la cronologia dei video guardati",
+    "Import/export data": "Importazione/esportazione dati",
+    "Change password": "",
+    "Manage subscriptions": "Gestisci le iscrizioni",
+    "Manage tokens": "",
+    "Watch history": "Cronologia dei video",
+    "Delete account": "Elimina l'account",
+    "Administrator preferences": "",
+    "Default homepage: ": "",
+    "Feed menu: ": "",
+    "Top enabled? ": "",
+    "CAPTCHA enabled? ": "",
+    "Login enabled? ": "",
+    "Registration enabled? ": "",
+    "Report statistics? ": "",
+    "Save preferences": "Salva le preferenze",
+    "Subscription manager": "Gestisci le iscrizioni",
+    "Token manager": "",
+    "Token": "",
+    "`x` subscriptions": "`x` iscrizioni",
+    "`x` tokens": "",
+    "Import/export": "Importa/esporta",
+    "unsubscribe": "disiscriviti",
+    "revoke": "",
+    "Subscriptions": "Iscrizioni",
+    "`x` unseen notifications": "`x` notifiche non visualizzate",
+    "search": "Cerca",
+    "Log out": "Esci",
+    "Released under the AGPLv3 by Omar Roth.": "Pubblicato con licenza AGPLv3 da Omar Roth.",
+    "Source available here.": "Codice sorgente.",
+    "View JavaScript license information.": "Guarda le informazioni di licenza del codice JavaScript.",
+    "View privacy policy.": "",
+    "Trending": "Tendenze",
+    "Unlisted": "",
+    "Watch on YouTube": "Guarda il video su YouTube",
+    "Hide annotations": "",
+    "Show annotations": "",
+    "Genre: ": "Genere: ",
+    "License: ": "Licenza: ",
+    "Family friendly? ": "Per tutti? ",
+    "Wilson score: ": "Punteggio di Wilson: ",
+    "Engagement: ": "Tasso di coinvolgimento: ",
+    "Whitelisted regions: ": "Regioni nella lista bianca: ",
+    "Blacklisted regions: ": "Regioni nella lista nera: ",
+    "Shared `x`": "Condiviso `x`",
+    "`x` views": "",
+    "Premieres in `x`": "",
+    "Hi! Looks like you have JavaScript turned off. Click here to view comments, keep in mind they may take a bit longer to load.": "Ciao! Sembra che tu abbia disattivato JavaScript. Clicca qui per visualizzare i commenti. Considera che potrebbe volerci più tempo.",
+    "View YouTube comments": "Visualizza i commenti da YouTube",
+    "View more comments on Reddit": "Visualizza più commenti su Reddit",
+    "View `x` comments": "Visualizza `x` commenti",
+    "View Reddit comments": "Visualizza i commenti da Reddit",
+    "Hide replies": "Nascondi le risposte",
+    "Show replies": "Mostra le risposte",
+    "Incorrect password": "Password sbagliata",
+    "Quota exceeded, try again in a few hours": "Limite superato, prova di nuovo fra qualche ora",
+    "Unable to log in, make sure two-factor authentication (Authenticator or SMS) is turned on.": "Impossibile autenticarsi, controlla che l'autenticazione in due passaggi (Authenticator o SMS) sia attiva.",
+    "Invalid TFA code": "Codice di autenticazione a due fattori non valido",
+    "Login failed. This may be because two-factor authentication is not turned on for your account.": "Login fallito. L'errore potrebbe essere causato dal fatto che la verifica in due passaggi non è attiva sul tuo account.",
+    "Wrong answer": "Risposta errata",
+    "Erroneous CAPTCHA": "CAPTCHA errato",
+    "CAPTCHA is a required field": "Il CAPTCHA è un campo obbligatorio",
+    "User ID is a required field": "L'ID utente è obbligatorio",
+    "Password is a required field": "La password è un campo obbligatorio",
+    "Wrong username or password": "Nome utente o password errati",
+    "Please sign in using 'Log in with Google'": "Per favore accedi con \"Entra con Google\"",
+    "Password cannot be empty": "La password non può essere vuota",
+    "Password cannot be longer than 55 characters": "La password non può contenere più di 55 caratteri",
+    "Please log in": "Per favore, entra",
+    "Invidious Private Feed for `x`": "Feed privato Invidious per `x`",
+    "channel:`x`": "canale:`x`",
+    "Deleted or invalid channel": "Canale cancellato o invalido",
+    "This channel does not exist.": "Canale inesistente.",
+    "Could not get channel info.": "Impossibile ottenere le informazioni del canale.",
+    "Could not fetch comments": "Impossibile recuperare i commenti",
+    "View `x` replies": "Visualizza `x` risposte",
+    "`x` ago": "`x` fa",
+    "Load more": "Carica altro",
+    "`x` points": "`x` punti",
+    "Could not create mix.": "Impossibile creare il mix.",
+    "Empty playlist": "Playlist vuota",
+    "Not a playlist.": "Playlist invalida.",
+    "Playlist does not exist.": "Playlist inesistente.",
+    "Could not pull trending pages.": "Impossibile recuperare le tendenze.",
+    "Hidden field \"challenge\" is a required field": "Il campo nascosto \"challenge\" è obbligatorio",
+    "Hidden field \"token\" is a required field": "Il campo nascosto \"token\" è obbligatorio",
+    "Erroneous challenge": "Campo \"challenge\" invalido",
+    "Erroneous token": "Campo \"token\" invalido",
+    "No such user": "Utente invalido",
+    "Token is expired, please try again": "Token scaduto, riprova",
+    "English": "Inglese",
+    "English (auto-generated)": "Inglese (generati automaticamente)",
+    "Afrikaans": "Afrikaans",
+    "Albanian": "Albanese",
+    "Amharic": "Amarico",
+    "Arabic": "Arabo",
+    "Armenian": "Armeno",
+    "Azerbaijani": "Azero",
+    "Bangla": "Bengalese",
+    "Basque": "Basco",
+    "Belarusian": "Biellorusso",
+    "Bosnian": "Bosniaco",
+    "Bulgarian": "Bulgaro",
+    "Burmese": "Birmano",
+    "Catalan": "Catalano",
+    "Cebuano": "Sugbuanon",
+    "Chinese (Simplified)": "Cinese semplifiato",
+    "Chinese (Traditional)": "Cinese tradizionale",
+    "Corsican": "Corso",
+    "Croatian": "Croato",
+    "Czech": "Ceco",
+    "Danish": "Danese",
+    "Dutch": "Olandese",
+    "Esperanto": "Esperanto",
+    "Estonian": "Estone",
+    "Filipino": "Filippino",
+    "Finnish": "Finlandese",
+    "French": "Francese",
+    "Galician": "Galiziano",
+    "Georgian": "Georgiano",
+    "German": "Tedesco",
+    "Greek": "Greco",
+    "Gujarati": "Gujarati",
+    "Haitian Creole": "Creolo haitiano",
+    "Hausa": "Lingua hausa",
+    "Hawaiian": "Hawaiano",
+    "Hebrew": "Ebreo",
+    "Hindi": "Hindi",
+    "Hmong": "Hmong",
+    "Hungarian": "Ungarese",
+    "Icelandic": "Islandese",
+    "Igbo": "Igbo",
+    "Indonesian": "Indonesiano",
+    "Irish": "Irlandese",
+    "Italian": "Italiano",
+    "Japanese": "Giapponese",
+    "Javanese": "Giavanese",
+    "Kannada": "Kannada",
+    "Kazakh": "Kazaco",
+    "Khmer": "Khmer",
+    "Korean": "Coreano",
+    "Kurdish": "Curdo",
+    "Kyrgyz": "Kirghize",
+    "Lao": "Lao",
+    "Latin": "Latino",
+    "Latvian": "Lettone",
+    "Lithuanian": "Lituano",
+    "Luxembourgish": "Lussemburghese",
+    "Macedonian": "Macedone",
+    "Malagasy": "Malgascio",
+    "Malay": "Malese",
+    "Malayalam": "Lingua malayalam",
+    "Maltese": "Maltese",
+    "Maori": "Maori",
+    "Marathi": "Marathi",
+    "Mongolian": "Mongolo",
+    "Nepali": "Nepalese",
+    "Norwegian Bokmål": "Norvegese",
+    "Nyanja": "Nyanja",
+    "Pashto": "Lingua pashtu",
+    "Persian": "Persiano",
+    "Polish": "Polacco",
+    "Portuguese": "Portoghese",
+    "Punjabi": "Punjabi",
+    "Romanian": "Rumeno",
+    "Russian": "Russo",
+    "Samoan": "Samoan",
+    "Scottish Gaelic": "Gaelico scozzese",
+    "Serbian": "Serbo",
+    "Shona": "Shona",
+    "Sindhi": "Sindhi",
+    "Sinhala": "Cingalese",
+    "Slovak": "Slovacco",
+    "Slovenian": "Sloveno",
+    "Somali": "Somalo",
+    "Southern Sotho": "Sotho del Sud",
+    "Spanish": "Spagnolo",
+    "Spanish (Latin America)": "Spagnolo (America latina)",
+    "Sundanese": "Sudanese",
+    "Swahili": "Swahili",
+    "Swedish": "Svedese",
+    "Tajik": "Tajik",
+    "Tamil": "Tamil",
+    "Telugu": "Telugu",
+    "Thai": "Thaï",
+    "Turkish": "Turco",
+    "Ukrainian": "Ucraino",
+    "Urdu": "Urdu",
+    "Uzbek": "Uzbeco",
+    "Vietnamese": "Vietnamese",
+    "Welsh": "Gallese",
+    "Western Frisian": "Frisone occidentale",
+    "Xhosa": "Xhosa",
+    "Yiddish": "Yiddish",
+    "Yoruba": "Yoruba",
+    "Zulu": "Zulu",
+    "`x` years": "`x` anni",
+    "`x` months": "`x` mesi",
+    "`x` weeks": "`x` settimane",
+    "`x` days": "`x` giorni",
+    "`x` hours": "`x` ore",
+    "`x` minutes": "`x` minuti",
+    "`x` seconds": "`x` secondi",
+    "Fallback comments: ": "Commenti alternativi: ",
+    "Popular": "Popolare",
+    "Top": "Top",
+    "About": "A proposito",
+    "Rating: ": "Punteggio: ",
+    "Language: ": "Lingua: ",
+    "View as playlist": "",
+    "Default": "Predefinito",
+    "Music": "Musica",
+    "Gaming": "Videogiochi",
+    "News": "Notizie",
+    "Movies": "Film",
+    "Download": "Scarica",
+    "Download as: ": "Scarica come: ",
+    "%A %B %-d, %Y": "%A %-d %B %Y",
+    "(edited)": "(modificato)",
+    "YouTube comment permalink": "Link permanente al commento di YouTube",
+    "`x` marked it with a ❤": "`x` l'ha contrassegnato con un ❤",
+    "Audio mode": "Modalità audio",
+    "Video mode": "Modalità video",
+    "Videos": "",
+    "Playlists": "",
+    "Current version: ": ""
+}
--- a/locales/nb_NO.json
+++ b/locales/nb_NO.json
@@ -5,7 +5,6 @@
    "Shared `x` ago": "Delt for `x` siden",
    "Unsubscribe": "Opphev abonnement",
    "Subscribe": "Abonner",
-    "Login to subscribe to `x`": "Logg inn for å abonnere på `x`",
    "View channel on YouTube": "Vis kanal på YouTube",
    "newest": "nyeste",
    "oldest": "eldste",
@@ -14,6 +13,11 @@
    "Next page": "Neste side",
    "Previous page": "Forrige side",
    "Clear watch history?": "Tøm visningshistorikk?",
+    "New password": "Nytt passord",
+    "New passwords must match": "Nye passordfelter må stemme overens",
+    "Cannot change password for Google accounts": "Kan ikke endre passord for Google-kontoer",
+    "Authorize token?": "Identitetsbekreft symbol?",
+    "Authorize token for `x`?": "Identitetsbekreft symbol for `x`?",
    "Yes": "Ja",
    "No": "Nei",
    "Import and Export Data": "Importer- og eksporter data",
@@ -32,22 +36,23 @@
    "An alternative front-end to YouTube": "En alternativ grenseflate for YouTube",
    "JavaScript license information": "JavaScript-lisensinformasjon",
    "source": "kilde",
-    "Login": "Logg inn",
-    "Login/Register": "Logg inn/registrer",
-    "Login to Google": "Logg inn med Google",
-    "User ID:": "Bruker-ID:",
-    "Password:": "Passord:",
+    "Log in": "Logg inn",
+    "Log in/register": "Logg inn/registrer",
+    "Log in with Google": "Logg inn med Google",
+    "User ID": "Bruker-ID",
+    "Password": "Passord",
    "Time (h:mm:ss):": "Tid (h:mm:ss):",
    "Text CAPTCHA": "Tekst-CAPTCHA",
    "Image CAPTCHA": "Bilde-CAPTCHA",
    "Sign In": "Innlogging",
    "Register": "Registrer",
-    "Email:": "E-post:",
-    "Google verification code:": "Google-bekreftelseskode:",
+    "E-mail": "E-post",
+    "Google verification code": "Google-bekreftelseskode",
    "Preferences": "Innstillinger",
    "Player preferences": "Avspillerinnstillinger",
    "Always loop: ": "Alltid gjenta: ",
    "Autoplay: ": "Autoavspilling: ",
+    "Play next by default: ": "Spill neste som forvalg: ",
    "Autoplay next video: ": "Autospill neste video: ",
    "Listen by default: ": "Lytt som forvalg: ",
    "Proxy videos? ": "Mellomtjen videoer? ",
@@ -55,13 +60,17 @@
    "Preferred video quality: ": "Foretrukket videokvalitet: ",
    "Player volume: ": "Avspillerlydstyrke: ",
    "Default comments: ": "Forvalgte kommentarer: ",
+    "youtube": "YouTube",
+    "reddit": "Reddit",
    "Default captions: ": "Forvalgte undertitler: ",
    "Fallback captions: ": "Tilbakefallsundertitler: ",
    "Show related videos? ": "Vis relaterte videoer? ",
+    "Show annotations by default? ": "Vis merknader som forvalg? ",
    "Visual preferences": "Visuelle innstillinger",
    "Dark mode: ": "Mørk drakt: ",
    "Thin mode: ": "Tynt modus: ",
    "Subscription preferences": "Abonnementsinnstillinger",
+    "Show annotations by default for subscribed channels? ": "Vis merknader som forvalg for kanaler det abonneres på? ",
    "Redirect homepage to feed: ": "Videresend hjemmeside til flyt: ",
    "Number of videos shown in feed: ": "Antall videoer å vise i flyt: ",
    "Sort videos by: ": "Sorter videoer etter: ",
@@ -77,8 +86,10 @@
    "Only show notifications (if there are any): ": "Kun vis merknader (hvis det er noen): ",
    "Data preferences": "Datainnstillinger",
    "Clear watch history": "Tøm visningshistorikk",
-    "Import/Export data": "Importer/eksporter data",
+    "Import/export data": "Importer/eksporter data",
+    "Change password": "Endre passord",
    "Manage subscriptions": "Behandle abonnementer",
+    "Manage tokens": "Behandle symboler",
    "Watch history": "Visningshistorikk",
    "Delete account": "Slett konto",
    "Administrator preferences": "Administratorinnstillinger",
@@ -91,20 +102,26 @@
    "Report statistics? ": "Innrapporter statistikk? ",
    "Save preferences": "Lagre innstillinger",
    "Subscription manager": "Abonnementsbehandler",
+    "Token manager": "Symbolbehandler",
+    "Token": "Symbol",
    "`x` subscriptions": "`x` abonnementer",
-    "Import/Export": "Importer/eksporter",
+    "`x` tokens": "`x` symboler",
+    "Import/export": "Importer/eksporter",
    "unsubscribe": "opphev abonnement",
+    "revoke": "tilbakekall",
    "Subscriptions": "Abonnement",
    "`x` unseen notifications": "`x` usette merknader",
    "search": "søk",
-    "Sign out": "Logg ut",
+    "Log out": "Logg ut",
    "Released under the AGPLv3 by Omar Roth.": "Utgitt med AGPLv3+lisens av Omar Roth.",
    "Source available here.": "Kildekode tilgjengelig her.",
    "View JavaScript license information.": "Vis JavaScript-lisensinfo.",
    "View privacy policy.": "Vis personvernspraksis.",
    "Trending": "Trendsettende",
    "Unlisted": "Ulistet",
-    "Watch video on Youtube": "Vis video på YouTube",
+    "Watch on YouTube": "Vis video på YouTube",
+    "Hide annotations": "Skjul merknader",
+    "Show annotations": "Vis merknader",
    "Genre: ": "Sjanger: ",
    "License: ": "Lisens: ",
    "Family friendly? ": "Familievennlig? ",
@@ -113,8 +130,9 @@
    "Whitelisted regions: ": "Hvitlistede regioner: ",
    "Blacklisted regions: ": "Svartelistede regioner: ",
    "Shared `x`": "Delt `x`",
+    "`x` views": "`x` visninger",
    "Premieres in `x`": "Premiere om `x`",
-    "Hi! Looks like you have JavaScript disabled. Click here to view comments, keep in mind it may take a bit longer to load.": "Hei. Det ser ut til at du har JavaScript avslått. Klikk her for å vise kommentarer, ha i minnet at innlasting tar lengre tid.",
+    "Hi! Looks like you have JavaScript turned off. Click here to view comments, keep in mind they may take a bit longer to load.": "Hei. Det ser ut til at du har JavaScript avslått. Klikk her for å vise kommentarer, ha i minnet at innlasting tar lengre tid.",
    "View YouTube comments": "Vis YouTube-kommentarer",
    "View more comments on Reddit": "Vis flere kommenterer på Reddit",
    "View `x` comments": "Vis `x` kommentarer",
@@ -123,19 +141,19 @@
    "Show replies": "Vis svar",
    "Incorrect password": "Feil passord",
    "Quota exceeded, try again in a few hours": "Kvote overskredet, prøv igjen om et par timer",
-    "Unable to login, make sure two-factor authentication (Authenticator or SMS) is enabled.": "Kunne ikke logge inn, forsikre deg om at tofaktor-identitetsbekreftelse (Authenticator eller SMS) er skrudd på.",
+    "Unable to log in, make sure two-factor authentication (Authenticator or SMS) is turned on.": "Kunne ikke logge inn, forsikre deg om at tofaktor-identitetsbekreftelse (Authenticator eller SMS) er skrudd på.",
    "Invalid TFA code": "Ugyldig tofaktorkode",
-    "Login failed. This may be because two-factor authentication is not enabled on your account.": "Innlogging mislyktes. Dette kan være fordi tofaktor-identitetsbekreftelse er skrudd av på kontoen din.",
-    "Invalid answer": "Ugyldig svar",
-    "Invalid CAPTCHA": "Ugyldig CAPTCHA",
+    "Login failed. This may be because two-factor authentication is not turned on for your account.": "Innlogging mislyktes. Dette kan være fordi tofaktor-identitetsbekreftelse er skrudd av på kontoen din.",
+    "Wrong answer": "Ugyldig svar",
+    "Erroneous CAPTCHA": "Ugyldig CAPTCHA",
    "CAPTCHA is a required field": "CAPTCHA er et påkrevd felt",
    "User ID is a required field": "Bruker-ID er et påkrevd felt",
    "Password is a required field": "Passord er et påkrevd felt",
-    "Invalid username or password": "Ugyldig brukernavn eller passord",
-    "Please sign in using 'Sign in with Google'": "Logg inn ved bruk av \"Google-innlogging\"",
+    "Wrong username or password": "Ugyldig brukernavn eller passord",
+    "Please sign in using 'Log in with Google'": "Logg inn ved bruk av \"Google-innlogging\"",
    "Password cannot be empty": "Passordet kan ikke være tomt",
    "Password cannot be longer than 55 characters": "Passordet kan ikke være lengre enn 55 tegn",
-    "Please sign in": "Logg inn",
+    "Please log in": "Logg inn",
    "Invidious Private Feed for `x`": "Ugyldig privat flyt for `x`",
    "channel:`x`": "kanal `x`",
    "Deleted or invalid channel": "Slettet eller ugyldig kanal",
@@ -147,15 +165,15 @@
    "Load more": "Last inn flere",
    "`x` points": "`x` poeng",
    "Could not create mix.": "Kunne ikke opprette miks.",
-    "Playlist is empty": "Spillelisten er tom",
-    "Invalid playlist.": "Ugyldig spilleliste.",
+    "Empty playlist": "Spillelisten er tom",
+    "Not a playlist.": "Ugyldig spilleliste.",
    "Playlist does not exist.": "Spillelisten finnes ikke.",
    "Could not pull trending pages.": "Kunne ikke hente trendsettende sider.",
    "Hidden field \"challenge\" is a required field": "Skjult felt \"utfordring\" er et påkrevd felt",
    "Hidden field \"token\" is a required field": "Skjult felt \"symbol\" er et påkrevd felt",
-    "Invalid challenge": "Ugyldig utfordring",
-    "Invalid token": "Ugyldig symbol",
-    "Invalid user": "Ugyldig bruker",
+    "Erroneous challenge": "Ugyldig utfordring",
+    "Erroneous token": "Ugyldig symbol",
+    "No such user": "Ugyldig bruker",
    "Token is expired, please try again": "Symbol utløpt, prøv igjen",
    "English": "Engelsk",
    "English (auto-generated)": "Engelsk (auto-generert)",
@@ -224,7 +242,7 @@
    "Marathi": "",
    "Mongolian": "",
    "Nepali": "",
-    "Norwegian": "Norsk bokmål",
+    "Norwegian Bokmål": "Norsk bokmål",
    "Nyanja": "",
    "Pashto": "",
    "Persian": "",
@@ -276,6 +294,7 @@
    "About": "Om",
    "Rating: ": "Vurdering: ",
    "Language: ": "Språk: ",
+    "View as playlist": "Vis som spilleliste",
    "Default": "Forvalg",
    "Music": "Musikk",
    "Gaming": "Spill",
@@ -285,7 +304,7 @@
    "Download as: ": "Last ned som: ",
    "%A %B %-d, %Y": "",
    "(edited)": "(redigert)",
-    "Youtube permalink of the comment": "Permanent YouTube-lenke til innholdet",
+    "YouTube comment permalink": "Permanent YouTube-lenke til innholdet",
    "`x` marked it with a ❤": "`x` levnet et ❤",
    "Audio mode": "Lydmodus",
    "Video mode": "Video-modus",
--- a/locales/nl.json
+++ b/locales/nl.json
@@ -1,295 +1,314 @@
 {
-  "`x` subscribers": "`x` abonnees",
-  "`x` videos": "`x` videos",
-  "LIVE": "LIVE",
-  "Shared `x` ago": "Gedeeld `x` geleden",
-  "Unsubscribe": "Abonnement opzeggen",
-  "Subscribe": "Abonneren",
-  "Login to subscribe to `x`": "Log in om te abonneren op `x`",
-  "View channel on YouTube": "Bekijk kanaal op Youtube",
-  "newest": "nieuwste",
-  "oldest": "oudste",
-  "popular": "populair",
-  "last": "",
-  "Next page": "Volgende pagina",
-  "Previous page": "Vorige pagina",
-  "Clear watch history?": "Kijk geschiedenis wissen?",
-  "Yes": "Ja",
-  "No": "Nee",
-  "Import and Export Data": "Importeer en Exporteer Gegevens",
-  "Import": "Importeren",
-  "Import Invidious data": "Importeer Invidious gegevens",
-  "Import YouTube subscriptions": "Importeer Youtube abonnees",
-  "Import FreeTube subscriptions (.db)": "Importeer FreeTube abonnees (.db)",
-  "Import NewPipe subscriptions (.json)": "Importeer NewPipe abonnees (.json)",
-  "Import NewPipe data (.zip)": "Importeer NewPipe gegevens (.zip)",
-  "Export": "Exporteren",
-  "Export subscriptions as OPML": "Exporteer abonnees als OPML",
-  "Export subscriptions as OPML (for NewPipe & FreeTube)": "Exporteer abonnees als OPML (voor NewPipe & FreeTube)",
-  "Export data as JSON": "Exporteer gegevens als JSON",
-  "Delete account?": "Verwijder account?",
-  "History": "Geschiedenis",
-  "An alternative front-end to YouTube": "Een alternatieve front-end voor YouTube",
-  "JavaScript license information": "JavaScript licentie informatie",
-  "source": "bron",
-  "Login": "Inloggen",
-  "Login/Register": "Inloggen/Registreren",
-  "Login to Google": "Inloggen op Google",
-  "User ID:": "Gebruiker ID:",
-  "Password:": "Wachtwoord:",
-  "Time (h:mm:ss):": "Tijd (h:mm:ss):",
-  "Text CAPTCHA": "Tekst CAPTCHA",
-  "Image CAPTCHA": "Afbeelding CAPTCHA",
-  "Sign In": "Aanmelden",
-  "Register": "Registreren",
-  "Email:": "Email:",
-  "Google verification code:": "Google verificatie code:",
-  "Preferences": "Voorkeuren",
-  "Player preferences": "Afspeler voorkeuren",
-  "Always loop: ": "Altijd herhalen: ",
-  "Autoplay: ": "Automatisch afspelen: ",
-  "Autoplay next video: ": "Automatisch volgende video afspelen: ",
-  "Listen by default: ": "Standaard luisteren: ",
-  "Proxy videos? ": "",
-  "Default speed: ": "Standaard snelheid: ",
-  "Preferred video quality: ": "Video kwaliteit voorkeur: ",
-  "Player volume: ": "Afspeler volume: ",
-  "Default comments: ": "Standaard reacties: ",
-  "Default captions: ": "Standaard ondertitels: ",
-  "Fallback captions: ": "Alternatieve ondertitels: ",
-  "Show related videos? ": "Laat gerelateerde videos zien? ",
-  "Visual preferences": "Visuele voorkeuren",
-  "Dark mode: ": "Donkere modus: ",
-  "Thin mode: ": "Smalle modus: ",
-  "Subscription preferences": "Abonnement voorkeuren",
-  "Redirect homepage to feed: ": "Startpagina omleiden naar feed: ",
-  "Number of videos shown in feed: ": "Aantal videos te zien in feed: ",
-  "Sort videos by: ": "Sorteer videos op: ",
-  "published": "gepubliceerd",
-  "published - reverse": "gepubliceerd - omgekeerd",
-  "alphabetically": "alfabetische volgorde",
-  "alphabetically - reverse": "alfabetisch - omgekeerd",
-  "channel name": "kanaal naam",
-  "channel name - reverse": "kanaal naam - omgekeerd",
-  "Only show latest video from channel: ": "Laat alleen laatste video van kanaal zien: ",
-  "Only show latest unwatched video from channel: ": "Laat alleen de laatste onbekeken video zien van kanaal: ",
-  "Only show unwatched: ": "Laat alleen onbekeken videos zien: ",
-  "Only show notifications (if there are any): ": "Laat alleen notificaties zien (als die er zijn): ",
-  "Data preferences": "Gegevens voorkeuren",
-  "Clear watch history": "Kijkgeschiedenis wissen",
-  "Import/Export data": "Importeer/Exporteer gegevens",
-  "Manage subscriptions": "Abonnees beheren",
-  "Watch history": "Kijkgeschiedenis",
-  "Delete account": "Account verwijderen",
-  "Administrator preferences": "",
-  "Default homepage: ": "",
-  "Feed menu: ": "",
-  "Top enabled? ": "",
-  "CAPTCHA enabled? ": "",
-  "Login enabled? ": "",
-  "Registration enabled? ": "",
-  "Report statistics? ": "",
-  "Save preferences": "Opslaan voorkeuren",
-  "Subscription manager": "Abonnees beheerder",
-  "`x` subscriptions": "`x` abonnees",
-  "Import/Export": "Importeer/Exporteer",
-  "unsubscribe": "abonnement opzeggen",
-  "Subscriptions": "Abonnees",
-  "`x` unseen notifications": "`x` onbekeken notificaties",
-  "search": "zoeken",
-  "Sign out": "Afmelden",
-  "Released under the AGPLv3 by Omar Roth.": "Uitgegeven onder AGPLv3 door Omar Roth.",
-  "Source available here.": "Bron beschikbaar hier.",
-  "View JavaScript license information.": "Bekijk JavaScript licentie informatie.",
-  "View privacy policy.": "",
-  "Trending": "Trending",
-  "Unlisted": "",
-  "Watch video on Youtube": "Bekijk video op Youtube",
-  "Genre: ": "Genre: ",
-  "License: ": "Licentie: ",
-  "Family friendly? ": "Gezinsvriendelijk? ",
-  "Wilson score: ": "Wilson score: ",
-  "Engagement: ": "Betrokkenheid: ",
-  "Whitelisted regions: ": "Toegestane regio's: ",
-  "Blacklisted regions: ": "Geblokkeerde regio's: ",
-  "Shared `x`": "`x` gedeeld",
-  "Premieres in `x`": "",
-  "Hi! Looks like you have JavaScript disabled. Click here to view comments, keep in mind it may take a bit longer to load.": "Hoi! Het lijkt erop dat je JavaScript uit hebt staan. Klik hier om de reacties te bekijken, hou er rekening mee dat het wat langer duurt om te laden.",
-  "View YouTube comments": "Bekijk YouTube reacties",
-  "View more comments on Reddit": "Bekijk meer reacties op Reddit",
-  "View `x` comments": "`x` reacties zien",
-  "View Reddit comments": "Bekijk Reddit reacties",
-  "Hide replies": "Verberg antwoorden",
-  "Show replies": "Laat antwoorden zien",
-  "Incorrect password": "Onjuist wachtwoord",
-  "Quota exceeded, try again in a few hours": "Quota overschreden, probeer het over een paar uur opnieuw",
-  "Unable to login, make sure two-factor authentication (Authenticator or SMS) is enabled.": "Niet in staat om in te loggen, zorg ervoor dat two-factor authentication (Authenticator of SMS) is ingeschakeld.",
-  "Invalid TFA code": "Onjuiste TFA code",
-  "Login failed. This may be because two-factor authentication is not enabled on your account.": "Aanmelden mislukt. Dit kan zijn omdat two-factor authentication niet is ingeschakeld voor uw account.",
-  "Invalid answer": "Onjuist antwoord",
-  "Invalid CAPTCHA": "Onjuiste CAPTCHA",
-  "CAPTCHA is a required field": "CAPTCHA is een vereist veld",
-  "User ID is a required field": "Gebruiker ID is een vereist veld",
-  "Password is a required field": "Wachtwoord is een vereist veld",
-  "Invalid username or password": "Ongeldige gebruikersnaam of wachtwoord",
-  "Please sign in using 'Sign in with Google'": "Meld u aan met 'Aanmelden met Google'",
-  "Password cannot be empty": "Wachtwoord mag niet leeg zijn",
-  "Password cannot be longer than 55 characters": "Wachtwoord mag niet langer dan 55 tekens zijn",
-  "Please sign in": "Meld u aan",
-  "Invidious Private Feed for `x`": "Invidious Privé Feed voor `x`",
-  "channel:`x`": "kanaal:`x`",
-  "Deleted or invalid channel": "Verwijderd of ongeldig kanaal",
-  "This channel does not exist.": "Dit kanaal bestaat niet.",
-  "Could not get channel info.": "Kan kanaal informatie niet verkrijgen.",
-  "Could not fetch comments": "Kan reacties niet verkrijgen",
-  "View `x` replies": "`x` antwoorden zien",
-  "`x` ago": "`x` geleden",
-  "Load more": "Meer laden",
-  "`x` points": "`x` punten",
-  "Could not create mix.": "Kon mix niet maken.",
-  "Playlist is empty": "Afspeellijst is leeg",
-  "Invalid playlist.": "Ongeldige afspeellijst.",
-  "Playlist does not exist.": "Afspeellijst bestaat niet.",
-  "Could not pull trending pages.": "Kon trending paginas niet verkrijgen.",
-  "Hidden field \"challenge\" is a required field": "Verborgen veld \"uitdaging\" is een vereist veld",
-  "Hidden field \"token\" is a required field": "Verborgen veld \"token\" is een vereist veld",
-  "Invalid challenge": "Ongeldige uitdaging",
-  "Invalid token": "Ongeldige token",
-  "Invalid user": "Ongeldige gebruiker",
-  "Token is expired, please try again": "Token is verlopen, probeer het opnieuw",
-  "English": "",
-  "English (auto-generated)": "",
-  "Afrikaans": "",
-  "Albanian": "",
-  "Amharic": "",
-  "Arabic": "",
-  "Armenian": "",
-  "Azerbaijani": "",
-  "Bangla": "",
-  "Basque": "",
-  "Belarusian": "",
-  "Bosnian": "",
-  "Bulgarian": "",
-  "Burmese": "",
-  "Catalan": "",
-  "Cebuano": "",
-  "Chinese (Simplified)": "",
-  "Chinese (Traditional)": "",
-  "Corsican": "",
-  "Croatian": "",
-  "Czech": "",
-  "Danish": "",
-  "Dutch": "",
-  "Esperanto": "",
-  "Estonian": "",
-  "Filipino": "",
-  "Finnish": "",
-  "French": "",
-  "Galician": "",
-  "Georgian": "",
-  "German": "",
-  "Greek": "",
-  "Gujarati": "",
-  "Haitian Creole": "",
-  "Hausa": "",
-  "Hawaiian": "",
-  "Hebrew": "",
-  "Hindi": "",
-  "Hmong": "",
-  "Hungarian": "",
-  "Icelandic": "",
-  "Igbo": "",
-  "Indonesian": "",
-  "Irish": "",
-  "Italian": "",
-  "Japanese": "",
-  "Javanese": "",
-  "Kannada": "",
-  "Kazakh": "",
-  "Khmer": "",
-  "Korean": "",
-  "Kurdish": "",
-  "Kyrgyz": "",
-  "Lao": "",
-  "Latin": "",
-  "Latvian": "",
-  "Lithuanian": "",
-  "Luxembourgish": "",
-  "Macedonian": "",
-  "Malagasy": "",
-  "Malay": "",
-  "Malayalam": "",
-  "Maltese": "",
-  "Maori": "",
-  "Marathi": "",
-  "Mongolian": "",
-  "Nepali": "",
-  "Norwegian": "",
-  "Nyanja": "",
-  "Pashto": "",
-  "Persian": "",
-  "Polish": "",
-  "Portuguese": "",
-  "Punjabi": "",
-  "Romanian": "",
-  "Russian": "",
-  "Samoan": "",
-  "Scottish Gaelic": "",
-  "Serbian": "",
-  "Shona": "",
-  "Sindhi": "",
-  "Sinhala": "",
-  "Slovak": "",
-  "Slovenian": "",
-  "Somali": "",
-  "Southern Sotho": "",
-  "Spanish": "",
-  "Spanish (Latin America)": "",
-  "Sundanese": "",
-  "Swahili": "",
-  "Swedish": "",
-  "Tajik": "",
-  "Tamil": "",
-  "Telugu": "",
-  "Thai": "",
-  "Turkish": "",
-  "Ukrainian": "",
-  "Urdu": "",
-  "Uzbek": "",
-  "Vietnamese": "",
-  "Welsh": "",
-  "Western Frisian": "",
-  "Xhosa": "",
-  "Yiddish": "",
-  "Yoruba": "",
-  "Zulu": "",
-  "`x` years": "`x` jaar",
-  "`x` months": "`x` maanden",
-  "`x` weeks": "`x` weken",
-  "`x` days": "`x` dagen",
-  "`x` hours": "`x` uur",
-  "`x` minutes": "`x` minuten",
-  "`x` seconds": "`x` seconden",
-  "Fallback comments: ": "",
-  "Popular": "",
-  "Top": "",
-  "About": "",
-  "Rating: ": "",
-  "Language: ": "",
-  "Default": "",
-  "Music": "",
-  "Gaming": "",
-  "News": "",
-  "Movies": "",
-  "Download": "",
-  "Download as: ": "",
-  "%A %B %-d, %Y": "",
-  "(edited)": "",
-  "Youtube permalink of the comment": "",
-  "`x` marked it with a ❤": "",
-  "Audio mode": "",
-  "Video mode": "",
-  "Videos": "",
-  "Playlists": "",
-  "Current version: ": ""
-}
+    "`x` subscribers": "`x` abonnees",
+    "`x` videos": "`x` videos",
+    "LIVE": "LIVE",
+    "Shared `x` ago": "Gedeeld `x` geleden",
+    "Unsubscribe": "Abonnement opzeggen",
+    "Subscribe": "Abonneren",
+    "View channel on YouTube": "Bekijk kanaal op Youtube",
+    "newest": "nieuwste",
+    "oldest": "oudste",
+    "popular": "populair",
+    "last": "",
+    "Next page": "Volgende pagina",
+    "Previous page": "Vorige pagina",
+    "Clear watch history?": "Kijk geschiedenis wissen?",
+    "New password": "",
+    "New passwords must match": "",
+    "Cannot change password for Google accounts": "",
+    "Authorize token?": "",
+    "Authorize token for `x`?": "",
+    "Yes": "Ja",
+    "No": "Nee",
+    "Import and Export Data": "Importeer en Exporteer Gegevens",
+    "Import": "Importeren",
+    "Import Invidious data": "Importeer Invidious gegevens",
+    "Import YouTube subscriptions": "Importeer Youtube abonnees",
+    "Import FreeTube subscriptions (.db)": "Importeer FreeTube abonnees (.db)",
+    "Import NewPipe subscriptions (.json)": "Importeer NewPipe abonnees (.json)",
+    "Import NewPipe data (.zip)": "Importeer NewPipe gegevens (.zip)",
+    "Export": "Exporteren",
+    "Export subscriptions as OPML": "Exporteer abonnees als OPML",
+    "Export subscriptions as OPML (for NewPipe & FreeTube)": "Exporteer abonnees als OPML (voor NewPipe & FreeTube)",
+    "Export data as JSON": "Exporteer gegevens als JSON",
+    "Delete account?": "Verwijder account?",
+    "History": "Geschiedenis",
+    "An alternative front-end to YouTube": "Een alternatieve front-end voor YouTube",
+    "JavaScript license information": "JavaScript licentie informatie",
+    "source": "bron",
+    "Log in": "Inloggen",
+    "Log in/register": "Inloggen/Registreren",
+    "Log in with Google": "Inloggen op Google",
+    "User ID": "Gebruiker ID",
+    "Password": "Wachtwoord",
+    "Time (h:mm:ss):": "Tijd (h:mm:ss):",
+    "Text CAPTCHA": "Tekst CAPTCHA",
+    "Image CAPTCHA": "Afbeelding CAPTCHA",
+    "Sign In": "Aanmelden",
+    "Register": "Registreren",
+    "E-mail": "Email",
+    "Google verification code": "Google verificatie code",
+    "Preferences": "Voorkeuren",
+    "Player preferences": "Afspeler voorkeuren",
+    "Always loop: ": "Altijd herhalen: ",
+    "Autoplay: ": "Automatisch afspelen: ",
+    "Play next by default: ": "",
+    "Autoplay next video: ": "Automatisch volgende video afspelen: ",
+    "Listen by default: ": "Standaard luisteren: ",
+    "Proxy videos? ": "",
+    "Default speed: ": "Standaard snelheid: ",
+    "Preferred video quality: ": "Video kwaliteit voorkeur: ",
+    "Player volume: ": "Afspeler volume: ",
+    "Default comments: ": "Standaard reacties: ",
+    "youtube": "",
+    "reddit": "",
+    "Default captions: ": "Standaard ondertitels: ",
+    "Fallback captions: ": "Alternatieve ondertitels: ",
+    "Show related videos? ": "Laat gerelateerde videos zien? ",
+    "Show annotations by default? ": "",
+    "Visual preferences": "Visuele voorkeuren",
+    "Dark mode: ": "Donkere modus: ",
+    "Thin mode: ": "Smalle modus: ",
+    "Subscription preferences": "Abonnement voorkeuren",
+    "Show annotations by default for subscribed channels? ": "",
+    "Redirect homepage to feed: ": "Startpagina omleiden naar feed: ",
+    "Number of videos shown in feed: ": "Aantal videos te zien in feed: ",
+    "Sort videos by: ": "Sorteer videos op: ",
+    "published": "gepubliceerd",
+    "published - reverse": "gepubliceerd - omgekeerd",
+    "alphabetically": "alfabetische volgorde",
+    "alphabetically - reverse": "alfabetisch - omgekeerd",
+    "channel name": "kanaal naam",
+    "channel name - reverse": "kanaal naam - omgekeerd",
+    "Only show latest video from channel: ": "Laat alleen laatste video van kanaal zien: ",
+    "Only show latest unwatched video from channel: ": "Laat alleen de laatste onbekeken video zien van kanaal: ",
+    "Only show unwatched: ": "Laat alleen onbekeken videos zien: ",
+    "Only show notifications (if there are any): ": "Laat alleen notificaties zien (als die er zijn): ",
+    "Data preferences": "Gegevens voorkeuren",
+    "Clear watch history": "Kijkgeschiedenis wissen",
+    "Import/export data": "Importeer/Exporteer gegevens",
+    "Change password": "",
+    "Manage subscriptions": "Abonnees beheren",
+    "Manage tokens": "",
+    "Watch history": "Kijkgeschiedenis",
+    "Delete account": "Account verwijderen",
+    "Administrator preferences": "",
+    "Default homepage: ": "",
+    "Feed menu: ": "",
+    "Top enabled? ": "",
+    "CAPTCHA enabled? ": "",
+    "Login enabled? ": "",
+    "Registration enabled? ": "",
+    "Report statistics? ": "",
+    "Save preferences": "Opslaan voorkeuren",
+    "Subscription manager": "Abonnees beheerder",
+    "Token manager": "",
+    "Token": "",
+    "`x` subscriptions": "`x` abonnees",
+    "`x` tokens": "",
+    "Import/export": "Importeer/Exporteer",
+    "unsubscribe": "abonnement opzeggen",
+    "revoke": "",
+    "Subscriptions": "Abonnees",
+    "`x` unseen notifications": "`x` onbekeken notificaties",
+    "search": "zoeken",
+    "Log out": "Afmelden",
+    "Released under the AGPLv3 by Omar Roth.": "Uitgegeven onder AGPLv3 door Omar Roth.",
+    "Source available here.": "Bron beschikbaar hier.",
+    "View JavaScript license information.": "Bekijk JavaScript licentie informatie.",
+    "View privacy policy.": "",
+    "Trending": "Trending",
+    "Unlisted": "",
+    "Watch on YouTube": "Bekijk video op Youtube",
+    "Hide annotations": "",
+    "Show annotations": "",
+    "Genre: ": "Genre: ",
+    "License: ": "Licentie: ",
+    "Family friendly? ": "Gezinsvriendelijk? ",
+    "Wilson score: ": "Wilson score: ",
+    "Engagement: ": "Betrokkenheid: ",
+    "Whitelisted regions: ": "Toegestane regio's: ",
+    "Blacklisted regions: ": "Geblokkeerde regio's: ",
+    "Shared `x`": "`x` gedeeld",
+    "`x` views": "",
+    "Premieres in `x`": "",
+    "Hi! Looks like you have JavaScript turned off. Click here to view comments, keep in mind they may take a bit longer to load.": "Hoi! Het lijkt erop dat je JavaScript uit hebt staan. Klik hier om de reacties te bekijken, hou er rekening mee dat het wat langer duurt om te laden.",
+    "View YouTube comments": "Bekijk YouTube reacties",
+    "View more comments on Reddit": "Bekijk meer reacties op Reddit",
+    "View `x` comments": "`x` reacties zien",
+    "View Reddit comments": "Bekijk Reddit reacties",
+    "Hide replies": "Verberg antwoorden",
+    "Show replies": "Laat antwoorden zien",
+    "Incorrect password": "Onjuist wachtwoord",
+    "Quota exceeded, try again in a few hours": "Quota overschreden, probeer het over een paar uur opnieuw",
+    "Unable to log in, make sure two-factor authentication (Authenticator or SMS) is turned on.": "Niet in staat om in te loggen, zorg ervoor dat two-factor authentication (Authenticator of SMS) is ingeschakeld.",
+    "Invalid TFA code": "Onjuiste TFA code",
+    "Login failed. This may be because two-factor authentication is not turned on for your account.": "Aanmelden mislukt. Dit kan zijn omdat two-factor authentication niet is ingeschakeld voor uw account.",
+    "Wrong answer": "Onjuist antwoord",
+    "Erroneous CAPTCHA": "Onjuiste CAPTCHA",
+    "CAPTCHA is a required field": "CAPTCHA is een vereist veld",
+    "User ID is a required field": "Gebruiker ID is een vereist veld",
+    "Password is a required field": "Wachtwoord is een vereist veld",
+    "Wrong username or password": "Ongeldige gebruikersnaam of wachtwoord",
+    "Please sign in using 'Log in with Google'": "Meld u aan met 'Aanmelden met Google'",
+    "Password cannot be empty": "Wachtwoord mag niet leeg zijn",
+    "Password cannot be longer than 55 characters": "Wachtwoord mag niet langer dan 55 tekens zijn",
+    "Please log in": "Meld u aan",
+    "Invidious Private Feed for `x`": "Invidious Privé Feed voor `x`",
+    "channel:`x`": "kanaal:`x`",
+    "Deleted or invalid channel": "Verwijderd of ongeldig kanaal",
+    "This channel does not exist.": "Dit kanaal bestaat niet.",
+    "Could not get channel info.": "Kan kanaal informatie niet verkrijgen.",
+    "Could not fetch comments": "Kan reacties niet verkrijgen",
+    "View `x` replies": "`x` antwoorden zien",
+    "`x` ago": "`x` geleden",
+    "Load more": "Meer laden",
+    "`x` points": "`x` punten",
+    "Could not create mix.": "Kon mix niet maken.",
+    "Empty playlist": "Afspeellijst is leeg",
+    "Not a playlist.": "Ongeldige afspeellijst.",
+    "Playlist does not exist.": "Afspeellijst bestaat niet.",
+    "Could not pull trending pages.": "Kon trending paginas niet verkrijgen.",
+    "Hidden field \"challenge\" is a required field": "Verborgen veld \"uitdaging\" is een vereist veld",
+    "Hidden field \"token\" is a required field": "Verborgen veld \"token\" is een vereist veld",
+    "Erroneous challenge": "Ongeldige uitdaging",
+    "Erroneous token": "Ongeldige token",
+    "No such user": "Ongeldige gebruiker",
+    "Token is expired, please try again": "Token is verlopen, probeer het opnieuw",
+    "English": "",
+    "English (auto-generated)": "",
+    "Afrikaans": "",
+    "Albanian": "",
+    "Amharic": "",
+    "Arabic": "",
+    "Armenian": "",
+    "Azerbaijani": "",
+    "Bangla": "",
+    "Basque": "",
+    "Belarusian": "",
+    "Bosnian": "",
+    "Bulgarian": "",
+    "Burmese": "",
+    "Catalan": "",
+    "Cebuano": "",
+    "Chinese (Simplified)": "",
+    "Chinese (Traditional)": "",
+    "Corsican": "",
+    "Croatian": "",
+    "Czech": "",
+    "Danish": "",
+    "Dutch": "",
+    "Esperanto": "",
+    "Estonian": "",
+    "Filipino": "",
+    "Finnish": "",
+    "French": "",
+    "Galician": "",
+    "Georgian": "",
+    "German": "",
+    "Greek": "",
+    "Gujarati": "",
+    "Haitian Creole": "",
+    "Hausa": "",
+    "Hawaiian": "",
+    "Hebrew": "",
+    "Hindi": "",
+    "Hmong": "",
+    "Hungarian": "",
+    "Icelandic": "",
+    "Igbo": "",
+    "Indonesian": "",
+    "Irish": "",
+    "Italian": "",
+    "Japanese": "",
+    "Javanese": "",
+    "Kannada": "",
+    "Kazakh": "",
+    "Khmer": "",
+    "Korean": "",
+    "Kurdish": "",
+    "Kyrgyz": "",
+    "Lao": "",
+    "Latin": "",
+    "Latvian": "",
+    "Lithuanian": "",
+    "Luxembourgish": "",
+    "Macedonian": "",
+    "Malagasy": "",
+    "Malay": "",
+    "Malayalam": "",
+    "Maltese": "",
+    "Maori": "",
+    "Marathi": "",
+    "Mongolian": "",
+    "Nepali": "",
+    "Norwegian Bokmål": "",
+    "Nyanja": "",
+    "Pashto": "",
+    "Persian": "",
+    "Polish": "",
+    "Portuguese": "",
+    "Punjabi": "",
+    "Romanian": "",
+    "Russian": "",
+    "Samoan": "",
+    "Scottish Gaelic": "",
+    "Serbian": "",
+    "Shona": "",
+    "Sindhi": "",
+    "Sinhala": "",
+    "Slovak": "",
+    "Slovenian": "",
+    "Somali": "",
+    "Southern Sotho": "",
+    "Spanish": "",
+    "Spanish (Latin America)": "",
+    "Sundanese": "",
+    "Swahili": "",
+    "Swedish": "",
+    "Tajik": "",
+    "Tamil": "",
+    "Telugu": "",
+    "Thai": "",
+    "Turkish": "",
+    "Ukrainian": "",
+    "Urdu": "",
+    "Uzbek": "",
+    "Vietnamese": "",
+    "Welsh": "",
+    "Western Frisian": "",
+    "Xhosa": "",
+    "Yiddish": "",
+    "Yoruba": "",
+    "Zulu": "",
+    "`x` years": "`x` jaar",
+    "`x` months": "`x` maanden",
+    "`x` weeks": "`x` weken",
+    "`x` days": "`x` dagen",
+    "`x` hours": "`x` uur",
+    "`x` minutes": "`x` minuten",
+    "`x` seconds": "`x` seconden",
+    "Fallback comments: ": "",
+    "Popular": "",
+    "Top": "",
+    "About": "",
+    "Rating: ": "",
+    "Language: ": "",
+    "View as playlist": "",
+    "Default": "",
+    "Music": "",
+    "Gaming": "",
+    "News": "",
+    "Movies": "",
+    "Download": "",
+    "Download as: ": "",
+    "%A %B %-d, %Y": "",
+    "(edited)": "",
+    "YouTube comment permalink": "",
+    "`x` marked it with a ❤": "",
+    "Audio mode": "",
+    "Video mode": "",
+    "Videos": "",
+    "Playlists": "",
+    "Current version: ": ""
+}
--- a/locales/pl.json
+++ b/locales/pl.json
@@ -1,295 +1,314 @@
 {
-  "`x` subscribers": "`x` subskrybcji",
-  "`x` videos": "`x` filmów",
-  "LIVE": "NA ŻYWO",
-  "Shared `x` ago": "Udostępniono `x` temu",
-  "Unsubscribe": "Odsubskrybuj",
-  "Subscribe": "Subskrybuj",
-  "Login to subscribe to `x`": "Zaloguj się, aby subskrybować `x`",
-  "View channel on YouTube": "Wyświetl kanał na YouTube",
-  "newest": "najnowsze",
-  "oldest": "najstarsze",
-  "popular": "popularne",
-  "last": "ostatnie",
-  "Next page": "Następna strona",
-  "Previous page": "Poprzednia strona",
-  "Clear watch history?": "Wyczyścić historię?",
-  "Yes": "Tak",
-  "No": "Nie",
-  "Import and Export Data": "Import i eksport danych",
-  "Import": "Import",
-  "Import Invidious data": "Importuj dane Invidious",
-  "Import YouTube subscriptions": "Importuj subskrybcje z YouTube",
-  "Import FreeTube subscriptions (.db)": "Importuj subskrybcje z FreeTube (.db)",
-  "Import NewPipe subscriptions (.json)": "Importuj subskrybcje z NewPipe (.json)",
-  "Import NewPipe data (.zip)": "Importuj dane NewPipe (.zip)",
-  "Export": "Eksport",
-  "Export subscriptions as OPML": "Eksportuj subskrybcje jako OPML",
-  "Export subscriptions as OPML (for NewPipe & FreeTube)": "Eksportuj subskrybcje jako OPML (dla NewPipe i FreeTube)",
-  "Export data as JSON": "Eksportuj dane jako JSON",
-  "Delete account?": "Usunąć konto?",
-  "History": "Historia",
-  "An alternative front-end to YouTube": "Alternatywny front-end dla YouTube",
-  "JavaScript license information": "Informacja o licencji JavaScript",
-  "source": "źródło",
-  "Login": "Zaloguj",
-  "Login/Register": "Zaloguj/Zarejestruj",
-  "Login to Google": "Zaloguj do Google",
-  "User ID:": "ID użytkownika:",
-  "Password:": "Hasło:",
-  "Time (h:mm:ss):": "Godzina (h:mm:ss):",
-  "Text CAPTCHA": "Tekst CAPTCHA",
-  "Image CAPTCHA": "Obraz CAPTCHA",
-  "Sign In": "Zaloguj się",
-  "Register": "Zarejestruj się",
-  "Email:": "Email:",
-  "Google verification code:": "Kod weryfikacyjny Google:",
-  "Preferences": "Preferencje",
-  "Player preferences": "Ustawienia odtwarzacza",
-  "Always loop: ": "Zawsze zapętlaj: ",
-  "Autoplay: ": "Autoodtwarzanie: ",
-  "Autoplay next video: ": "Odtwórz następny film: ",
-  "Listen by default: ": "Tryb dźwiękowy: ",
-  "Proxy videos? ": "Filmy przez proxy? ",
-  "Default speed: ": "Domyślna prędkość: ",
-  "Preferred video quality: ": "Preferowana jakość filmów: ",
-  "Player volume: ": "Głośność odtwarzacza: ",
-  "Default comments: ": "Domyślne komentarze: ",
-  "Default captions: ": "Domyślne napisy: ",
-  "Fallback captions: ": "Zastępcze napisy: ",
-  "Show related videos? ": "Pokaż powiązane filmy? ",
-  "Visual preferences": "Preferencje Wizualne",
-  "Dark mode: ": "Ciemny motyw: ",
-  "Thin mode: ": "Tryb minimalny: ",
-  "Subscription preferences": "Preferencje subskrybcji",
-  "Redirect homepage to feed: ": "Przekieruj stronę główną do subskrybcji: ",
-  "Number of videos shown in feed: ": "Liczba filmów widoczna na stronie subskrybcji: ",
-  "Sort videos by: ": "Sortuj filmy: ",
-  "published": "po czasie publikacji",
-  "published - reverse": "po czasie publikacji od najstarszych",
-  "alphabetically": "alfabetycznie",
-  "alphabetically - reverse": "alfabetycznie od tyłu",
-  "channel name": "po nazwie kanału",
-  "channel name - reverse": "po nazwie kanału od tyłu",
-  "Only show latest video from channel: ": "Pokazuj tylko najnowszy film z kanału: ",
-  "Only show latest unwatched video from channel: ": "Pokazuj tylko najnowszy nie obejrzany film z kanału: ",
-  "Only show unwatched: ": "Pokazuj tylko nie obejrzane: ",
-  "Only show notifications (if there are any): ": "Pokazuj tylko powiadomienia (jeśli są): ",
-  "Data preferences": "Preferencje danych",
-  "Clear watch history": "Wyczyść historię",
-  "Import/Export data": "Import/Eksport danych",
-  "Manage subscriptions": "Organizuj subskrybcje",
-  "Watch history": "Historia",
-  "Delete account": "Usuń konto",
-  "Administrator preferences": "Preferencje administratora",
-  "Default homepage: ": "Domyślna strona główna: ",
-  "Feed menu: ": "",
-  "Top enabled? ": "",
-  "CAPTCHA enabled? ": "CAPTCHA aktywna? ",
-  "Login enabled? ": "Logowanie włączone? ",
-  "Registration enabled? ": "Rejestracja włączona? ",
-  "Report statistics? ": "Raportować statystyki? ",
-  "Save preferences": "Zapisz preferencje",
-  "Subscription manager": "Manager subskrybcji",
-  "`x` subscriptions": "`x` subskrybcji",
-  "Import/Export": "Import/Eksport",
-  "unsubscribe": "odsubskrybuj",
-  "Subscriptions": "Subskrybcje",
-  "`x` unseen notifications": "`x` niewidzianych powiadomień",
-  "search": "szukaj",
-  "Sign out": "Wyloguj",
-  "Released under the AGPLv3 by Omar Roth.": "Wydano na licencji AGPLv3 przez Omar Roth.",
-  "Source available here.": "Kod źródłowy dostępny tutaj.",
-  "View JavaScript license information.": "Wyświetl informację o licencji JavaScript.",
-  "View privacy policy.": "Polityka prywatności.",
-  "Trending": "Na czasie",
-  "Unlisted": "",
-  "Watch video on Youtube": "Zobacz film na YouTube",
-  "Genre: ": "Gatunek: ",
-  "License: ": "Licencja: ",
-  "Family friendly? ": "Przyjazny rodzinie? ",
-  "Wilson score: ": "Punktacja Wilsona: ",
-  "Engagement: ": "Zaangażowanie: ",
-  "Whitelisted regions: ": "Dostępny na obszarach: ",
-  "Blacklisted regions: ": "Niedostępny na obszarach: ",
-  "Shared `x`": "Udostępniono `x`",
-  "Premieres in `x`": "",
-  "Hi! Looks like you have JavaScript disabled. Click here to view comments, keep in mind it may take a bit longer to load.": "Cześć! Wygląda na to, że masz wyłączoną obsługę JavaScriptu. Kliknij tutaj, żeby zobaczyć komentarze. Pamiętaj, że wczytywanie może potrwać dłużej.",
-  "View YouTube comments": "Wyświetl komentarze z YouTube",
-  "View more comments on Reddit": "Wyświetl więcej komentarzy na Reddicie",
-  "View `x` comments": "Wyświetl `x` komentarzy",
-  "View Reddit comments": "Wyświetl komentarze z Redditta",
-  "Hide replies": "Ukryj odpowiedzi",
-  "Show replies": "Pokaż odpowiedzi",
-  "Incorrect password": "Niepoprawne hasło",
-  "Quota exceeded, try again in a few hours": "Przekroczony limit zapytań, spróbuj ponownie za kilka godzin",
-  "Unable to login, make sure two-factor authentication (Authenticator or SMS) is enabled.": "Nie udało się zalogować, upewnij się, że dwuetapowe uwierzytelnianie (Autentykator lub SMS) jest aktywne.",
-  "Invalid TFA code": "Niepoprawny kod TFA",
-  "Login failed. This may be because two-factor authentication is not enabled on your account.": "Nie udało się zalogować. To może być spowodowane wyłączoną dwustopniową autoryzacją na twoim koncie.",
-  "Invalid answer": "Niepoprawna odpowiedź",
-  "Invalid CAPTCHA": "CAPTCHA wykonane błędnie",
-  "CAPTCHA is a required field": "CAPTCHA jest polem wymaganym",
-  "User ID is a required field": "ID użytkownika jest polem wymaganym",
-  "Password is a required field": "Hasło jest polem wymaganym",
-  "Invalid username or password": "Niepoprawny login lub hasło",
-  "Please sign in using 'Sign in with Google'": "Zaloguj się używając \"Zaloguj się przez Google\"",
-  "Password cannot be empty": "Hasło nie może być puste",
-  "Password cannot be longer than 55 characters": "Hasło nie może być dłuższe niż 55 znaków",
-  "Please sign in": "Proszę się zalogować",
-  "Invidious Private Feed for `x`": "",
-  "channel:`x`": "kanał:`x",
-  "Deleted or invalid channel": "Usunięty lub niepoprawny kanał",
-  "This channel does not exist.": "Ten kanał nie istnieje.",
-  "Could not get channel info.": "Nie udało się uzyskać informacji o kanale.",
-  "Could not fetch comments": "Nie udało się pobrać komentarzy",
-  "View `x` replies": "Wyświetl `x` odpowiedzi",
-  "`x` ago": "`x` temu",
-  "Load more": "Wczytaj więcej",
-  "`x` points": "`x` punktów",
-  "Could not create mix.": "Nie udało się utworzyć miksu.",
-  "Playlist is empty": "Lista odtwarzania jest pusta",
-  "Invalid playlist.": "Niepoprawna lista.",
-  "Playlist does not exist.": "Lista odtwarzania nie istnieje.",
-  "Could not pull trending pages.": "Nie udało się pobrać strony na czasie.",
-  "Hidden field \"challenge\" is a required field": "Ukryte pole \"wyzwanie\" jest polem wymaganym",
-  "Hidden field \"token\" is a required field": "Ukryte pole \"token\" jest polem wymaganym",
-  "Invalid challenge": "Niepoprawne wyzwanie",
-  "Invalid token": "Niepoprawny token",
-  "Invalid user": "Niepoprawny użytkownik",
-  "Token is expired, please try again": "Token wygasł, spróbuj ponownie",
-  "English": "angielski",
-  "English (auto-generated)": "angielski (automatycznie generowane)",
-  "Afrikaans": "afrykanerski",
-  "Albanian": "albański",
-  "Amharic": "amharski",
-  "Arabic": "arabski",
-  "Armenian": "armeński",
-  "Azerbaijani": "azerski",
-  "Bangla": "bengalski",
-  "Basque": "baskijski",
-  "Belarusian": "białoruski",
-  "Bosnian": "bośniacki",
-  "Bulgarian": "bułgarski",
-  "Burmese": "birmański",
-  "Catalan": "kataloński",
-  "Cebuano": "cebuański",
-  "Chinese (Simplified)": "chiński (uproszczony)",
-  "Chinese (Traditional)": "chiński (tradycyjny)",
-  "Corsican": "korsykański",
-  "Croatian": "chorwacki",
-  "Czech": "czeski",
-  "Danish": "duński",
-  "Dutch": "holenderski",
-  "Esperanto": "esperanto",
-  "Estonian": "estoński",
-  "Filipino": "filipiński",
-  "Finnish": "fiński",
-  "French": "francuski",
-  "Galician": "galicyjski",
-  "Georgian": "gruziński",
-  "German": "niemiecki",
-  "Greek": "grecki",
-  "Gujarati": "gudźarati",
-  "Haitian Creole": "kreolski haitański",
-  "Hausa": "hausa",
-  "Hawaiian": "hawajski",
-  "Hebrew": "hebrajski",
-  "Hindi": "hindi",
-  "Hmong": "hmong",
-  "Hungarian": "węgierski",
-  "Icelandic": "islandzki",
-  "Igbo": "ibo",
-  "Indonesian": "indonezyjski",
-  "Irish": "irlandzki",
-  "Italian": "włoski",
-  "Japanese": "japoński",
-  "Javanese": "jawajski",
-  "Kannada": "kannada",
-  "Kazakh": "kazachski",
-  "Khmer": "khmerski",
-  "Korean": "koreański",
-  "Kurdish": "kurdyjski",
-  "Kyrgyz": "kirgiski",
-  "Lao": "laotański",
-  "Latin": "łaciński",
-  "Latvian": "łotewski",
-  "Lithuanian": "litewski",
-  "Luxembourgish": "luksemburski",
-  "Macedonian": "macedoński",
-  "Malagasy": "malgaski",
-  "Malay": "malajski",
-  "Malayalam": "malajalam",
-  "Maltese": "maltański",
-  "Maori": "maoryski",
-  "Marathi": "marathi",
-  "Mongolian": "mongolski",
-  "Nepali": "nepalski",
-  "Norwegian": "norweski",
-  "Nyanja": "njandża",
-  "Pashto": "paszto",
-  "Persian": "perski",
-  "Polish": "polski",
-  "Portuguese": "portugalski",
-  "Punjabi": "pendżabski",
-  "Romanian": "rumuński",
-  "Russian": "rosyjski",
-  "Samoan": "samoański",
-  "Scottish Gaelic": "gaelicki szkocki",
-  "Serbian": "serbski",
-  "Shona": "shona",
-  "Sindhi": "sindhi",
-  "Sinhala": "syngaleski",
-  "Slovak": "słowacki",
-  "Slovenian": "słoweński",
-  "Somali": "somalijski",
-  "Southern Sotho": "sotho południowy",
-  "Spanish": "hiszpański",
-  "Spanish (Latin America)": "hiszpański (ameryka łacińska)",
-  "Sundanese": "sundajski",
-  "Swahili": "suahili",
-  "Swedish": "szwedzki",
-  "Tajik": "tadżycki",
-  "Tamil": "tamilski",
-  "Telugu": "telugu",
-  "Thai": "tajski",
-  "Turkish": "turecki",
-  "Ukrainian": "ukraiński",
-  "Urdu": "urdu",
-  "Uzbek": "uzbecki",
-  "Vietnamese": "wietnamski",
-  "Welsh": "walijski",
-  "Western Frisian": "zachodniofryzyjski",
-  "Xhosa": "xhosa",
-  "Yiddish": "jidysz",
-  "Yoruba": "joruba",
-  "Zulu": "zuluski",
-  "`x` years": "`x` lat",
-  "`x` months": "`x` miesięcy",
-  "`x` weeks": "`x` tygodni",
-  "`x` days": "`x` dni",
-  "`x` hours": "`x` godzin",
-  "`x` minutes": "`x` minut",
-  "`x` seconds": "`x` sekund",
-  "Fallback comments: ": "Zastępcze komentarze: ",
-  "Popular": "Popularne",
-  "Top": "Najczęściej oglądane",
-  "About": "Informacje",
-  "Rating: ": "Ocena: ",
-  "Language: ": "Język: ",
-  "Default": "Domyślnie",
-  "Music": "Muzyka",
-  "Gaming": "Gry",
-  "News": "Wiadomości",
-  "Movies": "Filmy",
-  "Download": "Pobierz",
-  "Download as: ": "Pobierz jako: ",
-  "%A %B %-d, %Y": "",
-  "(edited)": "(edytowany)",
-  "Youtube permalink of the comment": "Odnośnik bezpośredni do komentarza na YouTube",
-  "`x` marked it with a ❤": "'x' oznaczonych ❤",
-  "Audio mode": "Tryb audio",
-  "Video mode": "Tryb wideo",
-  "Videos": "Filmy",
-  "Playlists": "Playlisty",
-  "Current version: ": "Aktualna wersja: "
-}
+    "`x` subscribers": "`x` subskrybcji",
+    "`x` videos": "`x` filmów",
+    "LIVE": "NA ŻYWO",
+    "Shared `x` ago": "Udostępniono `x` temu",
+    "Unsubscribe": "Odsubskrybuj",
+    "Subscribe": "Subskrybuj",
+    "View channel on YouTube": "Wyświetl kanał na YouTube",
+    "newest": "najnowsze",
+    "oldest": "najstarsze",
+    "popular": "popularne",
+    "last": "ostatnie",
+    "Next page": "Następna strona",
+    "Previous page": "Poprzednia strona",
+    "Clear watch history?": "Wyczyścić historię?",
+    "New password": "",
+    "New passwords must match": "",
+    "Cannot change password for Google accounts": "",
+    "Authorize token?": "",
+    "Authorize token for `x`?": "",
+    "Yes": "Tak",
+    "No": "Nie",
+    "Import and Export Data": "Import i eksport danych",
+    "Import": "Import",
+    "Import Invidious data": "Importuj dane Invidious",
+    "Import YouTube subscriptions": "Importuj subskrybcje z YouTube",
+    "Import FreeTube subscriptions (.db)": "Importuj subskrybcje z FreeTube (.db)",
+    "Import NewPipe subscriptions (.json)": "Importuj subskrybcje z NewPipe (.json)",
+    "Import NewPipe data (.zip)": "Importuj dane NewPipe (.zip)",
+    "Export": "Eksport",
+    "Export subscriptions as OPML": "Eksportuj subskrybcje jako OPML",
+    "Export subscriptions as OPML (for NewPipe & FreeTube)": "Eksportuj subskrybcje jako OPML (dla NewPipe i FreeTube)",
+    "Export data as JSON": "Eksportuj dane jako JSON",
+    "Delete account?": "Usunąć konto?",
+    "History": "Historia",
+    "An alternative front-end to YouTube": "Alternatywny front-end dla YouTube",
+    "JavaScript license information": "Informacja o licencji JavaScript",
+    "source": "źródło",
+    "Log in": "Zaloguj",
+    "Log in/register": "Zaloguj/Zarejestruj",
+    "Log in with Google": "Zaloguj do Google",
+    "User ID": "ID użytkownika",
+    "Password": "Hasło",
+    "Time (h:mm:ss):": "Godzina (h:mm:ss):",
+    "Text CAPTCHA": "Tekst CAPTCHA",
+    "Image CAPTCHA": "Obraz CAPTCHA",
+    "Sign In": "Zaloguj się",
+    "Register": "Zarejestruj się",
+    "E-mail": "Email",
+    "Google verification code": "Kod weryfikacyjny Google",
+    "Preferences": "Preferencje",
+    "Player preferences": "Ustawienia odtwarzacza",
+    "Always loop: ": "Zawsze zapętlaj: ",
+    "Autoplay: ": "Autoodtwarzanie: ",
+    "Play next by default: ": "",
+    "Autoplay next video: ": "Odtwórz następny film: ",
+    "Listen by default: ": "Tryb dźwiękowy: ",
+    "Proxy videos? ": "Filmy przez proxy? ",
+    "Default speed: ": "Domyślna prędkość: ",
+    "Preferred video quality: ": "Preferowana jakość filmów: ",
+    "Player volume: ": "Głośność odtwarzacza: ",
+    "Default comments: ": "Domyślne komentarze: ",
+    "youtube": "",
+    "reddit": "",
+    "Default captions: ": "Domyślne napisy: ",
+    "Fallback captions: ": "Zastępcze napisy: ",
+    "Show related videos? ": "Pokaż powiązane filmy? ",
+    "Show annotations by default? ": "",
+    "Visual preferences": "Preferencje Wizualne",
+    "Dark mode: ": "Ciemny motyw: ",
+    "Thin mode: ": "Tryb minimalny: ",
+    "Subscription preferences": "Preferencje subskrybcji",
+    "Show annotations by default for subscribed channels? ": "",
+    "Redirect homepage to feed: ": "Przekieruj stronę główną do subskrybcji: ",
+    "Number of videos shown in feed: ": "Liczba filmów widoczna na stronie subskrybcji: ",
+    "Sort videos by: ": "Sortuj filmy: ",
+    "published": "po czasie publikacji",
+    "published - reverse": "po czasie publikacji od najstarszych",
+    "alphabetically": "alfabetycznie",
+    "alphabetically - reverse": "alfabetycznie od tyłu",
+    "channel name": "po nazwie kanału",
+    "channel name - reverse": "po nazwie kanału od tyłu",
+    "Only show latest video from channel: ": "Pokazuj tylko najnowszy film z kanału: ",
+    "Only show latest unwatched video from channel: ": "Pokazuj tylko najnowszy nie obejrzany film z kanału: ",
+    "Only show unwatched: ": "Pokazuj tylko nie obejrzane: ",
+    "Only show notifications (if there are any): ": "Pokazuj tylko powiadomienia (jeśli są): ",
+    "Data preferences": "Preferencje danych",
+    "Clear watch history": "Wyczyść historię",
+    "Import/export data": "Import/Eksport danych",
+    "Change password": "",
+    "Manage subscriptions": "Organizuj subskrybcje",
+    "Manage tokens": "",
+    "Watch history": "Historia",
+    "Delete account": "Usuń konto",
+    "Administrator preferences": "Preferencje administratora",
+    "Default homepage: ": "Domyślna strona główna: ",
+    "Feed menu: ": "",
+    "Top enabled? ": "",
+    "CAPTCHA enabled? ": "CAPTCHA aktywna? ",
+    "Login enabled? ": "Logowanie włączone? ",
+    "Registration enabled? ": "Rejestracja włączona? ",
+    "Report statistics? ": "Raportować statystyki? ",
+    "Save preferences": "Zapisz preferencje",
+    "Subscription manager": "Manager subskrybcji",
+    "Token manager": "",
+    "Token": "",
+    "`x` subscriptions": "`x` subskrybcji",
+    "`x` tokens": "",
+    "Import/export": "Import/Eksport",
+    "unsubscribe": "odsubskrybuj",
+    "revoke": "",
+    "Subscriptions": "Subskrybcje",
+    "`x` unseen notifications": "`x` nowych powiadomień",
+    "search": "szukaj",
+    "Log out": "Wyloguj",
+    "Released under the AGPLv3 by Omar Roth.": "Wydano na licencji AGPLv3 przez Omar Roth.",
+    "Source available here.": "Kod źródłowy dostępny tutaj.",
+    "View JavaScript license information.": "Wyświetl informację o licencji JavaScript.",
+    "View privacy policy.": "Polityka prywatności.",
+    "Trending": "Na czasie",
+    "Unlisted": "",
+    "Watch on YouTube": "Zobacz film na YouTube",
+    "Hide annotations": "",
+    "Show annotations": "",
+    "Genre: ": "Gatunek: ",
+    "License: ": "Licencja: ",
+    "Family friendly? ": "Przyjazny rodzinie? ",
+    "Wilson score: ": "Punktacja Wilsona: ",
+    "Engagement: ": "Zaangażowanie: ",
+    "Whitelisted regions: ": "Dostępny na obszarach: ",
+    "Blacklisted regions: ": "Niedostępny na obszarach: ",
+    "Shared `x`": "Udostępniono `x`",
+    "`x` views": "`x` wyświetleń",
+    "Premieres in `x`": "Publikacja za `x`",
+    "Hi! Looks like you have JavaScript turned off. Click here to view comments, keep in mind they may take a bit longer to load.": "Cześć! Wygląda na to, że masz wyłączoną obsługę JavaScriptu. Kliknij tutaj, żeby zobaczyć komentarze. Pamiętaj, że wczytywanie może potrwać dłużej.",
+    "View YouTube comments": "Wyświetl komentarze z YouTube",
+    "View more comments on Reddit": "Wyświetl więcej komentarzy na Reddicie",
+    "View `x` comments": "Wyświetl `x` komentarzy",
+    "View Reddit comments": "Wyświetl komentarze z Redditta",
+    "Hide replies": "Ukryj odpowiedzi",
+    "Show replies": "Pokaż odpowiedzi",
+    "Incorrect password": "Niepoprawne hasło",
+    "Quota exceeded, try again in a few hours": "Przekroczony limit zapytań, spróbuj ponownie za kilka godzin",
+    "Unable to log in, make sure two-factor authentication (Authenticator or SMS) is turned on.": "Nie udało się zalogować, upewnij się, że dwuetapowe uwierzytelnianie (Autentykator lub SMS) jest aktywne.",
+    "Invalid TFA code": "Niepoprawny kod TFA",
+    "Login failed. This may be because two-factor authentication is not turned on for your account.": "Nie udało się zalogować. To może być spowodowane wyłączoną dwustopniową autoryzacją na twoim koncie.",
+    "Wrong answer": "Niepoprawna odpowiedź",
+    "Erroneous CAPTCHA": "CAPTCHA wykonane błędnie",
+    "CAPTCHA is a required field": "CAPTCHA jest polem wymaganym",
+    "User ID is a required field": "ID użytkownika jest polem wymaganym",
+    "Password is a required field": "Hasło jest polem wymaganym",
+    "Wrong username or password": "Niepoprawny login lub hasło",
+    "Please sign in using 'Log in with Google'": "Zaloguj się używając \"Zaloguj się przez Google\"",
+    "Password cannot be empty": "Hasło nie może być puste",
+    "Password cannot be longer than 55 characters": "Hasło nie może być dłuższe niż 55 znaków",
+    "Please log in": "Proszę się zalogować",
+    "Invidious Private Feed for `x`": "",
+    "channel:`x`": "kanał:`x",
+    "Deleted or invalid channel": "Usunięty lub niepoprawny kanał",
+    "This channel does not exist.": "Ten kanał nie istnieje.",
+    "Could not get channel info.": "Nie udało się uzyskać informacji o kanale.",
+    "Could not fetch comments": "Nie udało się pobrać komentarzy",
+    "View `x` replies": "Wyświetl `x` odpowiedzi",
+    "`x` ago": "`x` temu",
+    "Load more": "Wczytaj więcej",
+    "`x` points": "`x` punktów",
+    "Could not create mix.": "Nie udało się utworzyć miksu.",
+    "Empty playlist": "Lista odtwarzania jest pusta",
+    "Not a playlist.": "Niepoprawna lista.",
+    "Playlist does not exist.": "Lista odtwarzania nie istnieje.",
+    "Could not pull trending pages.": "Nie udało się pobrać strony na czasie.",
+    "Hidden field \"challenge\" is a required field": "Ukryte pole \"wyzwanie\" jest polem wymaganym",
+    "Hidden field \"token\" is a required field": "Ukryte pole \"token\" jest polem wymaganym",
+    "Erroneous challenge": "Niepoprawne wyzwanie",
+    "Erroneous token": "Niepoprawny token",
+    "No such user": "Niepoprawny użytkownik",
+    "Token is expired, please try again": "Token wygasł, spróbuj ponownie",
+    "English": "angielski",
+    "English (auto-generated)": "angielski (automatycznie generowane)",
+    "Afrikaans": "afrykanerski",
+    "Albanian": "albański",
+    "Amharic": "amharski",
+    "Arabic": "arabski",
+    "Armenian": "armeński",
+    "Azerbaijani": "azerski",
+    "Bangla": "bengalski",
+    "Basque": "baskijski",
+    "Belarusian": "białoruski",
+    "Bosnian": "bośniacki",
+    "Bulgarian": "bułgarski",
+    "Burmese": "birmański",
+    "Catalan": "kataloński",
+    "Cebuano": "cebuański",
+    "Chinese (Simplified)": "chiński (uproszczony)",
+    "Chinese (Traditional)": "chiński (tradycyjny)",
+    "Corsican": "korsykański",
+    "Croatian": "chorwacki",
+    "Czech": "czeski",
+    "Danish": "duński",
+    "Dutch": "holenderski",
+    "Esperanto": "esperanto",
+    "Estonian": "estoński",
+    "Filipino": "filipiński",
+    "Finnish": "fiński",
+    "French": "francuski",
+    "Galician": "galicyjski",
+    "Georgian": "gruziński",
+    "German": "niemiecki",
+    "Greek": "grecki",
+    "Gujarati": "gudźarati",
+    "Haitian Creole": "kreolski haitański",
+    "Hausa": "hausa",
+    "Hawaiian": "hawajski",
+    "Hebrew": "hebrajski",
+    "Hindi": "hindi",
+    "Hmong": "hmong",
+    "Hungarian": "węgierski",
+    "Icelandic": "islandzki",
+    "Igbo": "ibo",
+    "Indonesian": "indonezyjski",
+    "Irish": "irlandzki",
+    "Italian": "włoski",
+    "Japanese": "japoński",
+    "Javanese": "jawajski",
+    "Kannada": "kannada",
+    "Kazakh": "kazachski",
+    "Khmer": "khmerski",
+    "Korean": "koreański",
+    "Kurdish": "kurdyjski",
+    "Kyrgyz": "kirgiski",
+    "Lao": "laotański",
+    "Latin": "łaciński",
+    "Latvian": "łotewski",
+    "Lithuanian": "litewski",
+    "Luxembourgish": "luksemburski",
+    "Macedonian": "macedoński",
+    "Malagasy": "malgaski",
+    "Malay": "malajski",
+    "Malayalam": "malajalam",
+    "Maltese": "maltański",
+    "Maori": "maoryski",
+    "Marathi": "marathi",
+    "Mongolian": "mongolski",
+    "Nepali": "nepalski",
+    "Norwegian Bokmål": "norweski",
+    "Nyanja": "njandża",
+    "Pashto": "paszto",
+    "Persian": "perski",
+    "Polish": "polski",
+    "Portuguese": "portugalski",
+    "Punjabi": "pendżabski",
+    "Romanian": "rumuński",
+    "Russian": "rosyjski",
+    "Samoan": "samoański",
+    "Scottish Gaelic": "gaelicki szkocki",
+    "Serbian": "serbski",
+    "Shona": "shona",
+    "Sindhi": "sindhi",
+    "Sinhala": "syngaleski",
+    "Slovak": "słowacki",
+    "Slovenian": "słoweński",
+    "Somali": "somalijski",
+    "Southern Sotho": "sotho południowy",
+    "Spanish": "hiszpański",
+    "Spanish (Latin America)": "hiszpański (ameryka łacińska)",
+    "Sundanese": "sundajski",
+    "Swahili": "suahili",
+    "Swedish": "szwedzki",
+    "Tajik": "tadżycki",
+    "Tamil": "tamilski",
+    "Telugu": "telugu",
+    "Thai": "tajski",
+    "Turkish": "turecki",
+    "Ukrainian": "ukraiński",
+    "Urdu": "urdu",
+    "Uzbek": "uzbecki",
+    "Vietnamese": "wietnamski",
+    "Welsh": "walijski",
+    "Western Frisian": "zachodniofryzyjski",
+    "Xhosa": "xhosa",
+    "Yiddish": "jidysz",
+    "Yoruba": "joruba",
+    "Zulu": "zuluski",
+    "`x` years": "`x` lat",
+    "`x` months": "`x` miesięcy",
+    "`x` weeks": "`x` tygodni",
+    "`x` days": "`x` dni",
+    "`x` hours": "`x` godzin",
+    "`x` minutes": "`x` minut",
+    "`x` seconds": "`x` sekund",
+    "Fallback comments: ": "Zastępcze komentarze: ",
+    "Popular": "Popularne",
+    "Top": "Najczęściej oglądane",
+    "About": "Informacje",
+    "Rating: ": "Ocena: ",
+    "Language: ": "Język: ",
+    "View as playlist": "Obejrzyj w playliście",
+    "Default": "Domyślnie",
+    "Music": "Muzyka",
+    "Gaming": "Gry",
+    "News": "Wiadomości",
+    "Movies": "Filmy",
+    "Download": "Pobierz",
+    "Download as: ": "Pobierz jako: ",
+    "%A %B %-d, %Y": "",
+    "(edited)": "(edytowany)",
+    "YouTube comment permalink": "Odnośnik bezpośredni do komentarza na YouTube",
+    "`x` marked it with a ❤": "`x` oznaczonych ❤",
+    "Audio mode": "Tryb audio",
+    "Video mode": "Tryb wideo",
+    "Videos": "Filmy",
+    "Playlists": "Playlisty",
+    "Current version: ": "Aktualna wersja: "
+}
--- a/locales/ru.json
+++ b/locales/ru.json
@@ -5,7 +5,6 @@
    "Shared `x` ago": "Опубликовано `x` назад",
    "Unsubscribe": "Отписаться",
    "Subscribe": "Подписаться",
-    "Login to subscribe to `x`": "Войти, чтобы подписаться на `x`",
    "View channel on YouTube": "Канал на YouTube",
    "newest": "новые",
    "oldest": "старые",
@@ -14,6 +13,11 @@
    "Next page": "Следующая страница",
    "Previous page": "Предыдущая страница",
    "Clear watch history?": "Очистить историю просмотров?",
+    "New password": "",
+    "New passwords must match": "",
+    "Cannot change password for Google accounts": "",
+    "Authorize token?": "",
+    "Authorize token for `x`?": "",
    "Yes": "Да",
    "No": "Нет",
    "Import and Export Data": "Импорт и экспорт данных",
@@ -32,38 +36,41 @@
    "An alternative front-end to YouTube": "Альтернативный фронтенд для YouTube",
    "JavaScript license information": "Лицензии JavaScript",
    "source": "источник",
-    "Login": "Войти",
-    "Login/Register": "Войти/Регистрация",
-    "Login to Google": "Войти через Google",
-    "User ID:": "ID пользователя:",
-    "Password:": "Пароль:",
+    "Log in": "Войти",
+    "Log in/register": "Войти/Регистрация",
+    "Log in with Google": "Войти через Google",
+    "User ID": "ID пользователя",
+    "Password": "Пароль",
    "Time (h:mm:ss):": "Время (ч:мм:сс):",
    "Text CAPTCHA": "Текст капчи",
    "Image CAPTCHA": "Изображение капчи",
    "Sign In": "Войти",
    "Register": "Регистрация",
-    "Email:": "Эл. почта:",
-    "Google verification code:": "Код подтверждения Google:",
+    "E-mail": "Эл. почта",
+    "Google verification code": "Код подтверждения Google",
    "Preferences": "Настройки",
    "Player preferences": "Настройки проигрывателя",
    "Always loop: ": "Всегда повторять: ",
    "Autoplay: ": "Автовоспроизведение: ",
+    "Play next by default: ": "",
    "Autoplay next video: ": "Автовоспроизведение следующего видео: ",
    "Listen by default: ": "Режим \"только аудио\" по-умолчанию: ",
    "Proxy videos? ": "Проксировать видео? ",
-    "Default speed: ": "Скорость по-умолчанию: ",
+    "Default speed: ": "Скорость по умолчанию: ",
    "Preferred video quality: ": "Предпочтительное качество видео: ",
    "Player volume: ": "Громкость воспроизведения: ",
    "Default comments: ": "Источник комментариев: ",
    "youtube": "YouTube",
    "reddit": "Reddit",
-    "Default captions: ": "Субтитры по-умолчанию: ",
+    "Default captions: ": "Субтитры по умолчанию: ",
    "Fallback captions: ": "Резервные субтитры: ",
    "Show related videos? ": "Показывать похожие видео? ",
+    "Show annotations by default? ": "",
    "Visual preferences": "Визуальные настройки",
    "Dark mode: ": "Темная тема: ",
    "Thin mode: ": "Облегченный режим: ",
    "Subscription preferences": "Настройки подписок",
+    "Show annotations by default for subscribed channels? ": "",
    "Redirect homepage to feed: ": "Отображать ленту вместо главной страницы: ",
    "Number of videos shown in feed: ": "Число видео в ленте: ",
    "Sort videos by: ": "Сортировать видео по: ",
@@ -79,44 +86,53 @@
    "Only show notifications (if there are any): ": "Отображать только оповещения (если есть): ",
    "Data preferences": "Настройки данных",
    "Clear watch history": "Очистить историю просмотра",
-    "Import/Export data": "Импорт/Экспорт данных",
+    "Import/export data": "Импорт/Экспорт данных",
+    "Change password": "",
    "Manage subscriptions": "Управление подписками",
+    "Manage tokens": "",
    "Watch history": "История просмотров",
    "Delete account": "Удалить аккаунт",
    "Administrator preferences": "Настройки администратора",
    "Default homepage: ": "Главная страница по умолчанию: ",
    "Feed menu: ": "Меню ленты: ",
-    "Top enabled? ": "Включить ТОП? ",
+    "Top enabled? ": "Включить топ? ",
    "CAPTCHA enabled? ": "Включить капчу? ",
    "Login enabled? ": "Включить логин? ",
    "Registration enabled? ": "Включить регистрацию? ",
    "Report statistics? ": "Отображать статистику? ",
    "Save preferences": "Сохранить настройки",
    "Subscription manager": "Менеджер подписок",
+    "Token manager": "",
+    "Token": "",
    "`x` subscriptions": "`x` подписок",
-    "Import/Export": "Импорт/Экспорт",
+    "`x` tokens": "",
+    "Import/export": "Импорт/Экспорт",
    "unsubscribe": "отписаться",
+    "revoke": "",
    "Subscriptions": "Подписки",
    "`x` unseen notifications": "`x` новых оповещений",
    "search": "поиск",
-    "Sign out": "Выйти",
+    "Log out": "Выйти",
    "Released under the AGPLv3 by Omar Roth.": "Распространяется Omar Roth по AGPLv3.",
    "Source available here.": "Исходный код доступен здесь.",
    "View JavaScript license information.": "Посмотреть лицензии JavaScript кода.",
    "View privacy policy.": "См. политику конфиденциальности.",
    "Trending": "В тренде",
    "Unlisted": "Доступно по ссылке",
-    "Watch video on Youtube": "Смотреть на YouTube",
+    "Watch on YouTube": "Смотреть на YouTube",
+    "Hide annotations": "",
+    "Show annotations": "",
    "Genre: ": "Жанр: ",
    "License: ": "Лицензия: ",
    "Family friendly? ": "Семейный просмотр: ",
-    "Wilson score: ": "Рейтинг Вильсона: ",
+    "Wilson score: ": "Рейтинг Уилсона: ",
    "Engagement: ": "Вовлеченность: ",
    "Whitelisted regions: ": "Доступно для: ",
    "Blacklisted regions: ": "Недоступно для: ",
    "Shared `x`": "Опубликовано `x`",
+    "`x` views": "`x` просмотров / просмотр / просмотра",
    "Premieres in `x`": "Премьера через `x`",
-    "Hi! Looks like you have JavaScript disabled. Click here to view comments, keep in mind it may take a bit longer to load.": "Похоже, что у Вас отключен JavaScript. Нажмите сюда, чтобы увидеть комментарии (учтите, что они могут загружаться дольше).",
+    "Hi! Looks like you have JavaScript turned off. Click here to view comments, keep in mind they may take a bit longer to load.": "Похоже, что у Вас отключен JavaScript. Нажмите сюда, чтобы увидеть комментарии (учтите, что они могут загружаться дольше).",
    "View YouTube comments": "Смотреть комментарии с YouTube",
    "View more comments on Reddit": "Больше комментариев на Reddit",
    "View `x` comments": "Показать `x` комментариев",
@@ -125,19 +141,19 @@
    "Show replies": "Показать ответы",
    "Incorrect password": "Неправильный пароль",
    "Quota exceeded, try again in a few hours": "Превышена квота, попробуйте снова через несколько часов",
-    "Unable to login, make sure two-factor authentication (Authenticator or SMS) is enabled.": "Вход не выполнен, проверьте, не включена ли двухфакторная аутентификация.",
+    "Unable to log in, make sure two-factor authentication (Authenticator or SMS) is turned on.": "Вход не выполнен, проверьте, не включена ли двухфакторная аутентификация.",
    "Invalid TFA code": "Неправильный TFA код",
-    "Login failed. This may be because two-factor authentication is not enabled on your account.": "Не удалось войти. Это может быть из-за того, что в вашем аккаунте не включена двухфакторная аутентификация.",
-    "Invalid answer": "Неверный ответ",
-    "Invalid CAPTCHA": "Неверная капча",
+    "Login failed. This may be because two-factor authentication is not turned on for your account.": "Не удалось войти. Это может быть из-за того, что в вашем аккаунте не включена двухфакторная аутентификация.",
+    "Wrong answer": "Неверный ответ",
+    "Erroneous CAPTCHA": "Неверная капча",
    "CAPTCHA is a required field": "Необходимо ввести капчу",
    "User ID is a required field": "Необходимо ввести идентификатор пользователя",
    "Password is a required field": "Необходимо ввести пароль",
-    "Invalid username or password": "Недопустимый пароль или имя пользователя",
-    "Please sign in using 'Sign in with Google'": "Пожалуйста войдите через Google",
+    "Wrong username or password": "Недопустимый пароль или имя пользователя",
+    "Please sign in using 'Log in with Google'": "Пожалуйста войдите через Google",
    "Password cannot be empty": "Пароль не может быть пустым",
    "Password cannot be longer than 55 characters": "Пароль не может быть длиннее 55 символов",
-    "Please sign in": "Пожалуйста, войдите",
+    "Please log in": "Пожалуйста, войдите",
    "Invidious Private Feed for `x`": "Приватная лента Invidious для `x`",
    "channel:`x`": "канал: `x`",
    "Deleted or invalid channel": "Канал удален или не найден",
@@ -149,15 +165,15 @@
    "Load more": "Загрузить больше",
    "`x` points": "`x` очков",
    "Could not create mix.": "Невозможно создать \"микс\".",
-    "Playlist is empty": "Плейлист пуст",
-    "Invalid playlist.": "Некорректный плейлист.",
+    "Empty playlist": "Плейлист пуст",
+    "Not a playlist.": "Некорректный плейлист.",
    "Playlist does not exist.": "Плейлист не существует.",
    "Could not pull trending pages.": "Невозможно получить страницы \"в тренде\".",
    "Hidden field \"challenge\" is a required field": "Необходимо заполнить скрытое поле \"challenge\"",
    "Hidden field \"token\" is a required field": "Необходимо заполнить скрытое поле \"токен\"",
-    "Invalid challenge": "Неправильный ответ в \"challenge\"",
-    "Invalid token": "Неправильный токен",
-    "Invalid user": "Недопустимое имя пользователя",
+    "Erroneous challenge": "Неправильный ответ в \"challenge\"",
+    "Erroneous token": "Неправильный токен",
+    "No such user": "Недопустимое имя пользователя",
    "Token is expired, please try again": "Срок действия токена истек, попробуйте позже",
    "English": "Английский",
    "English (auto-generated)": "Английский (созданы автоматически)",
@@ -226,7 +242,7 @@
    "Marathi": "Маратхи",
    "Mongolian": "Монгольская",
    "Nepali": "Непальский",
-    "Norwegian": "Норвежский",
+    "Norwegian Bokmål": "Норвежский",
    "Nyanja": "Ньянджа",
    "Pashto": "Пушту",
    "Persian": "Персидский",
@@ -278,6 +294,7 @@
    "About": "О сайте",
    "Rating: ": "Рейтинг: ",
    "Language: ": "Язык: ",
+    "View as playlist": "Смотреть как плейлист",
    "Default": "По-умолчанию",
    "Music": "Музыка",
    "Gaming": "Игры",
@@ -287,11 +304,11 @@
    "Download as: ": "Скачать как: ",
    "%A %B %-d, %Y": "%-d %B %Y, %A",
    "(edited)": "(изменено)",
-    "Youtube permalink of the comment": "Прямая ссылка на YouTube",
+    "YouTube comment permalink": "Прямая ссылка на YouTube",
    "`x` marked it with a ❤": "❤ от автора канала \"`x`\"",
    "Audio mode": "Аудио режим",
    "Video mode": "Видео режим",
    "Videos": "Видео",
    "Playlists": "Плейлисты",
    "Current version: ": "Текущая версия: "
-}
+}
--- a/locales/uk.json
+++ b/locales/uk.json
@@ -0,0 +1,314 @@
+{
+    "`x` subscribers": "`x` підписник / підписників / підписника",
+    "`x` videos": "`x` відео",
+    "LIVE": "ПРЯМИЙ ЕФІР",
+    "Shared `x` ago": "Розміщено `x` назад",
+    "Unsubscribe": "Відписатися",
+    "Subscribe": "Підписатися",
+    "View channel on YouTube": "Подивитися канал на YouTube",
+    "newest": "найновіше",
+    "oldest": "найстаріше",
+    "popular": "популярне",
+    "last": "останнє",
+    "Next page": "Наступна сторінка",
+    "Previous page": "Попередня сторінка",
+    "Clear watch history?": "Очистити історію переглядів?",
+    "New password": "",
+    "New passwords must match": "",
+    "Cannot change password for Google accounts": "",
+    "Authorize token?": "",
+    "Authorize token for `x`?": "",
+    "Yes": "Так",
+    "No": "Ні",
+    "Import and Export Data": "Імпорт і експорт даних",
+    "Import": "Імпорт",
+    "Import Invidious data": "Імпортувати дані Invidious",
+    "Import YouTube subscriptions": "Імпортувати підписки з YouTube",
+    "Import FreeTube subscriptions (.db)": "Імпортувати підписки з FreeTube (.db)",
+    "Import NewPipe subscriptions (.json)": "Імпортувати підписки з NewPipe (.json)",
+    "Import NewPipe data (.zip)": "Імпортувати дані з NewPipe (.zip)",
+    "Export": "Експорт",
+    "Export subscriptions as OPML": "Експортувати підписки у форматі OPML",
+    "Export subscriptions as OPML (for NewPipe & FreeTube)": "Експортувати підписки у форматі OPML (для NewPipe та FreeTube)",
+    "Export data as JSON": "Експортувати дані у форматі JSON",
+    "Delete account?": "Видалити обліківку?",
+    "History": "Історія",
+    "An alternative front-end to YouTube": "Альтернативний фронтенд до YouTube",
+    "JavaScript license information": "Інформація щодо ліцензій JavaScript",
+    "source": "джерело",
+    "Log in": "Увійти",
+    "Log in/register": "Увійти або зареєструватися",
+    "Log in with Google": "Увійти через Google",
+    "User ID": "ID користувача",
+    "Password": "Пароль",
+    "Time (h:mm:ss):": "Час (г:мм:сс):",
+    "Text CAPTCHA": "Текст капчі",
+    "Image CAPTCHA": "Зображення капчі",
+    "Sign In": "Увійти",
+    "Register": "Зареєструватися",
+    "E-mail": "Електронна пошта",
+    "Google verification code": "Код підтвердження Google",
+    "Preferences": "Налаштування",
+    "Player preferences": "Налаштування програвача",
+    "Always loop: ": "Завжди повторювати: ",
+    "Autoplay: ": "Автовідтворення: ",
+    "Play next by default: ": "",
+    "Autoplay next video: ": "Автовідтворення наступного відео: ",
+    "Listen by default: ": "Режим «тільки звук» як усталений: ",
+    "Proxy videos? ": "Програвати відео через проксі? ",
+    "Default speed: ": "Усталена швидкість відео: ",
+    "Preferred video quality: ": "Пріорітетна якість відео: ",
+    "Player volume: ": "Гучність відео: ",
+    "Default comments: ": "Джерело коментарів: ",
+    "youtube": "",
+    "reddit": "",
+    "Default captions: ": "Основна мова субтитрів: ",
+    "Fallback captions: ": "Запасна мова субтитрів: ",
+    "Show related videos? ": "Показувати схожі відео? ",
+    "Show annotations by default? ": "",
+    "Visual preferences": "Налаштування сайту",
+    "Dark mode: ": "Темне оформлення: ",
+    "Thin mode: ": "Полегшене оформлення: ",
+    "Subscription preferences": "Налаштування підписок",
+    "Show annotations by default for subscribed channels? ": "",
+    "Redirect homepage to feed: ": "Показувати відео з каналів, на які підписані, як головну сторінку: ",
+    "Number of videos shown in feed: ": "Кількість відео з каналів, на які підписані, у потоці: ",
+    "Sort videos by: ": "Сортувати відео: ",
+    "published": "за датою розміщення",
+    "published - reverse": "за датою розміщення в зворотному порядку",
+    "alphabetically": "за абеткою",
+    "alphabetically - reverse": "за абеткою в зворотному порядку",
+    "channel name": "за назвою каналу",
+    "channel name - reverse": "за назвою каналу в зворотному порядку",
+    "Only show latest video from channel: ": "Показувати тільки останнє відео з каналів: ",
+    "Only show latest unwatched video from channel: ": "Показувати тільки непереглянуті відео з каналів: ",
+    "Only show unwatched: ": "Показувати тільки непереглянуті відео: ",
+    "Only show notifications (if there are any): ": "Показувати лише сповіщення, якщо вони є: ",
+    "Data preferences": "Налаштування даних",
+    "Clear watch history": "Очистити історію переглядів",
+    "Import/export data": "Імпорт і експорт даних",
+    "Change password": "",
+    "Manage subscriptions": "Керування підписками",
+    "Manage tokens": "",
+    "Watch history": "Історія переглядів",
+    "Delete account": "Видалити обліківку",
+    "Administrator preferences": "Адміністраторські налаштування",
+    "Default homepage: ": "Усталена домашня сторінка: ",
+    "Feed menu: ": "Меню потоку з відео: ",
+    "Top enabled? ": "Увімкнути топ відео? ",
+    "CAPTCHA enabled? ": "Увімкнути капчу? ",
+    "Login enabled? ": "Увімкнути авторизацію? ",
+    "Registration enabled? ": "Увімкнути реєстрацію? ",
+    "Report statistics? ": "Повідомляти статистику? ",
+    "Save preferences": "Зберегти налаштування",
+    "Subscription manager": "Менеджер підписок",
+    "Token manager": "",
+    "Token": "",
+    "`x` subscriptions": "`x` підписка / підписок / підписки",
+    "`x` tokens": "",
+    "Import/export": "Імпорт і експорт",
+    "unsubscribe": "відписатися",
+    "revoke": "",
+    "Subscriptions": "Підписки",
+    "`x` unseen notifications": "`x` непереглянуте сповіщення / непереглянутих сповіщень / непереглянутих сповіщення",
+    "search": "пошук",
+    "Log out": "Вийти",
+    "Released under the AGPLv3 by Omar Roth.": "Реалізовано Омаром Ротом за ліцензією AGPLv3.",
+    "Source available here.": "Програмний код доступний тут.",
+    "View JavaScript license information.": "Переглянути інформацію щодо ліцензії JavaScript.",
+    "View privacy policy.": "Переглянути політику приватності.",
+    "Trending": "У тренді",
+    "Unlisted": "Відсутнє у листі",
+    "Watch on YouTube": "Дивитися відео на YouTube",
+    "Hide annotations": "",
+    "Show annotations": "",
+    "Genre: ": "Жанр: ",
+    "License: ": "Ліцензія: ",
+    "Family friendly? ": "Перегляд із родиною? ",
+    "Wilson score: ": "Рейтинг Вілсона: ",
+    "Engagement: ": "Залученість: ",
+    "Whitelisted regions: ": "Доступно у регіонах: ",
+    "Blacklisted regions: ": "Недоступно у регіонах: ",
+    "Shared `x`": "Розміщено `x`",
+    "`x` views": "",
+    "Premieres in `x`": "Прем’єра через `x`",
+    "Hi! Looks like you have JavaScript turned off. Click here to view comments, keep in mind they may take a bit longer to load.": "Схоже, у вас відключений JavaScript. Щоб побачити коментарі, натисніть сюда, але майте на увазі, що вони можуть завантажуватися трохи довше.",
+    "View YouTube comments": "Переглянути коментарі з YouTube",
+    "View more comments on Reddit": "Переглянути більше коментарів на Reddit",
+    "View `x` comments": "Переглянути `x` коментар / коментарів / коментаря",
+    "View Reddit comments": "Переглянути коментарі з Reddit",
+    "Hide replies": "Сховати відповіді",
+    "Show replies": "Показати відповіді",
+    "Incorrect password": "Неправильний пароль",
+    "Quota exceeded, try again in a few hours": "Ліміт перевищено, спробуйте знову за декілька годин",
+    "Unable to log in, make sure two-factor authentication (Authenticator or SMS) is turned on.": "Не вдається увійти. Перевірте, чи не ввімкнена двофакторна аутентифікація (за кодом чи смс).",
+    "Invalid TFA code": "Неправильний код двофакторної аутентифікації",
+    "Login failed. This may be because two-factor authentication is not turned on for your account.": "Не вдається увійти. Це може бути через те, що у вашій обліківці не ввімкнена двофакторна аутентифікація.",
+    "Wrong answer": "Неправильна відповідь",
+    "Erroneous CAPTCHA": "Неправильна капча",
+    "CAPTCHA is a required field": "Необхідно пройти капчу",
+    "User ID is a required field": "Необхідно ввести ID користувача",
+    "Password is a required field": "Необхідно ввести пароль",
+    "Wrong username or password": "Неправильний логін чи пароль",
+    "Please sign in using 'Log in with Google'": "Будь ласка, натисніть «Увійдіть через Google»",
+    "Password cannot be empty": "Пароль не може бути порожнім",
+    "Password cannot be longer than 55 characters": "Пароль не може бути довшим за 55 знаків",
+    "Please log in": "Будь ласка, увійдіть",
+    "Invidious Private Feed for `x`": "Приватний поток відео Invidious для `x`",
+    "channel:`x`": "канал: `x`",
+    "Deleted or invalid channel": "Канал видалено або не знайдено",
+    "This channel does not exist.": "Такого каналу не існує.",
+    "Could not get channel info.": "Не вдається отримати інформацію щодо цього каналу.",
+    "Could not fetch comments": "Не вдається завантажити коментарі",
+    "View `x` replies": "Переглянути `x` відповідь / відповідей / відповіді",
+    "`x` ago": "`x` тому",
+    "Load more": "Завантажити більше",
+    "`x` points": "`x` очко / очок / очка",
+    "Could not create mix.": "Не вдається створити мікс.",
+    "Empty playlist": "Плейлист порожній",
+    "Not a playlist.": "Недійсний плейлист.",
+    "Playlist does not exist.": "Плейлист не існує.",
+    "Could not pull trending pages.": "Не вдається завантажити сторінки «у тренді».",
+    "Hidden field \"challenge\" is a required field": "Необхідно заповнити приховане поле «challenge»",
+    "Hidden field \"token\" is a required field": "Необхідно заповнити приховане поле «token»",
+    "Erroneous challenge": "Неправильна відповідь у «challenge»",
+    "Erroneous token": "Недійсний токен",
+    "No such user": "Недопустиме ім’я користувача",
+    "Token is expired, please try again": "Термін дії токена закінчився, спробуйте пізніше",
+    "English": "Англійська",
+    "English (auto-generated)": "Англійська (сгенеровано автоматично)",
+    "Afrikaans": "Африкаанс",
+    "Albanian": "Албанська",
+    "Amharic": "Амхарська",
+    "Arabic": "Арабська",
+    "Armenian": "Вірменська",
+    "Azerbaijani": "Азербайджанська",
+    "Bangla": "Бенгальска",
+    "Basque": "Баскська",
+    "Belarusian": "Білоруська",
+    "Bosnian": "Боснійська",
+    "Bulgarian": "Болгарська",
+    "Burmese": "Бірманська",
+    "Catalan": "Каталонська",
+    "Cebuano": "Себуанська",
+    "Chinese (Simplified)": "Китайська (спрощена)",
+    "Chinese (Traditional)": "Китайська (традиційна)",
+    "Corsican": "Корсиканська",
+    "Croatian": "Хорватська",
+    "Czech": "Чеська",
+    "Danish": "Данська",
+    "Dutch": "Нідерландська",
+    "Esperanto": "Есперанто",
+    "Estonian": "Естонська",
+    "Filipino": "Філіппінська",
+    "Finnish": "Фінська",
+    "French": "Французька",
+    "Galician": "Галісійська",
+    "Georgian": "Грузинська",
+    "German": "Німецька",
+    "Greek": "Грецька",
+    "Gujarati": "Гуджаратська",
+    "Haitian Creole": "Гаїтянська креольська",
+    "Hausa": "Хауса",
+    "Hawaiian": "Гавайська",
+    "Hebrew": "Іврит",
+    "Hindi": "Гінді",
+    "Hmong": "Хмонгська",
+    "Hungarian": "Угорська",
+    "Icelandic": "Ісландська",
+    "Igbo": "Ігбо",
+    "Indonesian": "Індонезійська",
+    "Irish": "Ірландська",
+    "Italian": "Італійська",
+    "Japanese": "Японська",
+    "Javanese": "Яванська",
+    "Kannada": "Каннада",
+    "Kazakh": "Казахська",
+    "Khmer": "Кхмерська",
+    "Korean": "Корейська",
+    "Kurdish": "Курдська",
+    "Kyrgyz": "Киргизька",
+    "Lao": "Лаоська",
+    "Latin": "Латинська",
+    "Latvian": "Латиська",
+    "Lithuanian": "Литовська",
+    "Luxembourgish": "Люксембурзька",
+    "Macedonian": "Македонська",
+    "Malagasy": "Малагасійська",
+    "Malay": "Малайська",
+    "Malayalam": "Малаялам",
+    "Maltese": "Мальтійська",
+    "Maori": "Маорі",
+    "Marathi": "Маратхі",
+    "Mongolian": "Монгольська",
+    "Nepali": "Непальська",
+    "Norwegian Bokmål": "Норвезька",
+    "Nyanja": "Ньянджа",
+    "Pashto": "Пушту",
+    "Persian": "Перська",
+    "Polish": "Польська",
+    "Portuguese": "Португальська",
+    "Punjabi": "Пенджабська",
+    "Romanian": "Румунська",
+    "Russian": "Російська",
+    "Samoan": "Самоанська",
+    "Scottish Gaelic": "Шотландська ґельська",
+    "Serbian": "Сербська",
+    "Shona": "Шона",
+    "Sindhi": "Сіндгі",
+    "Sinhala": "Сингальська",
+    "Slovak": "Словацька",
+    "Slovenian": "Словенська",
+    "Somali": "Сомалійська",
+    "Southern Sotho": "Сесото (південна сото)",
+    "Spanish": "Іспанська",
+    "Spanish (Latin America)": "Испанська (Латинська Америка)",
+    "Sundanese": "Сунданська",
+    "Swahili": "Суахілі",
+    "Swedish": "Шведська",
+    "Tajik": "Таджицька",
+    "Tamil": "Тамільська",
+    "Telugu": "Телугу",
+    "Thai": "Тайська",
+    "Turkish": "Турецька",
+    "Ukrainian": "Українська",
+    "Urdu": "Урду",
+    "Uzbek": "Узбецька",
+    "Vietnamese": "В’єтнамська",
+    "Welsh": "Валлійська",
+    "Western Frisian": "Західнофризька",
+    "Xhosa": "Коса",
+    "Yiddish": "Їдиш",
+    "Yoruba": "Йоруба",
+    "Zulu": "Зулу",
+    "`x` years": "`x` років / рік / роки",
+    "`x` months": "`x` місяців / місяць / місяці",
+    "`x` weeks": "`x` тижнів / тиждень / тижні",
+    "`x` days": "`x` днів / день / дні",
+    "`x` hours": "`x` годин / година / години",
+    "`x` minutes": "`x` хвилин / хвилина / хвилини",
+    "`x` seconds": "`x` секунд / секунду / секунди",
+    "Fallback comments: ": "Резервні коментарі: ",
+    "Popular": "Популярне",
+    "Top": "Топ",
+    "About": "Про сайт",
+    "Rating: ": "Рейтинг: ",
+    "Language: ": "Мова: ",
+    "View as playlist": "",
+    "Default": "Усталено",
+    "Music": "Музика",
+    "Gaming": "Ігри",
+    "News": "Новини",
+    "Movies": "Фільми",
+    "Download": "Завантажити",
+    "Download as: ": "Завантажити як: ",
+    "%A %B %-d, %Y": "%-d %B %Y, %A",
+    "(edited)": "(змінено)",
+    "YouTube comment permalink": "Пряме посилання на коментар в YouTube",
+    "`x` marked it with a ❤": "❤ цьому від каналу `x`",
+    "Audio mode": "Аудіорежим",
+    "Video mode": "Відеорежим",
+    "Videos": "Відео",
+    "Playlists": "Плейлисти",
+    "Current version: ": "Поточна версія: "
+}
--- a/shard.yml
+++ b/shard.yml
@@ -1,5 +1,5 @@
 name: invidious
-version: 0.16.0
+version: 0.17.0

 authors:
  - Omar Roth <omarroth@protonmail.com>
@@ -16,6 +16,6 @@ dependencies:
  sqlite3:
    github: crystal-lang/crystal-sqlite3

-crystal: 0.27.2
+crystal: 0.28.0

 license: AGPLv3
--- a/spec/helpers_spec.cr
+++ b/spec/helpers_spec.cr
@@ -1,4 +1,5 @@
 require "kemal"
+require "openssl/hmac"
 require "pg"
 require "spec"
 require "yaml"
@@ -81,4 +82,27 @@ describe "Helpers" do
      produce_comment_reply_continuation("_cE8xSu6swE", "UC1AZY74-dGVPe6bfxFwwEMg", "UgyBUaRGHB9Jmt1dsUZ4AaABAg").should eq("EiYSC19jRTh4U3U2c3dFwAEByAEB4AEBogINKP___________wFAABgGMk0aSxIaVWd5QlVhUkdIQjlKbXQxZHNVWjRBYUFCQWciAggAKhhVQzFBWlk3NC1kR1ZQZTZiZnhGd3dFTWcyC19jRTh4U3U2c3dFQAFICg%3D%3D")
    end
  end
+
+  describe "#sign_token" do
+    it "correctly signs a given hash" do
+      token = {
+        "session" => "v1:AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+        "expires" => 1554680038,
+        "scopes"  => [
+          ":notifications",
+          ":subscriptions/*",
+          "GET:tokens*",
+        ],
+        "signature" => "f//2hS20th8pALF305PJFK+D2aVtvefNnQheILHD2vU=",
+      }
+      sign_token("SECRET_KEY", token).should eq(token["signature"])
+
+      token = {
+        "session"   => "v1:AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+        "scopes"    => [":notifications", "POST:subscriptions/*"],
+        "signature" => "fNvXoT0MRAL9eE6lTE33CEg8HitYJDOL9a22rSN2Ihg=",
+      }
+      sign_token("SECRET_KEY", token).should eq(token["signature"])
+    end
+  end
 end
--- a/src/invidious.cr
+++ b/src/invidious.cr
--- a/src/invidious/channels.cr
+++ b/src/invidious/channels.cr
@@ -9,6 +9,34 @@ struct InvidiousChannel
 end

 struct ChannelVideo
+  def to_json(locale, config, kemal_config, json : JSON::Builder)
+    json.object do
+      json.field "title", self.title
+      json.field "videoId", self.id
+      json.field "videoThumbnails" do
+        generate_thumbnails(json, self.id, config, Kemal.config)
+      end
+
+      json.field "lengthSeconds", self.length_seconds
+
+      json.field "author", self.author
+      json.field "authorId", self.ucid
+      json.field "authorUrl", "/channel/#{self.ucid}"
+      json.field "published", self.published.to_unix
+      json.field "publishedText", translate(locale, "`x` ago", recode_date(self.published, locale))
+    end
+  end
+
+  def to_json(locale, config, kemal_config, json : JSON::Builder | Nil = nil)
+    if json
+      to_json(locale, config, kemal_config, json)
+    else
+      JSON.build do |json|
+        to_json(locale, config, kemal_config, json)
+      end
+    end
+  end
+
  db_mapping({
    id:                 String,
    title:              String,
@@ -51,8 +79,7 @@ def get_batch_channels(channels, db, refresh = false, pull_all_videos = true, ma

  final = [] of String
  channels.size.times do
-    ucid = finished_channel.receive
-    if ucid
+    if ucid = finished_channel.receive
      final << ucid
    end
  end
@@ -102,71 +129,72 @@ def fetch_channel(ucid, db, pull_all_videos = true, locale = nil)
    auto_generated = true
  end

-  if !pull_all_videos
-    url = produce_channel_videos_url(ucid, 1, auto_generated: auto_generated)
-    response = client.get(url)
-    json = JSON.parse(response.body)
+  page = 1

-    if json["content_html"]? && !json["content_html"].as_s.empty?
-      document = XML.parse_html(json["content_html"].as_s)
-      nodeset = document.xpath_nodes(%q(//li[contains(@class, "feed-item-container")]))
+  url = produce_channel_videos_url(ucid, page, auto_generated: auto_generated)
+  response = client.get(url)
+  json = JSON.parse(response.body)

-      if auto_generated
-        videos = extract_videos(nodeset)
-      else
-        videos = extract_videos(nodeset, ucid)
-        videos.each { |video| video.ucid = ucid }
-        videos.each { |video| video.author = author }
-      end
+  if json["content_html"]? && !json["content_html"].as_s.empty?
+    document = XML.parse_html(json["content_html"].as_s)
+    nodeset = document.xpath_nodes(%q(//li[contains(@class, "feed-item-container")]))
+
+    if auto_generated
+      videos = extract_videos(nodeset)
+    else
+      videos = extract_videos(nodeset, ucid, author)
    end
+  end

-    videos ||= [] of ChannelVideo
+  videos ||= [] of ChannelVideo

-    rss.xpath_nodes("//feed/entry").each do |entry|
-      video_id = entry.xpath_node("videoid").not_nil!.content
-      title = entry.xpath_node("title").not_nil!.content
-      published = Time.parse_rfc3339(entry.xpath_node("published").not_nil!.content)
-      updated = Time.parse_rfc3339(entry.xpath_node("updated").not_nil!.content)
-      author = entry.xpath_node("author/name").not_nil!.content
-      ucid = entry.xpath_node("channelid").not_nil!.content
+  rss.xpath_nodes("//feed/entry").each do |entry|
+    video_id = entry.xpath_node("videoid").not_nil!.content
+    title = entry.xpath_node("title").not_nil!.content
+    published = Time.parse_rfc3339(entry.xpath_node("published").not_nil!.content)
+    updated = Time.parse_rfc3339(entry.xpath_node("updated").not_nil!.content)
+    author = entry.xpath_node("author/name").not_nil!.content
+    ucid = entry.xpath_node("channelid").not_nil!.content

-      channel_video = videos.select { |video| video.id == video_id }[0]?
+    channel_video = videos.select { |video| video.id == video_id }[0]?

-      length_seconds = channel_video.try &.length_seconds
-      length_seconds ||= 0
+    length_seconds = channel_video.try &.length_seconds
+    length_seconds ||= 0

-      live_now = channel_video.try &.live_now
-      live_now ||= false
+    live_now = channel_video.try &.live_now
+    live_now ||= false

-      premiere_timestamp = channel_video.try &.premiere_timestamp
+    premiere_timestamp = channel_video.try &.premiere_timestamp

-      video = ChannelVideo.new(
-        video_id,
-        title,
-        published,
-        Time.now,
-        ucid,
-        author,
-        length_seconds,
-        live_now,
-        premiere_timestamp
-      )
+    video = ChannelVideo.new(
+      id: video_id,
+      title: title,
+      published: published,
+      updated: Time.now,
+      ucid: ucid,
+      author: author,
+      length_seconds: length_seconds,
+      live_now: live_now,
+      premiere_timestamp: premiere_timestamp
+    )

-      db.exec("UPDATE users SET notifications = notifications || $1 \
+    db.exec("UPDATE users SET notifications = notifications || $1 \
        WHERE updated < $2 AND $3 = ANY(subscriptions) AND $1 <> ALL(notifications)", video.id, video.published, ucid)

-      video_array = video.to_a
-      args = arg_array(video_array)
+    video_array = video.to_a
+    args = arg_array(video_array)

-      # We don't include the 'premire_timestamp' here because channel pages don't include them,
-      # meaning the above timestamp is always null
-      db.exec("INSERT INTO channel_videos VALUES (#{args}) \
+    # We don't include the 'premire_timestamp' here because channel pages don't include them,
+    # meaning the above timestamp is always null
+    db.exec("INSERT INTO channel_videos VALUES (#{args}) \
      ON CONFLICT (id) DO UPDATE SET title = $2, published = $3, \
      updated = $4, ucid = $5, author = $6, length_seconds = $7, \
      live_now = $8", video_array)
-    end
-  else
-    page = 1
+  end
+
+  if pull_all_videos
+    page += 1
+
    ids = [] of String

    loop do
@@ -181,25 +209,25 @@ def fetch_channel(ucid, db, pull_all_videos = true, locale = nil)
        break
      end

+      nodeset = nodeset.not_nil!
+
      if auto_generated
        videos = extract_videos(nodeset)
      else
-        videos = extract_videos(nodeset, ucid)
-        videos.each { |video| video.ucid = ucid }
-        videos.each { |video| video.author = author }
+        videos = extract_videos(nodeset, ucid, author)
      end

      count = nodeset.size
      videos = videos.map { |video| ChannelVideo.new(
-        video.id,
-        video.title,
-        video.published,
-        Time.now,
-        video.ucid,
-        video.author,
-        video.length_seconds,
-        video.live_now,
-        video.premiere_timestamp
+        id: video.id,
+        title: video.title,
+        published: video.published,
+        updated: Time.now,
+        ucid: video.ucid,
+        author: video.author,
+        length_seconds: video.length_seconds,
+        live_now: video.live_now,
+        premiere_timestamp: video.premiere_timestamp
      ) }

      videos.each do |video|
@@ -213,16 +241,14 @@ def fetch_channel(ucid, db, pull_all_videos = true, locale = nil)
          video_array = video.to_a
          args = arg_array(video_array)

-          # We don't include the 'premire_timestamp' here because channel pages don't include them,
-          # meaning the above timestamp is always null
+          # We don't update the 'premire_timestamp' here because channel pages don't include them
          db.exec("INSERT INTO channel_videos VALUES (#{args}) \
-          ON CONFLICT (id) DO UPDATE SET title = $2, published = $3, \
-          updated = $4, ucid = $5, author = $6, length_seconds = $7, \
-          live_now = $8", video_array)
+          ON CONFLICT (id) DO UPDATE SET title = $2, updated = $4, \
+          ucid = $5, author = $6, length_seconds = $7, live_now = $8", video_array)
        end
      end

-      if count < 30
+      if count < 25
        break
      end

--- a/src/invidious/comments.cr
+++ b/src/invidious/comments.cr
@@ -249,7 +249,7 @@ def fetch_youtube_comments(id, db, continuation, proxies, format, locale, thin_m
  return comments
 end

-def fetch_reddit_comments(id)
+def fetch_reddit_comments(id, sort_by = "confidence")
  client = make_client(REDDIT_URL)
  headers = HTTP::Headers{"User-Agent" => "web:invidious:v#{CURRENT_VERSION} (by /u/omarroth)"}

@@ -259,12 +259,16 @@ def fetch_reddit_comments(id)
  if search_results.status_code == 200
    search_results = RedditThing.from_json(search_results.body)

+    # For videos that have more than one thread, choose the one with the highest score
    thread = search_results.data.as(RedditListing).children.sort_by { |child| child.data.as(RedditLink).score }[-1]
    thread = thread.data.as(RedditLink)

-    result = client.get("/r/#{thread.subreddit}/comments/#{thread.id}.json?limit=100&sort=top", headers).body
+    result = client.get("/r/#{thread.subreddit}/comments/#{thread.id}.json?limit=100&sort=#{sort_by}", headers).body
    result = Array(RedditThing).from_json(result)
  elsif search_results.status_code == 302
+    # Previously, if there was only one result then the API would redirect to that result.
+    # Now, it appears it will still return a listing so this section is likely unnecessary.
+
    result = client.get(search_results.headers["Location"], headers).body
    result = Array(RedditThing).from_json(result)

@@ -305,7 +309,7 @@ def template_youtube_comments(comments, locale, thin_mode)
    html += <<-END_HTML
    <div class="pure-g">
      <div class="pure-u-4-24 pure-u-md-2-24">
-        <img style="width:90%; padding-right:1em; padding-top:1em;" src="#{author_thumbnail}">
+        <img style="width:90%;padding-right:1em;padding-top:1em" src="#{author_thumbnail}">
      </div>
      <div class="pure-u-20-24 pure-u-md-22-24">
        <p>
@@ -315,7 +319,7 @@ def template_youtube_comments(comments, locale, thin_mode)
          <p style="white-space:pre-wrap">#{child["contentHtml"]}</p>
          <span title="#{Time.unix(child["published"].as_i64).to_s(translate(locale, "%A %B %-d, %Y"))}">#{translate(locale, "`x` ago", recode_date(Time.unix(child["published"].as_i64), locale))} #{child["isEdited"] == true ? translate(locale, "(edited)") : ""}</span>
          |
-          <a href="https://www.youtube.com/watch?v=#{comments["videoId"]}&lc=#{child["commentId"]}" title="#{translate(locale, "Youtube permalink of the comment")}">[YT]</a>
+          <a href="https://www.youtube.com/watch?v=#{comments["videoId"]}&lc=#{child["commentId"]}" title="#{translate(locale, "YouTube comment permalink")}">[YT]</a>
          |
          <i class="icon ion-ios-thumbs-up"></i> #{number_with_separator(child["likeCount"])}
    END_HTML
@@ -441,8 +445,12 @@ def replace_links(html)
    end
  end

-  html = html.to_xml(options: XML::SaveOptions::NO_DECL)
-  return html
+  html = html.xpath_node(%q(//body)).not_nil!
+  if node = html.xpath_node(%q(./p))
+    html = node
+  end
+
+  return html.to_xml(options: XML::SaveOptions::NO_DECL)
 end

 def fill_links(html, scheme, host)
@@ -459,12 +467,10 @@ def fill_links(html, scheme, host)
  end

  if host == "www.youtube.com"
-    html = html.xpath_node(%q(//body)).not_nil!.to_xml
-  else
-    html = html.to_xml(options: XML::SaveOptions::NO_DECL)
+    html = html.xpath_node(%q(//body/p)).not_nil!
  end

-  return html
+  return html.to_xml(options: XML::SaveOptions::NO_DECL)
 end

 def content_to_comment_html(content)
--- a/src/invidious/helpers/handlers.cr
+++ b/src/invidious/helpers/handlers.cr
@@ -20,7 +20,9 @@ module HTTP::Handler
 end

 class Kemal::RouteHandler
-  exclude ["/api/v1/*"]
+  {% for method in %w(GET POST PUT HEAD DELETE PATCH OPTIONS) %}
+  exclude ["/api/v1/*"], {{method}}
+  {% end %}

  # Processes the route if it's a match. Otherwise renders 404.
  private def process_request(context)
@@ -31,13 +33,20 @@ class Kemal::RouteHandler
      raise Kemal::Exceptions::CustomException.new(context)
    end

+    if context.request.method == "HEAD" &&
+       context.request.path.ends_with? ".jpg"
+      context.response.headers["Content-Type"] = "image/jpeg"
+    end
+
    context.response.print(content)
    context
  end
 end

 class Kemal::ExceptionHandler
-  exclude ["/api/v1/*"]
+  {% for method in %w(GET POST PUT HEAD DELETE PATCH OPTIONS) %}
+  exclude ["/api/v1/*"], {{method}}
+  {% end %}

  private def call_exception_with_status_code(context : HTTP::Server::Context, exception : Exception, status_code : Int32)
    return if context.response.closed?
@@ -53,7 +62,8 @@ class Kemal::ExceptionHandler
 end

 class FilteredCompressHandler < Kemal::Handler
-  exclude ["/videoplayback", "/videoplayback/*", "/vi/*", "/ggpht/*"]
+  exclude ["/videoplayback", "/videoplayback/*", "/vi/*", "/ggpht/*", "/api/v1/auth/notifications"]
+  exclude ["/data_control"], "POST"

  def call(env)
    return call_next env if exclude_match? env
@@ -76,14 +86,70 @@ class FilteredCompressHandler < Kemal::Handler
  end
 end

+class AuthHandler < Kemal::Handler
+  {% for method in %w(GET POST PUT HEAD DELETE PATCH OPTIONS) %}
+    only ["/api/v1/auth/*"], {{method}}
+  {% end %}
+
+  def call(env)
+    return call_next env unless only_match? env
+
+    begin
+      if token = env.request.headers["Authorization"]?
+        token = JSON.parse(URI.unescape(token.lchop("Bearer ")))
+        session = URI.unescape(token["session"].as_s)
+        scopes, expire, signature = validate_request(token, session, env.request, HMAC_KEY, PG_DB, nil)
+
+        if email = PG_DB.query_one?("SELECT email FROM session_ids WHERE id = $1", session, as: String)
+          user = PG_DB.query_one("SELECT * FROM users WHERE email = $1", email, as: User)
+        end
+      elsif sid = env.request.cookies["SID"]?.try &.value
+        if sid.starts_with? "v1:"
+          raise "Cannot use token as SID"
+        end
+
+        if email = PG_DB.query_one?("SELECT email FROM session_ids WHERE id = $1", sid, as: String)
+          user = PG_DB.query_one("SELECT * FROM users WHERE email = $1", email, as: User)
+        end
+
+        scopes = [":*"]
+        session = sid
+      end
+
+      if !user
+        raise "Request must be authenticated"
+      end
+
+      env.set "scopes", scopes
+      env.set "user", user
+      env.set "session", session
+
+      call_next env
+    rescue ex
+      env.response.content_type = "application/json"
+
+      error_message = {"error" => ex.message}.to_json
+      env.response.status_code = 403
+      env.response.puts error_message
+    end
+  end
+end
+
 class APIHandler < Kemal::Handler
-  only ["/api/v1/*"]
+  {% for method in %w(GET POST PUT HEAD DELETE PATCH OPTIONS) %}
+  only ["/api/v1/*"], {{method}}
+  {% end %}
+  exclude ["/api/v1/auth/notifications"]

  def call(env)
    return call_next env unless only_match? env

    env.response.headers["Access-Control-Allow-Origin"] = "*"

+    # Since /api/v1/notifications is an event-stream, we don't want
+    # to wrap the response
+    return call_next env if exclude_match? env
+
    # Here we swap out the socket IO so we can modify the response as needed
    output = env.response.output
    env.response.output = IO::Memory.new
@@ -97,8 +163,7 @@ class APIHandler < Kemal::Handler
      if env.response.headers["Content-Type"]?.try &.== "application/json"
        response = JSON.parse(response)

-        if env.params.query["fields"]?
-          fields_text = env.params.query["fields"]
+        if fields_text = env.params.query["fields"]?
          begin
            JSONFilter.filter(response, fields_text)
          rescue ex
@@ -113,7 +178,7 @@ class APIHandler < Kemal::Handler
          response = response.to_json
        end
      end
-    rescue
+    rescue ex
    ensure
      env.response.output = output
      env.response.puts response
@@ -134,10 +199,28 @@ class DenyFrame < Kemal::Handler
  end
 end

-# Temp fix for https://github.com/crystal-lang/crystal/issues/7383
+# Temp fixes for https://github.com/crystal-lang/crystal/issues/7383
+class HTTP::UnknownLengthContent
+  def read_byte
+    ensure_send_continue
+    if @io.is_a?(OpenSSL::SSL::Socket::Client)
+      return if @io.as(OpenSSL::SSL::Socket::Client).@in_buffer_rem.empty?
+    end
+    @io.read_byte
+  end
+end
+
 class HTTP::Client
  private def handle_response(response)
-    # close unless response.keep_alive?
+    if @socket.is_a?(OpenSSL::SSL::Socket::Client)
+      close unless response.keep_alive? || @socket.as(OpenSSL::SSL::Socket::Client).@in_buffer_rem.empty?
+      if @socket.as(OpenSSL::SSL::Socket::Client).@in_buffer_rem.empty?
+        @socket = nil
+      end
+    else
+      close unless response.keep_alive?
+    end
+
    response
  end
 end
--- a/src/invidious/helpers/helpers.cr
+++ b/src/invidious/helpers/helpers.cr
@@ -1,5 +1,27 @@
 require "./macros"

+struct Nonce
+  db_mapping({
+    nonce:  String,
+    expire: Time,
+  })
+end
+
+struct SessionId
+  db_mapping({
+    id:     String,
+    email:  String,
+    issued: String,
+  })
+end
+
+struct Annotation
+  db_mapping({
+    id:          String,
+    annotations: String,
+  })
+end
+
 struct ConfigPreferences
  module StringToArray
    def self.to_yaml(value : Array(String), yaml : YAML::Nodes::Builder)
@@ -37,26 +59,29 @@ struct ConfigPreferences
  end

  yaml_mapping({
-    autoplay:           {type: Bool, default: false},
-    captions:           {type: Array(String), default: ["", "", ""], converter: StringToArray},
-    comments:           {type: Array(String), default: ["youtube", ""], converter: StringToArray},
-    continue:           {type: Bool, default: false},
-    dark_mode:          {type: Bool, default: false},
-    latest_only:        {type: Bool, default: false},
-    listen:             {type: Bool, default: false},
-    local:              {type: Bool, default: false},
-    locale:             {type: String, default: "en-US"},
-    max_results:        {type: Int32, default: 40},
-    notifications_only: {type: Bool, default: false},
-    quality:            {type: String, default: "hd720"},
-    redirect_feed:      {type: Bool, default: false},
-    related_videos:     {type: Bool, default: true},
-    sort:               {type: String, default: "published"},
-    speed:              {type: Float32, default: 1.0_f32},
-    thin_mode:          {type: Bool, default: false},
-    unseen_only:        {type: Bool, default: false},
-    video_loop:         {type: Bool, default: false},
-    volume:             {type: Int32, default: 100},
+    annotations:            {type: Bool, default: false},
+    annotations_subscribed: {type: Bool, default: false},
+    autoplay:               {type: Bool, default: false},
+    captions:               {type: Array(String), default: ["", "", ""], converter: StringToArray},
+    comments:               {type: Array(String), default: ["youtube", ""], converter: StringToArray},
+    continue:               {type: Bool, default: false},
+    continue_autoplay:      {type: Bool, default: true},
+    dark_mode:              {type: Bool, default: false},
+    latest_only:            {type: Bool, default: false},
+    listen:                 {type: Bool, default: false},
+    local:                  {type: Bool, default: false},
+    locale:                 {type: String, default: "en-US"},
+    max_results:            {type: Int32, default: 40},
+    notifications_only:     {type: Bool, default: false},
+    quality:                {type: String, default: "hd720"},
+    redirect_feed:          {type: Bool, default: false},
+    related_videos:         {type: Bool, default: true},
+    sort:                   {type: String, default: "published"},
+    speed:                  {type: Float32, default: 1.0_f32},
+    thin_mode:              {type: Bool, default: false},
+    unseen_only:            {type: Bool, default: false},
+    video_loop:             {type: Bool, default: false},
+    volume:                 {type: Int32, default: 100},
  })
 end

@@ -99,7 +124,10 @@ user: String,
                               default: Preferences.new(*ConfigPreferences.from_yaml("").to_tuple),
                               converter: ConfigPreferencesConverter,
    },
-    dmca_content: {type: Array(String), default: [] of String}, # For compliance with DMCA, disables download widget using list of video IDs
+    dmca_content:      {type: Array(String), default: [] of String}, # For compliance with DMCA, disables download widget using list of video IDs
+    check_tables:      {type: Bool, default: false},                 # Check table integrity, automatically try to add any missing columns, create tables, etc.
+    cache_annotations: {type: Bool, default: false},                 # Cache annotations requested from IA, will not cache empty annotations or annotations that only contain cards
+    banner:            {type: String?, default: nil},                # Optional banner to be displayed along top of page for announcements, etc.
  })
 end

@@ -163,8 +191,8 @@ def html_to_content(description_html)
  return description_html, description
 end

-def extract_videos(nodeset, ucid = nil)
-  videos = extract_items(nodeset, ucid)
+def extract_videos(nodeset, ucid = nil, author_name = nil)
+  videos = extract_items(nodeset, ucid, author_name)
  videos.select! { |item| !item.is_a?(SearchChannel | SearchPlaylist) }
  videos.map { |video| video.as(SearchVideo) }
 end
@@ -225,7 +253,7 @@ def extract_items(nodeset, ucid = nil, author_name = nil)
          video_count = video_count.rchop("+")
        end

-        video_count = video_count.to_i?
+        video_count = video_count.gsub(/\D/, "").to_i?
      end
      video_count ||= 0

@@ -285,10 +313,10 @@ def extract_items(nodeset, ucid = nil, author_name = nil)

      author_thumbnail ||= ""

-      subscriber_count = node.xpath_node(%q(.//span[contains(@class, "yt-subscriber-count")])).try &.["title"].delete(",").to_i?
+      subscriber_count = node.xpath_node(%q(.//span[contains(@class, "yt-subscriber-count")])).try &.["title"].gsub(/\D/, "").to_i?
      subscriber_count ||= 0

-      video_count = node.xpath_node(%q(.//ul[@class="yt-lockup-meta-info"]/li)).try &.content.split(" ")[0].delete(",").to_i?
+      video_count = node.xpath_node(%q(.//ul[@class="yt-lockup-meta-info"]/li)).try &.content.split(" ")[0].gsub(/\D/, "").to_i?
      video_count ||= 0

      items << SearchChannel.new(
@@ -450,7 +478,7 @@ def extract_shelf_items(nodeset, ucid = nil, author_name = nil)

        video_count_label = child_node.xpath_node(%q(.//span[@class="formatted-video-count-label"]))
        if video_count_label
-          video_count = video_count_label.content.strip.match(/^\d+/).try &.[0].to_i?
+          video_count = video_count_label.content.gsub(/\D/, "").to_i?
        end
        video_count ||= 50

@@ -483,3 +511,120 @@ def extract_shelf_items(nodeset, ucid = nil, author_name = nil)

  return items
 end
+
+def analyze_table(db, logger, table_name, struct_type = nil)
+  # Create table if it doesn't exist
+  begin
+    db.exec("SELECT * FROM #{table_name} LIMIT 0")
+  rescue ex
+    logger.write("CREATE TABLE #{table_name}\n")
+
+    db.using_connection do |conn|
+      conn.as(PG::Connection).exec_all(File.read("config/sql/#{table_name}.sql"))
+    end
+  end
+
+  if !struct_type
+    return
+  end
+
+  struct_array = struct_type.to_type_tuple
+  column_array = get_column_array(db, table_name)
+  column_types = File.read("config/sql/#{table_name}.sql").match(/CREATE TABLE public\.#{table_name}\n\((?<types>[\d\D]*?)\);/)
+    .try &.["types"].split(",").map { |line| line.strip }
+
+  if !column_types
+    return
+  end
+
+  struct_array.each_with_index do |name, i|
+    if name != column_array[i]?
+      if !column_array[i]?
+        new_column = column_types.select { |line| line.starts_with? name }[0]
+        logger.write("ALTER TABLE #{table_name} ADD COLUMN #{new_column}\n")
+        db.exec("ALTER TABLE #{table_name} ADD COLUMN #{new_column}")
+        next
+      end
+
+      # Column doesn't exist
+      if !column_array.includes? name
+        new_column = column_types.select { |line| line.starts_with? name }[0]
+        db.exec("ALTER TABLE #{table_name} ADD COLUMN #{new_column}")
+      end
+
+      # Column exists but in the wrong position, rotate
+      if struct_array.includes? column_array[i]
+        until name == column_array[i]
+          new_column = column_types.select { |line| line.starts_with? column_array[i] }[0]?.try &.gsub("#{column_array[i]}", "#{column_array[i]}_new")
+
+          # There's a column we didn't expect
+          if !new_column
+            logger.write("ALTER TABLE #{table_name} DROP COLUMN #{column_array[i]}\n")
+            db.exec("ALTER TABLE #{table_name} DROP COLUMN #{column_array[i]} CASCADE")
+
+            column_array = get_column_array(db, table_name)
+            next
+          end
+
+          logger.write("ALTER TABLE #{table_name} ADD COLUMN #{new_column}\n")
+          db.exec("ALTER TABLE #{table_name} ADD COLUMN #{new_column}")
+          logger.write("UPDATE #{table_name} SET #{column_array[i]}_new=#{column_array[i]}\n")
+          db.exec("UPDATE #{table_name} SET #{column_array[i]}_new=#{column_array[i]}")
+          logger.write("ALTER TABLE #{table_name} DROP COLUMN #{column_array[i]} CASCADE\n")
+          db.exec("ALTER TABLE #{table_name} DROP COLUMN #{column_array[i]} CASCADE")
+          logger.write("ALTER TABLE #{table_name} RENAME COLUMN #{column_array[i]}_new TO #{column_array[i]}\n")
+          db.exec("ALTER TABLE #{table_name} RENAME COLUMN #{column_array[i]}_new TO #{column_array[i]}")
+
+          column_array = get_column_array(db, table_name)
+        end
+      else
+        logger.write("ALTER TABLE #{table_name} DROP COLUMN #{column_array[i]} CASCADE\n")
+        db.exec("ALTER TABLE #{table_name} DROP COLUMN #{column_array[i]} CASCADE")
+      end
+    end
+  end
+end
+
+class PG::ResultSet
+  def field(index = @column_index)
+    @fields.not_nil![index]
+  end
+end
+
+def get_column_array(db, table_name)
+  column_array = [] of String
+  db.query("SELECT * FROM #{table_name} LIMIT 0") do |rs|
+    rs.column_count.times do |i|
+      column = rs.as(PG::ResultSet).field(i)
+      column_array << column.name
+    end
+  end
+
+  return column_array
+end
+
+def cache_annotation(db, id, annotations)
+  if !CONFIG.cache_annotations
+    return
+  end
+
+  body = XML.parse(annotations)
+  nodeset = body.xpath_nodes(%q(/document/annotations/annotation))
+
+  if nodeset == 0
+    return
+  end
+
+  has_legacy_annotations = false
+  nodeset.each do |node|
+    if !{"branding", "card", "drawer"}.includes? node["type"]?
+      has_legacy_annotations = true
+      break
+    end
+  end
+
+  if has_legacy_annotations
+    # TODO: Update on conflict?
+    db.exec("INSERT INTO annotations VALUES ($1, $2) ON CONFLICT DO NOTHING", id, annotations)
+  end
+end
--- a/src/invidious/helpers/i18n.cr
+++ b/src/invidious/helpers/i18n.cr
@@ -7,8 +7,24 @@ def translate(locale : Hash(String, JSON::Any) | Nil, translation : String, text
  #   puts "Could not find translation for #{translation.dump}"
  # end

-  if locale && locale[translation]? && !locale[translation].as_s.empty?
-    translation = locale[translation].as_s
+  if locale && locale[translation]?
+    case locale[translation]
+    when .as_h?
+      match_length = 0
+
+      locale[translation].as_h.each do |key, value|
+        if md = text.try &.match(/#{key}/)
+          if md[0].size >= match_length
+            translation = value.as_s
+            match_length = md[0].size
+          end
+        end
+      end
+    when .as_s?
+      if !locale[translation].as_s.empty?
+        translation = locale[translation].as_s
+      end
+    end
  end

  if text
@@ -17,3 +33,12 @@ def translate(locale : Hash(String, JSON::Any) | Nil, translation : String, text

  return translation
 end
+
+def translate_bool(locale : Hash(String, JSON::Any) | Nil, translation : Bool)
+  case translation
+  when true
+    return translate(locale, "Yes")
+  when false
+    return translate(locale, "No")
+  end
+end
--- a/src/invidious/helpers/jobs.cr
+++ b/src/invidious/helpers/jobs.cr
@@ -54,7 +54,7 @@ def refresh_feeds(db, logger, max_threads = 1)
      db.query("SELECT email FROM users") do |rs|
        rs.each do
          email = rs.read(String)
-          view_name = "subscriptions_#{sha256(email)[0..7]}"
+          view_name = "subscriptions_#{sha256(email)}"

          if active_threads >= max_threads
            if active_channel.receive
@@ -65,28 +65,38 @@ def refresh_feeds(db, logger, max_threads = 1)
          active_threads += 1
          spawn do
            begin
-              db.query("SELECT * FROM #{view_name} LIMIT 1") do |rs|
-                # View doesn't contain same number of rows as ChannelVideo
-                if ChannelVideo.from_rs(rs)[0]?.try &.to_a.size.try &.!= rs.column_count
+              # Drop outdated views
+              column_array = get_column_array(db, view_name)
+              ChannelVideo.to_type_tuple.each_with_index do |name, i|
+                if name != column_array[i]?
+                  logger.write("DROP MATERIALIZED VIEW #{view_name}\n")
                  db.exec("DROP MATERIALIZED VIEW #{view_name}")
-                  raise "valid schema does not exist"
+                  raise "view does not exist"
                end
              end

              db.exec("REFRESH MATERIALIZED VIEW #{view_name}")
            rescue ex
-              # Create view if it doesn't exist
-              if ex.message.try &.ends_with?("does not exist")
-                # While iterating through, we may have an email stored from a deleted account
-                if db.query_one?("SELECT true FROM users WHERE email = $1", email, as: Bool)
-                  db.exec("CREATE MATERIALIZED VIEW #{view_name} AS \
-                  SELECT * FROM channel_videos WHERE \
-                  ucid = ANY ((SELECT subscriptions FROM users WHERE email = E'#{email.gsub("'", "\\'")}')::text[]) \
-                  ORDER BY published DESC;")
-                  logger.write("CREATE #{view_name}\n")
+              # Rename old views
+              begin
+                legacy_view_name = "subscriptions_#{sha256(email)[0..7]}"
+
+                db.exec("SELECT * FROM #{legacy_view_name} LIMIT 0")
+                logger.write("RENAME MATERIALIZED VIEW #{legacy_view_name}\n")
+                db.exec("ALTER MATERIALIZED VIEW #{legacy_view_name} RENAME TO #{view_name}")
+              rescue ex
+                begin
+                  # While iterating through, we may have an email stored from a deleted account
+                  if db.query_one?("SELECT true FROM users WHERE email = $1", email, as: Bool)
+                    logger.write("CREATE #{view_name}\n")
+                    db.exec("CREATE MATERIALIZED VIEW #{view_name} AS \
+                    SELECT * FROM channel_videos WHERE \
+                    ucid = ANY ((SELECT subscriptions FROM users WHERE email = E'#{email.gsub("'", "\\'")}')::text[]) \
+                    ORDER BY published DESC;")
+                  end
+                rescue ex
+                  logger.write("REFRESH #{email} : #{ex.message}\n")
                end
-              else
-                logger.write("REFRESH #{email} : #{ex.message}\n")
              end
            end

--- a/src/invidious/helpers/macros.cr
+++ b/src/invidious/helpers/macros.cr
@@ -3,10 +3,14 @@ macro db_mapping(mapping)
    end

    def to_a
-        return [{{*mapping.keys.map { |id| "@#{id}".id }}}]
+        return [ {{*mapping.keys.map { |id| "@#{id}".id }}} ]
    end

-    DB.mapping({{mapping}})
+    def self.to_type_tuple
+        return { {{*mapping.keys.map { |id| "#{id}" }}} }
+    end
+
+    DB.mapping( {{mapping}} )
 end

 macro json_mapping(mapping)
@@ -14,11 +18,11 @@ macro json_mapping(mapping)
    end

    def to_a
-        return [{{*mapping.keys.map { |id| "@#{id}".id }}}]
+        return [ {{*mapping.keys.map { |id| "@#{id}".id }}} ]
    end

-    JSON.mapping({{mapping}})
-    YAML.mapping({{mapping}})
+    JSON.mapping( {{mapping}} )
+    YAML.mapping( {{mapping}} )
 end

 macro yaml_mapping(mapping)
@@ -26,7 +30,7 @@ macro yaml_mapping(mapping)
    end

    def to_a
-        return [{{*mapping.keys.map { |id| "@#{id}".id }}}]
+        return [ {{*mapping.keys.map { |id| "@#{id}".id }}} ]
    end

    def to_tuple
--- a/src/invidious/helpers/signatures.cr
+++ b/src/invidious/helpers/signatures.cr
--- a/src/invidious/helpers/tokens.cr
+++ b/src/invidious/helpers/tokens.cr
@@ -0,0 +1,146 @@
+def generate_token(email, scopes, expire, key, db)
+  session = "v1:#{Base64.urlsafe_encode(Random::Secure.random_bytes(32))}"
+  PG_DB.exec("INSERT INTO session_ids VALUES ($1, $2, $3)", session, email, Time.now)
+
+  token = {
+    "session" => session,
+    "scopes"  => scopes,
+    "expire"  => expire,
+  }
+
+  if !expire
+    token.delete("expire")
+  end
+
+  token["signature"] = sign_token(key, token)
+
+  return token.to_json
+end
+
+def generate_response(session, scopes, key, db, expire = 6.hours, use_nonce = false)
+  expire = Time.now + expire
+
+  token = {
+    "session" => session,
+    "expire"  => expire.to_unix,
+    "scopes"  => scopes,
+  }
+
+  if use_nonce
+    nonce = Random::Secure.hex(16)
+    db.exec("INSERT INTO nonces VALUES ($1, $2) ON CONFLICT DO NOTHING", nonce, expire)
+    token["nonce"] = nonce
+  end
+
+  token["signature"] = sign_token(key, token)
+
+  return token.to_json
+end
+
+def sign_token(key, hash)
+  string_to_sign = [] of String
+
+  hash.each do |key, value|
+    if key == "signature"
+      next
+    end
+
+    if value.is_a?(JSON::Any)
+      case value
+      when .as_a?
+        value = value.as_a.map { |item| item.as_s }
+      end
+    end
+
+    case value
+    when Array
+      string_to_sign << "#{key}=#{value.sort.join(",")}"
+    when Tuple
+      string_to_sign << "#{key}=#{value.to_a.sort.join(",")}"
+    else
+      string_to_sign << "#{key}=#{value}"
+    end
+  end
+
+  string_to_sign = string_to_sign.sort.join("\n")
+  return Base64.urlsafe_encode(OpenSSL::HMAC.digest(:sha256, key, string_to_sign)).strip
+end
+
+def validate_request(token, session, request, key, db, locale = nil)
+  case token
+  when String
+    token = JSON.parse(URI.unescape(token)).as_h
+  when JSON::Any
+    token = token.as_h
+  when Nil
+    raise translate(locale, "Hidden field \"token\" is a required field")
+  end
+
+  if token["signature"] != sign_token(key, token)
+    raise translate(locale, "Invalid signature")
+  end
+
+  if token["session"] != session
+    raise translate(locale, "Erroneous token")
+  end
+
+  if token["nonce"]? && (nonce = db.query_one?("SELECT * FROM nonces WHERE nonce = $1", token["nonce"], as: {String, Time}))
+    if nonce[1] > Time.now
+      db.exec("UPDATE nonces SET expire = $1 WHERE nonce = $2", Time.new(1990, 1, 1), nonce[0])
+    else
+      raise translate(locale, "Erroneous token")
+    end
+  end
+
+  scopes = token["scopes"].as_a.map { |v| v.as_s }
+  scope = "#{request.method}:#{request.path.lchop("/api/v1/auth/").lstrip("/")}"
+
+  if !scopes_include_scope(scopes, scope)
+    raise translate(locale, "Invalid scope")
+  end
+
+  expire = token["expire"]?.try &.as_i
+  if expire.try &.< Time.now.to_unix
+    raise translate(locale, "Token is expired, please try again")
+  end
+
+  return {scopes, expire, token["signature"].as_s}
+end
+
+def scope_includes_scope(scope, subset)
+  methods, endpoint = scope.split(":")
+  methods = methods.split(";").map { |method| method.upcase }.reject { |method| method.empty? }.sort
+  endpoint = endpoint.downcase
+
+  subset_methods, subset_endpoint = subset.split(":")
+  subset_methods = subset_methods.split(";").map { |method| method.upcase }.sort
+  subset_endpoint = subset_endpoint.downcase
+
+  if methods.empty?
+    methods = %w(GET POST PUT HEAD DELETE PATCH OPTIONS)
+  end
+
+  if methods & subset_methods != subset_methods
+    return false
+  end
+
+  if endpoint.ends_with?("*") && !subset_endpoint.starts_with? endpoint.rchop("*")
+    return false
+  end
+
+  if !endpoint.ends_with?("*") && subset_endpoint != endpoint
+    return false
+  end
+
+  return true
+end
+
+def scopes_include_scope(scopes, subset)
+  scopes.each do |scope|
+    if scope_includes_scope(scope, subset)
+      return true
+    end
+  end
+
+  return false
+end
--- a/src/invidious/helpers/utils.cr
+++ b/src/invidious/helpers/utils.cr
@@ -18,13 +18,18 @@ def elapsed_text(elapsed)
  "#{(millis * 1000).round(2)}µs"
 end

-def make_client(url, proxies = {} of String => Array({ip: String, port: Int32}), region = nil)
-  context = OpenSSL::SSL::Context::Client.new
-  context.add_options(
-    OpenSSL::SSL::Options::ALL |
-    OpenSSL::SSL::Options::NO_SSL_V2 |
-    OpenSSL::SSL::Options::NO_SSL_V3
-  )
+def make_client(url : URI, proxies = {} of String => Array({ip: String, port: Int32}), region = nil)
+  context = nil
+
+  if url.scheme == "https"
+    context = OpenSSL::SSL::Context::Client.new
+    context.add_options(
+      OpenSSL::SSL::Options::ALL |
+      OpenSSL::SSL::Options::NO_SSL_V2 |
+      OpenSSL::SSL::Options::NO_SSL_V3
+    )
+  end
+
  client = HTTPClient.new(url, context)
  client.read_timeout = 10.seconds
  client.connect_timeout = 10.seconds
@@ -189,7 +194,9 @@ def number_to_short_text(number)

  text = text.rchop(".0")

-  if number / 1000000 != 0
+  if number / 1_000_000_000 != 0
+    text += "B"
+  elsif number / 1_000_000 != 0
    text += "M"
  elsif number / 1000 != 0
    text += "K"
--- a/src/invidious/mixes.cr
+++ b/src/invidious/mixes.cr
@@ -105,7 +105,7 @@ def template_mix(mix)
          </div>
          <p style="width:100%">#{video["title"]}</p>
          <p>
-              <b style="width: 100%">#{video["author"]}</b>
+              <b style="width:100%">#{video["author"]}</b>
          </p>
        </a>
      </li>
--- a/src/invidious/playlists.cr
+++ b/src/invidious/playlists.cr
@@ -49,7 +49,7 @@ def fetch_playlist_videos(plid, page, video_count, continuation = nil, locale =
    response = client.get(url)
    response = JSON.parse(response.body)
    if !response["content_html"]? || response["content_html"].as_s.empty?
-      raise translate(locale, "Playlist is empty")
+      raise translate(locale, "Empty playlist")
    end

    document = XML.parse_html(response["content_html"].as_s)
@@ -174,7 +174,7 @@ def fetch_playlist(plid, locale)

  response = client.get("/playlist?list=#{plid}&hl=en&disable_polymer=1")
  if response.status_code != 200
-    raise translate(locale, "Invalid playlist.")
+    raise translate(locale, "Not a playlist.")
  end

  body = response.body.gsub(/<button[^>]+><span[^>]+>\s*less\s*<img[^>]+>\n<\/span><\/button>/, "")
@@ -190,23 +190,27 @@ def fetch_playlist(plid, locale)
  description_html ||= document.xpath_node(%q(//span[@class="pl-header-description-text"]))
  description_html, description = html_to_content(description_html)

-  anchor = document.xpath_node(%q(//ul[@class="pl-header-details"])).not_nil!
-  author = anchor.xpath_node(%q(.//li[1]/a)).not_nil!.content
+  # YouTube allows anonymous playlists, so most of this can be empty or optional
+  anchor = document.xpath_node(%q(//ul[@class="pl-header-details"]))
+  author = anchor.try &.xpath_node(%q(.//li[1]/a)).try &.content
+  author ||= ""
  author_thumbnail = document.xpath_node(%q(//img[@class="channel-header-profile-image"])).try &.["src"]
  author_thumbnail ||= ""
-  ucid = anchor.xpath_node(%q(.//li[1]/a)).not_nil!["href"].split("/")[-1]
+  ucid = anchor.try &.xpath_node(%q(.//li[1]/a)).try &.["href"].split("/")[-1]
+  ucid ||= ""

-  video_count = anchor.xpath_node(%q(.//li[2])).not_nil!.content.delete("videos, ").to_i
-  views = anchor.xpath_node(%q(.//li[3])).not_nil!.content.delete("No views, ")
-  if views.empty?
-    views = 0_i64
+  video_count = anchor.try &.xpath_node(%q(.//li[2])).try &.content.gsub(/\D/, "").to_i?
+  video_count ||= 0
+  views = anchor.try &.xpath_node(%q(.//li[3])).try &.content.delete("No views, ").to_i64?
+  views ||= 0_i64
+
+  updated = anchor.try &.xpath_node(%q(.//li[4])).try &.content.lchop("Last updated on ").lchop("Updated ")
+  if updated
+    updated = decode_date(updated)
  else
-    views = views.to_i64
+    updated = Time.now
  end

-  updated = anchor.xpath_node(%q(.//li[4])).not_nil!.content.lchop("Last updated on ").lchop("Updated ")
-  updated = decode_date(updated)
-
  playlist = Playlist.new(
    title: title,
    id: plid,
@@ -244,7 +248,7 @@ def template_playlist(playlist)
          </div>
          <p style="width:100%">#{video["title"]}</p>
          <p>
-              <b style="width: 100%">#{video["author"]}</b>
+            <b style="width:100%">#{video["author"]}</b>
          </p>
        </a>
      </li>
--- a/src/invidious/search.cr
+++ b/src/invidious/search.cr
@@ -53,12 +53,18 @@ alias SearchItem = SearchVideo | SearchChannel | SearchPlaylist
 def channel_search(query, page, channel)
  client = make_client(YT_URL)

-  response = client.get("/user/#{channel}?disable_polymer=1&hl=en&gl=US")
+  response = client.get("/channel/#{channel}?disable_polymer=1&hl=en&gl=US")
  document = XML.parse_html(response.body)
  canonical = document.xpath_node(%q(//link[@rel="canonical"]))

  if !canonical
-    response = client.get("/channel/#{channel}?disable_polymer=1&hl=en&gl=US")
+    response = client.get("/c/#{channel}?disable_polymer=1&hl=en&gl=US")
+    document = XML.parse_html(response.body)
+    canonical = document.xpath_node(%q(//link[@rel="canonical"]))
+  end
+
+  if !canonical
+    response = client.get("/user/#{channel}?disable_polymer=1&hl=en&gl=US")
    document = XML.parse_html(response.body)
    canonical = document.xpath_node(%q(//link[@rel="canonical"]))
  end
--- a/src/invidious/trending.cr
+++ b/src/invidious/trending.cr
@@ -7,6 +7,8 @@ def fetch_trending(trending_type, proxies, region, locale)
  region = region.upcase

  trending = ""
+  plid = nil
+
  if trending_type && trending_type != "Default"
    trending_type = trending_type.downcase.capitalize

@@ -23,9 +25,11 @@ def fetch_trending(trending_type, proxies, region, locale)
    url = tabs.select { |tab| tab["channelListSubMenuAvatarRenderer"]["title"]["simpleText"] == trending_type }[0]?

    if url
+      url["channelListSubMenuAvatarRenderer"]["navigationEndpoint"]["commandMetadata"]["webCommandMetadata"]["url"]
      url = url["channelListSubMenuAvatarRenderer"]["navigationEndpoint"]["commandMetadata"]["webCommandMetadata"]["url"].as_s
      url += "&disable_polymer=1&gl=#{region}&hl=en"
      trending = client.get(url).body
+      plid = extract_plid(url)
    else
      trending = client.get("/feed/trending?gl=#{region}&hl=en&disable_polymer=1").body
    end
@@ -37,5 +41,37 @@ def fetch_trending(trending_type, proxies, region, locale)
  nodeset = trending.xpath_nodes(%q(//ul/li[@class="expanded-shelf-content-item-wrapper"]))
  trending = extract_videos(nodeset)

-  return trending
+  return {trending, plid}
+end
+
+def extract_plid(url)
+  wrapper = HTTP::Params.parse(URI.parse(url).query.not_nil!)["bp"]
+
+  wrapper = URI.unescape(wrapper)
+  wrapper = Base64.decode(wrapper)
+
+  # 0xe2 0x02 0x2e
+  wrapper += 3
+
+  # 0x0a
+  wrapper += 1
+
+  # Looks like "/m/[a-z0-9]{5}", not sure what it does here
+
+  item_size = wrapper[0]
+  wrapper += 1
+  item = wrapper[0, item_size]
+  wrapper += item.size
+
+  # 0x12
+  wrapper += 1
+
+  plid_size = wrapper[0]
+  wrapper += 1
+  plid = wrapper[0, plid_size]
+  wrapper += plid.size
+
+  plid = String.new(plid)
+
+  return plid
 end
--- a/src/invidious/users.cr
+++ b/src/invidious/users.cr
@@ -84,26 +84,29 @@ struct Preferences
  end

  json_mapping({
-    autoplay:           {type: Bool, default: CONFIG.default_user_preferences.autoplay},
-    captions:           {type: Array(String), default: CONFIG.default_user_preferences.captions, converter: StringToArray},
-    comments:           {type: Array(String), default: CONFIG.default_user_preferences.comments, converter: StringToArray},
-    continue:           {type: Bool, default: CONFIG.default_user_preferences.continue},
-    dark_mode:          {type: Bool, default: CONFIG.default_user_preferences.dark_mode},
-    latest_only:        {type: Bool, default: CONFIG.default_user_preferences.latest_only},
-    listen:             {type: Bool, default: CONFIG.default_user_preferences.listen},
-    local:              {type: Bool, default: CONFIG.default_user_preferences.local},
-    locale:             {type: String, default: CONFIG.default_user_preferences.locale},
-    max_results:        {type: Int32, default: CONFIG.default_user_preferences.max_results},
-    notifications_only: {type: Bool, default: CONFIG.default_user_preferences.notifications_only},
-    quality:            {type: String, default: CONFIG.default_user_preferences.quality},
-    redirect_feed:      {type: Bool, default: CONFIG.default_user_preferences.redirect_feed},
-    related_videos:     {type: Bool, default: CONFIG.default_user_preferences.related_videos},
-    sort:               {type: String, default: CONFIG.default_user_preferences.sort},
-    speed:              {type: Float32, default: CONFIG.default_user_preferences.speed},
-    thin_mode:          {type: Bool, default: CONFIG.default_user_preferences.thin_mode},
-    unseen_only:        {type: Bool, default: CONFIG.default_user_preferences.unseen_only},
-    video_loop:         {type: Bool, default: CONFIG.default_user_preferences.video_loop},
-    volume:             {type: Int32, default: CONFIG.default_user_preferences.volume},
+    annotations:            {type: Bool, default: CONFIG.default_user_preferences.annotations},
+    annotations_subscribed: {type: Bool, default: CONFIG.default_user_preferences.annotations_subscribed},
+    autoplay:               {type: Bool, default: CONFIG.default_user_preferences.autoplay},
+    captions:               {type: Array(String), default: CONFIG.default_user_preferences.captions, converter: StringToArray},
+    comments:               {type: Array(String), default: CONFIG.default_user_preferences.comments, converter: StringToArray},
+    continue:               {type: Bool, default: CONFIG.default_user_preferences.continue},
+    continue_autoplay:      {type: Bool, default: CONFIG.default_user_preferences.continue_autoplay},
+    dark_mode:              {type: Bool, default: CONFIG.default_user_preferences.dark_mode},
+    latest_only:            {type: Bool, default: CONFIG.default_user_preferences.latest_only},
+    listen:                 {type: Bool, default: CONFIG.default_user_preferences.listen},
+    local:                  {type: Bool, default: CONFIG.default_user_preferences.local},
+    locale:                 {type: String, default: CONFIG.default_user_preferences.locale},
+    max_results:            {type: Int32, default: CONFIG.default_user_preferences.max_results},
+    notifications_only:     {type: Bool, default: CONFIG.default_user_preferences.notifications_only},
+    quality:                {type: String, default: CONFIG.default_user_preferences.quality},
+    redirect_feed:          {type: Bool, default: CONFIG.default_user_preferences.redirect_feed},
+    related_videos:         {type: Bool, default: CONFIG.default_user_preferences.related_videos},
+    sort:                   {type: String, default: CONFIG.default_user_preferences.sort},
+    speed:                  {type: Float32, default: CONFIG.default_user_preferences.speed},
+    thin_mode:              {type: Bool, default: CONFIG.default_user_preferences.thin_mode},
+    unseen_only:            {type: Bool, default: CONFIG.default_user_preferences.unseen_only},
+    video_loop:             {type: Bool, default: CONFIG.default_user_preferences.video_loop},
+    volume:                 {type: Int32, default: CONFIG.default_user_preferences.volume},
  })
 end

@@ -125,7 +128,7 @@ def get_user(sid, headers, db, refresh = true)
      ON CONFLICT (id) DO NOTHING", sid, user.email, Time.now)

      begin
-        view_name = "subscriptions_#{sha256(user.email)[0..7]}"
+        view_name = "subscriptions_#{sha256(user.email)}"
        db.exec("CREATE MATERIALIZED VIEW #{view_name} AS \
        SELECT * FROM channel_videos WHERE \
        ucid = ANY ((SELECT subscriptions FROM users WHERE email = E'#{user.email.gsub("'", "\\'")}')::text[]) \
@@ -147,7 +150,7 @@ def get_user(sid, headers, db, refresh = true)
    ON CONFLICT (id) DO NOTHING", sid, user.email, Time.now)

    begin
-      view_name = "subscriptions_#{sha256(user.email)[0..7]}"
+      view_name = "subscriptions_#{sha256(user.email)}"
      db.exec("CREATE MATERIALIZED VIEW #{view_name} AS \
      SELECT * FROM channel_videos WHERE \
      ucid = ANY ((SELECT subscriptions FROM users WHERE email = E'#{user.email.gsub("'", "\\'")}')::text[]) \
@@ -197,69 +200,6 @@ def create_user(sid, email, password)
  return user, sid
 end

-def create_response(user_id, operation, key, db, expire = 6.hours)
-  expire = Time.now + expire
-  nonce = Random::Secure.hex(16)
-  db.exec("INSERT INTO nonces VALUES ($1, $2) ON CONFLICT DO NOTHING", nonce, expire)
-
-  challenge = "#{expire.to_unix}-#{nonce}-#{user_id}-#{operation}"
-  token = OpenSSL::HMAC.digest(:sha256, key, challenge)
-
-  challenge = Base64.urlsafe_encode(challenge)
-  token = Base64.urlsafe_encode(token)
-
-  return challenge, token
-end
-
-def validate_response(challenge, token, user_id, operation, key, db, locale)
-  if !challenge
-    raise translate(locale, "Hidden field \"challenge\" is a required field")
-  end
-
-  if !token
-    raise translate(locale, "Hidden field \"token\" is a required field")
-  end
-
-  challenge = Base64.decode_string(challenge)
-  if challenge.split("-").size == 4
-    expire, nonce, challenge_user_id, challenge_operation = challenge.split("-")
-
-    expire = expire.to_i?
-    expire ||= 0
-  else
-    raise translate(locale, "Invalid challenge")
-  end
-
-  challenge = OpenSSL::HMAC.digest(:sha256, key, challenge)
-  challenge = Base64.urlsafe_encode(challenge)
-
-  if nonce = db.query_one?("SELECT * FROM nonces WHERE nonce = $1", nonce, as: {String, Time})
-    if nonce[1] > Time.now
-      db.exec("UPDATE nonces SET expire = $1 WHERE nonce = $2", Time.new(1990, 1, 1), nonce[0])
-    else
-      raise translate(locale, "Invalid token")
-    end
-  else
-    raise translate(locale, "Invalid token")
-  end
-
-  if challenge != token
-    raise translate(locale, "Invalid token")
-  end
-
-  if challenge_operation != operation
-    raise translate(locale, "Invalid token")
-  end
-
-  if challenge_user_id != user_id
-    raise translate(locale, "Invalid token")
-  end
-
-  if expire < Time.now.to_unix
-    raise translate(locale, "Token is expired, please try again")
-  end
-end
-
 def generate_captcha(key, db)
  second = Random::Secure.rand(12)
  second_angle = second * 30
@@ -312,16 +252,16 @@ def generate_captcha(key, db)

  return {
    question: image,
-    tokens:   [create_response(answer, "sign_in", key, db)],
+    tokens:   {generate_response(answer, {":login"}, key, db, use_nonce: true)},
  }
 end

 def generate_text_captcha(key, db)
-  response = HTTP::Client.get(TEXTCAPTCHA_URL).body
+  response = make_client(TEXTCAPTCHA_URL).get("/omarroth@protonmail.com.json").body
  response = JSON.parse(response)

  tokens = response["a"].as_a.map do |answer|
-    create_response(answer.as_s, "sign_in", key, db)
+    generate_response(answer.as_s, {":login"}, key, db, use_nonce: true)
  end

  return {
--- a/src/invidious/videos.cr
+++ b/src/invidious/videos.cr
@@ -67,7 +67,7 @@ CAPTION_LANGUAGES = {
  "Marathi",
  "Mongolian",
  "Nepali",
-  "Norwegian",
+  "Norwegian Bokmål",
  "Nyanja",
  "Pashto",
  "Persian",
@@ -241,6 +241,28 @@ VIDEO_FORMATS = {
  "251" => {"ext" => "webm", "format" => "DASH audio", "acodec" => "opus", "abr" => 160},
 }

+struct VideoPreferences
+  json_mapping({
+    annotations:        Bool,
+    autoplay:           Bool,
+    continue:           Bool,
+    continue_autoplay:  Bool,
+    controls:           Bool,
+    listen:             Bool,
+    local:              Bool,
+    preferred_captions: Array(String),
+    quality:            String,
+    raw:                Bool,
+    region:             String?,
+    related_videos:     Bool,
+    speed:              (Float32 | Float64),
+    video_end:          (Float64 | Int32),
+    video_loop:         Bool,
+    video_start:        (Float64 | Int32),
+    volume:             Int32,
+  })
+end
+
 struct Video
  property player_json : JSON::Any?

@@ -250,6 +272,190 @@ struct Video
    end
  end

+  def to_json(locale, config, kemal_config, decrypt_function)
+    JSON.build do |json|
+      json.object do
+        json.field "title", self.title
+        json.field "videoId", self.id
+        json.field "videoThumbnails" do
+          generate_thumbnails(json, self.id, config, kemal_config)
+        end
+        json.field "storyboards" do
+          generate_storyboards(json, self.id, self.storyboards, config, kemal_config)
+        end
+
+        description_html, description = html_to_content(self.description)
+
+        json.field "description", description
+        json.field "descriptionHtml", description_html
+        json.field "published", self.published.to_unix
+        json.field "publishedText", translate(locale, "`x` ago", recode_date(self.published, locale))
+        json.field "keywords", self.keywords
+
+        json.field "viewCount", self.views
+        json.field "likeCount", self.likes
+        json.field "dislikeCount", self.dislikes
+
+        json.field "paid", self.paid
+        json.field "premium", self.premium
+        json.field "isFamilyFriendly", self.is_family_friendly
+        json.field "allowedRegions", self.allowed_regions
+        json.field "genre", self.genre
+        json.field "genreUrl", self.genre_url
+
+        json.field "author", self.author
+        json.field "authorId", self.ucid
+        json.field "authorUrl", "/channel/#{self.ucid}"
+
+        json.field "authorThumbnails" do
+          json.array do
+            qualities = {32, 48, 76, 100, 176, 512}
+
+            qualities.each do |quality|
+              json.object do
+                json.field "url", self.author_thumbnail.gsub("=s48-", "=s#{quality}-")
+                json.field "width", quality
+                json.field "height", quality
+              end
+            end
+          end
+        end
+
+        json.field "subCountText", self.sub_count_text
+
+        json.field "lengthSeconds", self.info["length_seconds"].to_i
+        json.field "allowRatings", self.allow_ratings
+        json.field "rating", self.info["avg_rating"].to_f32
+        json.field "isListed", self.is_listed
+        json.field "liveNow", self.live_now
+        json.field "isUpcoming", self.is_upcoming
+
+        if self.premiere_timestamp
+          json.field "premiereTimestamp", self.premiere_timestamp.not_nil!.to_unix
+        end
+
+        if self.player_response["streamingData"]?.try &.["hlsManifestUrl"]?
+          host_url = make_host_url(config, kemal_config)
+
+          hlsvp = self.player_response["streamingData"]["hlsManifestUrl"].as_s
+          hlsvp = hlsvp.gsub("https://manifest.googlevideo.com", host_url)
+
+          json.field "hlsUrl", hlsvp
+        end
+
+        json.field "dashUrl", "#{make_host_url(config, kemal_config)}/api/manifest/dash/id/#{id}"
+
+        json.field "adaptiveFormats" do
+          json.array do
+            self.adaptive_fmts(decrypt_function).each do |fmt|
+              json.object do
+                json.field "index", fmt["index"]
+                json.field "bitrate", fmt["bitrate"]
+                json.field "init", fmt["init"]
+                json.field "url", fmt["url"]
+                json.field "itag", fmt["itag"]
+                json.field "type", fmt["type"]
+                json.field "clen", fmt["clen"]
+                json.field "lmt", fmt["lmt"]
+                json.field "projectionType", fmt["projection_type"]
+
+                fmt_info = itag_to_metadata?(fmt["itag"])
+                if fmt_info
+                  fps = fmt_info["fps"]?.try &.to_i || fmt["fps"]?.try &.to_i || 30
+                  json.field "fps", fps
+                  json.field "container", fmt_info["ext"]
+                  json.field "encoding", fmt_info["vcodec"]? || fmt_info["acodec"]
+
+                  if fmt_info["height"]?
+                    json.field "resolution", "#{fmt_info["height"]}p"
+
+                    quality_label = "#{fmt_info["height"]}p"
+                    if fps > 30
+                      quality_label += "60"
+                    end
+                    json.field "qualityLabel", quality_label
+
+                    if fmt_info["width"]?
+                      json.field "size", "#{fmt_info["width"]}x#{fmt_info["height"]}"
+                    end
+                  end
+                end
+              end
+            end
+          end
+        end
+
+        json.field "formatStreams" do
+          json.array do
+            self.fmt_stream(decrypt_function).each do |fmt|
+              json.object do
+                json.field "url", fmt["url"]
+                json.field "itag", fmt["itag"]
+                json.field "type", fmt["type"]
+                json.field "quality", fmt["quality"]
+
+                fmt_info = itag_to_metadata?(fmt["itag"])
+                if fmt_info
+                  fps = fmt_info["fps"]?.try &.to_i || fmt["fps"]?.try &.to_i || 30
+                  json.field "fps", fps
+                  json.field "container", fmt_info["ext"]
+                  json.field "encoding", fmt_info["vcodec"]? || fmt_info["acodec"]
+
+                  if fmt_info["height"]?
+                    json.field "resolution", "#{fmt_info["height"]}p"
+
+                    quality_label = "#{fmt_info["height"]}p"
+                    if fps > 30
+                      quality_label += "60"
+                    end
+                    json.field "qualityLabel", quality_label
+
+                    if fmt_info["width"]?
+                      json.field "size", "#{fmt_info["width"]}x#{fmt_info["height"]}"
+                    end
+                  end
+                end
+              end
+            end
+          end
+        end
+
+        json.field "captions" do
+          json.array do
+            self.captions.each do |caption|
+              json.object do
+                json.field "label", caption.name.simpleText
+                json.field "languageCode", caption.languageCode
+                json.field "url", "/api/v1/captions/#{id}?label=#{URI.escape(caption.name.simpleText)}"
+              end
+            end
+          end
+        end
+
+        json.field "recommendedVideos" do
+          json.array do
+            self.info["rvs"]?.try &.split(",").each do |rv|
+              rv = HTTP::Params.parse(rv)
+
+              if rv["id"]?
+                json.object do
+                  json.field "videoId", rv["id"]
+                  json.field "title", rv["title"]
+                  json.field "videoThumbnails" do
+                    generate_thumbnails(json, rv["id"], config, kemal_config)
+                  end
+                  json.field "author", rv["author"]
+                  json.field "lengthSeconds", rv["length_seconds"].to_i
+                  json.field "viewCountText", rv["short_view_count_text"]
+                end
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+
  def allow_ratings
    allow_ratings = player_response["videoDetails"]?.try &.["allowRatings"]?.try &.as_bool

@@ -473,6 +679,75 @@ struct Video
    return @player_json.not_nil!
  end

+  def storyboards
+    storyboards = self.player_response["storyboards"]?
+      .try &.as_h
+        .try &.["playerStoryboardSpecRenderer"]?
+
+    if !storyboards
+      storyboards = self.player_response["storyboards"]?
+        .try &.as_h
+          .try &.["playerLiveStoryboardSpecRenderer"]?
+
+      if storyboard = storyboards.try &.["spec"]?
+           .try &.as_s
+        return [{
+          url:               storyboard.split("#")[0],
+          width:             106,
+          height:            60,
+          count:             -1,
+          interval:          5000,
+          storyboard_width:  3,
+          storyboard_height: 3,
+          storyboard_count:  -1,
+        }]
+      end
+    end
+
+    storyboards = storyboards.try &.["spec"]?
+      .try &.as_s.split("|")
+
+    items = [] of NamedTuple(
+      url: String,
+      width: Int32,
+      height: Int32,
+      count: Int32,
+      interval: Int32,
+      storyboard_width: Int32,
+      storyboard_height: Int32,
+      storyboard_count: Int32)
+
+    if !storyboards
+      return items
+    end
+
+    url = storyboards.shift
+
+    storyboards.each_with_index do |storyboard, i|
+      width, height, count, storyboard_width, storyboard_height, interval, _, sigh = storyboard.split("#")
+
+      width = width.to_i
+      height = height.to_i
+      count = count.to_i
+      interval = interval.to_i
+      storyboard_width = storyboard_width.to_i
+      storyboard_height = storyboard_height.to_i
+
+      items << {
+        url:               "#{url}&sigh=#{sigh}".sub("$L", i).sub("$N", "M$M"),
+        width:             width,
+        height:            height,
+        count:             count,
+        interval:          interval,
+        storyboard_width:  storyboard_width,
+        storyboard_height: storyboard_height,
+        storyboard_count:  (count.to_f / (storyboard_width.to_f * storyboard_height.to_f)).ceil.to_i,
+      }
+    end
+
+    items
+  end
+
  def paid
    reason = self.player_response["playabilityStatus"]?.try &.["reason"]?

@@ -566,12 +841,12 @@ end
 class VideoRedirect < Exception
 end

-def get_video(id, db, proxies = {} of String => Array({ip: String, port: Int32}), refresh = true, region = nil)
+def get_video(id, db, proxies = {} of String => Array({ip: String, port: Int32}), refresh = true, region = nil, force_refresh = false)
  if db.query_one?("SELECT EXISTS (SELECT true FROM videos WHERE id = $1)", id, as: Bool) && !region
    video = db.query_one("SELECT * FROM videos WHERE id = $1", id, as: Video)

    # If record was last updated over 10 minutes ago, refresh (expire param in response lasts for 6 hours)
-    if refresh && Time.now - video.updated > 10.minutes
+    if (refresh && Time.now - video.updated > 10.minutes) || force_refresh
      begin
        video = fetch_video(id, proxies, region)
        video_array = video.to_a
@@ -601,6 +876,168 @@ def get_video(id, db, proxies = {} of String => Array({ip: String, port: Int32})
  return video
 end

+def extract_polymer_config(body, html)
+  params = HTTP::Params.new
+
+  params["session_token"] = body.match(/"XSRF_TOKEN":"(?<session_token>[A-Za-z0-9\_\-\=]+)"/).try &.["session_token"] || ""
+
+  html_info = JSON.parse(body.match(/ytplayer\.config = (?<info>.*?);ytplayer\.load/).try &.["info"] || "{}").try &.["args"]?.try &.as_h
+
+  if html_info
+    html_info.each do |key, value|
+      params[key] = value.to_s
+    end
+  end
+
+  initial_data = JSON.parse(body.match(/window\["ytInitialData"\] = (?<info>.*?);\n/).try &.["info"] || "{}")
+
+  primary_results = initial_data["contents"]?
+    .try &.["twoColumnWatchNextResults"]?
+      .try &.["results"]?
+        .try &.["results"]?
+          .try &.["contents"]?
+
+  comment_continuation = primary_results.try &.as_a.select { |object| object["itemSectionRenderer"]? }[0]?
+    .try &.["itemSectionRenderer"]?
+      .try &.["continuations"]?
+        .try &.[0]?
+          .try &.["nextContinuationData"]?
+
+  params["ctoken"] = comment_continuation.try &.["continuation"]?.try &.as_s || ""
+  params["itct"] = comment_continuation.try &.["clickTrackingParams"]?.try &.as_s || ""
+
+  recommended_videos = initial_data["contents"]?
+    .try &.["twoColumnWatchNextResults"]?
+      .try &.["secondaryResults"]?
+        .try &.["secondaryResults"]?
+          .try &.["results"]?
+            .try &.as_a
+
+  rvs = [] of String
+
+  recommended_videos.try &.each do |compact_renderer|
+    if compact_renderer["compactRadioRenderer"]? || compact_renderer["compactPlaylistRenderer"]?
+      # TODO
+    elsif compact_renderer["compactVideoRenderer"]?
+      compact_renderer = compact_renderer["compactVideoRenderer"]
+
+      recommended_video = HTTP::Params.new
+      recommended_video["id"] = compact_renderer["videoId"].as_s
+      recommended_video["title"] = compact_renderer["title"]["simpleText"].as_s
+      recommended_video["author"] = compact_renderer["shortBylineText"]["runs"].as_a[0]["text"].as_s
+      recommended_video["ucid"] = compact_renderer["shortBylineText"]["runs"].as_a[0]["navigationEndpoint"]["browseEndpoint"]["browseId"].as_s
+      recommended_video["author_thumbnail"] = compact_renderer["channelThumbnail"]["thumbnails"][0]["url"].as_s
+
+      recommended_video["short_view_count_text"] = compact_renderer["shortViewCountText"]["simpleText"].as_s
+      recommended_video["view_count"] = compact_renderer["viewCountText"]?.try &.["simpleText"]?.try &.as_s.delete(", views watching").to_i64?.try &.to_s || "0"
+      recommended_video["length_seconds"] = decode_length_seconds(compact_renderer["lengthText"]?.try &.["simpleText"]?.try &.as_s || "0:00").to_s
+
+      rvs << recommended_video.to_s
+    end
+  end
+  params["rvs"] = rvs.join(",")
+
+  # TODO: Watching now
+  params["views"] = primary_results.try &.as_a.select { |object| object["videoPrimaryInfoRenderer"]? }[0]?
+    .try &.["videoPrimaryInfoRenderer"]?
+      .try &.["viewCount"]?
+        .try &.["videoViewCountRenderer"]?
+          .try &.["viewCount"]?
+            .try &.["simpleText"]?
+              .try &.as_s.gsub(/\D/, "").to_i64.to_s || "0"
+
+  sentiment_bar = primary_results.try &.as_a.select { |object| object["videoPrimaryInfoRenderer"]? }[0]?
+    .try &.["videoPrimaryInfoRenderer"]?
+      .try &.["sentimentBar"]?
+        .try &.["sentimentBarRenderer"]?
+          .try &.["tooltip"]?
+            .try &.as_s
+
+  likes, dislikes = sentiment_bar.try &.split(" / ").map { |a| a.delete(", ").to_i32 }[0, 2] || {0, 0}
+
+  params["likes"] = "#{likes}"
+  params["dislikes"] = "#{dislikes}"
+
+  published = primary_results.try &.as_a.select { |object| object["videoSecondaryInfoRenderer"]? }[0]?
+    .try &.["videoSecondaryInfoRenderer"]?
+      .try &.["dateText"]?
+        .try &.["simpleText"]?
+          .try &.as_s.split(" ")[-3..-1].join(" ")
+
+  if published
+    params["published"] = Time.parse(published, "%b %-d, %Y", Time::Location.local).to_unix.to_s
+  else
+    params["published"] = Time.new(1990, 1, 1).to_unix.to_s
+  end
+
+  params["description_html"] = "<p></p>"
+
+  description_html = primary_results.try &.as_a.select { |object| object["videoSecondaryInfoRenderer"]? }[0]?
+    .try &.["videoSecondaryInfoRenderer"]?
+      .try &.["description"]?
+        .try &.["runs"]?
+          .try &.as_a
+
+  if description_html
+    params["description_html"] = content_to_comment_html(description_html)
+  end
+
+  metadata = primary_results.try &.as_a.select { |object| object["videoSecondaryInfoRenderer"]? }[0]?
+    .try &.["videoSecondaryInfoRenderer"]?
+      .try &.["metadataRowContainer"]?
+        .try &.["metadataRowContainerRenderer"]?
+          .try &.["rows"]?
+            .try &.as_a
+
+  params["genre"] = ""
+  params["genre_ucid"] = ""
+  params["license"] = ""
+
+  metadata.try &.each do |row|
+    title = row["metadataRowRenderer"]?.try &.["title"]?.try &.["simpleText"]?.try &.as_s
+    contents = row["metadataRowRenderer"]?
+      .try &.["contents"]?
+        .try &.as_a[0]?
+
+    if title.try &.== "Category"
+      contents = contents.try &.["runs"]?
+        .try &.as_a[0]?
+
+      params["genre"] = contents.try &.["text"]?
+        .try &.as_s || ""
+      params["genre_ucid"] = contents.try &.["navigationEndpoint"]?
+        .try &.["browseEndpoint"]?
+          .try &.["browseId"]?.try &.as_s || ""
+    elsif title.try &.== "License"
+      contents = contents.try &.["runs"]?
+        .try &.as_a[0]?
+
+      params["license"] = contents.try &.["text"]?
+        .try &.as_s || ""
+    elsif title.try &.== "Licensed to YouTube by"
+      params["license"] = contents.try &.["simpleText"]?
+        .try &.as_s || ""
+    end
+  end
+
+  author_info = primary_results.try &.as_a.select { |object| object["videoSecondaryInfoRenderer"]? }[0]?
+    .try &.["videoSecondaryInfoRenderer"]?
+      .try &.["owner"]?
+        .try &.["videoOwnerRenderer"]?
+
+  params["author_thumbnail"] = author_info.try &.["thumbnail"]?
+    .try &.["thumbnails"]?
+      .try &.as_a[0]?
+        .try &.["url"]?
+          .try &.as_s || ""
+
+  params["sub_count_text"] = author_info.try &.["subscriberCountText"]?
+    .try &.["simpleText"]?
+      .try &.as_s.gsub(/\D/, "") || "0"
+
+  return params
+end
+
 def extract_player_config(body, html)
  params = HTTP::Params.new

@@ -718,7 +1155,7 @@ def fetch_video(id, proxies, region)
  info["avg_rating"] = "#{avg_rating}"

  description = html.xpath_node(%q(//p[@id="eow-description"]))
-  description = description ? description.to_xml : ""
+  description = description ? description.to_xml(options: XML::SaveOptions::NO_DECL) : ""

  wilson_score = ci_lower_bound(likes, likes + dislikes)

@@ -784,8 +1221,10 @@ def itag_to_metadata?(itag : String)
 end

 def process_video_params(query, preferences)
+  annotations = query["iv_load_policy"]?.try &.to_i?
  autoplay = query["autoplay"]?.try &.to_i?
  continue = query["continue"]?.try &.to_i?
+  continue_autoplay = query["continue_autoplay"]?.try &.to_i?
  listen = query["listen"]? && (query["listen"] == "true" || query["listen"] == "1").to_unsafe
  local = query["local"]? && (query["local"] == "true").to_unsafe
  preferred_captions = query["subtitles"]?.try &.split(",").map { |a| a.downcase }
@@ -798,8 +1237,10 @@ def process_video_params(query, preferences)

  if preferences
    # region ||= preferences.region
+    annotations ||= preferences.annotations.to_unsafe
    autoplay ||= preferences.autoplay.to_unsafe
    continue ||= preferences.continue.to_unsafe
+    continue_autoplay ||= preferences.continue_autoplay.to_unsafe
    listen ||= preferences.listen.to_unsafe
    local ||= preferences.local.to_unsafe
    preferred_captions ||= preferences.captions
@@ -810,8 +1251,10 @@ def process_video_params(query, preferences)
    volume ||= preferences.volume
  end

+  annotations ||= CONFIG.default_user_preferences.annotations.to_unsafe
  autoplay ||= CONFIG.default_user_preferences.autoplay.to_unsafe
  continue ||= CONFIG.default_user_preferences.continue.to_unsafe
+  continue_autoplay ||= CONFIG.default_user_preferences.continue_autoplay.to_unsafe
  listen ||= CONFIG.default_user_preferences.listen.to_unsafe
  local ||= CONFIG.default_user_preferences.local.to_unsafe
  preferred_captions ||= CONFIG.default_user_preferences.captions
@@ -821,8 +1264,10 @@ def process_video_params(query, preferences)
  video_loop ||= CONFIG.default_user_preferences.video_loop.to_unsafe
  volume ||= CONFIG.default_user_preferences.volume

+  annotations = annotations == 1
  autoplay = autoplay == 1
  continue = continue == 1
+  continue_autoplay = continue_autoplay == 1
  listen = listen == 1
  local = local == 1
  related_videos = related_videos == 1
@@ -853,23 +1298,25 @@ def process_video_params(query, preferences)
  controls ||= 1
  controls = controls >= 1

-  params = {
-    autoplay:           autoplay,
-    continue:           continue,
-    controls:           controls,
-    listen:             listen,
-    local:              local,
+  params = VideoPreferences.new(
+    annotations: annotations,
+    autoplay: autoplay,
+    continue: continue,
+    continue_autoplay: continue_autoplay,
+    controls: controls,
+    listen: listen,
+    local: local,
    preferred_captions: preferred_captions,
-    quality:            quality,
-    raw:                raw,
-    region:             region,
-    related_videos:     related_videos,
-    speed:              speed,
-    video_end:          video_end,
-    video_loop:         video_loop,
-    video_start:        video_start,
-    volume:             volume,
-  }
+    quality: quality,
+    raw: raw,
+    region: region,
+    related_videos: related_videos,
+    speed: speed,
+    video_end: video_end,
+    video_loop: video_loop,
+    video_start: video_start,
+    volume: volume,
+  )

  return params
 end
@@ -900,3 +1347,21 @@ def generate_thumbnails(json, id, config, kemal_config)
    end
  end
 end
+
+def generate_storyboards(json, id, storyboards, config, kemal_config)
+  json.array do
+    storyboards.each do |storyboard|
+      json.object do
+        json.field "url", "/api/v1/storyboards/#{id}?width=#{storyboard[:width]}&height=#{storyboard[:height]}"
+        json.field "templateUrl", storyboard[:url]
+        json.field "width", storyboard[:width]
+        json.field "height", storyboard[:height]
+        json.field "count", storyboard[:count]
+        json.field "interval", storyboard[:interval]
+        json.field "storyboardWidth", storyboard[:storyboard_width]
+        json.field "storyboardHeight", storyboard[:storyboard_height]
+        json.field "storyboardCount", storyboard[:storyboard_count]
+      end
+    end
+  end
+end
--- a/src/invidious/views/authorize_token.ecr
+++ b/src/invidious/views/authorize_token.ecr
@@ -0,0 +1,78 @@
+<% content_for "header" do %>
+<title><%= translate(locale, "Token") %> - Invidious</title>
+<% end %>
+
+<% if env.get? "access_token" %>
+    <div class="pure-g h-box">
+        <div class="pure-u-1-3">
+            <h3>
+                <%= translate(locale, "Token") %>
+            </h3>
+        </div>
+        <div class="pure-u-1-3" style="text-align:center">
+            <h3>
+                <a href="/token_manager"><%= translate(locale, "Token manager") %></a>
+            </h3>
+        </div>
+        <div class="pure-u-1-3" style="text-align:right">
+            <h3>
+                <a href="/preferences"><%= translate(locale, "Preferences") %></a>
+            </h3>
+        </div>
+    </div>
+
+    <div class="h-box">
+        <h4 style="padding-left:0.5em">
+            <code><%= env.get "access_token" %></code>
+        </h4>
+    </div>
+<% else %>
+    <div class="h-box">
+        <form class="pure-form pure-form-aligned" action="/authorize_token" method="post">
+            <% if callback_url %>
+                <legend><%= translate(locale, "Authorize token for `x`?", "#{callback_url.scheme}://#{callback_url.host}")  %></legend>
+            <% else %>
+                <legend><%= translate(locale, "Authorize token?") %></legend>
+            <% end %>
+
+            <div class="pure-g">
+                <div class="pure-u-1">
+                    <ul>
+                        <% scopes.each do |scope| %>
+                            <li><%= scope %></li>
+                        <% end %>
+                    </ul>
+                </div>
+            </div>
+
+            <div class="pure-g">
+                <div class="pure-u-1-2">
+                    <button type="submit" name="submit" value="clear_watch_history" class="pure-button pure-button-primary">
+                        <%= translate(locale, "Yes") %>
+                    </button>
+                </div>
+                <div class="pure-u-1-2">
+                    <% if callback_url %>
+                        <a class="pure-button" href="<%= callback_url %>">
+                    <% else %>
+                        <a class="pure-button" href="/">
+                    <% end %>
+                    <%= translate(locale, "No") %>
+                    </a>
+                </div>
+            </div>
+
+            <% scopes.each_with_index do |scope, i| %>
+                <input type="hidden" name="scopes[<%= i %>]" value="<%= scope %>">
+            <% end %>
+            <% if callback_url %>
+                <input type="hidden" name="callbackUrl" value="<%= callback_url %>">
+            <% end %>
+            <% if expire %>
+                <input type="hidden" name="expire" value="<%= expire %>">
+            <% end %>
+
+            <input type="hidden" name="csrf_token" value="<%= URI.escape(csrf_token) %>">
+        </form>
+    </div>
+<% end %>
--- a/src/invidious/views/change_password.ecr
+++ b/src/invidious/views/change_password.ecr
@@ -0,0 +1,32 @@
+<% content_for "header" do %>
+<title><%= translate(locale, "Change password") %> - Invidious</title>
+<% end %>
+
+<div class="pure-g">
+    <div class="pure-u-1 pure-u-lg-1-5"></div>
+    <div class="pure-u-1 pure-u-lg-3-5">
+        <div class="h-box">
+            <form class="pure-form pure-form-aligned" action="/change_password?referer=<%= URI.escape(referer) %>" method="post">
+                <legend><%= translate(locale, "Change password") %></legend>
+
+                <fieldset>
+                    <label for="password"><%= translate(locale, "Password") %> :</label>
+                    <input required class="pure-input-1" name="password" type="password" placeholder="<%= translate(locale, "Password") %>">
+
+                    <label for="new_password[0]"><%= translate(locale, "New password") %> :</label>
+                    <input required class="pure-input-1" name="new_password[0]" type="password" placeholder="<%= translate(locale, "New password") %>">
+
+                    <label for="new_password[1]"><%= translate(locale, "New password") %> :</label>
+                    <input required class="pure-input-1" name="new_password[1]" type="password" placeholder="<%= translate(locale, "New password") %>">
+
+                    <button type="submit" name="action" value="change_password" class="pure-button pure-button-primary">
+                        <%= translate(locale, "Change password") %>
+                    </button>
+
+                    <input type="hidden" name="csrf_token" value="<%= URI.escape(csrf_token) %>">
+                </fieldset>
+            </form>
+        </div>
+    </div>
+    <div class="pure-u-1 pure-u-lg-1-5"></div>
+</div>
--- a/src/invidious/views/channel.ecr
+++ b/src/invidious/views/channel.ecr
@@ -7,7 +7,7 @@
    <div class="pure-u-2-3">
        <h3><%= author %></h3>
    </div>
-    <div class="pure-u-1-3" style="text-align:right;">
+    <div class="pure-u-1-3" style="text-align:right">
        <h3>
            <a href="/feed/channel/<%= ucid %>"><i class="icon ion-logo-rss"></i></a>
        </h3>
@@ -15,41 +15,40 @@
 </div>

 <div class="h-box">
-<% sub_count_text = number_to_short_text(sub_count) %>
-<%= rendered "components/subscribe_widget" %>
+    <% sub_count_text = number_to_short_text(sub_count) %>
+    <%= rendered "components/subscribe_widget" %>
 </div>

 <div class="pure-g h-box">
    <div class="pure-u-1-3">
        <a href="https://www.youtube.com/channel/<%= ucid %>"><%= translate(locale, "View channel on YouTube") %></a>
        <% if !auto_generated %>
-        <div class="pure-u-1 pure-md-1-3">
-            <b><%= translate(locale, "Videos") %></b>
-        </div>
-        <% end %>
-        <div class="pure-u-1 pure-md-1-3">
-        <% if auto_generated %>
-            <b><%= translate(locale, "Playlists") %></b>
-        <% else %>
-            <a href="/channel/<%= ucid %>/playlists"><%= translate(locale, "Playlists") %></a>
-        <% end %>
-        </div>
-    </div>
-    <div class="pure-u-1-3">
-    </div>
-    <div class="pure-u-1-3">
-        <div class="pure-g" style="text-align:right;">
-        <% sort_options.each do |sort| %>
            <div class="pure-u-1 pure-md-1-3">
-                <% if sort_by == sort %>
-                <b><%= translate(locale, sort) %></b>
-                <% else %>
-                <a href="/channel/<%= ucid %>?page=<%= page %>&sort_by=<%= sort %>">
-                <%= translate(locale, sort) %>
-                </a>
-                <% end %>
+                <b><%= translate(locale, "Videos") %></b>
            </div>
        <% end %>
+        <div class="pure-u-1 pure-md-1-3">
+            <% if auto_generated %>
+                <b><%= translate(locale, "Playlists") %></b>
+            <% else %>
+                <a href="/channel/<%= ucid %>/playlists"><%= translate(locale, "Playlists") %></a>
+            <% end %>
+        </div>
+    </div>
+    <div class="pure-u-1-3"></div>
+    <div class="pure-u-1-3">
+        <div class="pure-g" style="text-align:right">
+            <% sort_options.each do |sort| %>
+                <div class="pure-u-1 pure-md-1-3">
+                    <% if sort_by == sort %>
+                        <b><%= translate(locale, sort) %></b>
+                    <% else %>
+                        <a href="/channel/<%= ucid %>?page=<%= page %>&sort_by=<%= sort %>">
+                            <%= translate(locale, sort) %>
+                        </a>
+                    <% end %>
+                </div>
+            <% end %>
        </div>
    </div>
 </div>
@@ -59,32 +58,27 @@
 </div>

 <div class="pure-g">
-<% items.each_slice(4) do |slice| %>
-    <% slice.each do |item| %>
-        <%= rendered "components/item" %>
+    <% items.each_slice(4) do |slice| %>
+        <% slice.each do |item| %>
+            <%= rendered "components/item" %>
+        <% end %>
    <% end %>
-<% end %>
 </div>

 <div class="pure-g h-box">
-    <div class="pure-u-1 pure-u-md-1-5">
-    <% if page >= 2 %>
-        <a href="/channel/<%= ucid %>?page=<%= page - 1 %><% if sort_by != "newest" %>&sort_by=<%= sort_by %><% end %>">
-            <%= translate(locale, "Previous page") %>
-        </a>
-    <% end %>
+    <div class="pure-u-1 pure-u-lg-1-5">
+        <% if page >= 2 %>
+            <a href="/channel/<%= ucid %>?page=<%= page - 1 %><% if sort_by != "newest" %>&sort_by=<%= sort_by %><% end %>">
+                <%= translate(locale, "Previous page") %>
+            </a>
+        <% end %>
    </div>
-    <div class="pure-u-1 pure-u-md-3-5"></div>
-    <div style="text-align:right;" class="pure-u-1 pure-u-md-1-5">
-    <% if count == 60 %>
-        <a href="/channel/<%= ucid %>?page=<%= page + 1 %><% if sort_by != "newest" %>&sort_by=<%= sort_by %><% end %>">
-            <%= translate(locale, "Next page") %>
-        </a>
-    <% end %>
+    <div class="pure-u-1 pure-u-lg-3-5"></div>
+    <div class="pure-u-1 pure-u-lg-1-5" style="text-align:right">
+        <% if count == 60 %>
+            <a href="/channel/<%= ucid %>?page=<%= page + 1 %><% if sort_by != "newest" %>&sort_by=<%= sort_by %><% end %>">
+                <%= translate(locale, "Next page") %>
+            </a>
+        <% end %>
    </div>
 </div>
-
-<script>
-<% sub_count_text = number_to_short_text(sub_count) %>
-<%= rendered "components/subscribe_widget_script" %>
-</script>
--- a/src/invidious/views/clear_watch_history.ecr
+++ b/src/invidious/views/clear_watch_history.ecr
@@ -13,13 +13,12 @@
                </button>
            </div>
            <div class="pure-u-1-2">
-                <a class="pure-button" href="<%= referer %>">
+                <a class="pure-button" href="<%= URI.escape(referer) %>">
                    <%= translate(locale, "No") %>
                </a>
            </div>
        </div>

-        <input type="hidden" name="token" value="<%= token %>">
-        <input type="hidden" name="challenge" value="<%= challenge %>">
+        <input type="hidden" name="csrf_token" value="<%= URI.escape(csrf_token) %>">
    </form>
 </div>
--- a/src/invidious/views/components/feed_menu.ecr
+++ b/src/invidious/views/components/feed_menu.ecr
@@ -4,16 +4,16 @@
        <div class="pure-g">
            <% feed_menu = config.feed_menu.dup %>
            <% if !env.get?("user") %>
-            <% feed_menu.reject! {|feed| feed == "Subscriptions"} %>
+                <% feed_menu.reject! {|feed| feed == "Subscriptions"} %>
            <% end %>
            <% feed_menu.each do |feed| %>
-            <div class="pure-u-1-2 pure-u-md-1-<%= feed_menu.size %>">
-                <a href="/feed/<%= feed.downcase %>" style="text-align:center;" class="pure-menu-heading">
-                    <%= translate(locale, feed) %>
-                </a>
-            </div>
+                <div class="pure-u-1-2 pure-u-md-1-<%= feed_menu.size %>">
+                    <a href="/feed/<%= feed.downcase %>" class="pure-menu-heading" style="text-align:center">
+                        <%= translate(locale, feed) %>
+                    </a>
+                </div>
            <% end %>
        </div>
    </div>
    <div class="pure-u-1 pure-u-md-1-4"></div>
-</div>
+</div>
--- a/src/invidious/views/components/item.ecr
+++ b/src/invidious/views/components/item.ecr
@@ -1,115 +1,138 @@
 <div class="pure-u-1 pure-u-md-1-4">
    <div class="h-box">
-    <% case item when %>
-    <% when SearchChannel %>
-        <a style="width:100%;" href="/channel/<%= item.ucid %>">
-            <% if env.get("preferences").as(Preferences).thin_mode %>
-            <% else %>
-            <center>
-                <img style="width:56.25%;" src="/ggpht<%= URI.parse(item.author_thumbnail).full_path %>"/>
-            </center>
-            <% end %>
-            <p><%= item.author %></p>
-        </a>
-        <p><%= translate(locale, "`x` subscribers", number_with_separator(item.subscriber_count)) %></p>
-        <p><%= translate(locale, "`x` videos", number_with_separator(item.video_count)) %></p>
-        <h5><%= item.description_html %></h5>
-    <% when SearchPlaylist %>
-        <% if item.id.starts_with? "RD" %>
-        <% url = "/mix?list=#{item.id}&continuation=#{item.thumbnail_id}" %>
-        <% else %>
-        <% url = "/playlist?list=#{item.id}" %>
-        <% end %>
-        <a style="width:100%;" href="<%= url %>">
-            <% if env.get("preferences").as(Preferences).thin_mode %>
-            <% else %>
-            <div class="thumbnail">
-                <img class="thumbnail" src="/vi/<%= item.thumbnail_id %>/mqdefault.jpg"/>
-                <p class="length"><%= number_with_separator(item.video_count) %> videos</p>
-            </div>
-            <% end %>
-            <p><%= item.title %></p>
-        </a>
-        <p>
-            <b><a style="width:100%;" href="/channel/<%= item.ucid %>"><%= item.author %></a></b>
-        </p>
-    <% when MixVideo %>
-        <a style="width:100%;" href="/watch?v=<%= item.id %>&list=<%= item.mixes[0] %>">
-            <% if env.get("preferences").as(Preferences).thin_mode %>
-            <% else %>
-            <div class="thumbnail">
-                <img class="thumbnail" src="/vi/<%= item.id %>/mqdefault.jpg"/>
-                <% if item.length_seconds != 0 %>
-                <p class="length"><%= recode_length_seconds(item.length_seconds) %></p>
+        <% case item when %>
+        <% when SearchChannel %>
+            <a style="width:100%" href="/channel/<%= item.ucid %>">
+                <% if !env.get("preferences").as(Preferences).thin_mode %>
+                    <center>
+                        <img style="width:56.25%" src="/ggpht<%= URI.parse(item.author_thumbnail).full_path %>"/>
+                    </center>
                <% end %>
-            </div>
-            <% end %>
-            <p><%= item.title %></p>
-        </a>
-        <p>
-            <b><a style="width:100%;" href="/channel/<%= item.ucid %>"><%= item.author %></a></b>
-        </p>
-    <% when PlaylistVideo %>
-        <a style="width:100%;" href="/watch?v=<%= item.id %>&list=<%= item.playlists[0] %>">
-            <% if env.get("preferences").as(Preferences).thin_mode %>
+                <p><%= item.author %></p>
+            </a>
+            <p><%= translate(locale, "`x` subscribers", number_with_separator(item.subscriber_count)) %></p>
+            <p><%= translate(locale, "`x` videos", number_with_separator(item.video_count)) %></p>
+            <h5><%= item.description_html %></h5>
+        <% when SearchPlaylist %>
+            <% if item.id.starts_with? "RD" %>
+                <% url = "/mix?list=#{item.id}&continuation=#{item.thumbnail_id}" %>
            <% else %>
-            <div class="thumbnail">
-                <img class="thumbnail" src="/vi/<%= item.id %>/mqdefault.jpg"/>
-                <% if item.responds_to?(:live_now) && item.live_now %>
-                <p class="length"><i class="icon ion-ios-play-circle"></i> <%= translate(locale, "LIVE") %></p>
-                <% elsif item.length_seconds != 0 %>
-                <p class="length"><%= recode_length_seconds(item.length_seconds) %></p>
-                <% end %>
-            </div>
+                <% url = "/playlist?list=#{item.id}" %>
            <% end %>
-            <p><%= item.title %></p>
-        </a>
-        <p>
-            <b><a style="width:100%;" href="/channel/<%= item.ucid %>"><%= item.author %></a></b>
-        </p>

-        <% if item.responds_to?(:premiere_timestamp) && item.premiere_timestamp && item.premiere_timestamp.not_nil! > Time.now %>
-        <h5><%= translate(locale, "Premieres in `x`", recode_date((item.premiere_timestamp.as(Time) - Time.now).ago, locale)) %></h5>
-        <% elsif Time.now - item.published > 1.minute %>
-        <h5><%= translate(locale, "Shared `x` ago", recode_date(item.published, locale)) %></h5>
-        <% end %>
-    <% else %>
-        <% if env.get("preferences").as(Preferences).thin_mode %>
-        <% else %>
-        <a style="width:100%;" href="/watch?v=<%= item.id %>">
-            <div class="thumbnail">
-                <img class="thumbnail" src="/vi/<%= item.id %>/mqdefault.jpg"/>
-                <% if env.get? "show_watched" %>
-                <p class="watched">
-                    <a onclick="mark_watched(this)"
-                        data-id="<%= item.id %>"
-                        onmouseenter='this["href"]="javascript:void(0)"'
-                        href="/mark_watched?id=<%= item.id %>">
-                        <i onmouseenter='this.setAttribute("class", "icon ion-ios-eye-off")'
-                           onmouseleave='this.setAttribute("class", "icon ion-ios-eye")'
-                           class="icon ion-ios-eye">
-                        </i>
-                    </a>
-                </p>
+            <a style="width:100%" href="<%= url %>">
+                <% if !env.get("preferences").as(Preferences).thin_mode %>
+                    <div class="thumbnail">
+                        <img class="thumbnail" src="/vi/<%= item.thumbnail_id %>/mqdefault.jpg"/>
+                        <p class="length"><%= number_with_separator(item.video_count) %> videos</p>
+                    </div>
                <% end %>
-                <% if item.responds_to?(:live_now) && item.live_now %>
-                <p class="length"><i class="icon ion-ios-play-circle"></i> <%= translate(locale, "LIVE") %></p>
-                <% elsif item.length_seconds != 0 %>
-                <p class="length"><%= recode_length_seconds(item.length_seconds) %></p>
+                <p><%= item.title %></p>
+            </a>
+            <p>
+                <b>
+                    <a style="width:100%" href="/channel/<%= item.ucid %>"><%= item.author %></a>
+                </b>
+            </p>
+        <% when MixVideo %>
+            <a style="width:100%" href="/watch?v=<%= item.id %>&list=<%= item.mixes[0] %>">
+                <% if !env.get("preferences").as(Preferences).thin_mode %>
+                    <div class="thumbnail">
+                        <img class="thumbnail" src="/vi/<%= item.id %>/mqdefault.jpg"/>
+                        <% if item.length_seconds != 0 %>
+                            <p class="length"><%= recode_length_seconds(item.length_seconds) %></p>
+                        <% end %>
+                    </div>
                <% end %>
-            </div>
-        </a>
-        <% end %>
-        <p><a href="/watch?v=<%= item.id %>"><%= item.title %></a></p>
-        <p>
-            <b><a style="width:100%;" href="/channel/<%= item.ucid %>"><%= item.author %></a></b>
-        </p>
+                <p><%= item.title %></p>
+            </a>
+            <p>
+                <b>
+                    <a style="width:100%" href="/channel/<%= item.ucid %>"><%= item.author %></a>
+                </b>
+            </p>
+        <% when PlaylistVideo %>
+            <a style="width:100%" href="/watch?v=<%= item.id %>&list=<%= item.playlists[0] %>">
+                <% if !env.get("preferences").as(Preferences).thin_mode %>
+                    <div class="thumbnail">
+                        <img class="thumbnail" src="/vi/<%= item.id %>/mqdefault.jpg"/>
+                        <% if item.responds_to?(:live_now) && item.live_now %>
+                            <p class="length"><i class="icon ion-ios-play-circle"></i> <%= translate(locale, "LIVE") %></p>
+                        <% elsif item.length_seconds != 0 %>
+                            <p class="length"><%= recode_length_seconds(item.length_seconds) %></p>
+                        <% end %>
+                    </div>
+                <% end %>
+                <p><%= item.title %></p>
+            </a>
+            <p>
+                <b>
+                    <a style="width:100%" href="/channel/<%= item.ucid %>"><%= item.author %></a>
+                </b>
+            </p>

-        <% if item.responds_to?(:premiere_timestamp) && item.premiere_timestamp && item.premiere_timestamp.not_nil! > Time.now %>
-        <h5><%= translate(locale, "Premieres in `x`", recode_date((item.premiere_timestamp.as(Time) - Time.now).ago, locale)) %></h5>
-        <% elsif Time.now - item.published > 1.minute %>
-        <h5><%= translate(locale, "Shared `x` ago", recode_date(item.published, locale)) %></h5>
+            <h5 class="pure-g">
+                <% if item.responds_to?(:premiere_timestamp) && item.premiere_timestamp && item.premiere_timestamp.not_nil! > Time.now %>
+                    <div class="pure-u-2-3"><%= translate(locale, "Premieres in `x`", recode_date((item.premiere_timestamp.as(Time) - Time.now).ago, locale)) %></div>
+                <% elsif Time.now - item.published > 1.minute %>
+                    <div class="pure-u-2-3"><%= translate(locale, "Shared `x` ago", recode_date(item.published, locale)) %></div>
+                <% else %>
+                    <div class="pure-u-2-3"></div>
+                <% end %>
+
+                <div class="pure-u-1-3" style="text-align:right">
+                    <%= item.responds_to?(:views) ? translate(locale, "`x` views", number_to_short_text(item.views)) : "" %>
+                </div>
+            </h5>
+        <% else %>
+            <% if !env.get("preferences").as(Preferences).thin_mode %>
+                <a style="width:100%" href="/watch?v=<%= item.id %>">
+                    <div class="thumbnail">
+                        <img class="thumbnail" src="/vi/<%= item.id %>/mqdefault.jpg"/>
+                        <% if env.get? "show_watched" %>
+                            <form onsubmit="return false" action="/watch_ajax?action_mark_watched=1&id=<%= item.id %>&referer=<%= env.get("current_page") %>" method="post">
+                                <input type="hidden" name="csrf_token" value="<%= URI.escape(env.get?("csrf_token").try &.as(String) || "") %>">
+                                <p class="watched">
+                                    <a onclick="mark_watched(this)" data-id="<%= item.id %>" href="#">
+                                        <button type="submit" style="all:unset">
+                                            <i onmouseenter='this.setAttribute("class", "icon ion-ios-eye-off")'
+                                                onmouseleave='this.setAttribute("class", "icon ion-ios-eye")'
+                                                class="icon ion-ios-eye">
+                                            </i>
+                                        </button>
+                                    </a>
+                                </p>
+                            </form>
+                        <% end %>
+
+                        <% if item.responds_to?(:live_now) && item.live_now %>
+                            <p class="length"><i class="icon ion-ios-play-circle"></i> <%= translate(locale, "LIVE") %></p>
+                        <% elsif item.length_seconds != 0 %>
+                            <p class="length"><%= recode_length_seconds(item.length_seconds) %></p>
+                        <% end %>
+                    </div>
+                </a>
+            <% end %>
+            <p><a href="/watch?v=<%= item.id %>"><%= item.title %></a></p>
+            <p>
+                <b>
+                    <a style="width:100%" href="/channel/<%= item.ucid %>"><%= item.author %></a>
+                </b>
+            </p>
+
+            <h5 class="pure-g">
+                <% if item.responds_to?(:premiere_timestamp) && item.premiere_timestamp && item.premiere_timestamp.not_nil! > Time.now %>
+                    <div class="pure-u-2-3"><%= translate(locale, "Premieres in `x`", recode_date((item.premiere_timestamp.as(Time) - Time.now).ago, locale)) %></div>
+                <% elsif Time.now - item.published > 1.minute %>
+                    <div class="pure-u-2-3"><%= translate(locale, "Shared `x` ago", recode_date(item.published, locale)) %></div>
+                <% else %>
+                    <div class="pure-u-2-3"></div>
+                <% end %>
+
+                <div class="pure-u-1-3" style="text-align:right">
+                    <%= item.responds_to?(:views) ? translate(locale, "`x` views", number_to_short_text(item.views)) : "" %>
+                </div>
+            </h5>
        <% end %>
-    <% end %>
    </div>
 </div>
--- a/src/invidious/views/components/player.ecr
+++ b/src/invidious/views/components/player.ecr
@@ -1,215 +1,267 @@
-<video style="outline:none;width:100%" playsinline poster="<%= thumbnail %>" title="<%= HTML.escape(video.title) %>"
+<video style="outline:none;width:100%;background-color:#000" playsinline poster="<%= thumbnail %>" title="<%= HTML.escape(video.title) %>"
    id="player" class="video-js"
    onmouseenter='this["data-title"]=this["title"];this["title"]=""'
    onmouseleave='this["title"]=this["data-title"];this["data-title"]=""'
    oncontextmenu='this["title"]=this["data-title"]'
-    <% if params[:autoplay] %>autoplay<% end %>
-    <% if params[:video_loop] %>loop<% end %>
-    <% if params[:controls] %>controls<% end %>>
+    <% if params.autoplay %>autoplay<% end %>
+    <% if params.video_loop %>loop<% end %>
+    <% if params.controls %>controls<% end %>>
    <% if hlsvp %>
-        <source src="<%= hlsvp %>" type="application/x-mpegURL" label="livestream">
+        <source src="<%= hlsvp %>?local=true" type="application/x-mpegURL" label="livestream">
    <% else %>
-        <% if params[:listen] %>
+        <% if params.listen %>
            <% audio_streams.each_with_index do |fmt, i| %>
-                <source src="/latest_version?id=<%= video.id %>&itag=<%= fmt["itag"] %><% if params[:local] %>&local=true<% end %>" type='<%= fmt["type"] %>' label="<%= fmt["bitrate"] %>k" selected="<%= i == 0 ? true : false %>">
+                <source src="/latest_version?id=<%= video.id %>&itag=<%= fmt["itag"] %><% if params.local %>&local=true<% end %>" type='<%= fmt["type"] %>' label="<%= fmt["bitrate"] %>k" selected="<%= i == 0 ? true : false %>">
            <% end %>
-        <% else %>
-            <% if params[:quality] == "dash" %>
+          <% else %>
+            <% if params.quality == "dash" %>
                <source src="/api/manifest/dash/id/<%= video.id %>?local=true" type='application/dash+xml' label="dash">
            <% end %>
+
            <% fmt_stream.each_with_index do |fmt, i| %>
-                <% if params[:quality] %>
-                <source src="/latest_version?id=<%= video.id %>&itag=<%= fmt["itag"] %><% if params[:local] %>&local=true<% end %>" type='<%= fmt["type"] %>' label="<%= fmt["label"] %>" selected="<%= params[:quality] == fmt["label"].split(" - ")[0] %>">
+                <% if params.quality %>
+                    <source src="/latest_version?id=<%= video.id %>&itag=<%= fmt["itag"] %><% if params.local %>&local=true<% end %>" type='<%= fmt["type"] %>' label="<%= fmt["label"] %>" selected="<%= params.quality == fmt["label"].split(" - ")[0] %>">
                <% else %>
-                <source src="/latest_version?id=<%= video.id %>&itag=<%= fmt["itag"] %><% if params[:local] %>&local=true<% end %>" type='<%= fmt["type"] %>' label="<%= fmt["label"] %>" selected="<%= i == 0 ? true : false %>">
+                    <source src="/latest_version?id=<%= video.id %>&itag=<%= fmt["itag"] %><% if params.local %>&local=true<% end %>" type='<%= fmt["type"] %>' label="<%= fmt["label"] %>" selected="<%= i == 0 ? true : false %>">
                <% end %>
            <% end %>
        <% end %>

        <% preferred_captions.each_with_index do |caption, i| %>
-        <track kind="captions" src="/api/v1/captions/<%= video.id %>?label=<%= caption.name.simpleText %>&hl=<%= env.get("preferences").as(Preferences).locale %>"
-            label="<%= caption.name.simpleText %>" <% if i == 0 %>default<% end %>>
+            <track kind="captions" src="/api/v1/captions/<%= video.id %>?label=<%= caption.name.simpleText %>&hl=<%= env.get("preferences").as(Preferences).locale %>"
+                label="<%= caption.name.simpleText %>" <% if i == 0 %>default<% end %>>
        <% end %>

        <% captions.each do |caption| %>
-        <track kind="captions" src="/api/v1/captions/<%= video.id %>?label=<%= caption.name.simpleText %>&hl=<%= env.get("preferences").as(Preferences).locale %>"
-            label="<%= caption.name.simpleText %>">
+            <track kind="captions" src="/api/v1/captions/<%= video.id %>?label=<%= caption.name.simpleText %>&hl=<%= env.get("preferences").as(Preferences).locale %>"
+                label="<%= caption.name.simpleText %>">
        <% end %>
    <% end %>
 </video>

 <script>
 var options = {
-  <% if aspect_ratio %>
-  aspectRatio: "<%= aspect_ratio %>",
-  <% end %>
-  preload: "auto",
-  playbackRates: [0.25, 0.5, 0.75, 1.0, 1.25, 1.5, 2.0],
-  controlBar: {
-    children: [
-      "playToggle",
-      "volumePanel",
-      "currentTimeDisplay",
-      "timeDivider",
-      "durationDisplay",
-      "progressControl",
-      "remainingTimeDisplay",
-      "captionsButton",
-      "qualitySelector",
-      "playbackRateMenuButton",
-      "fullscreenToggle"
-    ]
-  }
+    <% if aspect_ratio %>
+    aspectRatio: "<%= aspect_ratio %>",
+    <% end %>
+    preload: "auto",
+    playbackRates: [0.25, 0.5, 0.75, 1.0, 1.25, 1.5, 2.0],
+    controlBar: {
+        children: [
+            "playToggle",
+            "volumePanel",
+            "currentTimeDisplay",
+            "timeDivider",
+            "durationDisplay",
+            "progressControl",
+            "remainingTimeDisplay",
+            "captionsButton",
+            "qualitySelector",
+            "playbackRateMenuButton",
+            "fullscreenToggle"
+        ]
+    }
 };

 var shareOptions = {
-  socials: ["fb", "tw", "reddit", "mail"],
+    socials: ["fbFeed", "tw", "reddit", "email"],

-  url: "<%= host_url %>/<%= video.id %>?<%= host_params %>",
-  title: "<%= video.title.dump_unquoted %>",
-  description: "<%= description %>",
-  image: "<%= thumbnail %>",
-  embedCode: "<iframe id='ivplayer' type='text/html' width='640' height='360' \
-      src='<%= host_url %>/embed/<%= video.id %>?<%= host_params %>' frameborder='0'></iframe>"
+    url: window.location.href,
+    title: "<%= video.title.dump_unquoted %>",
+    description: "<%= description %>",
+    image: "<%= thumbnail %>",
+    embedCode: "<iframe id='ivplayer' type='text/html' width='640' height='360' \
+        src='<%= host_url %>/embed/<%= video.id %>?<%= host_params %>' frameborder='0'></iframe>"
 };

 var player = videojs("player", options, function() {
-  this.hotkeys({
-    volumeStep: 0.1,
-    seekStep: 5,
-    enableModifiersForNumbers: false,
-    enableHoverScroll: true,
-    customKeys: {
-      // Toggle play with K Key
-      play: {
-        key: function(e) {
-          return e.which === 75;
-        },
-        handler: function(player, options, e) {
-          if (player.paused()) {
-            player.play();
-          } else {
-            player.pause();
-          }
+    this.hotkeys({
+        volumeStep: 0.1,
+        seekStep: 5,
+        enableModifiersForNumbers: false,
+        enableHoverScroll: true,
+        customKeys: {
+            // Toggle play with K Key
+            play: {
+                key: function(e) {
+                    return e.which === 75;
+                },
+                handler: function(player, options, e) {
+                    if (player.paused()) {
+                        player.play();
+                    } else {
+                        player.pause();
+                    }
+                }
+            },
+            // Go backward 10 seconds
+            backward: {
+                key: function(e) {
+                    return e.which === 74;
+                },
+                handler: function(player, options, e) {
+                    player.currentTime(player.currentTime() - 10);
+                }
+            },
+            // Go forward 10 seconds
+            forward: {
+                key: function(e) {
+                    return e.which === 76;
+                },
+                handler: function(player, options, e) {
+                    player.currentTime(player.currentTime() + 10);
+                }
+            },
+            // Increase speed
+            increase_speed: {
+                key: function(e) {
+                    return (e.which === 190 && e.shiftKey);
+                },
+                handler: function(player, _, e) {
+                    size = options.playbackRates.length;
+                    index = options.playbackRates.indexOf(player.playbackRate());
+                    player.playbackRate(options.playbackRates[(index + 1) % size]);
+                }
+            },
+            // Decrease speed
+            decrease_speed: {
+                key: function(e) {
+                    return (e.which === 188 && e.shiftKey);
+                },
+                handler: function(player, _, e) {
+                    size = options.playbackRates.length;
+                    index = options.playbackRates.indexOf(player.playbackRate());
+                    player.playbackRate(options.playbackRates[(size + index - 1) % size]);
+                }
+            }
        }
-      },
-      // Go backward 5 seconds
-      backward: {
-        key: function(e) {
-          return e.which === 74;
-        },
-        handler: function(player, options, e) {
-          player.currentTime(player.currentTime() - 5);
-        }
-      },
-      // Go forward 5 seconds
-      forward: {
-        key: function(e) {
-          return e.which === 76;
-        },
-        handler: function(player, options, e) {
-          player.currentTime(player.currentTime() + 5);
-        }
-      },
-      // Increase speed
-      increase_speed: {
-        key: function(e) {
-          return e.which === 190;
-        },
-        handler: function(player, _, e) {
-          size = options.playbackRates.length;
-          index = options.playbackRates.indexOf(player.playbackRate());
-          player.playbackRate(options.playbackRates[(index + 1) % size]);
-        }
-      },
-      // Decrease speed
-      decrease_speed: {
-        key: function(e) {
-          return e.which === 188;
-        },
-        handler: function(player, _, e) {
-          size = options.playbackRates.length;
-          index = options.playbackRates.indexOf(player.playbackRate());
-          player.playbackRate(options.playbackRates[(size + index - 1) % size]);
-        }
-      }
-    }
-  });
+    });
 });

 player.on('error', function(event) {
-  if (player.error().code === 2 || player.error().code === 4) {
-    setInterval(setTimeout(function (event) {
-      console.log("An error occured in the player, reloading...");
+    if (player.error().code === 2 || player.error().code === 4) {
+        setInterval(setTimeout(function (event) {
+            console.log('An error occured in the player, reloading...');

-      var currentTime = player.currentTime();
-      var playbackRate = player.playbackRate();
-      var paused = player.paused();
+            var currentTime = player.currentTime();
+            var playbackRate = player.playbackRate();
+            var paused = player.paused();

-      player.load();
-      if (currentTime > 0.5) {
-        currentTime -= 0.5;
-      }
-      player.currentTime(currentTime);
-      player.playbackRate(playbackRate);
+            player.load();

-      if (!paused) {
-        player.play();
-      }
-    }, 5000), 5000);
-  }
-});
+            if (currentTime > 0.5) {
+                currentTime -= 0.5;
+            }

-<% if params[:video_start] > 0 || params[:video_end] > 0 %>
-player.markers({
-  onMarkerReached: function(marker) {
-    if (marker.text === "End") {
-      if (player.loop()) {
-        player.markers.prev("Start");
-      } else {
-        player.pause();
-      }
+            player.currentTime(currentTime);
+            player.playbackRate(playbackRate);
+
+            if (!paused) {
+                player.play();
+            }
+        }, 5000), 5000);
    }
-  },
-  markers: [
-    { time: <%= params[:video_start] %>, text: "Start" },
-    <% if params[:video_end] < 0 %>
-    { time: <%= video.info["length_seconds"].to_f - 0.5 %>, text: "End" }
-    <% else %>
-    { time: <%= params[:video_end] %>, text: "End" }
-    <% end %>
-  ]
 });

-player.currentTime(<%= params[:video_start] %>);
+<% if params.video_start > 0 || params.video_end > 0 %>
+player.markers({
+    onMarkerReached: function(marker) {
+        if (marker.text === 'End') {
+            if (player.loop()) {
+                player.markers.prev('Start');
+            } else {
+                player.pause();
+            }
+        }
+    },
+    markers: [
+        { time: <%= params.video_start %>, text: 'Start' },
+        <% if params.video_end < 0 %>
+            { time: <%= video.info["length_seconds"].to_f - 0.5 %>, text: 'End' }
+        <% else %>
+            { time: <%= params.video_end %>, text: 'End' }
+        <% end %>
+    ]
+});
+
+player.currentTime(<%= params.video_start %>);
 <% end %>

-player.volume(<%= params[:volume].to_f / 100 %>);
-player.playbackRate(<%= params[:speed] %>);
+player.volume(<%= params.volume.to_f / 100 %>);
+player.playbackRate(<%= params.speed %>);

-<% if params[:autoplay] %>
+<% if params.autoplay %>
 var bpb = player.getChild('bigPlayButton');

 if (bpb) {
-  bpb.hide();
+    bpb.hide();

-  player.ready(function() {
-    new Promise(function(resolve, reject) {
-      setTimeout(() => resolve(1), 1);
-    }).then(function(result) {
-      var promise = player.play();
+    player.ready(function() {
+        new Promise(function(resolve, reject) {
+            setTimeout(() => resolve(1), 1);
+        }).then(function(result) {
+        var promise = player.play();

-      if (promise !== undefined) {
-          promise.then(_ => {
-          }).catch(error => {
-              bpb.show();
-          });
-      }
+        if (promise !== undefined) {
+            promise.then(_ => {
+            }).catch(error => {
+                bpb.show();
+            });
+        }
    });
  });
 }
 <% end %>

+<% if !params.listen && params.quality == "dash" %>
+player.httpSourceSelector();
+<% end %>
+
+player.vttThumbnails({
+    src: 'api/v1/storyboards/<%= video.id %>?height=90'
+});
+
+<% if !params.listen && params.annotations %>
+var video_container = document.getElementById('player');
+let xhr = new XMLHttpRequest();
+xhr.responseType = 'text';
+xhr.timeout = 60000;
+xhr.open('GET', '/api/v1/annotations/<%= video.id %>', true);
+xhr.send();
+
+xhr.onreadystatechange = function () {
+    if (xhr.readyState === 4) {
+        if (xhr.status === 200) {
+            videojs.registerPlugin('youtubeAnnotationsPlugin', youtubeAnnotationsPlugin);
+            if (!player.paused()) {
+                player.youtubeAnnotationsPlugin({annotationXml: xhr.response, videoContainer: video_container});
+            } else {
+                player.one('play', function(event) {
+                    player.youtubeAnnotationsPlugin({annotationXml: xhr.response, videoContainer: video_container});
+                });
+            }
+        }
+    }
+};
+
+window.addEventListener('__ar_annotation_click', e => {
+    const { url, target, seconds } = e.detail;
+    var path = new URL(url);
+
+    if (path.href.startsWith('https://www.youtube.com/watch?') && seconds) {
+        path.search += '&t=' + seconds;
+    }
+
+    path  = path.pathname + path.search;
+
+    if (target === 'current') {
+        window.location.href = path;
+    } else if (target === 'new') {
+        window.open(path, '_blank');
+    }
+});
+<% end %>
+
 // Since videojs-share can sometimes be blocked, we try to load it last
 player.share(shareOptions);
 </script>
--- a/src/invidious/views/components/player_sources.ecr
+++ b/src/invidious/views/components/player_sources.ecr
@@ -1,15 +1,22 @@
 <link rel="stylesheet" href="/css/video-js.min.css">
-<link rel="stylesheet" href="/css/quality-selector.css">
+<link rel="stylesheet" href="/css/videojs-http-source-selector.css">
 <link rel="stylesheet" href="/css/videojs.markers.min.css">
 <link rel="stylesheet" href="/css/videojs-share.css">
+<link rel="stylesheet" href="/css/videojs-vtt-thumbnails.css">
 <script src="/js/video.min.js"></script>
+<script src="/js/videojs-contrib-quality-levels.min.js"></script>
+<script src="/js/videojs-http-source-selector.min.js"></script>
 <script src="/js/videojs.hotkeys.min.js"></script>
-<script src="/js/silvermine-videojs-quality-selector.min.js"></script>
 <script src="/js/videojs-markers.min.js"></script>
 <script src="/js/videojs-share.min.js"></script>
-<script src="/js/videojs-http-streaming.min.js"></script>
-<% if params[:quality] == "dash" %>
-<script src="/js/dash.mediaplayer.min.js"></script>
-<script src="/js/videojs-dash.min.js"></script>
-<script src="/js/videojs-contrib-quality-levels.min.js"></script>
-<% end %>
+<script src="/js/videojs-vtt-thumbnails.min.js"></script>
+
+<% if params.annotations %>
+    <link rel="stylesheet" href="/css/videojs-youtube-annotations.min.css">
+    <script src="/js/videojs-youtube-annotations.min.js"></script>
+<% end %>
+
+<% if params.listen || params.quality != "dash" %>
+    <link rel="stylesheet" href="/css/quality-selector.css">
+    <script src="/js/silvermine-videojs-quality-selector.min.js"></script>
+<% end %>
--- a/src/invidious/views/components/subscribe_widget.ecr
+++ b/src/invidious/views/components/subscribe_widget.ecr
@@ -1,24 +1,40 @@
 <% if user %>
    <% if subscriptions.includes? ucid %>
-    <p>
-        <a id="subscribe" onclick="unsubscribe()" class="pure-button pure-button-primary"
-            href="/subscription_ajax?action_remove_subscriptions=1&c=<%= ucid %>&referer=<%= env.get("current_page") %>">
-            <b><%= translate(locale, "Unsubscribe") %> | <%= sub_count_text %></b>
-        </a>
-    </p>
+        <p>
+            <form action="/subscription_ajax?action_remove_subscriptions=1&c=<%= ucid %>&referer=<%= env.get("current_page") %>" method="post">
+                <input type="hidden" name="csrf_token" value="<%= URI.escape(env.get?("csrf_token").try &.as(String) || "") %>">
+                <button data-type="unsubscribe" id="subscribe" class="pure-button pure-button-primary">
+                    <b><input style="all:unset" type="submit" value="<%= translate(locale, "Unsubscribe") %> | <%= sub_count_text %>"></b>
+                </button>
+            </form>
+        </p>
    <% else %>
-    <p>
-        <a id="subscribe" onclick="subscribe()" class="pure-button pure-button-primary"
-            href="/subscription_ajax?action_create_subscription_to_channel=1&c=<%= ucid %>&referer=<%= env.get("current_page") %>">
-            <b><%= translate(locale, "Subscribe") %> | <%= sub_count_text %></b>
-        </a>
-    </p>
+        <p>
+            <form action="/subscription_ajax?action_create_subscription_to_channel=1&c=<%= ucid %>&referer=<%= env.get("current_page") %>" method="post">
+                <input type="hidden" name="csrf_token" value="<%= URI.escape(env.get?("csrf_token").try &.as(String) || "") %>">
+                <button data-type="subscribe" id="subscribe" class="pure-button pure-button-primary">
+                    <b><input style="all:unset" type="submit" value="<%= translate(locale, "Subscribe") %> | <%= sub_count_text %>"></b>
+                </button>
+            </form>
+        </p>
    <% end %>
+
+    <script>
+    var subscribe_data = {
+        ucid: '<%= ucid %>',
+        author: '<%= author %>',
+        sub_count_text: '<%= sub_count_text %>',
+        csrf_token: '<%= URI.escape(env.get?("csrf_token").try &.as(String) || "") %>',
+        subscribe_text: '<%= translate(locale, "Subscribe").gsub("'", "\\'") %>',
+        unsubscribe_text: '<%= translate(locale, "Unsubscribe").gsub("'", "\\'") %>'
+    }
+    </script>
+    <script src="/js/subscribe_widget.js"></script>
 <% else %>
    <p>
        <a id="subscribe" class="pure-button pure-button-primary"
            href="/login?referer=<%= env.get("current_page") %>">
-            <b><%= translate(locale, "Login to subscribe to `x`", author) %></b>
+            <b><%= translate(locale, "Subscribe") %> | <%= sub_count_text %></b>
        </a>
    </p>
 <% end %>
--- a/src/invidious/views/components/subscribe_widget_script.ecr
+++ b/src/invidious/views/components/subscribe_widget_script.ecr
@@ -1,74 +0,0 @@
-subscribe_button = document.getElementById("subscribe");
-if (subscribe_button.getAttribute('onclick')) {
-    subscribe_button["href"] = "javascript:void(0)";
-}
-
-function subscribe(timeouts = 0) {
-    subscribe_button = document.getElementById("subscribe");
-
-    if (timeouts > 10) {
-        console.log("Failed to subscribe.");
-        return;
-    }
-
-    var url = "/subscription_ajax?action_create_subscription_to_channel=1&c=<%= ucid %>&referer=<%= env.get("current_page") %>";
-    var xhr = new XMLHttpRequest();
-    xhr.responseType = "json";
-    xhr.timeout = 20000;
-    xhr.open("GET", url, true);
-    xhr.send();
-
-    var fallback = subscribe_button.innerHTML;
-    subscribe_button.onclick = unsubscribe;
-    subscribe_button.innerHTML = '<b><%= translate(locale, "Unsubscribe").gsub("'", "\\'") %> | <%= sub_count_text %></b>'
-
-    xhr.onreadystatechange = function() {
-        if (xhr.readyState == 4) {
-            if (xhr.status != 200) {
-                subscribe_button.onclick = subscribe;
-                subscribe_button.innerHTML = fallback;
-            }
-        }
-    }
-
-    xhr.ontimeout = function() {
-        console.log("Subscribing timed out.");
-
-        subscribe(timeouts + 1);
-    };
-}
-
-function unsubscribe(timeouts = 0) {
-    subscribe_button = document.getElementById("subscribe");
-
-    if (timeouts > 10) {
-        console.log("Failed to subscribe");
-        return;
-    }
-
-    var url = "/subscription_ajax?action_remove_subscriptions=1&c=<%= ucid %>&referer=<%= env.get("current_page") %>";
-    var xhr = new XMLHttpRequest();
-    xhr.responseType = "json";
-    xhr.timeout = 20000;
-    xhr.open("GET", url, true);
-    xhr.send();
-
-    var fallback = subscribe_button.innerHTML;
-    subscribe_button.onclick = subscribe;
-    subscribe_button.innerHTML = '<b><%= translate(locale, "Subscribe").gsub("'", "\\'") %> | <%= sub_count_text %></b>'
-
-    xhr.onreadystatechange = function() {
-        if (xhr.readyState == 4) {
-            if (xhr.status != 200) {
-                subscribe_button.onclick = unsubscribe;
-                subscribe_button.innerHTML = fallback;
-            }
-        }
-    }
-
-    xhr.ontimeout = function() {
-        console.log("Unsubscribing timed out.");
-
-        unsubscribe(timeouts + 1);
-    };
-}
--- a/src/invidious/views/data_control.ecr
+++ b/src/invidious/views/data_control.ecr
@@ -3,7 +3,7 @@
 <% end %>

 <div class="h-box">
-    <form class="pure-form pure-form-aligned" enctype="multipart/form-data" action="/data_control?referer=<%= referer %>" method="post">
+    <form class="pure-form pure-form-aligned" enctype="multipart/form-data" action="/data_control?referer=<%= URI.escape(referer) %>" method="post">
        <fieldset>
            <legend><%= translate(locale, "Import") %></legend>

--- a/src/invidious/views/delete_account.ecr
+++ b/src/invidious/views/delete_account.ecr
@@ -13,13 +13,12 @@
                </button>
            </div>
            <div class="pure-u-1-2">
-                <a class="pure-button" href="<%= referer %>">
+                <a class="pure-button" href="<%= URI.escape(referer) %>">
                    <%= translate(locale, "No") %>
                </a>
            </div>
        </div>

-        <input type="hidden" name="token" value="<%= token %>">
-        <input type="hidden" name="challenge" value="<%= challenge %>">
+        <input type="hidden" name="csrf_token" value="<%= URI.escape(csrf_token) %>">
    </form>
 </div>
--- a/src/invidious/views/embed.ecr
+++ b/src/invidious/views/embed.ecr
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html>
+<html lang="<%= env.get("preferences").as(Preferences).locale %>">

 <head>
  <meta charset="utf-8">
@@ -23,6 +23,82 @@
 </head>

 <body>
-  <%= rendered "components/player" %>
+<%= rendered "components/player" %>
+
+<script>
+<% if plid %>
+function get_playlist(plid, timeouts = 0) {
+    if (timeouts > 10) {
+        console.log('Failed to pull playlist');
+        return;
+    }
+
+    if (plid.startsWith('RD')) {
+        var plid_url = '/api/v1/mixes/' + plid +
+            '?continuation=<%= video.id %>' +
+            '&format=html&hl=<%= env.get("preferences").as(Preferences).locale %>';
+    } else {
+        var plid_url = '/api/v1/playlists/' + plid +
+            '?continuation=<%= video.id %>' +
+            '&format=html&hl=<%= env.get("preferences").as(Preferences).locale %>';
+    }
+
+    var xhr = new XMLHttpRequest();
+    xhr.responseType = 'json';
+    xhr.timeout = 20000;
+    xhr.open('GET', plid_url, true);
+    xhr.send();
+
+    xhr.onreadystatechange = function() {
+        if (xhr.readyState == 4) {
+            if (xhr.status == 200) {
+                if (xhr.response.nextVideo) {
+                    player.on('ended', function() {
+                        location.assign('/watch?v=' + xhr.response.nextVideo +
+                            '&list=' + plid +
+                            <% if params.listen != preferences.listen %>
+                                '&listen=<%= params.listen %>' +
+                            <% end %>
+                            <% if params.autoplay || params.continue_autoplay %>
+                                '&autoplay=1' +
+                            <% end %>
+                            <% if params.speed != preferences.speed %>
+                                '&speed=<%= params.speed %>' +
+                            <% end %>
+                            ''
+                        );
+                    });
+                }
+            }
+        }
+    };
+
+    xhr.ontimeout = function() {
+        console.log('Pulling playlist timed out.');
+        get_playlist(plid, timeouts + 1);
+    };
+}
+
+get_playlist('<%= plid %>');
+<% elsif video_series %>
+player.on('ended', function() {
+    location.assign('/embed/<%= video_series.shift %>' +
+        <% if !video_series.empty? %>
+            '?playlist=<%= video_series.join(",") %>' +
+        <% end %>
+        <% if params.listen != preferences.listen %>
+            '&listen=<%= params.listen %>' +
+        <% end %>
+        <% if params.autoplay || params.continue_autoplay %>
+            '&autoplay=1' +
+        <% end %>
+        <% if params.speed != preferences.speed %>
+            '&speed=<%= params.speed %>' +
+        <% end %>
+        ''
+    );
+});
+<% end %>
+</script>
 </body>
 </html>
--- a/src/invidious/views/error.ecr
+++ b/src/invidious/views/error.ecr
@@ -3,5 +3,5 @@
 <% end %>

 <div class="h-box">
-<%= error_message %>
+    <%= error_message %>
 </div>
--- a/src/invidious/views/history.ecr
+++ b/src/invidious/views/history.ecr
@@ -3,10 +3,15 @@
 <% end %>

 <div class="pure-g h-box">
-    <div class="pure-u-2-3">
+    <div class="pure-u-1-3">
        <h3><%= translate(locale, "`x` videos", %(<span id="count">#{user.watched.size}</span>)) %></h3>
    </div>
-    <div class="pure-u-1-3" style="text-align:right;">
+    <div class="pure-u-1-3" style="text-align:center">
+        <h3>
+            <a href="/feed/subscriptions"><%= translate(locale, "`x` subscriptions", %(<span id="count">#{user.subscriptions.size}</span>)) %></a>
+        </h3>
+    </div>
+    <div class="pure-u-1-3" style="text-align:right">
        <h3>
            <a href="/clear_watch_history"><%= translate(locale, "Clear watch history") %></a>
        </h3>
@@ -16,50 +21,53 @@
 <div class="pure-g">
 <% watched.each_slice(4) do |slice| %>
        <% slice.each do |item| %>
-        <div class="pure-u-1 pure-u-md-1-4">
-            <div class="h-box">
-                <a style="width:100%;" href="/watch?v=<%= item %>">
-                    <% if env.get("preferences").as(Preferences).thin_mode %>
-                    <% else %>
-                    <div class="thumbnail">
-                        <img class="thumbnail" src="/vi/<%= item %>/mqdefault.jpg"/>
-                        <p class="watched">
-                            <a onclick="mark_unwatched(this)"
-                                data-id="<%= item %>"
-                                onmouseenter='this["href"]="javascript:void(0)"'
-                                href="/mark_unwatched?id=<%= item %>">
-                                <i class="icon ion-md-trash"></i>
-                            </a>
-                        </p>
-                    </div>
-                    <p></p>
-                    <% end %>
-                </a>
+            <div class="pure-u-1 pure-u-md-1-4">
+                <div class="h-box">
+                    <a style="width:100%" href="/watch?v=<%= item %>">
+                        <% if !env.get("preferences").as(Preferences).thin_mode %>
+                            <div class="thumbnail">
+                                <img class="thumbnail" src="/vi/<%= item %>/mqdefault.jpg"/>
+                                <form onsubmit="return false;" action="/watch_ajax?action_mark_unwatched=1&id=<%= item %>&referer=<%= env.get("current_page") %>" method="post">
+                                    <input type="hidden" name="csrf_token" value="<%= URI.escape(env.get?("csrf_token").try &.as(String) || "") %>">
+                                    <p class="watched">
+                                        <a onclick="mark_unwatched(this)" data-id="<%= item %>" href="#">
+                                            <button type="submit" style="all:unset">
+                                                <i class="icon ion-md-trash"></i>
+                                            </button>
+                                        </a>
+                                    </p>
+                                </form>
+                            </div>
+                            <p></p>
+                        <% end %>
+                    </a>
+                </div>
            </div>
-        </div>
        <% end %>
 <% end %>
 </div>

 <script>
 function mark_unwatched(target) {
-    var tile = target.parentNode.parentNode.parentNode.parentNode;
+    var tile = target.parentNode.parentNode.parentNode.parentNode.parentNode;
    tile.style.display = "none";
-    var count = document.getElementById("count")
+    var count = document.getElementById('count')
    count.innerText = count.innerText - 1;

-    var url = "/mark_unwatched?redirect=false&id=" + target.getAttribute("data-id");
+    var url = '/watch_ajax?action_mark_unwatched=1&redirect=false' +
+        '&id=' + target.getAttribute('data-id');
    var xhr = new XMLHttpRequest();
-    xhr.responseType = "json";
+    xhr.responseType = 'json';
    xhr.timeout = 20000;
-    xhr.open("GET", url, true);
-    xhr.send();
+    xhr.open('POST', url, true);
+    xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
+    xhr.send('csrf_token=<%= URI.escape(env.get?("csrf_token").try &.as(String) || "") %>');

    xhr.onreadystatechange = function() {
        if (xhr.readyState == 4) {
            if (xhr.status != 200) {
                count.innerText = count.innerText - 1 + 2;
-                tile.style.display = "";
+                tile.style.display = '';
            }
        }
    }
@@ -67,19 +75,19 @@ function mark_unwatched(target) {
 </script>

 <div class="pure-g h-box">
-    <div class="pure-u-1 pure-u-md-1-5">
-    <% if page >= 2 %>
-        <a href="/feed/history?page=<%= page - 1 %>">
-            <%= translate(locale, "Previous page") %>
-        </a>
-    <% end %>
+    <div class="pure-u-1 pure-u-lg-1-5">
+        <% if page >= 2 %>
+            <a href="/feed/history?page=<%= page - 1 %>">
+                <%= translate(locale, "Previous page") %>
+            </a>
+        <% end %>
    </div>
-    <div class="pure-u-1 pure-u-md-3-5"></div>
-    <div style="text-align:right;" class="pure-u-1 pure-u-md-1-5">
-    <% if watched.size >= limit %>
-        <a href="/feed/history?page=<%= page + 1 %>">
-            <%= translate(locale, "Next page") %>
-        </a>
-    <% end %>
+    <div class="pure-u-1 pure-u-lg-3-5"></div>
+    <div class="pure-u-1 pure-u-lg-1-5" style="text-align:right">
+        <% if watched.size >= limit %>
+            <a href="/feed/history?page=<%= page + 1 %>">
+                <%= translate(locale, "Next page") %>
+            </a>
+        <% end %>
    </div>
 </div>
--- a/src/invidious/views/licenses.ecr
+++ b/src/invidious/views/licenses.ecr
@@ -1,28 +1,14 @@
 <!DOCTYPE html>
-<html>
+<html lang="en-US">

 <head>
-  <meta charset="utf-8">
-  <meta name="viewport" content="width=device-width, initial-scale=1">
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
 </head>

 <body>
    <h1><%= translate(locale, "JavaScript license information") %></h1>
    <table id="jslicense-labels1">
-        <tr>
-            <td>
-                <a href="/js/dash.mediaplayer.min.js">dash.mediaplayer.min.js</a>
-            </td>
-
-            <td>
-                <a href="http://directory.fsf.org/wiki/License:BSD_3Clause">Modified-BSD</a>
-            </td>
-
-            <td>
-                <a href="https://github.com/Dash-Industry-Forum/dash.js"><%= translate(locale, "source") %></a>
-            </td>
-        </tr>
-
        <tr>
            <td>
                <a href="/js/silvermine-videojs-quality-selector.min.js">silvermine-videojs-quality-selector.min.js</a>
@@ -37,20 +23,6 @@
            </td>
        </tr>

-        <tr>
-            <td>
-                <a href="/js/video.min.js">video.min.js</a>
-            </td>
-
-            <td>
-                <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache-2.0-only</a>
-            </td>
-
-            <td>
-                <a href="https://github.com/videojs/video.js"><%= translate(locale, "source") %></a>
-            </td>
-        </tr>
-
        <tr>
            <td>
                <a href="/js/videojs-contrib-quality-levels.min.js">videojs-contrib-quality-levels.min.js</a>
@@ -67,7 +39,7 @@

        <tr>
            <td>
-                <a href="/js/videojs-dash.min.js">videojs-dash.min.js</a>
+                <a href="/js/videojs.hotkeys.min.js">videojs.hotkeys.min.js</a>
            </td>

            <td>
@@ -75,21 +47,21 @@
            </td>

            <td>
-                <a href="https://github.com/videojs/videojs-contrib-dash"><%= translate(locale, "source") %></a>
+                <a href="https://github.com/ctd1500/videojs-hotkeys"><%= translate(locale, "source") %></a>
            </td>
        </tr>

        <tr>
            <td>
-                <a href="/js/videojs-http-streaming.min.js">videojs-http-streaming.min.js</a>
+                <a href="/js/videojs-http-source-selector.min.js">videojs-http-source-selector.min.js</a>
            </td>

            <td>
-                <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache-2.0-only</a>
+                <a href="http://www.jclark.com/xml/copying.txt">Expat</a>
            </td>

            <td>
-                <a href="https://github.com/videojs/http-streaming"><%= translate(locale, "source") %></a>
+                <a href="https://github.com/jfujita/videojs-http-source-selector"><%= translate(locale, "source") %></a>
            </td>
        </tr>

@@ -123,7 +95,35 @@

        <tr>
            <td>
-                <a href="/js/videojs.hotkeys.min.js">videojs.hotkeys.min.js</a>
+                <a href="/js/videojs-vtt-thumbnails.min.js">videojs-vtt-thumbnails.min.js</a>
+            </td>
+
+            <td>
+                <a href="http://www.jclark.com/xml/copying.txt">Expat</a>
+            </td>
+
+            <td>
+                <a href="https://github.com/chrisboustead/videojs-vtt-thumbnails"><%= translate(locale, "source") %></a>
+            </td>
+        </tr>
+
+        <tr>
+            <td>
+                <a href="/js/videojs-youtube-annotations.min.js">videojs-youtube-annotations.min.js</a>
+            </td>
+
+            <td>
+                <a href="https://www.gnu.org/licenses/gpl-3.0.html">GPL-3.0</a>
+            </td>
+
+            <td>
+                <a href="https://github.com/afrmtbl/videojs-youtube-annotations"><%= translate(locale, "source") %></a>
+            </td>
+        </tr>
+
+        <tr>
+            <td>
+                <a href="/js/video.min.js">video.min.js</a>
            </td>

            <td>
@@ -131,7 +131,7 @@
            </td>

            <td>
-                <a href="https://github.com/ctd1500/videojs-hotkeys"><%= translate(locale, "source") %></a>
+                <a href="https://github.com/videojs/video.js"><%= translate(locale, "source") %></a>
            </td>
        </tr>

@@ -150,4 +150,4 @@
        </tr>
    </table>
 </body>
-</html>
+</html>
--- a/src/invidious/views/login.ecr
+++ b/src/invidious/views/login.ecr
@@ -1,116 +1,116 @@
 <% content_for "header" do %>
-<title><%= translate(locale, "Login") %> - Invidious</title>
+<title><%= translate(locale, "Log in") %> - Invidious</title>
 <% end %>

 <div class="pure-g">
-    <div class="pure-u-1 pure-u-md-1-5"></div>
-    <div class="pure-u-1 pure-u-md-3-5">
+    <div class="pure-u-1 pure-u-lg-1-5"></div>
+    <div class="pure-u-1 pure-u-lg-3-5">
        <div class="h-box">
            <div class="pure-g">
                <div class="pure-u-1-2">
                    <a class="pure-button <% if account_type == "invidious" %>pure-button-disabled<% end %>" href="/login?type=invidious">
-                        <%= translate(locale, "Login/Register") %>
+                        <%= translate(locale, "Log in/register") %>
                    </a>
                </div>
                <div class="pure-u-1-2">
                    <a class="pure-button <% if account_type == "google" %>pure-button-disabled<% end %>" href="/login?type=google">
-                        <%= translate(locale, "Login to Google") %>
+                        <%= translate(locale, "Log in with Google") %>
                    </a>
                </div>
            </div>
+
            <hr>
+
            <% if account_type == "invidious" %>
-            <form class="pure-form pure-form-stacked" action="/login?referer=<%= URI.escape(referer) %>&type=invidious" method="post">
-                <fieldset>
-                    <% if email %>
-                    <input name="email" type="hidden" value="<%= email %>">
-                    <% else %>
-                    <label for="email"><%= translate(locale, "User ID:") %></label>
-                    <input required class="pure-input-1" name="email" type="text" placeholder="User ID">
-                    <% end %>
-
-                    <% if password %>
-                    <input name="password" type="hidden" value="<%= password %>">
-                    <% else %>
-                    <label for="password"><%= translate(locale, "Password:") %></label>
-                    <input required class="pure-input-1" name="password" type="password" placeholder="Password">
-                    <% end %>
-
-                <% if captcha %>
-                    <% case captcha_type when %>
-                    <% when "image" %>
-                        <% captcha = captcha.not_nil! %>
-                        <img style="width:100%" src='<%= captcha[:question] %>'/>
-                        <% captcha[:tokens].each_with_index do |token, i| %>
-                            <input type="hidden" name="challenge[<%= i %>]" value="<%= token[0] %>">
-                            <input type="hidden" name="token[<%= i %>]" value="<%= token[1] %>">
+                <form class="pure-form pure-form-stacked" action="/login?referer=<%= URI.escape(referer) %>&type=invidious" method="post">
+                    <fieldset>
+                        <% if email %>
+                            <input name="email" type="hidden" value="<%= email %>">
+                        <% else %>
+                            <label for="email"><%= translate(locale, "User ID") %> :</label>
+                            <input required class="pure-input-1" name="email" type="text" placeholder="<%= translate(locale, "User ID") %>">
                        <% end %>
-                        <input type="hidden" name="captcha_type" value="image">
-                        <label for="answer"><%= translate(locale, "Time (h:mm:ss):") %></label>
-                        <input type="text" name="answer" type="text" placeholder="h:mm:ss">
-                    <% when "text" %>
-                        <% captcha = captcha.not_nil! %>
-                        <% captcha[:tokens].each_with_index do |token, i| %>
-                            <input type="hidden" name="challenge[<%= i %>]" value="<%= token[0] %>">
-                            <input type="hidden" name="token[<%= i %>]" value="<%= token[1] %>">
+
+                        <% if password %>
+                            <input name="password" type="hidden" value="<%= password %>">
+                        <% else %>
+                            <label for="password"><%= translate(locale, "Password") %> :</label>
+                            <input required class="pure-input-1" name="password" type="password" placeholder="<%= translate(locale, "Password") %>">
                        <% end %>
-                        <input type="hidden" name="captcha_type" value="text">
-                        <label for="answer"><%= captcha[:question] %></label>
-                        <input type="text" name="answer" type="text" placeholder="Answer">
-                    <% end %>

-                    <button type="submit" name="action" value="signin" class="pure-button pure-button-primary">
-                        <%= translate(locale, "Register") %>
-                    </button>
+                        <% if captcha %>
+                            <% case captcha_type when %>
+                            <% when "image" %>
+                                <% captcha = captcha.not_nil! %>
+                                <img style="width:100%" src='<%= captcha[:question] %>'/>
+                                <% captcha[:tokens].each_with_index do |token, i| %>
+                                    <input type="hidden" name="token[<%= i %>]" value="<%= URI.escape(token) %>">
+                                <% end %>
+                                <input type="hidden" name="captcha_type" value="image">
+                                <label for="answer"><%= translate(locale, "Time (h:mm:ss):") %></label>
+                                <input type="text" name="answer" type="text" placeholder="h:mm:ss">
+                            <% when "text" %>
+                                <% captcha = captcha.not_nil! %>
+                                <% captcha[:tokens].each_with_index do |token, i| %>
+                                    <input type="hidden" name="token[<%= i %>]" value="<%= URI.escape(token) %>">
+                                <% end %>
+                                <input type="hidden" name="captcha_type" value="text">
+                                <label for="answer"><%= captcha[:question] %></label>
+                                <input type="text" name="answer" type="text" placeholder="<%= translate(locale, "Answer") %>">
+                            <% end %>

-                    <% case captcha_type when %>
-                    <% when "image" %>
-                        <label>
-                            <button type="submit" name="change_type" class="pure-button pure-button-primary" value="text">
-                                <%= translate(locale, "Text CAPTCHA") %>
+                            <button type="submit" name="action" value="signin" class="pure-button pure-button-primary">
+                                <%= translate(locale, "Register") %>
                            </button>
-                        </label>
-                    <% when "text" %>
-                        <label>
-                            <button type="submit" name="change_type" class="pure-button pure-button-primary" value="image">
-                                <%= translate(locale, "Image CAPTCHA") %>
+
+                            <% case captcha_type when %>
+                            <% when "image" %>
+                                <label>
+                                    <button type="submit" name="change_type" class="pure-button pure-button-primary" value="text">
+                                        <%= translate(locale, "Text CAPTCHA") %>
+                                    </button>
+                                </label>
+                            <% when "text" %>
+                                <label>
+                                    <button type="submit" name="change_type" class="pure-button pure-button-primary" value="image">
+                                        <%= translate(locale, "Image CAPTCHA") %>
+                                    </button>
+                                </label>
+                            <% end %>
+                        <% else %>
+                            <button type="submit" name="action" value="signin" class="pure-button pure-button-primary">
+                                <%= translate(locale, "Sign In") %>/<%= translate(locale, "Register") %>
                            </button>
-                        </label>
-                    <% end %>
-                <% else %>
-                    <button type="submit" name="action" value="signin" class="pure-button pure-button-primary">
-                        <%= translate(locale, "Sign In") %>/<%= translate(locale, "Register") %>
-                    </button>
-                <% end %>
-                </fieldset>
-            </form>
+                        <% end %>
+                    </fieldset>
+                </form>
            <% elsif account_type == "google" %>
-            <form class="pure-form pure-form-stacked" action="/login?referer=<%= URI.escape(referer) %>&type=google" method="post">
-                <fieldset>
-                    <% if email %>
-                    <input name="email" type="hidden" value="<%= email %>">
-                    <% else %>
-                    <label for="email"><%= translate(locale, "Email:") %></label>
-                    <input required class="pure-input-1" name="email" type="email" placeholder="Email">
-                    <% end %>
+                <form class="pure-form pure-form-stacked" action="/login?referer=<%= URI.escape(referer) %>&type=google" method="post">
+                    <fieldset>
+                        <% if email %>
+                            <input name="email" type="hidden" value="<%= email %>">
+                        <% else %>
+                            <label for="email"><%= translate(locale, "E-mail") %> :</label>
+                            <input required class="pure-input-1" name="email" type="email" placeholder="<%= translate(locale, "E-mail") %>">
+                        <% end %>

-                    <% if password %>
-                    <input name="password" type="hidden" value="<%= password %>">
-                    <% else %>
-                    <label for="password"><%= translate(locale, "Password:") %></label>
-                    <input required class="pure-input-1" name="password" type="password" placeholder="Password">
-                    <% end %>
+                        <% if password %>
+                            <input name="password" type="hidden" value="<%= password %>">
+                        <% else %>
+                            <label for="password"><%= translate(locale, "Password") %> :</label>
+                            <input required class="pure-input-1" name="password" type="password" placeholder="<%= translate(locale, "Password") %>">
+                        <% end %>

-                    <% if tfa %>
-                    <label for="tfa"><%= translate(locale, "Google verification code:") %></label>
-                    <input required class="pure-input-1" name="tfa" type="text" placeholder="Google verification code">
-                    <% end %>
+                        <% if tfa %>
+                            <label for="tfa"><%= translate(locale, "Google verification code") %> :</label>
+                            <input required class="pure-input-1" name="tfa" type="text" placeholder="<%= translate(locale, "Google verification code") %>">
+                        <% end %>

-                    <button type="submit" class="pure-button pure-button-primary"><%= translate(locale, "Sign In") %></button>
-                </fieldset>
-            </form>
+                        <button type="submit" class="pure-button pure-button-primary"><%= translate(locale, "Sign In") %></button>
+                    </fieldset>
+                </form>
            <% end %>
        </div>
    </div>
-    <div class="pure-u-1 pure-u-md-1-5"></div>
+    <div class="pure-u-1 pure-u-lg-1-5"></div>
 </div>
--- a/src/invidious/views/mix.ecr
+++ b/src/invidious/views/mix.ecr
@@ -6,7 +6,7 @@
    <div class="pure-u-2-3">
        <h3><%= mix.title %></h3>
    </div>
-    <div class="pure-u-1-3" style="text-align:right;">
+    <div class="pure-u-1-3" style="text-align:right">
        <h3>
            <a href="/feed/playlist/<%= mix.id %>"><i class="icon ion-logo-rss"></i></a>
        </h3>
@@ -14,9 +14,9 @@
 </div>

 <div class="pure-g">
-<% mix.videos.each_slice(4) do |slice| %>
-    <% slice.each do |item| %>
-        <%= rendered "components/item" %>
+    <% mix.videos.each_slice(4) do |slice| %>
+        <% slice.each do |item| %>
+            <%= rendered "components/item" %>
+        <% end %>
    <% end %>
-<% end %>
 </div>
--- a/src/invidious/views/playlist.ecr
+++ b/src/invidious/views/playlist.ecr
@@ -7,12 +7,13 @@
    <div class="pure-u-2-3">
        <h3><%= playlist.title %></h3>
    </div>
-    <div class="pure-u-1-3" style="text-align:right;">
+    <div class="pure-u-1-3" style="text-align:right">
        <h3>
            <a href="/feed/playlist/<%= plid %>"><i class="icon ion-logo-rss"></i></a>
        </h3>
    </div>
 </div>
+
 <div class="pure-g h-box">
    <div class="pure-u-1 pure-u-md-1-4">
        <a href="/channel/<%= playlist.ucid %>">
@@ -26,27 +27,27 @@
 </div>

 <div class="pure-g">
-<% videos.each_slice(4) do |slice| %>
-    <% slice.each do |item| %>
-        <%= rendered "components/item" %>
+    <% videos.each_slice(4) do |slice| %>
+        <% slice.each do |item| %>
+            <%= rendered "components/item" %>
+        <% end %>
    <% end %>
-<% end %>
 </div>

 <div class="pure-g h-box">
-    <div class="pure-u-1 pure-u-md-1-5">
-    <% if page >= 2 %>
-        <a href="/playlist?list=<%= playlist.id %>&page=<%= page - 1 %>">
-            <%= translate(locale, "Previous page") %>
-        </a>
-    <% end %>
+    <div class="pure-u-1 pure-u-lg-1-5">
+        <% if page >= 2 %>
+            <a href="/playlist?list=<%= playlist.id %>&page=<%= page - 1 %>">
+                <%= translate(locale, "Previous page") %>
+            </a>
+        <% end %>
    </div>
-    <div class="pure-u-1 pure-u-md-3-5"></div>
-    <div style="text-align:right;" class="pure-u-1 pure-u-md-1-5">
-    <% if videos.size == 100 %>
-        <a href="/playlist?list=<%= playlist.id %>&page=<%= page + 1 %>">
-            <%= translate(locale, "Next page") %>
-        </a>
-    <% end %>
+    <div class="pure-u-1 pure-u-lg-3-5"></div>
+    <div class="pure-u-1 pure-u-lg-1-5" style="text-align:right">
+        <% if videos.size == 100 %>
+            <a href="/playlist?list=<%= playlist.id %>&page=<%= page + 1 %>">
+                <%= translate(locale, "Next page") %>
+            </a>
+        <% end %>
    </div>
 </div>
--- a/src/invidious/views/playlists.ecr
+++ b/src/invidious/views/playlists.ecr
@@ -6,7 +6,7 @@
    <div class="pure-u-2-3">
        <h3><%= author %></h3>
    </div>
-    <div class="pure-u-1-3" style="text-align:right;">
+    <div class="pure-u-1-3" style="text-align:right">
        <h3>
            <a href="/feed/channel/<%= ucid %>"><i class="icon ion-logo-rss"></i></a>
        </h3>
@@ -14,8 +14,8 @@
 </div>

 <div class="h-box">
-<% sub_count_text = number_to_short_text(sub_count) %>
-<%= rendered "components/subscribe_widget" %>
+    <% sub_count_text = number_to_short_text(sub_count) %>
+    <%= rendered "components/subscribe_widget" %>
 </div>

 <div class="pure-g h-box">
@@ -28,25 +28,24 @@
        </div>
        <div class="pure-u-1 pure-md-1-3">
            <% if !auto_generated %>
-            <b><%= translate(locale, "Playlists") %></b>
+                <b><%= translate(locale, "Playlists") %></b>
            <% end %>
        </div>
    </div>
+    <div class="pure-u-1-3"></div>
    <div class="pure-u-1-3">
-    </div>
-    <div class="pure-u-1-3">
-        <div class="pure-g" style="text-align:right;">
-        <% {"last", "oldest", "newest"}.each do |sort| %>
-            <div class="pure-u-1 pure-md-1-3">
-                <% if sort_by == sort %>
-                <b><%= translate(locale, sort) %></b>
-                <% else %>
-                <a href="/channel/<%= ucid %>/playlists?sort_by=<%= sort %>">
-                <%= translate(locale, sort) %>
-                </a>
-                <% end %>
-            </div>
-        <% end %>
+        <div class="pure-g" style="text-align:right">
+            <% {"last", "oldest", "newest"}.each do |sort| %>
+                <div class="pure-u-1 pure-md-1-3">
+                    <% if sort_by == sort %>
+                        <b><%= translate(locale, sort) %></b>
+                    <% else %>
+                        <a href="/channel/<%= ucid %>/playlists?sort_by=<%= sort %>">
+                            <%= translate(locale, sort) %>
+                        </a>
+                    <% end %>
+                </div>
+            <% end %>
        </div>
    </div>
 </div>
@@ -56,25 +55,20 @@
 </div>

 <div class="pure-g">
-<% items.each_slice(4) do |slice| %>
-    <% slice.each do |item| %>
-        <%= rendered "components/item" %>
+    <% items.each_slice(4) do |slice| %>
+        <% slice.each do |item| %>
+            <%= rendered "components/item" %>
+        <% end %>
    <% end %>
-<% end %>
 </div>

 <div class="pure-g h-box">
    <div class="pure-u-1 pure-u-md-4-5"></div>
-    <div style="text-align:right;" class="pure-u-1 pure-u-md-1-5">
-    <% if items.size >= 28 %>
-        <a href="/channel/<%= ucid %>/playlists?continuation=<%= continuation %><% if sort_by != "last" %>&sort_by=<%= sort_by %><% end %>">
-            <%= translate(locale, "Next page") %>
-        </a>
-    <% end %>
+    <div class="pure-u-1 pure-u-lg-1-5" style="text-align:right">
+        <% if items.size >= 28 %>
+            <a href="/channel/<%= ucid %>/playlists?continuation=<%= continuation %><% if sort_by != "last" %>&sort_by=<%= sort_by %><% end %>">
+                <%= translate(locale, "Next page") %>
+            </a>
+        <% end %>
    </div>
 </div>
-
-<script>
-<% sub_count_text = number_to_short_text(sub_count) %>
-<%= rendered "components/subscribe_widget_script" %>
-</script>
--- a/src/invidious/views/popular.ecr
+++ b/src/invidious/views/popular.ecr
@@ -1,14 +1,20 @@
 <% content_for "header" do %>
 <meta name="description" content="<%= translate(locale, "An alternative front-end to YouTube") %>">
-<title><% if config.default_home != "Popular" %><%= translate(locale, "Popular") %> - <% end %>Invidious</title>
+<title>
+    <% if config.default_home != "Popular" %>
+        <%= translate(locale, "Popular") %> - Invidious
+    <% else %>
+        Invidious
+    <% end %>
+</title>
 <% end %>

 <%= rendered "components/feed_menu" %>

 <div class="pure-g">
-<% popular_videos.each_slice(4) do |slice| %>
-        <% slice.each do |item| %>
-            <%= rendered "components/item" %>
-        <% end %>
-<% end %>
+    <% popular_videos.each_slice(4) do |slice| %>
+            <% slice.each do |item| %>
+                <%= rendered "components/item" %>
+            <% end %>
+    <% end %>
 </div>
--- a/src/invidious/views/preferences.ecr
+++ b/src/invidious/views/preferences.ecr
@@ -9,7 +9,7 @@ function update_value(element) {
 </script>

 <div class="h-box">
-    <form class="pure-form pure-form-aligned" action="/preferences?referer=<%= referer %>" method="post">
+    <form class="pure-form pure-form-aligned" action="/preferences?referer=<%= URI.escape(referer) %>" method="post">
        <fieldset>
            <legend><%= translate(locale, "Player preferences") %></legend>

@@ -24,10 +24,15 @@ function update_value(element) {
            </div>

            <div class="pure-control-group">
-                <label for="continue"><%= translate(locale, "Autoplay next video: ") %></label>
+                <label for="continue"><%= translate(locale, "Play next by default: ") %></label>
                <input name="continue" id="continue" type="checkbox" <% if preferences.continue %>checked<% end %>>
            </div>

+            <div class="pure-control-group">
+                <label for="continue_autoplay"><%= translate(locale, "Autoplay next video: ") %></label>
+                <input name="continue_autoplay" id="continue_autoplay" type="checkbox" <% if preferences.continue_autoplay %>checked<% end %>>
+            </div>
+
            <div class="pure-control-group">
                <label for="local"><%= translate(locale, "Proxy videos? ") %></label>
                <input name="local" id="local" type="checkbox" <% if preferences.local %>checked<% end %>>
@@ -41,18 +46,18 @@ function update_value(element) {
            <div class="pure-control-group">
                <label for="speed"><%= translate(locale, "Default speed: ") %></label>
                <select name="speed" id="speed">
-                <% {2.0, 1.5, 1.25, 1.0, 0.75, 0.5, 0.25}.each do |option| %>
-                    <option <% if preferences.speed == option %> selected <% end %>><%= option %></option>
-                <% end %>
+                    <% {2.0, 1.5, 1.25, 1.0, 0.75, 0.5, 0.25}.each do |option| %>
+                        <option <% if preferences.speed == option %> selected <% end %>><%= option %></option>
+                    <% end %>
                </select>
            </div>

            <div class="pure-control-group">
                <label for="quality"><%= translate(locale, "Preferred video quality: ") %></label>
                <select name="quality" id="quality">
-                <% {"dash", "hd720", "medium", "small"}.each do |option| %>
-                    <option value="<%= option %>" <% if preferences.quality == option %> selected <% end %>><%= translate(locale, option) %></option>
-                <% end %>
+                    <% {"dash", "hd720", "medium", "small"}.each do |option| %>
+                        <option value="<%= option %>" <% if preferences.quality == option %> selected <% end %>><%= translate(locale, option) %></option>
+                    <% end %>
                </select>
            </div>

@@ -65,22 +70,22 @@ function update_value(element) {
            <div class="pure-control-group">
                <label for="comments[0]"><%= translate(locale, "Default comments: ") %></label>
                <% preferences.comments.each_with_index do |comments, index| %>
-                <select name="comments[<%= index %>]" id="comments[<%= index %>]">
-                <% {"", "youtube", "reddit"}.each do |option| %>
-                    <option value="<%= option %>" <% if preferences.comments[index] == option %> selected <% end %>><%= translate(locale, option) %></option>
-                <% end %>
-                </select>
+                    <select name="comments[<%= index %>]" id="comments[<%= index %>]">
+                        <% {"", "youtube", "reddit"}.each do |option| %>
+                            <option value="<%= option %>" <% if preferences.comments[index] == option %> selected <% end %>><%= translate(locale, option) %></option>
+                        <% end %>
+                    </select>
                <% end %>
            </div>

            <div class="pure-control-group">
                <label for="captions[0]"><%= translate(locale, "Default captions: ") %></label>
                <% preferences.captions.each_with_index do |caption, index| %>
-                <select class="pure-u-1-6" name="captions[<%= index %>]" id="captions[<%= index %>]">
-                <% CAPTION_LANGUAGES.each do |option| %>
-                    <option value="<%= option %>" <% if preferences.captions[index] == option %> selected <% end %>><%= translate(locale, option) %></option>
-                <% end %>
-                </select>
+                    <select class="pure-u-1-6" name="captions[<%= index %>]" id="captions[<%= index %>]">
+                        <% CAPTION_LANGUAGES.each do |option| %>
+                            <option value="<%= option %>" <% if preferences.captions[index] == option %> selected <% end %>><%= translate(locale, option) %></option>
+                        <% end %>
+                    </select>
                <% end %>
            </div>

@@ -89,14 +94,19 @@ function update_value(element) {
                <input name="related_videos" id="related_videos" type="checkbox" <% if preferences.related_videos %>checked<% end %>>
            </div>

+            <div class="pure-control-group">
+                <label for="annotations"><%= translate(locale, "Show annotations by default? ") %></label>
+                <input name="annotations" id="annotations" type="checkbox" <% if preferences.annotations %>checked<% end %>>
+            </div>
+
            <legend><%= translate(locale, "Visual preferences") %></legend>

            <div class="pure-control-group">
                <label for="locale"><%= translate(locale, "Language: ") %></label>
                <select name="locale" id="locale">
-                <% LOCALES.each_key do |option| %>
-                    <option value="<%= option %>" <% if preferences.locale == option %> selected <% end %>><%= option %></option>
-                <% end %>
+                    <% LOCALES.each_key do |option| %>
+                        <option value="<%= option %>" <% if preferences.locale == option %> selected <% end %>><%= option %></option>
+                    <% end %>
                </select>
            </div>

@@ -111,118 +121,131 @@ function update_value(element) {
            </div>

            <% if env.get? "user" %>
-            <legend><%= translate(locale, "Subscription preferences") %></legend>
+                <legend><%= translate(locale, "Subscription preferences") %></legend>

-            <div class="pure-control-group">
-                <label for="redirect_feed"><%= translate(locale, "Redirect homepage to feed: ") %></label>
-                <input name="redirect_feed" id="redirect_feed" type="checkbox" <% if preferences.redirect_feed %>checked<% end %>>
-            </div>
+                <div class="pure-control-group">
+                    <label for="annotations_subscribed"><%= translate(locale, "Show annotations by default for subscribed channels? ") %></label>
+                    <input name="annotations_subscribed" id="annotations_subscribed" type="checkbox" <% if preferences.annotations_subscribed %>checked<% end %>>
+                </div>

-            <div class="pure-control-group">
-                <label for="max_results"><%= translate(locale, "Number of videos shown in feed: ") %></label>
-                <input name="max_results" id="max_results" type="number" value="<%= preferences.max_results %>">
-            </div>
+                <div class="pure-control-group">
+                    <label for="redirect_feed"><%= translate(locale, "Redirect homepage to feed: ") %></label>
+                    <input name="redirect_feed" id="redirect_feed" type="checkbox" <% if preferences.redirect_feed %>checked<% end %>>
+                </div>

-            <div class="pure-control-group">
-                <label for="sort"><%= translate(locale, "Sort videos by: ") %></label>
-                <select name="sort" id="sort">
-                <% {"published", "published - reverse", "alphabetically", "alphabetically - reverse", "channel name", "channel name - reverse"}.each do |option| %>
-                    <option value="<%= option %>" <% if preferences.sort == option %> selected <% end %>><%= translate(locale, option) %></option>
-                <% end %>
-                </select>
-            </div>
+                <div class="pure-control-group">
+                    <label for="max_results"><%= translate(locale, "Number of videos shown in feed: ") %></label>
+                    <input name="max_results" id="max_results" type="number" value="<%= preferences.max_results %>">
+                </div>

-            <div class="pure-control-group">
-                <% if preferences.unseen_only %>
-                <label for="latest_only"><%= translate(locale, "Only show latest unwatched video from channel: ") %></label>
-                <% else %>
-                <label for="latest_only"><%= translate(locale, "Only show latest video from channel: ") %></label>
-                <% end %>
-                <input name="latest_only" id="latest_only" type="checkbox" <% if preferences.latest_only %>checked<% end %>>
-            </div>
+                <div class="pure-control-group">
+                    <label for="sort"><%= translate(locale, "Sort videos by: ") %></label>
+                    <select name="sort" id="sort">
+                        <% {"published", "published - reverse", "alphabetically", "alphabetically - reverse", "channel name", "channel name - reverse"}.each do |option| %>
+                            <option value="<%= option %>" <% if preferences.sort == option %> selected <% end %>><%= translate(locale, option) %></option>
+                        <% end %>
+                    </select>
+                </div>

-            <div class="pure-control-group">
-                <label for="unseen_only"><%= translate(locale, "Only show unwatched: ") %></label>
-                <input name="unseen_only" id="unseen_only" type="checkbox" <% if preferences.unseen_only %>checked<% end %>>
-            </div>
+                <div class="pure-control-group">
+                    <% if preferences.unseen_only %>
+                        <label for="latest_only"><%= translate(locale, "Only show latest unwatched video from channel: ") %></label>
+                    <% else %>
+                        <label for="latest_only"><%= translate(locale, "Only show latest video from channel: ") %></label>
+                    <% end %>
+                    <input name="latest_only" id="latest_only" type="checkbox" <% if preferences.latest_only %>checked<% end %>>
+                </div>

-            <div class="pure-control-group">
-                <label for="notifications_only"><%= translate(locale, "Only show notifications (if there are any): ") %></label>
-                <input name="notifications_only" id="notifications_only" type="checkbox" <% if preferences.notifications_only %>checked<% end %>>
-            </div>
+                <div class="pure-control-group">
+                    <label for="unseen_only"><%= translate(locale, "Only show unwatched: ") %></label>
+                    <input name="unseen_only" id="unseen_only" type="checkbox" <% if preferences.unseen_only %>checked<% end %>>
+                </div>
+
+                <div class="pure-control-group">
+                    <label for="notifications_only"><%= translate(locale, "Only show notifications (if there are any): ") %></label>
+                    <input name="notifications_only" id="notifications_only" type="checkbox" <% if preferences.notifications_only %>checked<% end %>>
+                </div>
            <% end %>

            <% if env.get?("user") && config.admins.includes? env.get?("user").as(User).email %>
-            <legend><%= translate(locale, "Administrator preferences") %></legend>
+                <legend><%= translate(locale, "Administrator preferences") %></legend>

-            <div class="pure-control-group">
-                <label for="default_home"><%= translate(locale, "Default homepage: ") %></label>
-                <select name="default_home" id="default_home">
-                <% {"Popular", "Top", "Trending", "Subscriptions"}.each do |option| %>
-                    <option value="<%= option %>" <% if config.default_home == option %> selected <% end %>><%= translate(locale, option) %></option>
-                <% end %>
-                </select>
-            </div>
+                <div class="pure-control-group">
+                    <label for="default_home"><%= translate(locale, "Default homepage: ") %></label>
+                    <select name="default_home" id="default_home">
+                        <% {"Popular", "Top", "Trending", "Subscriptions"}.each do |option| %>
+                            <option value="<%= option %>" <% if config.default_home == option %> selected <% end %>><%= translate(locale, option) %></option>
+                        <% end %>
+                    </select>
+                </div>

-            <div class="pure-control-group">
-                <label for="feed_menu"><%= translate(locale, "Feed menu: ") %></label>
-                <% 4.times do |index| %>
-                <select name="feed_menu[<%= index %>]" id="feed_menu[<%= index %>]">
-                <% {"", "Popular", "Top", "Trending", "Subscriptions"}.each do |option| %>
-                    <option value="<%= option %>" <% if config.feed_menu[index]? == option %> selected <% end %>><%= translate(locale, option) %></option>
-                <% end %>
-                </select>
-                <% end %>
-            </div>
+                <div class="pure-control-group">
+                    <label for="feed_menu"><%= translate(locale, "Feed menu: ") %></label>
+                    <% 4.times do |index| %>
+                        <select name="feed_menu[<%= index %>]" id="feed_menu[<%= index %>]">
+                            <% {"", "Popular", "Top", "Trending", "Subscriptions"}.each do |option| %>
+                                <option value="<%= option %>" <% if config.feed_menu[index]? == option %> selected <% end %>><%= translate(locale, option) %></option>
+                            <% end %>
+                        </select>
+                    <% end %>
+                </div>

-            <div class="pure-control-group">
-                <label for="top_enabled"><%= translate(locale, "Top enabled? ") %></label>
-                <input name="top_enabled" id="top_enabled" type="checkbox" <% if config.top_enabled %>checked<% end %>>
-            </div>
+                <div class="pure-control-group">
+                    <label for="top_enabled"><%= translate(locale, "Top enabled? ") %></label>
+                    <input name="top_enabled" id="top_enabled" type="checkbox" <% if config.top_enabled %>checked<% end %>>
+                </div>

-            <div class="pure-control-group">
-                <label for="captcha_enabled"><%= translate(locale, "CAPTCHA enabled? ") %></label>
-                <input name="captcha_enabled" id="captcha_enabled" type="checkbox" <% if config.captcha_enabled %>checked<% end %>>
-            </div>
+                <div class="pure-control-group">
+                    <label for="captcha_enabled"><%= translate(locale, "CAPTCHA enabled? ") %></label>
+                    <input name="captcha_enabled" id="captcha_enabled" type="checkbox" <% if config.captcha_enabled %>checked<% end %>>
+                </div>

-            <div class="pure-control-group">
-                <label for="login_enabled"><%= translate(locale, "Login enabled? ") %></label>
-                <input name="login_enabled" id="login_enabled" type="checkbox" <% if config.login_enabled %>checked<% end %>>
-            </div>
+                <div class="pure-control-group">
+                    <label for="login_enabled"><%= translate(locale, "Login enabled? ") %></label>
+                    <input name="login_enabled" id="login_enabled" type="checkbox" <% if config.login_enabled %>checked<% end %>>
+                </div>

-            <div class="pure-control-group">
-                <label for="registration_enabled"><%= translate(locale, "Registration enabled? ") %></label>
-                <input name="registration_enabled" id="registration_enabled" type="checkbox" <% if config.registration_enabled %>checked<% end %>>
-            </div>
+                <div class="pure-control-group">
+                    <label for="registration_enabled"><%= translate(locale, "Registration enabled? ") %></label>
+                    <input name="registration_enabled" id="registration_enabled" type="checkbox" <% if config.registration_enabled %>checked<% end %>>
+                </div>

-            <div class="pure-control-group">
-                <label for="statistics_enabled"><%= translate(locale, "Report statistics? ") %></label>
-                <input name="statistics_enabled" id="statistics_enabled" type="checkbox" <% if config.statistics_enabled %>checked<% end %>>
-            </div>
+                <div class="pure-control-group">
+                    <label for="statistics_enabled"><%= translate(locale, "Report statistics? ") %></label>
+                    <input name="statistics_enabled" id="statistics_enabled" type="checkbox" <% if config.statistics_enabled %>checked<% end %>>
+                </div>
            <% end %>

            <% if env.get? "user" %>
-            <legend><%= translate(locale, "Data preferences") %></legend>
+                <legend><%= translate(locale, "Data preferences") %></legend>

-            <div class="pure-control-group">
-                <a href="/clear_watch_history?referer=<%= URI.escape(referer) %>"><%= translate(locale, "Clear watch history") %></a>
-            </div>
+                <div class="pure-control-group">
+                    <a href="/clear_watch_history?referer=<%= URI.escape(referer) %>"><%= translate(locale, "Clear watch history") %></a>
+                </div>

-            <div class="pure-control-group">
-                <a href="/data_control?referer=<%= URI.escape(referer) %>"><%= translate(locale, "Import/Export data") %></a>
-            </div>
+                <div class="pure-control-group">
+                    <a href="/change_password?referer=<%= URI.escape(referer) %>"><%= translate(locale, "Change password") %></a>
+                </div>

-            <div class="pure-control-group">
-                <a href="/subscription_manager"><%= translate(locale, "Manage subscriptions") %></a>
-            </div>
+                <div class="pure-control-group">
+                    <a href="/data_control?referer=<%= URI.escape(referer) %>"><%= translate(locale, "Import/export data") %></a>
+                </div>

-            <div class="pure-control-group">
-                <a href="/feed/history"><%= translate(locale, "Watch history") %></a>
-            </div>
+                <div class="pure-control-group">
+                    <a href="/subscription_manager"><%= translate(locale, "Manage subscriptions") %></a>
+                </div>

-            <div class="pure-control-group">
-                <a href="/delete_account?referer=<%= URI.escape(referer) %>"><%= translate(locale, "Delete account") %></a>
-            </div>
+                <div class="pure-control-group">
+                    <a href="/token_manager"><%= translate(locale, "Manage tokens") %></a>
+                </div>
+
+                <div class="pure-control-group">
+                    <a href="/feed/history"><%= translate(locale, "Watch history") %></a>
+                </div>
+
+                <div class="pure-control-group">
+                    <a href="/delete_account?referer=<%= URI.escape(referer) %>"><%= translate(locale, "Delete account") %></a>
+                </div>
            <% end %>

            <div class="pure-controls">
--- a/src/invidious/views/privacy.ecr
+++ b/src/invidious/views/privacy.ecr
@@ -3,73 +3,73 @@
 <% end %>

 <div class="h-box">
-<%= Markdown.to_html(<<-END_PRIVACY_POLICY
-  ## Privacy
+    <%= Markdown.to_html(<<-END_PRIVACY_POLICY
+        ## Privacy

-  This document concerns what data you provide to this website, the purpose of the data, how the data is stored, and how the data can be removed.
+        This document concerns what data you provide to this website, the purpose of the data, how the data is stored, and how the data can be removed.

-  ### Data you directly provide
+        ### Data you directly provide

-  Data that you provide to the website for the purpose of the site's operation (for example: an account name, account password, or channel subscription) will be stored in the website's database until the user decides to remove it. This data will not be intentionally shared with anyone or anything.
+        Data that you provide to the website for the purpose of the site's operation (for example: an account name, account password, or channel subscription) will be stored in the website's database until the user decides to remove it. This data will not be intentionally shared with anyone or anything.

-  Information stored about a registered user is limited to:
+        Information stored about a registered user is limited to:

-  - a list of session tokens for remaining logged in across devices
-  - the last time an account was updated (to provide accurate notifications)
-  - a list of video IDs identifying notifications from a user's subscriptions
-  - a list of channel UCIDs the user is subscribed to
-  - a user ID (for persistent storage of subscriptions and preferences)
-  - a json object containing user preferences
-  - a hashed password if applicable (not present on google accounts)
-  - a randomly generated token for providing an RSS feed of a user's subscriptions
-  - a list of video IDs identifying watched videos
+        - a list of session tokens for remaining logged in across devices
+        - the last time an account was updated (to provide accurate notifications)
+        - a list of video IDs identifying notifications from a user's subscriptions
+        - a list of channel UCIDs the user is subscribed to
+        - a user ID (for persistent storage of subscriptions and preferences)
+        - a json object containing user preferences
+        - a hashed password if applicable (not present on google accounts)
+        - a randomly generated token for providing an RSS feed of a user's subscriptions
+        - a list of video IDs identifying watched videos

-  The above list reflects [this code](https://github.com/omarroth/invidious/blob/master/src/invidious/users.cr#L14-L51).
+        The above list reflects [this code](https://github.com/omarroth/invidious/blob/master/src/invidious/users.cr#L14-L51).

-  Users can clear their watch history using the [clear watch history](/clear_watch_history) page.
+        Users can clear their watch history using the [clear watch history](/clear_watch_history) page.

-  If a user is logged in with a Google account, no password will ever be stored. This website uses the session token provided by Google to identify a user, but does not store the information required to make requests on a user's behalf without their knowledge or consent.
+        If a user is logged in with a Google account, no password will ever be stored. This website uses the session token provided by Google to identify a user, but does not store the information required to make requests on a user's behalf without their knowledge or consent.

-  ### Data you passively provide
+        ### Data you passively provide

-  When you request any resource from this website (for example: a page, a font, an image, or an API endpoint) information about the request may be logged.
+        When you request any resource from this website (for example: a page, a font, an image, or an API endpoint) information about the request may be logged.

-  Information about a request is limited to:
+        Information about a request is limited to:

-  - the time the request was made
-  - the status code of the response
-  - the method of the request
-  - the requested URL
-  - how long it took to complete the request.
+        - the time the request was made
+        - the status code of the response
+        - the method of the request
+        - the requested URL
+        - how long it took to complete the request.

-  No identifying information is logged, such as the visitor's cookie, user-agent, or IP address. Here are a couple lines to serve as an example:
+        No identifying information is logged, such as the visitor's cookie, user-agent, or IP address. Here are a couple lines to serve as an example:

-  ```
-  2019-01-19 16:37:47 +00:00 200 GET /api/v1/comments/xrlETJYzH-c?format=html&hl=en-US 1345.88ms
-  2019-01-19 16:37:53 +00:00 200 GET /vi/r5P-f5arPXE/maxres.jpg 1085.41ms
-  2019-01-19 16:37:54 +00:00 200 GET /watch 7.04ms
-  ```
+        ```
+        2019-01-19 16:37:47 +00:00 200 GET /api/v1/comments/xrlETJYzH-c?format=html&hl=en-US 1345.88ms
+        2019-01-19 16:37:53 +00:00 200 GET /vi/r5P-f5arPXE/maxres.jpg 1085.41ms
+        2019-01-19 16:37:54 +00:00 200 GET /watch 7.04ms
+        ```

-  This website does not store the visitor's user-agent or IP address and does not use fingerprinting, advertisements, or tracking of any form.
+        This website does not store the visitor's user-agent or IP address and does not use fingerprinting, advertisements, or tracking of any form.

-  This website provides links to googlevideo.com to provide audio and video playback. googlevideo.com is owned by Google and is subject to their [privacy policy](https://policies.google.com/privacy).
+        This website provides links to googlevideo.com to provide audio and video playback. googlevideo.com is owned by Google and is subject to their [privacy policy](https://policies.google.com/privacy).

-  ### Data stored in your browser
+        ### Data stored in your browser

-  This website uses browser cookies to authenticate registered users. This data consists of:
+        This website uses browser cookies to authenticate registered users. This data consists of:

-  - An account token to keep you logged into the website between visits, which is sent when any page is loaded while you are logged in
+        - An account token to keep you logged into the website between visits, which is sent when any page is loaded while you are logged in

-  This website also provides an option to store site preferences, such as the theme or locale, without an account. Using this feature will store a cookie in the visitor's browser containing their preferences. This cookie is sent on every request and does not contain any identifying information.
+        This website also provides an option to store site preferences, such as the theme or locale, without an account. Using this feature will store a cookie in the visitor's browser containing their preferences. This cookie is sent on every request and does not contain any identifying information.

-  You can remove this data from your browser by logging out of this website, or by using your browser's cookie-related controls to delete the data.
+        You can remove this data from your browser by logging out of this website, or by using your browser's cookie-related controls to delete the data.

-  ### Removal of data
+        ### Removal of data

-  To remove data stored in your browser, you can log out of the website, or you can use your browser's cookie-related controls to delete the data.
+        To remove data stored in your browser, you can log out of the website, or you can use your browser's cookie-related controls to delete the data.

-  To remove data that has been stored in the website's database, you can use the [delete my account](/delete_account) page.
-  END_PRIVACY_POLICY
-  )
-%>
-</div>
+        To remove data that has been stored in the website's database, you can use the [delete my account](/delete_account) page.
+        END_PRIVACY_POLICY
+    )
+    %>
+</div>
--- a/src/invidious/views/search.ecr
+++ b/src/invidious/views/search.ecr
@@ -3,27 +3,27 @@
 <% end %>

 <div class="pure-g">
-<% videos.each_slice(4) do |slice| %>
-    <% slice.each do |item| %>
-        <%= rendered "components/item" %>
+    <% videos.each_slice(4) do |slice| %>
+        <% slice.each do |item| %>
+            <%= rendered "components/item" %>
+        <% end %>
    <% end %>
-<% end %>
 </div>

 <div class="pure-g h-box">
-    <div class="pure-u-1 pure-u-md-1-5">
-    <% if page >= 2 %>
-        <a href="/search?q=<%= HTML.escape(query.not_nil!) %>&page=<%= page - 1 %>">
-            <%= translate(locale, "Previous page") %>
-        </a>
-    <% end %>
+    <div class="pure-u-1 pure-u-lg-1-5">
+        <% if page >= 2 %>
+            <a href="/search?q=<%= HTML.escape(query.not_nil!) %>&page=<%= page - 1 %>">
+                <%= translate(locale, "Previous page") %>
+            </a>
+        <% end %>
    </div>
-    <div class="pure-u-1 pure-u-md-3-5"></div>
-    <div style="text-align:right;" class="pure-u-1 pure-u-md-1-5">
-    <% if count >= 20 %>
-        <a href="/search?q=<%= HTML.escape(query.not_nil!) %>&page=<%= page + 1 %>">
-            <%= translate(locale, "Next page") %>
-        </a>
-    <% end %>
+    <div class="pure-u-1 pure-u-lg-3-5"></div>
+    <div class="pure-u-1 pure-u-lg-1-5" style="text-align:right">
+        <% if count >= 20 %>
+            <a href="/search?q=<%= HTML.escape(query.not_nil!) %>&page=<%= page + 1 %>">
+                <%= translate(locale, "Next page") %>
+            </a>
+        <% end %>
    </div>
 </div>
--- a/src/invidious/views/subscription_manager.ecr
+++ b/src/invidious/views/subscription_manager.ecr
@@ -5,69 +5,78 @@
 <div class="pure-g h-box">
    <div class="pure-u-1-3">
        <h3>
-            <a href="/feed/subscriptions"><%= translate(locale, "`x` subscriptions", %(<span id="count">#{subscriptions.size}</span>)) %></a>
+            <a href="/feed/subscriptions">
+                <%= translate(locale, "`x` subscriptions", %(<span id="count">#{subscriptions.size}</span>)) %>
+            </a>
        </h3>
    </div>
-    <div class="pure-u-1-3" style="text-align:center;">
+    <div class="pure-u-1-3" style="text-align:center">
        <h3>
-            <a href="/feed/history"><%= translate(locale, "Watch history") %></a>
+            <a href="/feed/history">
+                <%= translate(locale, "Watch history") %>
+            </a>
        </h3>
    </div>
-    <div class="pure-u-1-3" style="text-align:right;">
+    <div class="pure-u-1-3" style="text-align:right">
        <h3>
-            <a href="/data_control?referer=<%= referer %>"><%= translate(locale, "Import/Export") %></a>
+            <a href="/data_control?referer=<%= URI.escape(referer) %>">
+                <%= translate(locale, "Import/export") %>
+            </a>
        </h3>
    </div>
 </div>

 <% subscriptions.each do |channel| %>
-<div class="h-box">
-    <div class="pure-g<% if channel.deleted %> deleted <% end%>">
-        <div class="pure-u-2-5">
-            <h3 style="padding-left: 0.5em">
-                <a href="/channel/<%= channel.id %>"><%= channel.author %></a>
-            </h3>
+    <div class="h-box">
+        <div class="pure-g<% if channel.deleted %> deleted <% end %>">
+            <div class="pure-u-2-5">
+                <h3 style="padding-left:0.5em">
+                    <a href="/channel/<%= channel.id %>"><%= channel.author %></a>
+                </h3>
+            </div>
+            <div class="pure-u-2-5"></div>
+            <div class="pure-u-1-5" style="text-align:right">
+                <h3 style="padding-right:0.5em">
+                    <form onsubmit="return false" action="/subscription_ajax?action_remove_subscriptions=1&c=<%= channel.id %>&referer=<%= env.get("current_page") %>" method="post">
+                        <input type="hidden" name="csrf_token" value="<%= URI.escape(env.get?("csrf_token").try &.as(String) || "") %>">
+                        <a onclick="remove_subscription(this)" data-ucid="<%= channel.id %>" href="#">
+                            <input style="all:unset" type="submit" value="<%= translate(locale, "unsubscribe") %>">
+                        </a>
+                    </form>
+                </h3>
+            </div>
        </div>
-        <div class="pure-u-2-5"></div>
-        <div class="pure-u-1-5" style="text-align: right;">
-            <h3 style="padding-right: 0.5em">
-                <a onclick="remove_subscription(this)"
-                    data-id="<%= channel.id %>"
-                    onmouseenter='this["href"]="javascript:void(0)"'
-                    href="/subscription_ajax?action_remove_subscriptions=1&c=<%= channel.id %>">
-                    <%= translate(locale, "unsubscribe") %>
-                </a>
-            </h3>
-        </div>
-    </div>

-    <% if subscriptions[-1].author != channel.author %>
-    <hr>
-    <% end %>
-</div>
+        <% if subscriptions[-1].author != channel.author %>
+            <hr>
+        <% end %>
+    </div>
 <% end %>

 <script>
 function remove_subscription(target) {
-    var row = target.parentNode.parentNode.parentNode.parentNode;
-    row.style.display = "none";
-    var count = document.getElementById("count")
+    var row = target.parentNode.parentNode.parentNode.parentNode.parentNode;
+    row.style.display = 'none';
+    var count = document.getElementById('count');
    count.innerText = count.innerText - 1;

-    var url = "/subscription_ajax?action_remove_subscriptions=1&redirect=false&c=" + target.getAttribute("data-id");
+    var url = '/subscription_ajax?action_remove_subscriptions=1&redirect=false' +
+        '&referer=<%= env.get("current_page") %>' +
+        '&c=' + target.getAttribute('data-ucid');
    var xhr = new XMLHttpRequest();
-    xhr.responseType = "json";
+    xhr.responseType = 'json';
    xhr.timeout = 20000;
-    xhr.open("GET", url, true);
-    xhr.send();
+    xhr.open('POST', url, true);
+    xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
+    xhr.send('csrf_token=<%= URI.escape(env.get?("csrf_token").try &.as(String) || "") %>');

    xhr.onreadystatechange = function() {
        if (xhr.readyState == 4) {
            if (xhr.status != 200) {
-                count.innerText = count.innerText - 1 + 2;
-                row.style.display = "";
+                count.innerText = parseInt(count.innerText) + 1;
+                row.style.display = '';
            }
        }
    }
 }
-</script>
+</script>
--- a/src/invidious/views/subscriptions.ecr
+++ b/src/invidious/views/subscriptions.ecr
@@ -11,32 +11,34 @@
            <a href="/subscription_manager"><%= translate(locale, "Manage subscriptions") %></a>
        </h3>
    </div>
-    <div class="pure-u-1-3" style="text-align:center;">
+    <div class="pure-u-1-3" style="text-align:center">
        <h3>
            <a href="/feed/history"><%= translate(locale, "Watch history") %></a>
        </h3>
    </div>
-    <div class="pure-u-1-3" style="text-align:right;">
+    <div class="pure-u-1-3" style="text-align:right">
        <h3>
            <a href="/feed/private?token=<%= token %>"><i class="icon ion-logo-rss"></i></a>
        </h3>
    </div>
 </div>

-<center><%= translate(locale, "`x` unseen notifications", "#{notifications.size}") %></center>
+<center>
+    <%= translate(locale, "`x` unseen notifications", "#{notifications.size}") %>
+</center>

 <% if !notifications.empty? %>
-<div class="h-box">
-    <hr>
-</div>
+    <div class="h-box">
+        <hr>
+    </div>
 <% end %>

 <div class="pure-g">
-<% notifications.each_slice(4) do |slice| %>
-        <% slice.each do |item| %>
-            <%= rendered "components/item" %>
-        <% end %>
-<% end %>
+    <% notifications.each_slice(4) do |slice| %>
+            <% slice.each do |item| %>
+                <%= rendered "components/item" %>
+            <% end %>
+    <% end %>
 </div>

 <div class="h-box">
@@ -44,29 +46,31 @@
 </div>

 <div class="pure-g">
-<% videos.each_slice(4) do |slice| %>
-        <% slice.each do |item| %>
-            <%= rendered "components/item" %>
-        <% end %>
-<% end %>
+    <% videos.each_slice(4) do |slice| %>
+            <% slice.each do |item| %>
+                <%= rendered "components/item" %>
+            <% end %>
+    <% end %>
 </div>

 <script>
 function mark_watched(target) {
-    var tile = target.parentNode.parentNode.parentNode.parentNode;
-    tile.style.display = "none";
+    var tile = target.parentNode.parentNode.parentNode.parentNode.parentNode;
+    tile.style.display = 'none';

-    var url = "/mark_watched?redirect=false&id=" + target.getAttribute("data-id");
+    var url = '/watch_ajax?action_mark_watched=1&redirect=false' +
+        '&id=' + target.getAttribute('data-id');
    var xhr = new XMLHttpRequest();
-    xhr.responseType = "json";
+    xhr.responseType = 'json';
    xhr.timeout = 20000;
-    xhr.open("GET", url, true);
-    xhr.send();
+    xhr.open('POST', url, true);
+    xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
+    xhr.send('csrf_token=<%= URI.escape(env.get?("csrf_token").try &.as(String) || "") %>');

    xhr.onreadystatechange = function() {
        if (xhr.readyState == 4) {
            if (xhr.status != 200) {
-                tile.style.display = "";
+                tile.style.display = '';
            }
        }
    }
@@ -74,15 +78,15 @@ function mark_watched(target) {
 </script>

 <div class="pure-g h-box">
-    <div class="pure-u-1 pure-u-md-1-5">
-    <% if page >= 2 %>
-        <a href="/feed/subscriptions?max_results=<%= max_results %>&page=<%= page - 1 %>">
-            <%= translate(locale, "Previous page") %>
-        </a>
-    <% end %>
+    <div class="pure-u-1 pure-u-lg-1-5">
+        <% if page >= 2 %>
+            <a href="/feed/subscriptions?max_results=<%= max_results %>&page=<%= page - 1 %>">
+                <%= translate(locale, "Previous page") %>
+            </a>
+        <% end %>
    </div>
-    <div class="pure-u-1 pure-u-md-3-5"></div>
-    <div style="text-align:right;" class="pure-u-1 pure-u-md-1-5">
+    <div class="pure-u-1 pure-u-lg-3-5"></div>
+    <div class="pure-u-1 pure-u-lg-1-5" style="text-align:right">
        <% if (videos.size + notifications.size) == max_results %>
            <a href="/feed/subscriptions?max_results=<%= max_results %>&page=<%= page + 1 %>">
                <%= translate(locale, "Next page") %>
--- a/src/invidious/views/template.ecr
+++ b/src/invidious/views/template.ecr
@@ -1,144 +1,158 @@
 <!DOCTYPE html>
-<html>
+<html lang="<%= env.get("preferences").as(Preferences).locale %>">

 <head>
-  <meta charset="utf-8">
-  <meta name="viewport" content="width=device-width, initial-scale=1">
-  <meta name="referrer" content="no-referrer">
-  <%= yield_content "header" %>
-  <link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png">
-  <link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png">
-  <link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png">
-  <link rel="manifest" href="/site.webmanifest">
-  <link rel="mask-icon" href="/safari-pinned-tab.svg" color="#575757">
-  <meta name="msapplication-TileColor" content="#575757">
-  <meta name="theme-color" content="#575757">
-  <link title="Invidious" type="application/opensearchdescription+xml" rel="search" href="/opensearch.xml">
-  <link rel="stylesheet" href="/css/pure-min.css">
-  <link rel="stylesheet" href="/css/grids-responsive-min.css">
-  <link rel="stylesheet" href="/css/ionicons.min.css">
-  <link rel="stylesheet" href="/css/default.css">
-  <% if env.get("preferences").as(Preferences).dark_mode %>
-  <link rel="stylesheet" href="/css/darktheme.css">
-  <% else %>
-  <link rel="stylesheet" href="/css/lighttheme.css">
-  <% end %>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <meta name="referrer" content="no-referrer">
+    <%= yield_content "header" %>
+    <link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png">
+    <link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png">
+    <link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png">
+    <link rel="manifest" href="/site.webmanifest">
+    <link rel="mask-icon" href="/safari-pinned-tab.svg" color="#575757">
+    <meta name="msapplication-TileColor" content="#575757">
+    <meta name="theme-color" content="#575757">
+    <link title="Invidious" type="application/opensearchdescription+xml" rel="search" href="/opensearch.xml">
+    <link rel="stylesheet" href="/css/pure-min.css">
+    <link rel="stylesheet" href="/css/grids-responsive-min.css">
+    <link rel="stylesheet" href="/css/ionicons.min.css">
+    <link rel="stylesheet" href="/css/default.css">
+    <% if env.get("preferences").as(Preferences).dark_mode %>
+    <link rel="stylesheet" href="/css/darktheme.css">
+    <% else %>
+    <link rel="stylesheet" href="/css/lighttheme.css">
+    <% end %>
 </head>

 <% locale = LOCALES[env.get("preferences").as(Preferences).locale]? %>

 <body>
-  <div class="pure-g">
-    <div class="pure-u-1 pure-u-md-2-24"></div>
-    <div class="pure-u-1 pure-u-md-20-24">
-      <div class="pure-g navbar h-box">
-        <div class="pure-u-1 pure-u-md-4-24">
-          <a href="/" class="index-link pure-menu-heading">Invidious</a>
-        </div>
-        <div class="pure-u-1 pure-u-md-12-24 searchbar">
-          <form class="pure-form" action="/search" method="get">
-            <fieldset>
-              <input type="search" style="width:100%;" name="q" placeholder="<%= translate(locale, "search") %>" value="<%= env.get?("search").try {|x| HTML.escape(x.as(String)) } || env.params.query["q"]?.try {|x| HTML.escape(x)} %>">
-            </fieldset>
-          </form>
-        </div>
-        <div class="pure-u-1 pure-u-md-8-24 user-field">
-        <% if env.get? "user" %>
-        <div class="pure-u-1-4">
-          <a href="/toggle_theme?referer=<%= env.get?("current_page") %>" class="pure-menu-heading">
-            <% if env.get("preferences").as(Preferences).dark_mode %>
-            <i class="icon ion-ios-sunny"></i>
-            <% else %>
-            <i class="icon ion-ios-moon"></i>
+    <div class="pure-g">
+        <div class="pure-u-1 pure-u-md-2-24"></div>
+        <div class="pure-u-1 pure-u-md-20-24">
+            <div class="pure-g navbar h-box">
+                <div class="pure-u-1 pure-u-md-4-24">
+                    <a href="/" class="index-link pure-menu-heading">Invidious</a>
+                </div>
+                <div class="pure-u-1 pure-u-md-12-24 searchbar">
+                    <form class="pure-form" action="/search" method="get">
+                        <fieldset>
+                            <input type="search" style="width:100%" name="q" placeholder="<%= translate(locale, "search") %>" value="<%= env.get?("search").try {|x| HTML.escape(x.as(String)) } || env.params.query["q"]?.try {|x| HTML.escape(x)} %>">
+                        </fieldset>
+                    </form>
+                </div>
+                <div class="pure-u-1 pure-u-md-8-24 user-field">
+                    <% if env.get? "user" %>
+                        <div class="pure-u-1-4">
+                            <a href="/toggle_theme?referer=<%= env.get?("current_page") %>" class="pure-menu-heading">
+                                <% if env.get("preferences").as(Preferences).dark_mode %>
+                                    <i class="icon ion-ios-sunny"></i>
+                                <% else %>
+                                    <i class="icon ion-ios-moon"></i>
+                                <% end %>
+                            </a>
+                        </div>
+                        <div class="pure-u-1-4">
+                            <a title="<%= translate(locale, "Subscriptions") %>" href="/feed/subscriptions" class="pure-menu-heading">
+                                <% notification_count = env.get("user").as(User).notifications.size %>
+                                <% if notification_count > 0 %>
+                                    <%= notification_count %> <i class="icon ion-ios-notifications"></i>
+                                <% else %>
+                                    <i class="icon ion-ios-notifications-outline"></i>
+                                <% end %>
+                            </a>
+                        </div>
+                        <div class="pure-u-1-4">
+                            <a title="<%= translate(locale, "Preferences") %>" href="/preferences?referer=<%= env.get?("current_page") %>" class="pure-menu-heading">
+                                <i class="icon ion-ios-cog"></i>
+                            </a>
+                        </div>
+                        <div class="pure-u-1-4">
+                            <form action="/signout?referer=<%= env.get?("current_page") %>" method="post">
+                                <input type="hidden" name="csrf_token" value="<%= URI.escape(env.get?("csrf_token").try &.as(String) || "") %>">
+                                <a class="pure-menu-heading" href="#">
+                                    <input style="all:unset" type="submit" value="<%= translate(locale, "Log out") %>">
+                                </a>
+                            </form>
+                        </div>
+                    <% else %>
+                        <div class="pure-u-1-3">
+                            <a href="/toggle_theme?referer=<%= env.get?("current_page") %>" class="pure-menu-heading">
+                                <% if env.get("preferences").as(Preferences).dark_mode %>
+                                    <i class="icon ion-ios-sunny"></i>
+                                <% else %>
+                                    <i class="icon ion-ios-moon"></i>
+                                <% end %>
+                            </a>
+                        </div>
+                        <div class="pure-u-1-3">
+                            <a title="<%= translate(locale, "Preferences") %>" href="/preferences?referer=<%= env.get?("current_page") %>" class="pure-menu-heading">
+                                <i class="icon ion-ios-cog"></i>
+                            </a>
+                        </div>
+                        <% if config.login_enabled %>
+                            <div class="pure-u-1-3">
+                                <a href="/login?referer=<%= env.get?("current_page") %>" class="pure-menu-heading">
+                                    <%= translate(locale, "Log in") %>
+                                </a>
+                            </div>
+                        <% end %>
+                    <% end %>
+                </div>
+            </div>
+
+            <% if CONFIG.banner %>
+                <div class="h-box">
+                    <h3><%= CONFIG.banner %></h3>
+                </div>
            <% end %>
-          </a>
+
+            <%= content %>
+
+            <div class="footer">
+                <div class="pure-g">
+                    <div class="pure-u-1 pure-u-md-1-3">
+                        <a href="https://github.com/omarroth/invidious">
+                            <%= translate(locale, "Released under the AGPLv3 by Omar Roth.") %>
+                        </a>
+                    </div>
+                    <div class="pure-u-1 pure-u-md-1-3">
+                        <i class="icon ion-logo-bitcoin"></i>
+                        BTC: 356DpZyMXu6rYd55Yqzjs29n79kGKWcYrY
+                    </div>
+                    <div class="pure-u-1 pure-u-md-1-3">
+                        <i class="icon ion-logo-bitcoin"></i>
+                        BCH: qq4ptclkzej5eza6a50et5ggc58hxsq5aylqut2npk
+                    </div>
+                    <div class="pure-u-1 pure-u-md-1-3">
+                        <i class="icon ion-logo-usd"></i>
+                        <a href="https://liberapay.com/omarroth">Liberapay</a>
+                         /
+                        <a href="https://patreon.com/omarroth">Patreon</a>
+                    </div>
+                    <div class="pure-u-1 pure-u-md-1-3">
+                        <i class="icon ion-logo-javascript"></i>
+                        <a rel="jslicense" href="/licenses">
+                            <%= translate(locale, "View JavaScript license information.") %>
+                        </a>
+                        /
+                        <i class="icon ion-ios-paper"></i>
+                        <a href="/privacy">
+                            <%= translate(locale, "View privacy policy.") %>
+                        </a>
+                    </div>
+                    <div class="pure-u-1 pure-u-md-1-3">
+                        <i class="icon ion-logo-github"></i>
+                        <%= translate(locale, "Current version: ") %> <%= CURRENT_VERSION %>-<%= CURRENT_COMMIT %>
+                        <i class="icon ion-logo-github"></i>
+                        <%= CURRENT_BRANCH %>
+                    </div>
+                </div>
+            </div>
        </div>
-        <div class="pure-u-1-4">
-          <a title="<%= translate(locale, "Subscriptions") %>" href="/feed/subscriptions" class="pure-menu-heading">
-            <% notification_count = env.get("user").as(User).notifications.size %>
-            <% if notification_count > 0 %>
-            <%= notification_count %> <i class="icon ion-ios-notifications"></i>
-            <% else %>
-            <i class="icon ion-ios-notifications-outline"></i>
-            <% end %>
-          </a>
-        </div>
-        <div class="pure-u-1-4">
-          <a title="<%= translate(locale, "Preferences") %>" href="/preferences?referer=<%= env.get?("current_page") %>" class="pure-menu-heading">
-            <i class="icon ion-ios-cog"></i>
-          </a>
-        </div>
-        <div class="pure-u-1-4">
-          <a href="/signout?referer=<%= env.get?("current_page") %>&token=<%= env.get?("token") %>&challenge=<%= env.get?("challenge") %>" class="pure-menu-heading">
-            <%= translate(locale, "Sign out") %>
-          </a>
-        </div>
-        <% else %>
-        <div class="pure-u-1-3">
-          <a href="/toggle_theme?referer=<%= env.get?("current_page") %>" class="pure-menu-heading">
-            <% if env.get("preferences").as(Preferences).dark_mode %>
-            <i class="icon ion-ios-sunny"></i>
-            <% else %>
-            <i class="icon ion-ios-moon"></i>
-            <% end %>
-          </a>
-        </div>
-        <div class="pure-u-1-3">
-          <a title="<%= translate(locale, "Preferences") %>" href="/preferences?referer=<%= env.get?("current_page") %>" class="pure-menu-heading">
-            <i class="icon ion-ios-cog"></i>
-          </a>
-        </div>
-        <% if config.login_enabled %>
-        <div class="pure-u-1-3">
-          <a href="/login?referer=<%= env.get?("current_page") %>" class="pure-menu-heading">
-            <%= translate(locale, "Login") %>
-          </a>
-        </div>
-        <% end %>
-        <% end %>
-        </div>
-      </div>
-      <%= content %>
-      <div class="footer">
-        <div class="pure-g">
-          <div class="pure-u-1 pure-u-md-1-3">
-            <a href="https://github.com/omarroth/invidious">
-              <%= translate(locale, "Released under the AGPLv3 by Omar Roth.") %>
-            </a>
-          </div>
-          <div class="pure-u-1 pure-u-md-1-3">
-            <i class="icon ion-logo-bitcoin"></i>
-            BTC: 356DpZyMXu6rYd55Yqzjs29n79kGKWcYrY</div>
-          <div class="pure-u-1 pure-u-md-1-3">
-            <i class="icon ion-logo-bitcoin"></i>
-            BCH: qq4ptclkzej5eza6a50et5ggc58hxsq5aylqut2npk</div>
-          <div class="pure-u-1 pure-u-md-1-3">
-            <i class="icon ion-logo-usd"></i>
-            <a href="https://liberapay.com/omarroth">Liberapay</a>
-             /
-            <a href="https://patreon.com/omarroth">Patreon</a>
-          </div>
-          <div class="pure-u-1 pure-u-md-1-3">
-            <i class="icon ion-logo-javascript"></i>
-            <a rel="jslicense" href="/licenses">
-              <%= translate(locale, "View JavaScript license information.") %>
-            </a>
-            /
-            <i class="icon ion-ios-paper"></i>
-            <a href="/privacy">
-              <%= translate(locale, "View privacy policy.") %>
-            </a>
-          </div>
-          <div class="pure-u-1 pure-u-md-1-3">
-            <i class="icon ion-logo-github"></i>
-            <%= translate(locale, "Current version: ") %> <%= CURRENT_VERSION %>-<%= CURRENT_COMMIT %>
-            <i class="icon ion-logo-github"></i>
-            <%= CURRENT_BRANCH %></div>
-        </div>
-      </div>
+        <div class="pure-u-1 pure-u-md-2-24"></div>
    </div>
-    <div class="pure-u-1 pure-u-md-2-24"></div>
-  </div>
 </body>

 </html>
--- a/src/invidious/views/token_manager.ecr
+++ b/src/invidious/views/token_manager.ecr
@@ -0,0 +1,74 @@
+<% content_for "header" do %>
+<title><%= translate(locale, "Token manager") %> - Invidious</title>
+<% end %>
+
+<div class="pure-g h-box">
+    <div class="pure-u-1-3">
+        <h3>
+            <%= translate(locale, "`x` tokens", %(<span id="count">#{tokens.size}</span>)) %>
+        </h3>
+    </div>
+    <div class="pure-u-1-3"></div>
+    <div class="pure-u-1-3" style="text-align:right">
+        <h3>
+            <a href="/preferences?referer=<%= URI.escape(referer) %>"><%= translate(locale, "Preferences") %></a>
+        </h3>
+    </div>
+</div>
+
+<% tokens.each do |token| %>
+<div class="h-box">
+    <div class="pure-g<% if token[:session] == sid %> deleted <% end %>">
+        <div class="pure-u-3-5">
+            <h4 style="padding-left:0.5em">
+                <code><%= token[:session] %></code>
+            </h4>
+        </div>
+        <div class="pure-u-1-5" style="text-align:center">
+            <h4><%= translate(locale, "`x` ago", recode_date(token[:issued], locale)) %></h4>
+        </div>
+        <div class="pure-u-1-5" style="text-align:right">
+            <h3 style="padding-right:0.5em">
+                <form onsubmit="return false" action="/token_ajax?action_revoke_token=1&session=<%= token[:session] %>&referer=<%= env.get("current_page") %>" method="post">
+                    <input type="hidden" name="csrf_token" value="<%= URI.escape(env.get?("csrf_token").try &.as(String) || "") %>">
+                    <a onclick="revoke_token(this)" data-session="<%= token[:session] %>" href="#">
+                        <input style="all:unset" type="submit" value="<%= translate(locale, "revoke") %>">
+                    </a>
+                </form>
+            </h3>
+        </div>
+    </div>
+
+    <% if tokens[-1].try &.[:session]? != token[:session] %>
+        <hr>
+    <% end %>
+</div>
+<% end %>
+
+<script>
+function revoke_token(target) {
+    var row = target.parentNode.parentNode.parentNode.parentNode.parentNode;
+    row.style.display = 'none';
+    var count = document.getElementById('count');
+    count.innerText = count.innerText - 1;
+
+    var url = '/token_ajax?action_revoke_token=1&redirect=false' +
+        '&referer=<%= env.get("current_page") %>' +
+        '&session=' + target.getAttribute('data-session');
+    var xhr = new XMLHttpRequest();
+    xhr.responseType = 'json';
+    xhr.timeout = 20000;
+    xhr.open('POST', url, true);
+    xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
+    xhr.send('csrf_token=<%= URI.escape(env.get?("csrf_token").try &.as(String) || "") %>');
+
+    xhr.onreadystatechange = function() {
+        if (xhr.readyState == 4) {
+            if (xhr.status != 200) {
+                count.innerText = parseInt(count.innerText) + 1;
+                row.style.display = '';
+            }
+        }
+    }
+}
+</script>
--- a/src/invidious/views/top.ecr
+++ b/src/invidious/views/top.ecr
@@ -1,14 +1,20 @@
 <% content_for "header" do %>
 <meta name="description" content="<%= translate(locale, "An alternative front-end to YouTube") %>">
-<title><% if config.default_home != "Top" %><%= translate(locale, "Top") %> - <% end %>Invidious</title>
+<title>
+    <% if config.default_home != "Top" %>
+        <%= translate(locale, "Top") %> - Invidious
+    <% else %>
+        Invidious
+    <% end %>
+</title>
 <% end %>

 <%= rendered "components/feed_menu" %>

 <div class="pure-g">
-<% top_videos.each_slice(4) do |slice| %>
-        <% slice.each do |item| %>
-            <%= rendered "components/item" %>
-        <% end %>
-<% end %>
+    <% top_videos.each_slice(4) do |slice| %>
+            <% slice.each do |item| %>
+                <%= rendered "components/item" %>
+            <% end %>
+    <% end %>
 </div>
--- a/src/invidious/views/trending.ecr
+++ b/src/invidious/views/trending.ecr
@@ -1,25 +1,34 @@
 <% content_for "header" do %>
 <meta name="description" content="<%= translate(locale, "An alternative front-end to YouTube") %>">
-<title><% if config.default_home != "Trending" %><%= translate(locale, "Trending") %> - <% end %>Invidious</title>
+<title>
+    <% if config.default_home != "Trending" %>
+        <%= translate(locale, "Trending") %> - Invidious
+    <% else %>
+        Invidious
+    <% end %>
+</title>
 <% end %>

 <%= rendered "components/feed_menu" %>

 <div class="pure-g h-box">
-    <div class="pure-u-2-3">
-        <form class="pure-form pure-form-aligned" action="/feed/trending" method="get">
-        </form>
+    <div style="align-self:flex-end" class="pure-u-2-3">
+        <% if plid %>
+            <a href="/playlist?list=<%= plid %>">
+                <%= translate(locale, "View as playlist") %>
+            </a>
+        <% end %>
    </div>
    <div class="pure-u-1-3">
-        <div class="pure-g" style="text-align:right;">
+        <div class="pure-g" style="text-align:right">
            <% {"Default", "Music", "Gaming", "News", "Movies"}.each do |option| %>
                <div class="pure-u-1 pure-md-1-3">
                    <% if trending_type == option %>
-                    <b><%= translate(locale, option) %></b>
+                        <b><%= translate(locale, option) %></b>
                    <% else %>
-                    <a href="/feed/trending?type=<%= option %>&region=<%= region %>">
-                    <%= translate(locale, option) %>
-                    </a>
+                        <a href="/feed/trending?type=<%= option %>&region=<%= region %>">
+                            <%= translate(locale, option) %>
+                        </a>
                    <% end %>
                </div>
            <% end %>
@@ -32,9 +41,9 @@
 </div>

 <div class="pure-g">
-<% trending.each_slice(4) do |slice| %>
-        <% slice.each do |item| %>
-            <%= rendered "components/item" %>
-        <% end %>
-<% end %>
+    <% trending.each_slice(4) do |slice| %>
+            <% slice.each do |item| %>
+                <%= rendered "components/item" %>
+            <% end %>
+    <% end %>
 </div>
--- a/src/invidious/views/watch.ecr
+++ b/src/invidious/views/watch.ecr
@@ -28,184 +28,220 @@
 <% end %>

 <div id="player-container" class="h-box">
-  <%= rendered "components/player" %>
+    <%= rendered "components/player" %>
 </div>

 <div class="h-box">
-<h1>
-    <%= HTML.escape(video.title) %>
-    <% if params[:listen] %>
-    <a title="<%=translate(locale, "Video mode")%>" href="/watch?<%= env.params.query %>&listen=0">
-        <i class="icon ion-ios-videocam"></i>
-    </a>
-    <% else %>
-    <a title="<%=translate(locale, "Audio mode")%>" href="/watch?<%= env.params.query %>&listen=1">
-        <i class="icon ion-ios-volume-high"></i>
-    </a>
+    <h1>
+        <%= HTML.escape(video.title) %>
+        <% if params.listen %>
+            <a title="<%=translate(locale, "Video mode")%>" href="/watch?<%= env.params.query %>&listen=0">
+                <i class="icon ion-ios-videocam"></i>
+            </a>
+        <% else %>
+            <a title="<%=translate(locale, "Audio mode")%>" href="/watch?<%= env.params.query %>&listen=1">
+                <i class="icon ion-md-headset"></i>
+            </a>
+        <% end %>
+    </h1>
+
+    <% if !video.is_listed %>
+        <h3>
+            <i class="icon ion-ios-lock"></i> <%= translate(locale, "Unlisted") %>
+        </h3>
+    <% end %>
+
+    <% if !reason.empty? %>
+        <h3>
+            <%= reason %>
+        </h3>
    <% end %>
-</h1>
-<% if !video.is_listed %>
-<h3><i class="icon ion-ios-lock"></i> <%= translate(locale, "Unlisted") %></h3>
-<% end %>
-<% if !reason.empty? %>
-<h3><%= reason %></h3>
-<% end %>
 </div>

 <div class="pure-g">
-    <div class="pure-u-1 pure-u-md-1-5">
+    <div class="pure-u-1 pure-u-lg-1-5">
        <div class="h-box">
-            <p><a href="https://www.youtube.com/watch?v=<%= video.id %>"><%= translate(locale, "Watch video on Youtube") %></a></p>
+            <p>
+                <a href="https://www.youtube.com/watch?v=<%= video.id %>"><%= translate(locale, "Watch on YouTube") %></a>
+            </p>
+            <p>
+                <% if params.annotations %>
+                    <a href="/watch?<%= env.params.query %>&iv_load_policy=3">
+                        <%= translate(locale, "Hide annotations") %>
+                    </a>
+                <% else %>
+                    <a href="/watch?<%= env.params.query %>&iv_load_policy=1">
+                        <%=translate(locale, "Show annotations")%>
+                    </a>
+                <% end %>
+            </p>

            <% if CONFIG.dmca_content.includes? video.id %>
-            <p>Download is disabled.</p>
+                <p><%= translate(locale, "Download is disabled.") %></p>
            <% else %>
-            <form class="pure-form pure-form-stacked" action="/latest_version" method="get" rel="noopener" target="_blank">
-                <div class="pure-control-group">
-                    <label for="download_widget"><%= translate(locale, "Download as: ") %></label>
-                    <select style="width:100%" name="download_widget" id="download_widget">
-                    <% video_streams.each do |option| %>
-                        <option value='{"id":"<%= video.id %>","itag":"<%= option["itag"] %>","title":"<%= URI.escape(video.title) %>-<%= video.id %>.<%= option["type"].split(";")[0].split("/")[1] %>"}'>
-                            <%= option["quality_label"] %> - <%= option["type"].split(";")[0] %> @ <%= option["fps"] %>fps - video only
-                        </option>
-                    <% end %>
-                    <% audio_streams.each do |option| %>
-                        <option value='{"id":"<%= video.id %>","itag":"<%= option["itag"] %>","title":"<%= URI.escape(video.title) %>-<%= video.id %>.<%= option["type"].split(";")[0].split("/")[1] %>"}'>
-                            <%= option["type"].split(";")[0] %> @ <%= option["bitrate"] %>k - audio only
-                        </option>
-                    <% end %>
-                    <% fmt_stream.each do |option| %>
-                        <option value='{"id":"<%= video.id %>","itag":"<%= option["itag"] %>","title":"<%= URI.escape(video.title) %>-<%= video.id %>.<%= option["type"].split(";")[0].split("/")[1] %>"}'>
-                            <%= itag_to_metadata?(option["itag"]).try &.["height"]? || "~240" %>p - <%= option["type"].split(";")[0] %>
-                        </option>
-                    <% end %>
-                    </select>
-                </div>
+                <form class="pure-form pure-form-stacked" action="/latest_version" method="get" rel="noopener" target="_blank">
+                    <div class="pure-control-group">
+                        <label for="download_widget"><%= translate(locale, "Download as: ") %></label>
+                        <select style="width:100%" name="download_widget" id="download_widget">
+                            <% fmt_stream.each do |option| %>
+                                <option value='{"id":"<%= video.id %>","itag":"<%= option["itag"] %>","title":"<%= URI.escape(video.title) %>-<%= video.id %>.<%= option["type"].split(";")[0].split("/")[1] %>"}'>
+                                    <%= itag_to_metadata?(option["itag"]).try &.["height"]? || "~240" %>p - <%= option["type"].split(";")[0] %>
+                                </option>
+                            <% end %>
+                            <% video_streams.each do |option| %>
+                                <option value='{"id":"<%= video.id %>","itag":"<%= option["itag"] %>","title":"<%= URI.escape(video.title) %>-<%= video.id %>.<%= option["type"].split(";")[0].split("/")[1] %>"}'>
+                                    <%= option["quality_label"] %> - <%= option["type"].split(";")[0] %> @ <%= option["fps"] %>fps - video only
+                                </option>
+                            <% end %>
+                            <% audio_streams.each do |option| %>
+                                <option value='{"id":"<%= video.id %>","itag":"<%= option["itag"] %>","title":"<%= URI.escape(video.title) %>-<%= video.id %>.<%= option["type"].split(";")[0].split("/")[1] %>"}'>
+                                    <%= option["type"].split(";")[0] %> @ <%= option["bitrate"] %>k - audio only
+                                </option>
+                            <% end %>
+                            <% captions.each do |caption| %>
+                                <option value='{"id":"<%= video.id %>","label":"<%= caption.name.simpleText %>","title":"<%= URI.escape(video.title) %>-<%= video.id %>.<%= caption.languageCode %>.vtt"}'>
+                                    <%= translate(locale, "Subtitles - `x` (.vtt)", caption.name.simpleText) %>
+                                </option>
+                            <% end %>
+                        </select>
+                    </div>

-                <button type="submit" class="pure-button pure-button-primary">
-                    <b><%= translate(locale, "Download") %></b>
-                </button>
-            </form>
+                    <button type="submit" class="pure-button pure-button-primary">
+                        <b><%= translate(locale, "Download") %></b>
+                    </button>
+                </form>
            <% end %>

            <p><i class="icon ion-ios-eye"></i> <%= number_with_separator(video.views) %></p>
            <p><i class="icon ion-ios-thumbs-up"></i> <%= number_with_separator(video.likes) %></p>
            <p><i class="icon ion-ios-thumbs-down"></i> <%= number_with_separator(video.dislikes) %></p>
-            <p id="Genre"><%= translate(locale, "Genre: ") %>
-            <% if video.genre_url.empty? %>
-            <%= video.genre %>
-            <% else %>
-            <a href="<%= video.genre_url %>"><%= video.genre %></a>
-            <% end %>
+            <p id="genre"><%= translate(locale, "Genre: ") %>
+                <% if video.genre_url.empty? %>
+                    <%= video.genre %>
+                <% else %>
+                    <a href="<%= video.genre_url %>"><%= video.genre %></a>
+                <% end %>
            </p>
            <% if !video.license.empty? %>
-            <p id="License"><%= translate(locale, "License: ") %><%= video.license %></p>
+                <p id="license"><%= translate(locale, "License: ") %><%= video.license %></p>
            <% end %>
-            <p id="FamilyFriendly"><%= translate(locale, "Family friendly? ") %><%= video.is_family_friendly %></p>
-            <p id="Wilson"><%= translate(locale, "Wilson score: ") %><%= video.wilson_score.round(4) %></p>
-            <p id="Rating"><%= translate(locale, "Rating: ") %><%= rating.round(4) %> / 5</p>
-            <p id="Engagement"><%= translate(locale, "Engagement: ") %><%= engagement.round(2) %>%</p>
+            <p id="family_friendly"><%= translate(locale, "Family friendly? ") %><%= translate_bool(locale, video.is_family_friendly) %></p>
+            <p id="wilson"><%= translate(locale, "Wilson score: ") %><%= video.wilson_score.round(4) %></p>
+            <p id="rating"><%= translate(locale, "Rating: ") %><%= rating.round(4) %> / 5</p>
+            <p id="engagement"><%= translate(locale, "Engagement: ") %><%= engagement.round(2) %>%</p>
            <% if video.allowed_regions.size != REGIONS.size %>
-                <p id="AllowedRegions">
-                <% if video.allowed_regions.size < REGIONS.size / 2 %>
-                <%= translate(locale, "Whitelisted regions: ") %><%= video.allowed_regions.join(", ") %>
-                <% else %>
-                <%= translate(locale, "Blacklisted regions: ") %><%= (REGIONS.to_a - video.allowed_regions).join(", ") %>
-                <% end %>
+                <p id="allowed_regions">
+                    <% if video.allowed_regions.size < REGIONS.size / 2 %>
+                        <%= translate(locale, "Whitelisted regions: ") %><%= video.allowed_regions.join(", ") %>
+                    <% else %>
+                        <%= translate(locale, "Blacklisted regions: ") %><%= (REGIONS.to_a - video.allowed_regions).join(", ") %>
+                    <% end %>
                </p>
            <% end %>
        </div>
    </div>

-    <div class="pure-u-1 <% if params[:related_videos] || plid %>pure-u-md-3-5<% else %>pure-u-md-4-5<% end %>">
+    <div class="pure-u-1 <% if params.related_videos || plid %>pure-u-lg-3-5<% else %>pure-u-md-4-5<% end %>">
        <div class="h-box">
            <p>
                <a href="/channel/<%= video.ucid %>">
                    <h3><%= video.author %></h3>
                </a>
            </p>
+
            <% ucid = video.ucid %>
            <% author = video.author %>
            <% sub_count_text = video.sub_count_text %>
            <%= rendered "components/subscribe_widget" %>
+
            <p>
                <b><%= translate(locale, "Shared `x`", video.published.to_s("%B %-d, %Y")) %></b>
            </p>
+
            <div>
                <%= video.description %>
            </div>
+
            <hr>
+
            <div id="comments">
                <% if nojs %>
                    <%= comment_html %>
                <% else %>
-                <noscript>
-                    <a href="/watch?<%= env.params.query %>&nojs=1">
-                        <%= translate(locale, "Hi! Looks like you have JavaScript disabled. Click here to view comments, keep in mind it may take a bit longer to load.") %>
-                    </a>
-                </noscript>
+                    <noscript>
+                        <a href="/watch?<%= env.params.query %>&nojs=1">
+                            <%= translate(locale, "Hi! Looks like you have JavaScript turned off. Click here to view comments, keep in mind they may take a bit longer to load.") %>
+                        </a>
+                    </noscript>
                <% end %>
            </div>
        </div>
    </div>
-    <% if params[:related_videos] || plid %>
-    <div class="pure-u-1 pure-u-md-1-5">
-        <% if plid %>
-        <div id="playlist" class="h-box">
-        </div>
-        <% end %>

-        <% if params[:related_videos] %>
-        <div class="h-box">
-
-        <% if !rvs.empty? %>
-        <div id="continue" <% if plid %>style="display:none"<% end %>>
-            <div class="pure-control-group">
-                <label for="continue"><%= translate(locale, "Autoplay next video: ") %></label>
-                <input name="continue" onclick="continue_autoplay(this)" id="continue" type="checkbox" <% if params[:continue] %>checked<% end %>>
-            </div>
-            <hr>
-        </div>
-        <% end %>
-
-        <% rvs.each do |rv| %>
-            <% if rv["id"]? %>
-            <a href="/watch?v=<%= rv["id"] %>">
-                <% if env.get("preferences").as(Preferences).thin_mode %>
-                <% else %>
-                <div class="thumbnail">
-                    <img class="thumbnail" src="/vi/<%= rv["id"] %>/mqdefault.jpg">
-                    <p class="length"><%= recode_length_seconds(rv["length_seconds"]?.try &.to_i? || 0) %></p>
-                </div>
-                <% end %>
-                <p style="width:100%"><%= rv["title"] %></p>
-                <p>
-                    <b style="width: 100%"><%= rv["author"] %></b>
-                </p>
-            </a>
+    <% if params.related_videos || plid %>
+        <div class="pure-u-1 pure-u-lg-1-5">
+            <% if plid %>
+                <div id="playlist" class="h-box"></div>
+            <% end %>
+
+            <% if params.related_videos %>
+                <div class="h-box">
+                    <% if !rvs.empty? %>
+                        <div <% if plid %>style="display:none"<% end %>>
+                            <div class="pure-control-group">
+                                <label for="continue"><%= translate(locale, "Autoplay next video: ") %></label>
+                                <input name="continue" onclick="continue_autoplay(this)" id="continue" type="checkbox" <% if params.continue %>checked<% end %>>
+                            </div>
+                            <hr>
+                        </div>
+                    <% end %>
+
+                    <% rvs.each do |rv| %>
+                        <% if rv["id"]? %>
+                            <a href="/watch?v=<%= rv["id"] %>">
+                                <% if !env.get("preferences").as(Preferences).thin_mode %>
+                                    <div class="thumbnail">
+                                        <img class="thumbnail" src="/vi/<%= rv["id"] %>/mqdefault.jpg">
+                                        <p class="length"><%= recode_length_seconds(rv["length_seconds"]?.try &.to_i? || 0) %></p>
+                                    </div>
+                                <% end %>
+                                <p style="width:100%"><%= rv["title"] %></p>
+                                <h5 class="pure-g">
+                                    <div class="pure-u-14-24">
+                                        <b style="width:100%"><%= rv["author"] %></b>
+                                    </div>
+
+                                    <div class="pure-u-10-24" style="text-align:right">
+                                        <% if views = rv["short_view_count_text"]?.try &.delete(", views watching") %>
+                                            <b class="width:100%"><%= translate(locale, "`x` views", views) %></b>
+                                        <% end %>
+                                    </div>
+                                </h5>
+                            </a>
+                        <% end %>
+                    <% end %>
+                </div>
            <% end %>
-        <% end %>
        </div>
-        <% end %>
-    </div>
    <% end %>
 </div>

 <script>
-<% if !rvs.empty? && !plid && params[:continue] %>
+<% if !rvs.empty? && !plid && params.continue %>
 player.on('ended', function() {
-    location.assign("/watch?v="
-        + "<%= rvs.select { |rv| rv["id"]? }[0]?.try &.["id"] %>"
-        + "&continue=1"
-        <% if params[:listen] %>
-        + "&listen=1"
+    location.assign('/watch?v=' +
+        '<%= rvs.select { |rv| rv["id"]? }[0]?.try &.["id"] %>' +
+        '&continue=1' +
+        <% if params.listen != preferences.listen %>
+            '&listen=<%= params.listen %>' +
        <% end %>
-        <% if params[:autoplay] %>
-        + "&autoplay=1"
+        <% if params.autoplay || params.continue_autoplay %>
+            '&autoplay=1' +
        <% end %>
-        <% if params[:speed] %>
-        + "&speed=<%= params[:speed] %>"
+        <% if params.speed != preferences.speed %>
+            '&speed=<%= params.speed %>' +
        <% end %>
+        ''
    );
 });
 <% end %>
@@ -213,18 +249,19 @@ player.on('ended', function() {
 function continue_autoplay(target) {
    if (target.checked) {
        player.on('ended', function() {
-            location.assign("/watch?v="
-                + "<%= rvs.select { |rv| rv["id"]? }[0]?.try &.["id"] %>"
-                + "&continue=1"
-                <% if params[:listen] %>
-                + "&listen=1"
+            location.assign('/watch?v=' +
+                '<%= rvs.select { |rv| rv["id"]? }[0]?.try &.["id"] %>' +
+                '&continue=1' +
+                <% if params.listen != preferences.listen %>
+                    '&listen=<%= params.listen %>' +
                <% end %>
-                <% if params[:autoplay] %>
-                + "&autoplay=1"
+                <% if params.autoplay || params.continue_autoplay %>
+                    '&autoplay=1' +
                <% end %>
-                <% if params[:speed] %>
-                + "&speed=<%= params[:speed] %>"
+                <% if params.speed != preferences.speed %>
+                    '&speed=<%= params.speed %>' +
                <% end %>
+                ''
            );
        });
    } else {
@@ -233,44 +270,40 @@ function continue_autoplay(target) {
 }

 function number_with_separator(val) {
-  while (/(\d+)(\d{3})/.test(val.toString())) {
-    val = val.toString().replace(/(\d+)(\d{3})/, "$1" + "," + "$2");
-  }
-  return val;
+    while (/(\d+)(\d{3})/.test(val.toString())) {
+        val = val.toString().replace(/(\d+)(\d{3})/, "$1" + "," + "$2");
+    }
+    return val;
 }

-<% ucid = video.ucid %>
-<% author = video.author %>
-<% sub_count_text = video.sub_count_text %>
-<%= rendered "components/subscribe_widget_script" %>
-
-
 <% if plid %>
-function get_playlist(timeouts = 0) {
-    playlist = document.getElementById("playlist");
+function get_playlist(plid, timeouts = 0) {
+    playlist = document.getElementById('playlist');

    if (timeouts > 10) {
-        console.log("Failed to pull playlist");
-        playlist.innerHTML = "";
+        console.log('Failed to pull playlist');
+        playlist.innerHTML = '';
        return;
    }

    playlist.innerHTML = ' \
-      <h3 style="text-align:center"><div class="loading"><i class="icon ion-ios-refresh"></i></div></h3> \
-      <hr>'
+        <h3 style="text-align:center"><div class="loading"><i class="icon ion-ios-refresh"></i></div></h3> \
+        <hr>'

-    var plid = "<%= plid %>"
-
-    if (plid.startsWith("RD")) {
-        var plid_url = "/api/v1/mixes/<%= plid %>?continuation=<%= video.id %>&format=html&hl=<%= env.get("preferences").as(Preferences).locale %>";
+    if (plid.startsWith('RD')) {
+        var plid_url = '/api/v1/mixes/' + plid +
+            '?continuation=<%= video.id %>' +
+            '&format=html&hl=<%= env.get("preferences").as(Preferences).locale %>';
    } else {
-        var plid_url = "/api/v1/playlists/<%= plid %>?continuation=<%= video.id %>&format=html&hl=<%= env.get("preferences").as(Preferences).locale %>";
+        var plid_url = '/api/v1/playlists/' + plid +
+            '?continuation=<%= video.id %>' +
+            '&format=html&hl=<%= env.get("preferences").as(Preferences).locale %>';
    }

    var xhr = new XMLHttpRequest();
-    xhr.responseType = "json";
+    xhr.responseType = 'json';
    xhr.timeout = 20000;
-    xhr.open("GET", plid_url, true);
+    xhr.open('GET', plid_url, true);
    xhr.send();

    xhr.onreadystatechange = function() {
@@ -280,228 +313,232 @@ function get_playlist(timeouts = 0) {

                if (xhr.response.nextVideo) {
                    player.on('ended', function() {
-                        location.assign("/watch?v="
-                            + xhr.response.nextVideo
-                            + "&list=<%= plid %>"
-                            <% if params[:listen] %>
-                            + "&listen=1"
+                        location.assign('/watch?v=' + xhr.response.nextVideo +
+                            '&list=' + plid +
+                            <% if params.listen != preferences.listen %>
+                                '&listen=<%= params.listen %>' +
                            <% end %>
-                            <% if params[:autoplay] %>
-                            + "&autoplay=1"
+                            <% if params.autoplay || params.continue_autoplay %>
+                                '&autoplay=1' +
                            <% end %>
-                            <% if params[:speed] %>
-                            + "&speed=<%= params[:speed] %>"
+                            <% if params.speed != preferences.speed %>
+                                '&speed=<%= params.speed %>' +
                            <% end %>
+                            ''
                        );
                    });
                }
            } else {
-                playlist.innerHTML = "";
-                document.getElementById('continue').style.display = "";
+                playlist.innerHTML = '';
+                document.getElementById('continue').style.display = '';
            }
        }
    };

    xhr.ontimeout = function() {
-        console.log("Pulling playlist timed out.");
-
-        comments = document.getElementById("playlist");
-        comments.innerHTML =
+        console.log('Pulling playlist timed out.');
+        playlist = document.getElementById('playlist');
+        playlist.innerHTML =
            '<h3 style="text-align:center"><div class="loading"><i class="icon ion-ios-refresh"></i></div></h3><hr>';
-        get_playlist(timeouts + 1);
+        get_playlist(plid, timeouts + 1);
    };
 }

-get_playlist();
+get_playlist('<%= plid %>');
 <% end %>

 function get_reddit_comments(timeouts = 0) {
-  comments = document.getElementById("comments");
+    comments = document.getElementById('comments');

-  if (timeouts > 10) {
-    console.log("Failed to pull comments");
-    comments.innerHTML = "";
-    return;
-  }
-
-  var fallback = comments.innerHTML;
-  comments.innerHTML =
-    '<h3 style="text-align:center"><div class="loading"><i class="icon ion-ios-refresh"></i></div></h3>';
-
-  var url = "/api/v1/comments/<%= video.id %>?source=reddit&format=html&hl=<%= env.get("preferences").as(Preferences).locale %>";
-  var xhr = new XMLHttpRequest();
-  xhr.responseType = "json";
-  xhr.timeout = 20000;
-  xhr.open("GET", url, true);
-  xhr.send();
-
-  xhr.onreadystatechange = function() {
-    if (xhr.readyState == 4) {
-      if (xhr.status == 200) {
-        comments.innerHTML = ' \
-            <div> \
-                <h3> \
-                    <a href="javascript:void(0)" onclick="toggle_comments(this)">[ - ]</a> \
-                    {title} \
-                </h3> \
-                <p> \
-                    <b> \
-                        <a href="javascript:void(0)" onclick="swap_comments(\'youtube\')"> \
-                            <%= translate(locale, "View YouTube comments") %> \
-                        </a> \
-                    </b> \
-                </p> \
-                <b> \
-                    <a rel="noopener" target="_blank" href="https://reddit.com{permalink}"><%= translate(locale, "View more comments on Reddit") %></a> \
-                </b> \
-            </div> \
-            <div>{contentHtml}</div> \
-            <hr>'.supplant({
-          title: xhr.response.title,
-          permalink: xhr.response.permalink,
-          contentHtml: xhr.response.contentHtml
-        });
-      } else {
-        <% if preferences && preferences.comments[1] == "youtube" %>
-        get_youtube_comments();
-        <% else %>
-        comments.innerHTML = fallback;
-        <% end %>
-      }
+    if (timeouts > 10) {
+        console.log('Failed to pull comments');
+        comments.innerHTML = '';
+        return;
    }
-  };

-  xhr.ontimeout = function() {
-    console.log("Pulling comments timed out.");
+    var fallback = comments.innerHTML;
+    comments.innerHTML =
+      '<h3 style="text-align:center"><div class="loading"><i class="icon ion-ios-refresh"></i></div></h3>';

-    get_reddit_comments(timeouts + 1);
-  };
-}
+    var url = '/api/v1/comments/<%= video.id %>' +
+        '?source=reddit&format=html' +
+        '&hl=<%= env.get("preferences").as(Preferences).locale %>';
+    var xhr = new XMLHttpRequest();
+    xhr.responseType = 'json';
+    xhr.timeout = 20000;
+    xhr.open('GET', url, true);
+    xhr.send();

-function get_youtube_comments(timeouts = 0) {
-  comments = document.getElementById("comments");
-
-  if (timeouts > 10) {
-    console.log("Failed to pull comments");
-    comments.innerHTML = "";
-    return;
-  }
-
-  var fallback = comments.innerHTML;
-  comments.innerHTML =
-    '<h3 style="text-align:center"><div class="loading"><i class="icon ion-ios-refresh"></i></div></h3>';
-
-  var url = "/api/v1/comments/<%= video.id %>?format=html&hl=<%= env.get("preferences").as(Preferences).locale %>&thin_mode=<%= env.get("preferences").as(Preferences).thin_mode %>";
-  var xhr = new XMLHttpRequest();
-  xhr.responseType = "json";
-  xhr.timeout = 20000;
-  xhr.open("GET", url, true);
-  xhr.send();
-
-  xhr.onreadystatechange = function() {
-    if (xhr.readyState == 4) {
-      if (xhr.status == 200) {
-        if (xhr.response.commentCount > 0)  {
-            comments.innerHTML = ' \
+    xhr.onreadystatechange = function() {
+        if (xhr.readyState == 4) {
+            if (xhr.status == 200) {
+                comments.innerHTML = ' \
                <div> \
                    <h3> \
                        <a href="javascript:void(0)" onclick="toggle_comments(this)">[ - ]</a> \
-                        <%= translate(locale, "View `x` comments", "{commentCount}") %>  \
+                        {title} \
                    </h3> \
+                    <p> \
+                        <b> \
+                            <a href="javascript:void(0)" onclick="swap_comments(\'youtube\')"> \
+                                <%= translate(locale, "View YouTube comments") %> \
+                            </a> \
+                        </b> \
+                    </p> \
                    <b> \
-                        <a href="javascript:void(0)" onclick="swap_comments(\'reddit\')"> \
-                            <%= translate(locale, "View Reddit comments") %> \
-                        </a> \
+                        <a rel="noopener" target="_blank" href="https://reddit.com{permalink}"><%= translate(locale, "View more comments on Reddit") %></a> \
                    </b> \
                </div> \
                <div>{contentHtml}</div> \
                <hr>'.supplant({
-            contentHtml: xhr.response.contentHtml,
-            commentCount: number_with_separator(xhr.response.commentCount)
-            });
-        } else {
-          comments.innerHTML = "";
+                    title: xhr.response.title,
+                    permalink: xhr.response.permalink,
+                    contentHtml: xhr.response.contentHtml
+                });
+            } else {
+                <% if preferences && preferences.comments[1] == "youtube" %>
+                    get_youtube_comments(timeouts + 1);
+                <% else %>
+                    comments.innerHTML = fallback;
+                <% end %>
+            }
        }
-      } else {
-        <% if preferences && preferences.comments[1] == "youtube" %>
-        get_youtube_comments();
-        <% else %>
-        comments.innerHTML = "";
-        <% end %>
-      }
+    };
+
+    xhr.ontimeout = function() {
+        console.log('Pulling comments timed out.');
+        get_reddit_comments(timeouts + 1);
+    };
+}
+
+function get_youtube_comments(timeouts = 0) {
+    comments = document.getElementById('comments');
+
+    if (timeouts > 10) {
+        console.log('Failed to pull comments');
+        comments.innerHTML = '';
+        return;
    }
-  };
-
-  xhr.ontimeout = function() {
-    console.log("Pulling comments timed out.");

+    var fallback = comments.innerHTML;
    comments.innerHTML =
-      '<h3 style="text-align:center"><div class="loading"><i class="icon ion-ios-refresh"></i></div></h3>';
-    get_youtube_comments(timeouts + 1);
-  };
+        '<h3 style="text-align:center"><div class="loading"><i class="icon ion-ios-refresh"></i></div></h3>';
+
+    var url = '/api/v1/comments/<%= video.id %>' +
+        '?format=html' +
+        '&hl=<%= env.get("preferences").as(Preferences).locale %>' +
+        '&thin_mode=<%= env.get("preferences").as(Preferences).thin_mode %>';
+    var xhr = new XMLHttpRequest();
+    xhr.responseType = 'json';
+    xhr.timeout = 20000;
+    xhr.open('GET', url, true);
+    xhr.send();
+
+    xhr.onreadystatechange = function() {
+        if (xhr.readyState == 4) {
+            if (xhr.status == 200) {
+                if (xhr.response.commentCount > 0)  {
+                    comments.innerHTML = ' \
+                        <div> \
+                            <h3> \
+                                <a href="javascript:void(0)" onclick="toggle_comments(this)">[ - ]</a> \
+                                <%= translate(locale, "View `x` comments", "{commentCount}") %>  \
+                            </h3> \
+                            <b> \
+                                <a href="javascript:void(0)" onclick="swap_comments(\'reddit\')"> \
+                                    <%= translate(locale, "View Reddit comments") %> \
+                                </a> \
+                            </b> \
+                        </div> \
+                        <div>{contentHtml}</div> \
+                        <hr>'.supplant({
+                            contentHtml: xhr.response.contentHtml,
+                            commentCount: number_with_separator(xhr.response.commentCount)
+                        });
+                } else {
+                    comments.innerHTML = "";
+                }
+            } else {
+                <% if preferences && preferences.comments[1] == "youtube" %>
+                    get_youtube_comments(timeouts + 1);
+                <% else %>
+                    comments.innerHTML = '';
+                <% end %>
+            }
+        }
+    };
+
+    xhr.ontimeout = function() {
+        console.log('Pulling comments timed out.');
+        comments.innerHTML =
+            '<h3 style="text-align:center"><div class="loading"><i class="icon ion-ios-refresh"></i></div></h3>';
+        get_youtube_comments(timeouts + 1);
+    };
 }

 function get_youtube_replies(target, load_more) {
-  var continuation = target.getAttribute('data-continuation');
+    var continuation = target.getAttribute('data-continuation');

-  var body = target.parentNode.parentNode;
-  var fallback = body.innerHTML;
-  body.innerHTML =
-      '<h3 style="text-align:center"><div class="loading"><i class="icon ion-ios-refresh"></i></div></h3>';
+    var body = target.parentNode.parentNode;
+    var fallback = body.innerHTML;
+    body.innerHTML =
+        '<h3 style="text-align:center"><div class="loading"><i class="icon ion-ios-refresh"></i></div></h3>';

-  var url = '/api/v1/comments/<%= video.id %>?format=html&hl=<%= env.get("preferences").as(Preferences).locale %>&thin_mode=<%= env.get("preferences").as(Preferences).thin_mode %>&continuation=' +
-      continuation;
-  var xhr = new XMLHttpRequest();
-  xhr.responseType = 'json';
-  xhr.timeout = 20000;
-  xhr.open('GET', url, true);
-  xhr.send();
+    var url = '/api/v1/comments/<%= video.id %>' +
+        '?format=html' +
+        '&hl=<%= env.get("preferences").as(Preferences).locale %>' +
+        '&thin_mode=<%= env.get("preferences").as(Preferences).thin_mode %>' +
+        '&continuation=' + continuation;
+    var xhr = new XMLHttpRequest();
+    xhr.responseType = 'json';
+    xhr.timeout = 20000;
+    xhr.open('GET', url, true);
+    xhr.send();

-  xhr.onreadystatechange = function() {
-    if (xhr.readyState == 4) {
-      if (xhr.status == 200) {
-        if (load_more) {
-            body = body.parentNode.parentNode;
-            body.removeChild(body.lastElementChild);
-            body.innerHTML += xhr.response.contentHtml;
-        } else {
-            body.innerHTML = ' \
-                <p><a href="javascript:void(0)" \
+    xhr.onreadystatechange = function() {
+        if (xhr.readyState == 4) {
+            if (xhr.status == 200) {
+                if (load_more) {
+                    body = body.parentNode.parentNode;
+                    body.removeChild(body.lastElementChild);
+                    body.innerHTML += xhr.response.contentHtml;
+                } else {
+                    body.innerHTML = ' \
+                    <p><a href="javascript:void(0)" \
                    onclick="hide_youtube_replies(this, \'<%= translate(locale, "Hide replies") %>\', \'<%= translate(locale, "Show replies") %>\')"><%= translate(locale, "Hide replies") %> \
-                </a></p> \
-                <div>{contentHtml}</div>'.supplant({
-                contentHtml: xhr.response.contentHtml,
-            });
+                    </a></p> \
+                    <div>{contentHtml}</div>'.supplant({
+                        contentHtml: xhr.response.contentHtml,
+                    });
+                }
+            } else {
+                body.innerHTML = fallback;
+            }
        }
-      } else {
+    };
+
+    xhr.ontimeout = function() {
+        console.log('Pulling comments timed out.');
        body.innerHTML = fallback;
-      }
-    }
-  };
-
-  xhr.ontimeout = function() {
-    console.log('Pulling comments timed out.');
-
-    body.innerHTML = fallback;
-  };
+    };
 }

 <% if preferences %>
    <% if preferences.comments[0] == "youtube" %>
-    get_youtube_comments();
+        get_youtube_comments();
    <% elsif preferences.comments[0] == "reddit" %>
-    get_reddit_comments();
+        get_reddit_comments();
    <% else %>
        <% if preferences.comments[1] == "youtube" %>
-        get_youtube_comments();
+            get_youtube_comments();
        <% elsif preferences.comments[1] == "reddit" %>
-        get_reddit_comments();
+            get_reddit_comments();
        <% else %>
-        comments = document.getElementById("comments");
-        comments.innerHTML = "";
+            comments = document.getElementById('comments');
+            comments.innerHTML = '';
        <% end %>
    <% end %>
 <% else %>
-get_youtube_comments();
+    get_youtube_comments();
 <% end %>
 </script>
Author	SHA1	Message	Date
Omar Roth	5e2889e776	Update CHANGELOG and bump version	2019-05-05 23:02:43 -05:00
Omar Roth	5bda36fb28	Remove source map URL from videojs.hotkeys.min.js	2019-05-05 20:45:46 -05:00
Omar Roth	53fbb257b9	Update fix for HTTP Client	2019-05-05 19:03:56 -05:00
Omar Roth	65a32d6e20	Update fix for crystal-lang/crystal#7383	2019-05-05 17:47:45 -05:00
Omar Roth	92450920d4	Fix backticks in locales	2019-05-05 17:46:58 -05:00
Omar Roth	0099a9822e	Refactor subscribe_widget	2019-05-05 08:38:55 -05:00
Omar Roth	0cf86974dd	Add redirect for videos with no audio sources	2019-05-04 10:47:54 -05:00
Omar Roth	716705aa15	Add mouse hover for video previews	2019-05-04 08:43:41 -05:00
Omar Roth	757993064e	Fix view_count_text extractor for livestreams	2019-05-04 08:43:41 -05:00
Omar Roth	3f738cf905	Tweak styling for thumbnail video length	2019-05-04 08:43:34 -05:00
Omar Roth	570715100b	Fix text size for premieres	2019-05-03 18:00:16 -05:00
Omar Roth	ad8750b40d	Fix referer escaping	2019-05-03 12:15:21 -05:00
Omar Roth	757ea93393	Fix typo	2019-05-03 09:15:53 -05:00
Omar Roth	dbd5a222d5	Add '/watch_videos' endpoint	2019-05-03 09:11:38 -05:00
Omar Roth	bba80bc80f	Fix content-type for HEAD '.jpg'	2019-05-03 08:23:11 -05:00
Allan Nordhøy	094143bc28	Update Norwegian Bokmål translation	2019-05-02 21:38:28 +02:00
Jorge Maldonado Ventura	24a335d304	Update Esperanto translation	2019-05-02 21:38:28 +02:00
arkakuso	c62b318b9e	Update Basque translation	2019-05-02 21:38:28 +02:00
Jorge Maldonado Ventura	ea5c7c321a	Update Esperanto translation	2019-05-02 21:38:28 +02:00
Omar Roth	6d92775ab5	Add video previews	2019-05-02 14:36:32 -05:00
Omar Roth	1a9360ca75	Minor formatting changes	2019-05-01 20:03:39 -05:00
Omar Roth	22b9bbe702	Add support for anonymous playlists	2019-05-01 08:03:58 -05:00
Omar Roth	6fb44083ec	Update source and licenses	2019-05-01 07:40:18 -05:00
Omar Roth	ba02be08bb	Merge pull request #303 from glmdgrielson/annotations Add annotation player	2019-05-01 07:14:10 -05:00
Omar Roth	56fe3ede5b	Add annotation preferences	2019-04-30 23:39:04 -05:00
glmdgrielson	e48a000784	Add annotation player This addresses issue #110 from master. Yay for adding annotations back!	2019-04-30 21:19:13 -05:00
Omar Roth	6d1c150ff5	Fix typo	2019-04-30 21:18:35 -05:00
Omar Roth	21190a240f	Add support for adding banner to site header	2019-04-30 21:17:34 -05:00
Omar Roth	8a525bc131	Add '/api/v1/auth/preferences'	2019-04-30 21:01:57 -05:00
Omar Roth	734905d1f7	Bump max-age for HSTS	2019-04-30 20:53:56 -05:00
Omar Roth	90edf2fc60	Add 'debug' topic to /api/v1/auth/notifications	2019-04-30 20:48:48 -05:00
Omar Roth	e3f37c14db	Add glibc to Docker dependencies	2019-04-30 08:56:24 -05:00
Omar Roth	c6c92184d9	Fix duplicate id on watch page	2019-04-29 09:34:49 -05:00
Omar Roth	c4fbc65354	Provide bundled streams first in download widget	2019-04-28 18:51:10 -05:00
Omar Roth	54d250bde4	Add 'since' to '/api/v1/auth/notifications'	2019-04-28 18:14:16 -05:00
Omar Roth	ef309bd8d0	Translate value for 'familyFriendly'	2019-04-28 14:56:06 -05:00
Omar Roth	6cdb6ec711	Add support for plurlization to locales	2019-04-28 14:50:17 -05:00
Omar Roth	03891b66b6	Show view count for related videos	2019-04-28 14:14:44 -05:00
Omar Roth	42dd6326d5	Remove unnecessary index	2019-04-28 14:11:23 -05:00
Omar Roth	5c4defdb8e	Add support for '/c/:user/live'	2019-04-28 14:11:23 -05:00
Omar Roth	f08d53b0c6	Add view count to livestreams in search results	2019-04-28 14:11:23 -05:00
Omar Roth	6859b85266	Add 'lang' to HTML tag	2019-04-28 10:05:15 -05:00
Omar Roth	075adb4f03	Add http-source-selector	2019-04-28 10:05:15 -05:00
Esmail EL BoB	5ce72a3461	Updated most of ar.json (#508 ) * Update ar.json	2019-04-25 13:09:38 -05:00
Omar Roth	8c2958b86d	Add 'local=true' to hlsUrl	2019-04-25 12:41:35 -05:00
Omar Roth	f15b7cebac	Try to prevent timeout in /data_control	2019-04-24 20:18:35 -05:00
Omar Roth	f6d8df1e83	Update videojs-share	2019-04-24 08:48:34 -05:00
Omar Roth	19ed5bf993	Add support for 'user' URLs in NewPipe import	2019-04-22 15:39:57 -05:00
Omar Roth	5567e2843d	Force refresh after receiving PubSub notification	2019-04-22 11:15:19 -05:00
Omar Roth	0a8e20fd60	Revert "Update French translation" This reverts commit `a2533af116`.	2019-04-22 11:07:41 -05:00
Omar Roth	558c4341e4	Merge remote-tracking branch 'weblate/master'	2019-04-22 10:51:08 -05:00
Omar Roth	250860d92c	Add '/api/v1/auth/subscriptions'	2019-04-22 10:40:29 -05:00
Omar Roth	64aecba7a0	Add option to change passwords	2019-04-22 10:18:17 -05:00
Jorge Maldonado Ventura	3689b08237	Update Esperanto translation	2019-04-20 20:33:58 +02:00
Omar Roth	30e567e8b6	Fix published time for /api/v1/auth/notifications	2019-04-20 12:41:51 -05:00
Omar Roth	ddd74549fe	Fix description field for /api/v1/videos	2019-04-20 10:50:55 -05:00
Omar Roth	14620c32aa	Don't overwrite published date for channel_videos	2019-04-20 10:18:54 -05:00
Omar Roth	fb7068d415	Add '/api/v1/notifications'	2019-04-20 09:33:45 -05:00
Omar Roth	8614ff40df	Add support for Ukranian and Esperanto	2019-04-19 11:20:18 -05:00
Allan Nordhøy	aa10a9d899	Language fixes (#366 ) * Language fixes	2019-04-19 11:14:11 -05:00
Omar Roth	a5b8feca93	Merge remote-tracking branch 'weblate/master'	2019-04-19 10:31:14 -05:00
Omar Roth	486e47f985	Add missing text to locales	2019-04-19 10:28:12 -05:00
Omar Roth	bb5a1ad513	Add 'continue_autoplay' preference	2019-04-19 09:38:27 -05:00
Omar Roth	eac0a52f10	Fix shiftKey for player hotkeys	2019-04-19 09:20:41 -05:00
Tolstovka	7ac00258cc	Update Ukrainian translation	2019-04-19 15:49:24 +02:00
Tolstovka	e3a0ae8a4b	Update Russian translation	2019-04-19 15:49:24 +02:00
Adam Zieliński	2953159f8b	Update Polish translation	2019-04-19 15:49:24 +02:00
Allan Nordhøy	9693363c76	Update Norwegian Bokmål translation	2019-04-19 15:49:24 +02:00
Anne Onyme 017	a2533af116	Update French translation	2019-04-19 15:49:24 +02:00
Jorge Maldonado Ventura	b4aecb5b74	Update Spanish translation	2019-04-19 15:49:24 +02:00
Jorge Maldonado Ventura	15aa2498b5	Update Esperanto translation	2019-04-19 15:49:24 +02:00
Omar Roth	0372ff0c2c	Update shard.yml	2019-04-19 08:49:08 -05:00
Omar Roth	7a8d5a391a	Fix downcasting with usernames	2019-04-18 19:17:58 -05:00
Omar Roth	2a6c81a89d	Add authentication API	2019-04-18 16:23:50 -05:00
Omar Roth	301871aec6	Bump version	2019-04-18 08:37:29 -05:00
Omar Roth	25359e5320	Fix typo in 404 handler	2019-04-17 14:46:00 -05:00
Omar Roth	b6fff53b21	Refactor HTTP::Client calls into make_client	2019-04-17 09:06:31 -05:00
Omar Roth	ae7b5fac74	Fix handling for comments	2019-04-16 08:20:25 -05:00
Omar Roth	26168a9520	Refactor CSRF tokens (using format in #473 )	2019-04-15 23:23:40 -05:00
Omar Roth	698dfca319	Add migrate script for annotations.sql	2019-04-15 11:17:23 -05:00
Omar Roth	3bcb98e644	Add config option to cache annotations from IA	2019-04-15 11:13:09 -05:00
Omar Roth	2deb436ccd	Update placeholder text in new locales	2019-04-15 10:45:00 -05:00
Omar Roth	2b3405c4a9	Merge remote-tracking branch 'weblate/master'	2019-04-14 19:48:47 -05:00
Omar Roth	677a465630	Fix file formatting for locales	2019-04-14 19:48:21 -05:00
Omar Roth	8ecb76fc0b	Merge remote-tracking branch 'weblate/master'	2019-04-14 19:40:47 -05:00
Tolstovka	0178013fc1	Update Ukrainian translation	2019-04-14 19:39:17 -05:00
Tolstovka	c273a8ee69	Update Ukrainian translation	2019-04-15 02:23:36 +02:00
Tolstovka	0ed56b706b	Update Russian translation	2019-04-15 02:23:32 +02:00
Jorge Maldonado Ventura	4582b6cf76	Update Esperanto translation	2019-04-15 02:23:31 +02:00
Omar Roth	05513bcd1e	Fix "placeholder=" text in locales	2019-04-14 19:17:56 -05:00
Omar Roth	f5dd135ed8	Add 'view as playlist' option to trending page	2019-04-14 19:04:10 -05:00
Omar Roth	9c8f85741c	Fix search when keyword matches operator	2019-04-14 18:37:43 -05:00
Omar Roth	ca515f2eae	Use headset icon for audio mode	2019-04-14 18:24:25 -05:00
Omar Roth	80c1ebd768	Support 'sort_by' in reddit /api/v1/comments	2019-04-14 18:08:00 -05:00
Omar Roth	b51fd7fc13	Add view count to video items	2019-04-14 17:43:44 -05:00
Omar Roth	efe86c37b2	Show subscribe text when not logged in	2019-04-14 17:10:32 -05:00
Omar Roth	d20a4a8bfc	Fix grid size for smaller devices	2019-04-14 17:04:52 -05:00
Tolstovka	9da2d11e80	Add Ukrainian translation	2019-04-14 01:58:01 +02:00
Jorge Maldonado Ventura	5ef554aecf	Add Esperanto translation	2019-04-14 01:41:17 +02:00
Omar Roth	9a7fea0447	Add playlist support to embedded videos	2019-04-13 14:26:32 -05:00
Omar Roth	ae52ff93b2	Fix 404 for annotations endpoint	2019-04-13 08:28:59 -05:00
Omar Roth	80a567bf1e	Fix video count in playlist extractor	2019-04-12 16:37:35 -05:00
Omar Roth	ce2a3361eb	Fix missing author name for channel_videos	2019-04-12 16:29:23 -05:00
Omar Roth	ca9ea109c6	Add id to AdaptationSets	2019-04-12 11:19:54 -05:00
Omar Roth	2a33a746f0	Remove content type from videoplayback redirects	2019-04-12 11:08:33 -05:00
Omar Roth	e8c5246645	Fix share button	2019-04-12 09:31:05 -05:00
Omar Roth	98295b85ab	Add webm to dash manifests	2019-04-12 08:04:59 -05:00
Omar Roth	af1823db8c	Fix url in storyboards	2019-04-12 07:29:47 -05:00
Omar Roth	a2ab6b89f1	Fix width and height in manifest	2019-04-11 22:31:45 -05:00
Omar Roth	5de300fb35	Fix default background color for player	2019-04-11 17:03:37 -05:00
Omar Roth	62a4c82e95	Add storyboards and fix image caching	2019-04-11 17:00:00 -05:00
Omar Roth	d522c864d4	Add dashUrl to /api/v1/videos	2019-04-11 15:28:03 -05:00
Omar Roth	aa8ff7ace3	Always use ucid for channel search	2019-04-11 13:52:09 -05:00
Omar Roth	4e6a931de3	Make check_tables config option	2019-04-11 12:13:25 -05:00
Omar Roth	5e141e869d	Add subtitles to download widget	2019-04-11 12:08:43 -05:00
Omar Roth	611555514c	Remove unnecessary XML declaration	2019-04-11 11:53:07 -05:00
Omar Roth	e1c78fcbd3	Update view names to avoid collisions	2019-04-10 19:56:38 -05:00
Omar Roth	8640d6bb1e	Add 'extract_polymer_config'	2019-04-10 18:02:13 -05:00
Omar Roth	28d5bedcc7	Speed up table creation	2019-04-10 17:16:18 -05:00
Omar Roth	373b890e1d	Log command before execution	2019-04-10 17:09:36 -05:00
Omar Roth	aad0f90a9d	Add 'sign_token'	2019-04-10 16:58:46 -05:00
Omar Roth	5dc45c35e6	Automatically migrate database	2019-04-10 16:23:37 -05:00
Omar Roth	b8c87632e6	Add feed link to watch history	2019-04-09 17:41:25 -05:00
Omar Roth	c85903383a	Fix to_json for storing user preferences	2019-04-08 09:46:58 -05:00
Omar Roth	4aededf038	Add media-src blob: to CSP	2019-04-08 09:39:47 -05:00
Omar Roth	4bc6501b8d	Add 'blob' to CSP	2019-04-08 09:36:12 -05:00
Omar Roth	a1b3b47573	Add CSP, STS, and Referrer-Policy	2019-04-07 14:04:33 -05:00
Omar Roth	c8cf4fe09c	Fix subscription_ajax for Google accounts	2019-04-07 12:59:12 -05:00
Omar Roth	ca07d75405	Add '--version' to command line	2019-04-06 08:32:36 -05:00
Omar Roth	c5001f3620	Add role to psql scripts	2019-04-06 07:38:33 -05:00
				`@@ -0,0 +1 @@`
				.__cxt-ar-annotations-container__{--annotation-close-size: 20px;position:absolute;width:100%;height:100%;top:0;left:0;pointer-events:none;overflow:hidden}.__cxt-ar-annotation__{position:absolute;box-sizing:border-box;font-family:Arial,sans-serif;color:#fff;z-index:20;pointer-events:auto}.__cxt-ar-annotation__ span{position:absolute;left:0;top:0;overflow:hidden;word-wrap:break-word;white-space:pre-wrap;pointer-events:none;box-sizing:border-box;padding:2%;user-select:none;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none}.__cxt-ar-annotation-close__{display:none;position:absolute;width:var(--annotation-close-size);height:var(--annotation-close-size);cursor:pointer;right:calc(var(--annotation-close-size)/-1.8);top:calc(var(--annotation-close-size)/-1.8);z-index:1}.__cxt-ar-annotation__:hover:not([hidden]):not([data-ar-closed]) .__cxt-ar-annotation-close__{display:block}.__cxt-ar-annotation__[hidden]{display:none!important}.__cxt-ar-annotation__[data-ar-type=highlight]{border:1px solid rgba(255,255,255,.1);background-color:transparent}.__cxt-ar-annotation__[data-ar-type=highlight]:hover{border:1px solid rgba(255,255,255,.5);background-color:transparent}.__cxt-ar-annotation__ svg{pointer-events:all}